Skip to content

Commit

Permalink
Removes Questionable Trash Spawns, and Axes Elf Mutagen Books from al…
Browse files Browse the repository at this point in the history
…l but Lab Areas (#71936)

* fixes merge errors.

* removes, axes, throws away the trash.
  • Loading branch information
DoctorBoomstick authored Feb 24, 2024
1 parent d6c98a1 commit fc26b93
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 13 deletions.
3 changes: 0 additions & 3 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@
{ "group": "religious_books", "prob": 10 },
{ "group": "kids_books", "prob": 20 },
{ "item": "wrapper_foil_roll", "prob": 25 },
[ "recipe_elfa", 15 ],
[ "recipe_bows", 15 ],
[ "manual_stabbing", 20 ],
[ "manual_dodge", 20 ],
Expand Down Expand Up @@ -1247,7 +1246,6 @@
{ "item": "water_purifier", "prob": 5, "charges": [ 0, 100 ] },
[ "flyer", 10 ],
[ "decoy_elfa", 10 ],
[ "recipe_elfa", 1 ],
[ "tongs", 10 ],
[ "boots_rubber", 20 ],
{ "item": "sm_extinguisher", "prob": 10, "charges": 10 },
Expand Down Expand Up @@ -1828,7 +1826,6 @@
[ "textbook_carpentry", 6 ],
[ "mag_mechanics", 25 ],
[ "decoy_elfa", 8 ],
[ "recipe_elfa", 1 ],
{ "item": "extinguisher", "prob": 20, "charges": 100 },
{ "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
{ "item": "geiger_off", "prob": 8, "charges": [ 0, 100 ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@
[ "SICP", 3 ],
[ "textbook_robots", 1 ],
[ "textbook_traps", 2 ],
[ "recipe_elfa", 1 ],
[ "textbook_anarch", 1 ],
[ "recipe_bows", 2 ],
[ "recipe_arrows", 2 ],
Expand Down
8 changes: 2 additions & 6 deletions data/json/itemgroups/food_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@
{
"id": "pizza_trash",
"type": "item_group",
"ammo": 100,
"items": [
[ "cup_plastic", 40 ],
[ "wrapper", 34 ],
Expand All @@ -394,9 +393,7 @@
[ "news_regional", 7 ],
[ "mag_news", 7 ],
[ "hairpin", 10 ],
[ "flyer", 7 ],
{ "item": "glock_19", "prob": 5, "charges": [ 0, 15 ] },
{ "item": "9mm", "prob": 3, "charges": [ 1, 50 ] }
[ "flyer", 7 ]
]
},
{
Expand Down Expand Up @@ -1151,8 +1148,7 @@
[ "mag_news", 15 ],
[ "news_regional", 15 ],
{ "item": "glass_shard", "prob": 30, "count": [ 1, 8 ] },
[ "jug_plastic", 25 ],
[ "fetus", 1 ]
[ "jug_plastic", 25 ]
]
},
{
Expand Down
3 changes: 0 additions & 3 deletions data/json/itemgroups/trash_and_debris.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@
"magazine": 50,
"items": [
[ "plastic_shopping_bag", 35 ],
{ "prob": 5, "group": "iodine_bottle_plastic_pill_supplement_1_10" },
{ "prob": 5, "group": "prussian_blue_bottle_plastic_pill_supplement_1_10" },
[ "bum_wine", 5 ],
{ "prob": 2, "group": "meth_bag_zipper_1_6" },
{ "prob": 1, "group": "heroin_bag_zipper_1_4" },
Expand Down Expand Up @@ -220,7 +218,6 @@
{ "group": "newspaper", "prob": 10 },
[ "file", 5 ],
[ "decoy_elfa", 10 ],
[ "recipe_elfa", 1 ],
[ "jug_plastic", 10 ],
[ "fuel_tin", 8 ],
[ "spray_can", 50 ],
Expand Down

0 comments on commit fc26b93

Please sign in to comment.