Skip to content

Commit

Permalink
Mainline Nonperishable Overhaul's perishability changes
Browse files Browse the repository at this point in the history
Doing the Derg's work, one tedious Weh at a time.

Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com>
  • Loading branch information
RobbieNeko and chaosvolt committed Jan 15, 2024
1 parent 6a10d32 commit 78804e1
Show file tree
Hide file tree
Showing 16 changed files with 143 additions and 212 deletions.
1 change: 0 additions & 1 deletion data/json/items/comestibles/bread.json
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
33 changes: 16 additions & 17 deletions data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
"weight": "85 g",
"container": "bag_plastic",
"color": "brown",
"spoils_in": "24 days",
"spoils_in": "0 days",
"volume": "250 ml",
"parasites": 0,
"price": "320 cent",
Expand All @@ -356,7 +356,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 +375,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 +389,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 +533,6 @@
"name": "tallow",
"weight": "110 g",
"color": "white",
"spoils_in": "60 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -10,
Expand Down Expand Up @@ -620,8 +619,8 @@
"symbol": "%",
"calories": 174,
"description": "Meat that's obviously unhealthy. You could eat it, but it will poison you.",
"price": "0 cent",
"price_postapoc": "10 cent",
"price": 0,
"price_postapoc": 10,
"material": "flesh",
"volume": "250 ml",
"fun": -10,
Expand All @@ -641,8 +640,8 @@
"healthy": -1,
"calories": 17,
"description": "A rotten and brittle bone from some unnatural creature or other. Could be used to make some stuff, like charcoal or glue. You could eat it, but it will poison you.",
"price": "0 cent",
"price_postapoc": "5 cent",
"price": 0,
"price_postapoc": 5,
"//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes except for charcoal.",
"material": "bone",
"volume": "250 ml",
Expand Down Expand Up @@ -672,8 +671,8 @@
"healthy": -3,
"calories": 9,
"description": "A watery yellow glob of fat from some unnatural creature or other. You could eat it, but it will poison you.",
"price": "0 cent",
"price_postapoc": "25 cent",
"price": 0,
"price_postapoc": 25,
"//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes.",
"material": "flesh",
"volume": "250 ml",
Expand All @@ -694,8 +693,8 @@
"healthy": -2,
"calories": 18,
"description": "A smooth grayish block of cleaned and rendered monster fat. It will remain 'fresh' for a very long time, and can be used as an ingredient in many projects. You could eat it, but it will poison you.",
"price": "0 cent",
"price_postapoc": "50 cent",
"price": 0,
"price_postapoc": 50,
"//": "Not for use in edible/foodsafe recipes. Inefficiency is handled by tainted tallow recipe requiring 200% as much materials input as regular tallow recipe.",
"material": "flesh",
"volume": "250 ml",
Expand Down Expand Up @@ -776,9 +775,9 @@
"name": "tainted hide",
"spoils_in": "6 hours",
"use_action": "POISON",
"price_postapoc": "10 cent",
"price_postapoc": 10,
"description": "A carefully folded poisonous raw skin harvested from an unnatural creature. You can cure it for storage and tanning.",
"price": "0 cent"
"price": 0
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -818,8 +817,8 @@
"spoils_in": "6 hours",
"use_action": "POISON",
"description": "A carefully folded raw skin harvested from a fur-bearing unnatural creature. It still has the fur attached and is poisonous. You can cure it for storage and tanning.",
"price": "0 cent",
"price_postapoc": "50 cent",
"price": 0,
"price_postapoc": 50,
"flags": [ "NO_SALVAGE", "UNSAFE_CONSUME" ]
},
{
Expand Down
4 changes: 1 addition & 3 deletions data/json/items/comestibles/dairy.json
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
26 changes: 11 additions & 15 deletions data/json/items/comestibles/drink.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,12 @@
"copy-from": "tea",
"color": "green",
"use_action": "FLUMED",
"spoils_in": "10 days",
"stim": 1,
"quench": 34,
"healthy": 1,
"description": "A healthy beverage made from bee balm steeped in boiling water. Can be used to reduce negative effects of common cold or flu.",
"price": "1 USD",
"price_postapoc": "25 cent",
"price": 100,
"price_postapoc": 25,
"fun": 1
},
{
Expand Down Expand Up @@ -182,12 +181,11 @@
"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.",
"price": "1 USD",
"price_postapoc": "25 cent",
"price": 100,
"price_postapoc": 25,
"fun": 1
},
{
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,12 +922,11 @@
"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.",
"price": "1 USD",
"price_postapoc": "25 cent",
"price": 100,
"price_postapoc": 25,
"fun": 1
},
{
Expand Down Expand Up @@ -1031,8 +1027,8 @@
"symbol": "~",
"quench": -35,
"description": "Often regarded as folk medicine in some countries, bark tea tastes awful and tends to dry you out, but can help flush out stomach or other gut bugs.",
"price": "1250 cent",
"price_postapoc": "25 cent",
"price": 1250,
"price_postapoc": 25,
"volume": "500 ml",
"material": [ "water" ],
"phase": "liquid",
Expand Down Expand Up @@ -1070,9 +1066,9 @@
"category": "food",
"name": { "str_sp": "water" },
"description": "Water, the stuff of life, the best thirst-quencher available. It would be safer to drink once purified.",
"weight": "250 g",
"volume": "250 ml",
"price": "50 cent",
"weight": 250,
"volume": 1,
"price": 50,
"symbol": "~",
"color": "light_blue",
"phase": "liquid",
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/comestibles/fruit_dishes.json
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
Loading

0 comments on commit 78804e1

Please sign in to comment.