Skip to content

Commit

Permalink
Caviar sandwich + bread material! (CleverRaven#61817)
Browse files Browse the repository at this point in the history
* Update comment-commands.yml

* Update egg.json

* Update recipe_food.json

* Update recipe_food.json

* typo

* linting

* more linting

* volue and weight values are a complete scam

* dropping razorclaw roe from recipe

* lint again after line got smaller

* new "bread" material

* bread!

* bread!

* dont need to double after removing razorclaw roe

* 1 charge

* Update comment-commands.yml

* adding 252 calories

* Update egg.json

* Update data/json/materials.json

Co-authored-by: TheShadowFerret <[email protected]>

Co-authored-by: TheShadowFerret <[email protected]>
  • Loading branch information
nopenoperson and TheShadowFerret authored Oct 25, 2022
1 parent daab6e1 commit c21b171
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 0 deletions.
17 changes: 17 additions & 0 deletions data/json/items/comestibles/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,23 @@
"fun": 12,
"flags": [ "EATEN_HOT", "FREEZERBURN" ]
},
{
"type": "COMESTIBLE",
"id": "caviar_egg_sandwich",
"name": { "str_sp": "caviar and egg sandwich" },
"weight": "165 g",
"color": "brown",
"comestible_type": "FOOD",
"symbol": "%",
"calories": 252,
"description": "A simple sandwich with sliced, hard boiled eggs and mayo to balance out the saltiness of the caviar. Scandinavian breakfast staple.",
"price": 500,
"price_postapoc": 300,
"material": [ "bread", "egg" ],
"primary_material": "bread",
"volume": "649 ml",
"fun": 10
},
{
"type": "COMESTIBLE",
"id": "pickled_egg",
Expand Down
23 changes: 23 additions & 0 deletions data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,29 @@
"cut_dmg_verb": "cut",
"burn_data": [ { "fuel": 1, "smoke": 1, "burn": 1 }, { "fuel": 1, "smoke": 1, "burn": 2 }, { "fuel": 1, "smoke": 1, "burn": 3 } ]
},
{
"type": "material",
"id": "bread",
"//": "copied from junk food sans resists, then I googled density of bread and didn't do any other research, it's supposed to be US style white bread",
"name": "Bread",
"density": 0.2,
"specific_heat_liquid": 3.3,
"specific_heat_solid": 2.05,
"latent_heat": 220,
"edible": true,
"rotting": true,
"bash_resist": 0,
"cut_resist": 0,
"bullet_resist": 0,
"acid_resist": 0,
"fire_resist": 0,
"conductive": true,
"chip_resist": 0,
"dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
"bash_dmg_verb": "smashed",
"cut_dmg_verb": "cut",
"burn_data": [ { "fuel": 1, "smoke": 1, "burn": 1 }, { "fuel": 1, "smoke": 1, "burn": 2 }, { "fuel": 1, "smoke": 1, "burn": 3 } ]
},
{
"type": "material",
"id": "foodplace_foodstuff",
Expand Down
14 changes: 14 additions & 0 deletions data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
Expand Up @@ -4491,6 +4491,20 @@
[ [ "condiment", 2, "LIST" ] ]
]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "caviar_egg_sandwich",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_OTHER",
"skill_used": "cooking",
"difficulty": 2,
"time": "2 m",
"autolearn": true,
"batch_time_factors": [ 80, 2 ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "boiled_egg", 1 ] ], [ [ "mayonnaise", 1 ] ], [ [ "cured_roe", 1 ] ], [ [ "bread_sandwich", 2, "LIST" ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand Down

0 comments on commit c21b171

Please sign in to comment.