Skip to content

Commit

Permalink
feat: remove EDIBLE_FROZEN tag (#2607)
Browse files Browse the repository at this point in the history
we don't have item temperature anymore, might as well as remove it
  • Loading branch information
scarf005 authored Apr 9, 2023
1 parent dabdd38 commit e4f40a8
Show file tree
Hide file tree
Showing 28 changed files with 106 additions and 167 deletions.
5 changes: 0 additions & 5 deletions data/json/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -1319,11 +1319,6 @@
"type": "json_flag",
"context": [ ]
},
{
"id": "EDIBLE_FROZEN",
"type": "json_flag",
"context": [ ]
},
{
"id": "EFFECT_IMPEDING",
"type": "json_flag",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,6 @@
"fun": -4,
"color": "yellow",
"container": "bottle_plastic_small",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 50,
"calories": 13,
"description": "This is a pre-mixed salty solution of protein and sugar. It's meant for bacteria to eat, but if you were desperate you could eat it too; it's not much different from cup noodle stock.",
Expand All @@ -1197,7 +1196,7 @@
"calories": 70,
"charges": 8,
"container": "bag_plastic",
"flags": [ "EDIBLE_FROZEN", "EATEN_COLD" ],
"flags": [ "EATEN_COLD" ],
"description": "These clear cubes of processed seaweed can be dissolved in boiling water to create a very sturdy, temperature resistant gel. Not only is it good for making gels to separate molecules by size, but it's a great cheat ingredient to make sure your jellies set properly.",
"material": "junk",
"volume": "900 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/comestibles/alcohol.json
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
"price_postapoc": 250,
"material": "alcohol",
"volume": "250 ml",
"flags": [ "UNSAFE_CONSUME", "EDIBLE_FROZEN" ],
"flags": [ "UNSAFE_CONSUME" ],
"freezing_point": 0,
"phase": "liquid",
"charges": 7,
Expand Down Expand Up @@ -1036,7 +1036,7 @@
"volume": "250 ml",
"phase": "liquid",
"charges": 6,
"flags": [ "UNSAFE_CONSUME", "EATEN_COLD", "EDIBLE_FROZEN" ],
"flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
"fun": 8,
"vitamins": [ [ "vitC", 20 ] ],
"freezing_point": -22
Expand Down Expand Up @@ -1065,7 +1065,7 @@
"volume": "250 ml",
"phase": "liquid",
"charges": 6,
"flags": [ "UNSAFE_CONSUME", "EATEN_COLD", "EDIBLE_FROZEN" ],
"flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
"fun": -12,
"vitamins": [ [ "vitC", 20 ] ],
"freezing_point": -22
Expand Down
7 changes: 3 additions & 4 deletions data/json/items/comestibles/bread.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"price_postapoc": 100,
"material": "wheat",
"volume": "250 ml",
"flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
"flags": [ "EATEN_HOT" ],
"vitamins": [ [ "calcium", 5 ], [ "iron", 12 ] ]
},
{
Expand Down Expand Up @@ -234,7 +234,7 @@
"primary_material": "wheat",
"volume": "250 ml",
"charges": 2,
"flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
"flags": [ "EATEN_HOT" ],
"fun": 1,
"vitamins": [ [ "calcium", 1 ], [ "iron", 1 ] ]
},
Expand All @@ -255,7 +255,6 @@
"material": "wheat",
"volume": "250 ml",
"charges": 2,
"flags": [ "EDIBLE_FROZEN" ],
"vitamins": [ [ "calcium", 2 ], [ "iron", 15 ] ],
"stack_size": 20,
"fun": -1
Expand All @@ -277,7 +276,7 @@
"material": "wheat",
"volume": "250 ml",
"charges": 10,
"flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
"flags": [ "EATEN_HOT" ],
"fun": 3,
"vitamins": [ [ "vitA", 1 ], [ "calcium", 11 ], [ "iron", 9 ] ]
},
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"type": "COMESTIBLE",
"name": "large human stomach",
"description": "The stomach of a large humanoid creature. It is surprisingly durable.",
"proportional": { "weight": 2.0, "volume": 2.0, "price": 1.5, "calories": 2.0 }
"proportional": { "weight": 2, "volume": 2, "price": 1.5, "calories": 2 }
},
{
"id": "human_fat",
Expand Down Expand Up @@ -241,7 +241,7 @@
"type": "COMESTIBLE",
"name": "raw offal",
"description": "Offal is uncooked internal organs and entrails. It's filled with essential vitamins, but most people consider it a bit gross unless very carefully prepared.",
"proportional": { "parasites": 2.0 },
"proportional": { "parasites": 2 },
"price_postapoc": 25,
"delete": { "flags": [ "SMOKABLE" ] },
"relative": { "vitamins": [ [ "vitA", 5 ], [ "iron", 4 ] ], "fun": -5 }
Expand Down Expand Up @@ -320,7 +320,7 @@
"type": "COMESTIBLE",
"name": "large stomach",
"description": "The stomach of a large woodland creature. It is surprisingly durable.",
"proportional": { "weight": 2.0, "volume": 2.0, "price": 1.5, "calories": 2.0 }
"proportional": { "weight": 2, "volume": 2, "price": 1.5, "calories": 2 }
},
{
"id": "jerky",
Expand Down Expand Up @@ -361,7 +361,7 @@
"price_postapoc": 250,
"quench": -5,
"fun": 4,
"proportional": { "price": 2.0, "volume": 0.345, "weight": 0.345 },
"proportional": { "price": 2, "volume": 0.345, "weight": 0.345 },
"delete": { "flags": [ "RAW" ] }
},
{
Expand Down Expand Up @@ -709,7 +709,7 @@
"copy-from": "small_stomach_boiled",
"name": "large boiled stomach",
"description": "A boiled stomach from an animal, nothing else. It looks all but appetizing.",
"proportional": { "price": 2.0, "calories": 2.0, "volume": 2.0, "weight": 2.0 },
"proportional": { "price": 2, "calories": 2, "volume": 2, "weight": 2 },
"fun": -5
},
{
Expand Down
1 change: 0 additions & 1 deletion data/json/items/comestibles/dairy.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@
"primary_material": "powder",
"volume": "250 ml",
"cooks_like": "milk",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 4,
"vitamins": [ [ "vitA", 3 ], [ "vitB", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
"fun": -5
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/drink_other.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@
"name": { "str_sp": "animal cooking oil" },
"copy-from": "cooking_oil",
"description": "Thin yellow animal oil used for cooking.",
"material": [ "flesh", "oil" ],
"flags": [ ]
"material": [ "flesh", "oil" ]
},
{
"type": "COMESTIBLE",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"material": "egg",
"volume": "600 ml",
"fun": -5,
"proportional": { "weight": 12.0, "calories": 12.0 },
"proportional": { "weight": 12, "calories": 12 },
"vitamins": [ [ "vitA", 108 ], [ "calcium", 36 ], [ "iron", 48 ], [ "vitB", 252 ], [ "mutant_toxin", 25 ] ],
"rot_spawn": "GROUP_EGG_ANT",
"rot_spawn_chance": 60
Expand Down Expand Up @@ -255,7 +255,6 @@
"material": [ "powder", "egg" ],
"primary_material": "powder",
"volume": "250 ml",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 16,
"fun": -3,
"vitamins": [ [ "vitB", 2 ] ]
Expand Down
3 changes: 0 additions & 3 deletions data/json/items/comestibles/fruit_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"material": "fruit",
"primary_material": "dried_vegetable",
"volume": "250 ml",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 5,
"vitamins": [ [ "vitC", 21 ], [ "calcium", 2 ], [ "iron", 4 ] ],
"fun": 3
Expand Down Expand Up @@ -117,7 +116,6 @@
"material": [ "powder", "fruit" ],
"primary_material": "powder",
"volume": "250 ml",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 10,
"vitamins": [ [ "vitC", 7 ] ],
"fun": 1
Expand Down Expand Up @@ -184,7 +182,6 @@
"primary_material": "dried_vegetable",
"//": "most of the water weight and volume is lost",
"volume": "100 ml",
"flags": [ "EDIBLE_FROZEN" ],
"fun": 2
},
{
Expand Down
Loading

0 comments on commit e4f40a8

Please sign in to comment.