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

Jump to bottom

feat(balance,port): Mainline Nonperishable Overhaul's changes to item perishability #4113

Merged
merged 8 commits into from
Jan 17, 2024
Merged

feat(balance,port): Mainline Nonperishable Overhaul's changes to item perishability #4113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78804e1
Mainline Nonperishable Overhaul's perishability changes
RobbieNeko Jan 15, 2024
98641ef
Revert "Mainline Nonperishable Overhaul's perishability changes"
RobbieNeko Jan 15, 2024
4c4832a
Mainline Nonperishable Overhaul's changes WITHOUT messing up the chan…
RobbieNeko Jan 15, 2024
22f5f00
Fix jerky error
RobbieNeko Jan 15, 2024
299b234
Update item_test.cpp
chaosvolt Jan 15, 2024
58abd70
Update food_fun_for_test.cpp
chaosvolt Jan 15, 2024
643dd94
Update food_fun_for_test.cpp
chaosvolt Jan 15, 2024
057c35b
Fix potted meat
RobbieNeko Jan 16, 2024
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/items/comestibles/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@
"name": "hardtack",
"weight": "80 g",
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -2,
Expand Down
8 changes: 3 additions & 5 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty confident spoils in 0 errors out. This needs to be load tested.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As described in the PR body, I did load test this. It does not error, and works just fine.
image
As you can see, no spoiling

Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@
"weight": "85 g",
"container": "bag_plastic",
"color": "brown",
"spoils_in": "24 days",
"volume": "250 ml",
"parasites": 0,
"price": "320 cent",
Expand All @@ -356,7 +355,7 @@
"primary_material": "cured_meat",
"container": "bag_plastic",
"color": "light_gray",
"spoils_in": "24 days",
"spoils_in": "0 days",
"parasites": 0,
"price_postapoc": "250 cent",
"quench": -5,
Expand All @@ -375,7 +374,7 @@
],
"description": "Tasty meat that has been heavily smoked for preservation. It could be further smoked to dehydrate it completely.",
"color": "brown",
"spoils_in": "24 days",
"spoils_in": "0 days",
"price_postapoc": "2 USD",
"quench": -1,
"fun": 5,
Expand All @@ -389,7 +388,7 @@
"name": { "str_sp": "smoked fish" },
"description": "Tasty fish that has been heavily smoked for long term preservation. It could be further smoked to dehydrate it completely.",
"color": "brown",
"spoils_in": "24 days",
"spoils_in": "0 days",
"price_postapoc": "2 USD",
"fun": 6,
"flags": [ "EATEN_HOT", "SMOKED", "SMOKABLE" ],
Expand Down Expand Up @@ -533,7 +532,6 @@
"name": "tallow",
"weight": "110 g",
"color": "white",
"spoils_in": "60 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -10,
Expand Down
4 changes: 1 addition & 3 deletions data/json/items/comestibles/dairy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"type": "COMESTIBLE",
"id": "milk_UHT",
"name": { "str_sp": "shelf stable milk" },
"spoils_in": "2 d",
"spoils_in": "2 days",
"copy-from": "milk",
"container": "carton_sealed",
"description": "This is milk that has been pasteurized at much higher temperatures than normal. It tastes slightly different, but, unopened, will last far longer than regular milk.",
Expand Down Expand Up @@ -92,7 +92,6 @@
"name": { "str_sp": "ghee" },
"copy-from": "butter",
"weight": "13500 mg",
"spoils_in": "90 days",
"container": "jar_glass_sealed",
"calories": 112,
"description": "Clarified butter, free from milk solids and water. Will last a very long time.",
Expand Down Expand Up @@ -145,7 +144,6 @@
"name": { "str_sp": "hard cheese" },
"weight": "34 g",
"color": "yellow",
"spoils_in": "180 days",
"container": "wrapper",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down
4 changes: 0 additions & 4 deletions data/json/items/comestibles/drink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
"copy-from": "tea",
"color": "green",
"use_action": "FLUMED",
"spoils_in": "10 days",
"stim": 1,
"quench": 34,
"healthy": 1,
Expand Down Expand Up @@ -182,7 +181,6 @@
"copy-from": "tea",
"color": "green",
"use_action": "SLEEP",
"spoils_in": "10 days",
"quench": 34,
"healthy": 1,
"description": "A healthy beverage made from chamomile flowers steeped in boiling water. Can be used to treat insomnia.",
Expand Down Expand Up @@ -629,7 +627,6 @@
"name": { "str_sp": "lotus tea" },
"copy-from": "tea",
"color": "green",
"spoils_in": "10 days",
"quench": 34,
"healthy": 1,
"description": "A healthy beverage made from lotus flowers steeped in boiling water.",
Expand Down Expand Up @@ -925,7 +922,6 @@
"copy-from": "tea",
"color": "green",
"use_action": "ANTIASTHMATIC",
"spoils_in": "10 days",
"quench": 34,
"healthy": 1,
"description": "A healthy beverage made from spurge flowers steeped in boiling water. Can be used to prevent asthma attacks.",
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/comestibles/fruit_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"name": "fruit leather",
"weight": "34 g",
"color": "pink",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -169,7 +168,6 @@
"name": { "str_sp": "dehydrated fruit" },
"weight": "75 g",
"color": "magenta",
"spoils_in": "360 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -2,
Expand Down
22 changes: 0 additions & 22 deletions data/json/items/comestibles/junkfood.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
"name": { "str_sp": "popcorn" },
"weight": "8 g",
"color": "white",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -154,7 +153,6 @@
"name": { "str_sp": "pretzels" },
"weight": "62 g",
"color": "brown",
"spoils_in": "90 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -175,7 +173,6 @@
"name": "chocolate-covered pretzel",
"weight": "96 g",
"color": "brown",
"spoils_in": "90 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -195,7 +192,6 @@
"name": "chocolate bar",
"weight": "34 g",
"color": "brown",
"spoils_in": "360 days",
"container": "wrapper",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -215,7 +211,6 @@
"name": { "str_sp": "marshmallows" },
"weight": "53 g",
"color": "white",
"spoils_in": "90 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -252,7 +247,6 @@
"name": { "str": "peanut butter candy", "str_pl": "peanut butter candies" },
"weight": "39 g",
"color": "brown",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -273,7 +267,6 @@
"name": { "str": "chocolate candy", "str_pl": "chocolate candies" },
"weight": "57 g",
"color": "red",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -294,7 +287,6 @@
"name": { "str_sp": "chewy candy" },
"weight": "46 g",
"color": "yellow",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -314,7 +306,6 @@
"name": { "str_sp": "powder candy sticks" },
"weight": "46 g",
"color": "red",
"spoils_in": "360 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -6,
Expand All @@ -334,7 +325,6 @@
"name": { "str": "maple syrup candy", "str_pl": "maple syrup candies" },
"weight": "18 g",
"color": "brown",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -355,7 +345,6 @@
"name": "graham cracker",
"weight": "31 g",
"color": "brown",
"spoils_in": "90 days",
"container": "box_small",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -376,7 +365,6 @@
"name": "cookie",
"weight": "33 g",
"color": "brown",
"spoils_in": "60 days",
"container": "box_small",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -476,7 +464,6 @@
"name": "chocolate-covered coffee bean",
"weight": "30 g",
"color": "brown",
"spoils_in": "360 days",
"addiction_type": "caffeine",
"fatigue_mod": 30,
"stim": 10,
Expand Down Expand Up @@ -531,7 +518,6 @@
"name": { "str": "peppermint patty", "str_pl": "peppermint patties" },
"weight": "43 g",
"color": "brown",
"spoils_in": "180 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -551,7 +537,6 @@
"name": { "str_sp": "Necco wafers" },
"weight": "60 g",
"color": "magenta",
"spoils_in": "180 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -571,7 +556,6 @@
"name": "candy cigarette",
"weight": "18 g",
"color": "white",
"spoils_in": "180 days",
"container": "box_cigarette",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -613,7 +597,6 @@
"name": { "str_sp": "potato chips" },
"weight": "28 g",
"color": "yellow",
"spoils_in": "30 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -634,7 +617,6 @@
"name": "sugary cereal",
"weight": "38 g",
"color": "yellow",
"spoils_in": "90 days",
"container": "box_small",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -654,7 +636,6 @@
"name": "corn cereal",
"weight": "39 g",
"color": "yellow",
"spoils_in": "90 days",
"container": "box_small",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -674,7 +655,6 @@
"name": { "str_sp": "tortilla chips" },
"weight": "80 g",
"color": "yellow",
"spoils_in": "30 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -768,7 +748,6 @@
"name": "pork stick",
"weight": "56 g",
"color": "brown",
"spoils_in": "24 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -1097,7 +1076,6 @@
"name": "malted milk ball",
"weight": "40 g",
"color": "brown",
"spoils_in": "180 days",
"container": "box_small",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down
15 changes: 5 additions & 10 deletions data/json/items/comestibles/meat_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"copy-from": "sausage_raw",
"parasites": 0,
"healthy": 0,
"spoils_in": "24 days",
"spoils_in": "0 days",
"price_postapoc": "3 USD",
"description": "A hefty sausage that has been cured and smoked for long term storage.",
"flags": [ "EATEN_HOT", "SMOKED" ],
Expand Down Expand Up @@ -71,7 +71,6 @@
],
"weight": "351 g",
"color": "brown",
"spoils_in": "60 days",
"container": "can_medium",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -157,7 +156,6 @@
"name": { "str": "bacon", "str_pl": "pieces of bacon" },
"weight": "85 g",
"color": "pink",
"spoils_in": "24 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand All @@ -183,7 +181,7 @@
"description": "Lean sausage made from heavily salt-cured offal, with natural gut casing. Waste not, want not.",
"parasites": 0,
"healthy": 0,
"spoils_in": "24 days",
"spoils_in": "0 days",
"quench": -7,
"fun": -3,
"flags": [ "SMOKED" ]
Expand Down Expand Up @@ -217,7 +215,6 @@
"name": { "str_sp": "cracklins" },
"weight": "42 g",
"color": "brown",
"spoils_in": "7 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -314,7 +311,7 @@
"primary_material": "cured_meat",
"weight": "85 g",
"color": "light_gray",
"spoils_in": "360 days",
"spoils_in": "0 days",
"quench": -3,
"description": "Dehydrated fish flakes. With proper storage, this dried food will remain edible for an incredibly long time.",
"price": "5 USD",
Expand Down Expand Up @@ -430,7 +427,6 @@
"name": "lutefisk",
"weight": "175 g",
"color": "light_gray",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -535,7 +531,6 @@
],
"weight": "106 g",
"color": "brown",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
Expand Down Expand Up @@ -1156,7 +1151,7 @@
"copy-from": "meat_cooked",
"weight": "85 g",
"color": "red",
"spoils_in": "360 days",
"spoils_in": "0 days",
"quench": -3,
"description": "Dehydrated meat flakes. With proper storage, this dried food will remain edible for an incredibly long time.",
"price": "9 USD",
Expand Down Expand Up @@ -1267,7 +1262,7 @@
"copy-from": "meat_tainted",
"weight": "85 g",
"color": "red",
"spoils_in": "360 days",
"spoils_in": "0 days",
"use_action": "POISON",
"quench": -3,
"description": "Pieces of poisonous meat that have been dried to prevent them from rotting away. It will still poison you if you eat this.",
Expand Down
Loading
Loading