Merge pull request #7 from CleverRaven/master

Add supreme pizza (CleverRaven#35924)
fengjixuchui · Dec 10, 2019 · 1fe9a14 · 1fe9a14
2 parents 94f41b6 + 24490b7
commit 1fe9a14
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
@@ -844,6 +844,20 @@
     "fun": 10,
     "vitamins": [ [ "vitA", 3 ], [ "vitC", 10 ], [ "calcium", 28 ], [ "iron", 28 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "pizza_supreme",
+    "name": "supreme pizza",
+    "copy-from": "pizza_meat",
+    "color": "light_red",
+    "weight": "300 g",
+    "calories": 641,
+    "description": "A supreme pizza with ALL the toppings.",
+    "price": 1500,
+    "material": [ "wheat", "flesh", "veggy", "milk" ],
+    "fun": 11,
+    "vitamins": [ [ "vitA", 12 ], [ "vitC", 20 ], [ "calcium", 32 ], [ "iron", 28 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "deluxe_eggs",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -3854,6 +3854,46 @@
       [ [ "water", 1 ], [ "water_clean", 1 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "result": "pizza_supreme",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 3,
+    "time": "30 m",
+    "book_learn": [ [ "cookbook_italian", 3 ] ],
+    "qualities": [ { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
+    "components": [
+      [ [ "flour", 30 ] ],
+      [
+        [ "meat_red", 2, "LIST" ],
+        [ "can_chicken", 2 ],
+        [ "meat_salted", 2 ],
+        [ "dry_meat", 2 ],
+        [ "fish", 2 ],
+        [ "fish_canned", 2 ],
+        [ "can_tuna", 2 ],
+        [ "salted_fish", 2 ],
+        [ "rehydrated_fish", 2 ],
+        [ "dry_fish", 2 ],
+        [ "tofu", 2 ],
+        [ "dry_tofu", 2 ]
+      ],
+      [
+        [ "veggy_any", 2, "LIST" ],
+        [ "mushroom", 2 ],
+        [ "dry_mushroom", 2 ],
+        [ "morel_cooked", 2 ],
+        [ "mushroom_cooked", 2 ],
+        [ "dry_veggy", 2 ]
+      ],
+      [ [ "cheese", 2 ], [ "can_cheese", 2 ], [ "cheese_hard", 2 ] ],
+      [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "seasoning_italian", 5 ], [ "wild_herbs", 10 ] ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "smores",

diff --git a/src/suffer.cpp b/src/suffer.cpp
@@ -417,8 +417,8 @@ void Character::suffer_from_schizophrenia()
     std::string i_name_w;
     if( !weapon.is_null() ) {
         i_name_w = weapon.has_var( "item_label" ) ? weapon.get_var( "item_label" ) :
-                               //~ %1$s: weapon name
-                               string_format( _( "your %1$s" ), weapon.type_name() );
+                   //~ %1$s: weapon name
+                   string_format( _( "your %1$s" ), weapon.type_name() );
     }
     // Start with the effects that both NPCs and avatars can suffer from
     // Delusions