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

Resize Hardtack into Hardtack Crackers #74887

Merged
merged 9 commits into from
Jul 11, 2024
Merged

Resize Hardtack into Hardtack Crackers #74887

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2c7de78
hardtack_cracker
Maleclypse Jul 4, 2024
00a0f2d
Apply suggestions from code review
Maleclypse Jul 4, 2024
deb0bc4
Update data/json/recipes/recipe_food.json
Maleclypse Jul 4, 2024
4c45483
Update data/json/recipes/recipe_food.json
Maleclypse Jul 4, 2024
aa94187
Update data/json/items/comestibles/bread.json
Maleclypse Jul 4, 2024
90fed5b
Update data/json/items/comestibles/bread.json
Maleclypse Jul 7, 2024
715a2c0
Update bread.json
Maleclypse Jul 8, 2024
3651c89
remove bad densities
Maleclypse Jul 9, 2024
cd90036
Update fruit_dishes.json
Maleclypse Jul 9, 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
20 changes: 20 additions & 0 deletions data/json/items/comestibles/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,26 @@
"fun": 1,
"vitamins": [ [ "calcium", 1 ], [ "iron", 1 ], [ "wheat_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
"id": "hardtack_cracker",
"name": { "str_sp": "hardtack cracker" },
"weight": "480 g",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -12,
"calories": 280,
"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.",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"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",
Expand Down
18 changes: 15 additions & 3 deletions data/json/recipes/recipe_food.json
View file
Open in desktop
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 ]

Check failure on line 4438 in data/json/recipes/recipe_food.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

([slow] ~starting_items)=> Expected an array, got string

    "time": "2 m",
    "autolearn": true,
    "components": [ "hardtack_cracker", 1 ]
                  ▲▲▲
  },
  {

Check failure on line 4438 in data/json/recipes/recipe_food.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

(~[slow] ~[.],starting_items)=> Expected an array, got string

    "time": "2 m",
    "autolearn": true,
    "components": [ "hardtack_cracker", 1 ]
                  ▲▲▲
  },
  {
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand Down
Loading