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.

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

Resize Hardtack into Hardtack Crackers #74887

Merged
merged 9 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 22 additions & 2 deletions data/json/items/comestibles/bread.json
Original file line number Diff line number Diff line change
Expand Up @@ -443,11 +443,31 @@
"fun": 1,
"vitamins": [ [ "calcium", 1 ], [ "iron", 1 ], [ "wheat_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
"id": "hardtack_cracker",
"name": { "str_sp": "hardtack cracker" },
"weight": "72 g",
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -12,
"calories": 1680,
"description": "A dry, virtually tasteless bread cracker capable of remaining edible without spoilage for vast lengths of time. So hard it is inedible by itself. Usually broken into smaller pieces for consumption.",
"price": "6 cent",
"price_postapoc": "7 cent",
"material": [ "wheat" ],
"volume": "73 ml",
"flags": [ "INEDIBLE" ],
"vitamins": [ [ "calcium", 12 ], [ "iron", 90 ], [ "wheat_allergen", 1 ] ],
"fun": -4
},
{
"type": "COMESTIBLE",
"id": "hardtack",
"name": { "str_sp": "hardtack" },
"weight": "80 g",
"weight": "12 g",
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
Expand All @@ -467,7 +487,7 @@
"type": "COMESTIBLE",
"id": "soggy_hardtack",
"name": { "str_sp": "soggy hardtack" },
"weight": "80 g",
"weight": "12 g",
"color": "white",
"spoils_in": "5 days",
"comestible_type": "FOOD",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/fruit_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@
"id": "hardtack_pudding",
"looks_like": "biscuit",
"name": { "str": "hardtack pudding" },
"weight": "250 g",
"weight": "15 g",
"color": "brown",
"spoils_in": "5 days",
"container": "can_medium",
Expand All @@ -565,7 +565,7 @@
"price": "50 cent",
"price_postapoc": "1 USD",
"material": [ "fruit", "wheat" ],
"volume": "500 ml",
"volume": "250 ml",
"charges": 4,
"phase": "liquid",
"flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
Expand Down
18 changes: 15 additions & 3 deletions data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
Expand Up @@ -4405,7 +4405,7 @@
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "hardtack",
"result": "hardtack_cracker",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREAD",
"skill_used": "cooking",
Expand All @@ -4420,11 +4420,23 @@
"proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_baking" } ],
"//1": "double usual price of flour to dehydrate it more than usual.",
"components": [
[ [ "flour_any", 6, "LIST" ] ],
[ [ "salt", 1 ], [ "soysauce", 1 ], [ "seasoning_salt", 1 ] ],
[ [ "flour_any", 38, "LIST" ] ],
[ [ "salt", 6 ], [ "soysauce", 6 ], [ "seasoning_salt", 6 ] ],
[ [ "water_clean", 2 ] ]
]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "hardtack",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREAD",
"skill_used": "cooking",
"charges": 6,
"time": "2 m",
"autolearn": true,
"components": [ [ [ "hardtack_cracker", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand Down
3 changes: 0 additions & 3 deletions data/mods/TEST_DATA/known_bad_density.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
"scrambledeggsandbrain",
"sewage",
"sauerkraut_onions",
"soggy_hardtack",
"antarvasa",
"needle_bone",
"chem_formaldehyde",
Expand Down Expand Up @@ -271,7 +270,6 @@
"rehydrated_meat",
"hickory_nut",
"lye_potassium",
"hardtack",
"con_milk",
"venom_paralytic",
"oil_lamp_clay",
Expand Down Expand Up @@ -435,7 +433,6 @@
"lye",
"walnut",
"chaps_leather",
"hardtack_pudding",
"fetus",
"makeshift_hose",
"cheeseburger_wheat_free",
Expand Down
Loading