Merge pull request #52 from CleverRaven/master

Bittersweet encounters (CleverRaven#36939)
fengjixuchui · Jan 14, 2020 · 0debc00 · 0debc00
2 parents 0e88064 + 7b2fa6d
commit 0debc00
Show file tree

Hide file tree

Showing 49 changed files with 2,153 additions and 1,187 deletions.
diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json
diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -18,15 +18,15 @@
     "name": "fillet of fish",
     "name_plural": "fillets of fish",
     "description": "Freshly caught fish.  Makes a passable meal raw.",
-    "//": "Nutrition information based on cod",
+    "//": "Nutrition information based on whitefish",
     "weight": "148 g",
     "volume": "250 ml",
     "price": 500,
     "spoils_in": "12 hours",
     "flags": [ "SMOKABLE", "RAW" ],
     "smoking_result": "fish_smoked",
     "vitamins": [ [ "vitA", 2 ], [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 3 ], [ "vitB", 9 ] ],
-    "calories": 121
+    "calories": 260
   },
   {
     "id": "fish_cooked",

diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
@@ -331,7 +331,7 @@
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "calories": 470,
+    "calories": 748,
     "description": "A delicious golden brown serving of crispy fried fish.",
     "price": 500,
     "material": "flesh",
@@ -396,7 +396,7 @@
     "symbol": "%",
     "quench": -2,
     "healthy": 1,
-    "calories": 121,
+    "calories": 260,
     "description": "Lutefisk is preserved fish that has been dried in a lye solution.  Vile and soap-like yet highly nutritious, it is reminiscent of the afterbirth of a dog or the world's largest chunk of phlegm.",
     "price": 200,
     "material": "flesh",
@@ -1168,7 +1168,7 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 2,
-    "calories": 223,
+    "calories": 378,
     "description": "Delicious slivers of thinly sliced raw fish wrapped in tasty sushi rice and rolled up in a healthy green vegetable.",
     "price": 350,
     "material": [ "veggy", "flesh" ],
@@ -1207,6 +1207,7 @@
     "color": "white",
     "spoils_in": "12 hours",
     "healthy": 1,
+    "calories": 160,
     "description": "Delicious slivers of thinly sliced raw fish and tasty vegetables.",
     "price": 600,
     "material": [ "veggy", "flesh" ],

diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json
@@ -328,7 +328,7 @@
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "calories": 561,
+    "calories": 700,
     "description": "A delicious fish bagel with spinach and eggs.",
     "price": 800,
     "material": [ "flesh", "wheat" ],

diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
@@ -107,7 +107,7 @@
     "symbol": "~",
     "quench": 8,
     "healthy": 1,
-    "calories": 220,
+    "calories": 359,
     "description": "A nutritious and delicious hearty fish soup.",
     "price": 400,
     "material": "flesh",
@@ -297,7 +297,7 @@
     "symbol": "~",
     "quench": 8,
     "healthy": 1,
-    "calories": 293,
+    "calories": 387,
     "description": "A rich and tasty fish chowder from Scotland, made with preserved fish and creamy milk.",
     "price": 500,
     "material": [ "flesh", "milk" ],