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.

Sign up for GitHub

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 charges from solid comestibles #60885

Merged
merged 13 commits into from
Jul 31, 2023
Merged

Remove charges from solid comestibles #60885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c4827ee
charge removal:
Mar 12, 2023
801394b
enforce proper charge definitions
Mar 11, 2023
2741ea4
adjust iuse_transform
Dec 5, 2022
f5489e4
overflow items before consuming/using them to avoid removing items wi…
May 9, 2023
66db31a
allow recipe charges for non-charge items
May 1, 2023
7e2cb39
remove copy-from from spread_peanutbutter
May 1, 2023
8e5d30c
fix pickle spawn amount
May 1, 2023
d06dc4b
keep test items stackable
May 1, 2023
9297c6e
fungal_seeds AMMO -> COMESTIBLE
May 8, 2023
821a34e
misc fixes
May 1, 2023
ec9c610
charge removal script
May 1, 2023
689e81f
automated json updates - items, itemgroups, and recipes
Jul 25, 2023
e02978c
post script fixes
Jul 25, 2023
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
15 changes: 10 additions & 5 deletions data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,20 @@
"ammo": 100,
"magazine": 100,
"subtype": "distribution",
"entries": [
{ "item": "wooden_barrel", "prob": 100, "sealed": true },
{ "item": "juice_pulp", "prob": 100, "charges": [ 7, 77 ], "container-item": "wooden_barrel" }
]
"entries": [ { "item": "wooden_barrel", "prob": 100, "sealed": true }, { "prob": 100, "group": "juice_pulp_wooden_barrel_7_77" } ]
},
{
"type": "item_group",
"id": "sometimes_manure",
"subtype": "distribution",
"entries": [ { "item": "null", "prob": 3 }, { "item": "feces_manure", "prob": 1 } ]
"entries": [ { "item": "null", "prob": 3 }, { "item": "feces_manure", "prob": 1, "count": 4 } ]
},
{
"type": "item_group",
"id": "juice_pulp_wooden_barrel_7_77",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "wooden_barrel",
"entries": [ { "item": "juice_pulp", "count": [ 7, 77 ] } ]
}
]
14 changes: 7 additions & 7 deletions data/json/itemgroups/Agriculture_Forage_Excavation/forage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{ "item": "snail_garden", "prob": 10, "count-min": 1, "count-max": 3 },
{ "item": "wild_garlic", "prob": 5, "count-min": 2, "count-max": 7 },
{ "item": "rhubarb", "prob": 5, "count-min": 2, "count-max": 5 },
{ "item": "wild_herbs", "prob": 10 },
{ "item": "wild_herbs", "prob": 10, "count": 20 },
{ "item": "thyme", "prob": 5, "count-min": 1, "count-max": 2 },
{ "item": "garlic", "prob": 1 },
{ "item": "seed_garlic", "prob": 4, "count-min": 1, "count-max": 2 },
{ "item": "seed_canola", "prob": 5, "count-min": 1, "count-max": 2 },
{ "item": "dogbane", "prob": 5, "count-min": 1, "count-max": 2 },
{ "item": "carrot_wild", "prob": 5, "count-min": 1, "count-max": 2 },
{ "item": "carrot_wild", "prob": 5, "count-min": 3, "count-max": 6 },
{ "item": "bee_balm", "prob": 5, "count-min": 4, "count-max": 8 },
{ "item": "mugwort", "prob": 5, "count-min": 1, "count-max": 2 },
{ "item": "swarm_bees", "prob": 2 }
Expand All @@ -34,8 +34,8 @@
{ "group": "any_wild_egg", "prob": 5, "count-min": 2, "count-max": 5 },
{ "item": "egg_reptile", "prob": 5, "count-min": 1, "count-max": 3 },
{ "item": "snail_garden", "prob": 10, "count-min": 1, "count-max": 3 },
{ "item": "wild_herbs", "prob": 20 },
{ "item": "buckwheat", "prob": 5, "count-min": 1, "count-max": 4 },
{ "item": "wild_herbs", "prob": 20, "count": 20 },
{ "item": "buckwheat", "prob": 5, "count-min": 2, "count-max": 8 },
{ "item": "thyme", "prob": 5, "count-min": 1, "count-max": 3 },
{ "item": "garlic", "prob": 1 },
{ "item": "seed_garlic", "prob": 4, "count-min": 1, "count-max": 6 },
Expand All @@ -54,15 +54,15 @@
{ "item": "mayapple", "prob": 8, "count-min": 1, "count-max": 2 },
{ "item": "groundnut", "prob": 2, "count-min": 1, "count-max": 9 },
{ "group": "forage_mushroom", "prob": 50 },
{ "item": "wild_herbs", "prob": 10 },
{ "item": "buckwheat", "prob": 15, "count-min": 2, "count-max": 4 },
{ "item": "wild_herbs", "prob": 10, "count": 20 },
{ "item": "buckwheat", "prob": 15, "count-min": 4, "count-max": 8 },
{ "item": "thyme", "prob": 5, "count-min": 1, "count-max": 3 },
{ "item": "garlic", "prob": 1 },
{ "item": "snail_garden", "prob": 10, "count-min": 1, "count-max": 3 },
{ "item": "seed_garlic", "prob": 4, "count-min": 1, "count-max": 6 },
{ "item": "seed_canola", "prob": 5, "count-min": 1, "count-max": 3 },
{ "item": "dogbane", "prob": 5, "count-min": 1, "count-max": 3 },
{ "item": "carrot_wild", "prob": 5, "count-min": 1, "count-max": 2 },
{ "item": "carrot_wild", "prob": 5, "count-min": 3, "count-max": 6 },
{ "item": "bee_balm", "prob": 5, "count-min": 1, "count-max": 3 },
{ "item": "mugwort", "prob": 5, "count-min": 1, "count-max": 3 },
{ "item": "salsify_raw", "prob": 5, "count-min": 1, "count-max": 3 }
Expand Down
40 changes: 36 additions & 4 deletions data/json/itemgroups/Clothing_Gear/clothing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@
{ "item": "jeans", "prob": 30 },
{ "item": "sports_bra", "prob": 25 },
{ "item": "jacket_leather", "prob": 20 },
{ "item": "aspirin", "prob": 30 },
{ "prob": 30, "group": "aspirin_bottle_plastic_pill_painkiller_20" },
{ "item": "water_clean", "prob": 30 },
{ "item": "sports_drink", "prob": 30 },
{ "group": "used_1st_aid", "prob": 20 },
Expand Down Expand Up @@ -3379,9 +3379,9 @@
[ "machete_gimmick", 3 ],
[ "fungicide", 10 ],
[ "insecticide", 10 ],
{ "item": "antifungal", "prob": 1, "charges": [ 0, 10 ] },
{ "item": "antiparasitic", "prob": 5, "charges": [ 0, 10 ] },
{ "item": "diazepam", "prob": 1, "charges": [ 0, 10 ] },
{ "prob": 1, "group": "antifungal_bottle_plastic_pill_prescription_0_10" },
{ "prob": 5, "group": "antiparasitic_bottle_plastic_pill_prescription_0_10" },
{ "prob": 1, "group": "diazepam_bottle_plastic_pill_prescription_0_10" },
[ "throw_extinguisher", 2 ],
{ "item": "small_repairkit", "prob": 14, "charges": [ 0, 500 ] },
[ "grapnel", 6 ],
Expand Down Expand Up @@ -4584,5 +4584,37 @@
"//": "tefillin sets",
"subtype": "collection",
"items": [ { "item": "tefillin_hand_l", "prob": 100 }, { "item": "tefillin_head", "prob": 100 } ]
},
{
"type": "item_group",
"id": "aspirin_bottle_plastic_pill_painkiller_20",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "bottle_plastic_pill_painkiller",
"entries": [ { "item": "aspirin", "container-item": "null", "count": 20 } ]
},
{
"type": "item_group",
"id": "antifungal_bottle_plastic_pill_prescription_0_10",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "bottle_plastic_pill_prescription",
"entries": [ { "item": "antifungal", "container-item": "null", "count": [ 0, 10 ] } ]
},
{
"type": "item_group",
"id": "antiparasitic_bottle_plastic_pill_prescription_0_10",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "bottle_plastic_pill_prescription",
"entries": [ { "item": "antiparasitic", "container-item": "null", "count": [ 0, 10 ] } ]
},
{
"type": "item_group",
"id": "diazepam_bottle_plastic_pill_prescription_0_10",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "bottle_plastic_pill_prescription",
"entries": [ { "item": "diazepam", "container-item": "null", "count": [ 0, 10 ] } ]
}
]
4 changes: 2 additions & 2 deletions data/json/itemgroups/Clothing_Gear/gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
{ "item": "oxygen_tank", "prob": 10, "charges-min": 4 },
{ "item": "smoxygen_tank", "prob": 15, "charges-min": 2 },
[ "UPS_OFF", 2 ],
{ "item": "prussian_blue", "prob": 25, "charges": [ 1, 10 ] },
{ "item": "iodine", "prob": 50, "charges": [ 1, 10 ] }
{ "prob": 25, "group": "prussian_blue_bottle_plastic_pill_supplement_1_10" },
{ "prob": 50, "group": "iodine_bottle_plastic_pill_supplement_1_10" }
]
},
{
Expand Down
26 changes: 17 additions & 9 deletions data/json/itemgroups/Clothing_Gear/gear_civilian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{ "group": "wallets", "prob": 1600 },
{ "item": "cell_phone", "prob": 26, "charges": [ 0, 300 ] },
{ "item": "smart_phone", "prob": 204, "charges-min": 0 },
{ "item": "cig", "prob": 250, "charges-min": 1, "charges-max": 20 },
{ "prob": 250, "group": "cig_box_cigarette_1_20" },
{ "item": "lighter", "prob": 50, "charges-min": 0 },
{ "item": "small_lighter", "prob": 25, "charges-min": 0 },
[ "joint", 10 ],
Expand All @@ -32,8 +32,8 @@
[ "machete_gimmick", 5 ],
[ "teleumbrella", 20 ],
[ "umbrella", 20 ],
{ "item": "aspirin", "prob": 100, "charges": [ 1, 20 ] },
{ "item": "vitamins", "prob": 100, "charges": [ 1, 20 ] },
{ "prob": 100, "group": "aspirin_bottle_plastic_pill_painkiller_1_20" },
{ "prob": 100, "group": "vitamins_bottle_plastic_pill_supplement_1_20" },
[ "eyedrops", 50 ],
{ "item": "inhaler", "prob": 50, "charges-min": 10, "charges-max": 100 },
{ "item": "flashlight", "prob": 50, "charges": [ 0, 300 ] },
Expand All @@ -50,7 +50,7 @@
{ "item": "mp3", "prob": 20, "charges": [ 0, 100 ] },
{ "item": "portable_game", "prob": 50, "charges": [ 0, 100 ] },
{ "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] },
{ "item": "gum", "prob": 50, "charges": [ 0, 10 ] },
{ "item": "gum", "prob": 50, "count": [ 0, 10 ] },
{ "group": "ammo_pocket_batteries", "prob": 50 },
[ "wrapper", 50 ],
[ "wrapper_foil", 5 ],
Expand Down Expand Up @@ -94,8 +94,8 @@
"items": [
{ "group": "candy_chocolate", "prob": 200 },
{ "group": "toastems", "prob": 25 },
{ "item": "cookies", "prob": 80, "charges": [ 1, 4 ] },
{ "item": "licorice", "prob": 10, "charges": [ 1, 4 ] },
{ "prob": 80, "group": "cookies_box_snack_1_4" },
{ "prob": 10, "group": "licorice_bag_plastic_1_4" },
{ "item": "mp3", "prob": 80, "charges": [ 0, 100 ] },
{ "item": "portable_game", "prob": 30, "charges": [ 0, 100 ] },
{ "group": "softdrinks_canned", "prob": 55 },
Expand Down Expand Up @@ -133,8 +133,8 @@
"items": [
{ "group": "candy_chocolate", "prob": 200 },
{ "group": "toastems", "prob": 25 },
{ "item": "cookies", "prob": 80, "charges": [ 1, 4 ] },
{ "item": "licorice", "prob": 10, "charges": [ 1, 4 ] },
{ "prob": 80, "group": "cookies_box_snack_1_4" },
{ "prob": 10, "group": "licorice_bag_plastic_1_4" },
[ "bat", 40 ],
[ "bat_nerf", 20 ],
[ "bat_metal", 20 ],
Expand Down Expand Up @@ -329,7 +329,7 @@
[ "trailmap", 6 ],
[ "touristmap", 4 ],
{ "item": "lighter", "prob": 60, "charges-min": 0 },
{ "item": "cig", "prob": 40, "charges": [ 1, 20 ] },
{ "prob": 40, "group": "cig_box_cigarette_1_20" },
[ "blazer", 15 ],
[ "jeans", 90 ],
[ "under_armor", 15 ],
Expand Down Expand Up @@ -396,5 +396,13 @@
[ "wallet_travel", 10 ],
{ "item": "teargas_sprayer", "prob": 5, "charges": 10 }
]
},
{
"type": "item_group",
"id": "licorice_bag_plastic_1_4",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "bag_plastic",
"entries": [ { "item": "licorice", "container-item": "null", "count": [ 1, 4 ] } ]
}
]
2 changes: 1 addition & 1 deletion data/json/itemgroups/Clothing_Gear/hazmat_gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{ "item": "mask_gas", "prob": 60, "charges-min": 0 },
{ "item": "gasfilter_med", "prob": 60, "charges-min": 0 },
{ "item": "rad_monitor", "prob": 33, "charges": [ 0, 100 ] },
{ "item": "iodine", "prob": 33, "charges": [ 1, 10 ] },
{ "prob": 33, "group": "iodine_bottle_plastic_pill_supplement_1_10" },
{ "group": "full_1st_aid", "prob": 15 },
{ "item": "geiger_off", "prob": 15, "charges": [ 0, 100 ] }
]
Expand Down
Loading