Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove more 0.G migrations #64399

Merged
merged 7 commits into from
Mar 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@
"TOXICFLESH",
"FRESHWATEROSMOSIS",
"BIOLUM0",
"BIOLUM0_active",
"BIOLUM1",
"BIOLUM1_active",
"BIOLUM2",
Expand Down
3 changes: 1 addition & 2 deletions data/json/itemgroups/Labs/lab_security.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
"entries": [
{ "item": "UPS_off", "prob": 70 },
{ "item": "heavy_battery_cell", "prob": 70 },
{ "item": "heavy_plus_battery_cell", "prob": 40 },
{ "item": "adv_UPS_off", "prob": 40 }
{ "item": "heavy_plus_battery_cell", "prob": 40 }
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{ "item": "molotov", "count": 5 },
{ "item": "cotton_patchwork", "count": 25 },
{ "item": "gasoline", "count": 1 },
{ "item": "improvised_pipebomb", "count": 25 },
{ "item": "pipebomb", "count": 25 },
{ "item": "fuse", "count": 5 },
{ "item": "FMCNote", "count": 3 },
{ "item": "nail", "count": 5, "charges": [ 1, 100 ] },
Expand Down
6 changes: 2 additions & 4 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@
{ "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
{ "item": "ref_matches", "prob": 60, "charges": [ 0, 32 ] },
[ "sewage", 60 ],
[ "improvised_pipebomb", 4 ],
[ "pipebomb", 4 ],
{ "item": "crack", "prob": 8, "charges": [ 1, 4 ] },
[ "crackpipe", 37 ],
{ "item": "lsd", "prob": 10, "charges": [ 1, 5 ] },
Expand Down Expand Up @@ -1295,8 +1295,7 @@
[ "material_shrd_limestone", 40 ],
[ "material_niter", 5 ],
[ "chem_rdx", 5 ],
[ "chem_hmtd", 10 ],
[ "tool_anfo_charge", 2 ]
[ "chem_hmtd", 10 ]
]
},
{
Expand Down Expand Up @@ -1369,7 +1368,6 @@
{ "group": "tools_toolbox", "prob": 1 },
[ "apron_leather", 5 ],
[ "apron_cut_resistant", 10 ],
[ "tool_anfo_charge", 1 ],
{ "item": "remotevehcontrol", "prob": 10, "charges": [ 0, 100 ] }
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
[ "deagle_44", 2 ],
[ "lemat_revolver", 1 ],
[ "m1911", 5 ],
[ "mn_ebr_kit", 1 ],
[ "mosin91_30", 1 ],
[ "match_trigger", 3 ],
[ "autoclave", 1 ],
{ "item": "geiger_off", "prob": 8, "charges": [ 0, 100 ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
{ "item": "ref_matches", "prob": 60, "charges": [ 0, 32 ] },
[ "claw_bar", 3 ],
[ "crowbar", 18 ],
[ "improvised_pipebomb", 4 ],
[ "pipebomb", 4 ],
[ "grenade", 3 ],
[ "grenade_inc", 1 ],
[ "mininuke", 1 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Locations_MapExtras/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@
[ "glass", 20 ],
{ "group": "tobacco_products", "prob": 75 },
{ "group": "cigar_box_opened", "prob": 50 },
[ "money_bundle", 10 ],
[ "money_bundle_ten", 10 ],
[ "pretzels", 5 ],
[ "chips", 5 ],
{ "group": "wallet_stylish_full", "prob": 1 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
{ "item": "survivormap", "prob": 1 },
{ "item": "miner_hat", "prob": 10 },
{ "item": "honey_ant", "prob": 30 },
{ "item": "tool_small_primitive_fragmentation_device", "prob": 1 }
{ "item": "homemade_bomb_act", "prob": 1 }
]
},
{
Expand All @@ -93,7 +93,7 @@
{ "item": "survivormap", "prob": 1 },
{ "item": "wetsuit", "prob": 10, "damage": [ 2, 4 ] },
{ "item": "wetsuit_thick", "prob": 10, "damage": [ 2, 4 ] },
{ "item": "tool_small_primitive_fragmentation_device", "prob": 1 }
{ "item": "homemade_bomb_act", "prob": 1 }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/arsenal/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"type": "item_group",
"id": "milspec_arsenal_shot",
"items": [
{ "item": "m1014", "prob": 100 },
{ "item": "mossberg_930", "variant": "m1014", "prob": 100 },
{ "item": "mossberg_590", "prob": 70 },
{ "item": "mossberg_500", "prob": 50 },
{ "group": "nested_m26_mass_no_ammo", "prob": 30 }
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@
"type": "item_group",
"id": "guns_rifle_improvised",
"//": "Makeshift or otherwise poor quality rifles.",
"items": [ { "item": "rifle_22", "prob": 60 }, { "item": "rifle_3006", "prob": 30 }, { "item": "rifle_9mm", "prob": 60 } ]
"items": [ { "item": "rifle_22", "prob": 60 }, { "item": "remington_700", "prob": 30 }, { "item": "rifle_9mm", "prob": 60 } ]
},
{
"type": "item_group",
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@
[ "rugerlcpmag", 10 ],
[ "sw22mag", 10 ],
[ "p220_10_mag", 1 ],
[ "p226mag_15rd_357sig", 25 ],
[ "p320mag_14rd_357sig", 10 ],
[ "p226mag_12rd_357sig", 25 ],
[ "p320mag_13rd_357sig", 10 ],
[ "bhp9mag_13rd", 2 ],
[ "bhp9mag_15rd", 1 ],
[ "ppq9mag_10rd", 4 ],
Expand Down
3 changes: 0 additions & 3 deletions data/json/itemgroups/obsolete.json

This file was deleted.

2 changes: 1 addition & 1 deletion data/json/itemgroups/shops_trades.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
{ "item": "glass_bowl", "prob": 65, "count": [ 1, 6 ] },
{ "item": "malachite", "prob": 75, "count": [ 3, 15 ] },
{ "item": "citrine", "prob": 75, "count": [ 3, 15 ] },
{ "item": "jar_glass", "prob": 60, "count": [ 1, 5 ] },
{ "item": "jar_glass_sealed", "prob": 60, "count": [ 1, 5 ] },
{ "item": "glass", "prob": 60, "count": [ 1, 7 ] }
]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gunmod/mechanism.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"symbol": ":",
"color": "red",
"location": "mechanism",
"mod_targets": [ "glock_19", "glock_17", "glock_22", "glock_31", "glock_21", "glock_20", "glock_40", "glock_29" ],
"mod_targets": [ "glock_19", "glock_17", "glock_22", "glock_31", "glock_21", "glock_20", "glock_29" ],
"//": "Install time should be short as it is simply a replacement back plate, installed by slightly more than field stripping the gun.",
"install_time": "5 m",
"//durability_modifier": -1,
Expand Down
Loading