Merge pull request #12 from CleverRaven/master

Update #12
Maleclypse · Jun 9, 2020 · 1a37367 · 1a37367
2 parents 02b04b6 + d071e91
commit 1a37367
Show file tree

Hide file tree

Showing 53 changed files with 1,012 additions and 414 deletions.
diff --git a/data/json/achievements.json b/data/json/achievements.json
@@ -145,14 +145,28 @@
     "name": "What are they hiding?",
     "requirements": [
       {
-        "event_statistic": "num_avatar_enter_lab_finale",
-        "is": ">=",
-        "target": 1,
+        "event_statistic": "last_oter_type_avatar_entered",
+        "is": "==",
+        "target": [ "oter_type_str_id", "lab_finale" ],
         "visible": "when_achievement_completed",
         "description": "Enter a lab finale room"
       }
     ]
   },
+  {
+    "id": "achievement_reach_refugee_center",
+    "type": "achievement",
+    "name": "The Last Homely House",
+    "requirements": [
+      {
+        "event_statistic": "last_oter_type_avatar_entered",
+        "is": "==",
+        "target": [ "oter_type_str_id", "evac_center_18" ],
+        "visible": "when_achievement_completed",
+        "description": "Reach a refugee center"
+      }
+    ]
+  },
   {
     "id": "achievement_return_to_first_omt",
     "type": "achievement",

diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -598,6 +598,7 @@
     "price": 0,
     "price_postapoc": 10,
     "material": "bone",
+    "milling": { "into": "meal_bone", "conversion_rate": 4 },
     "volume": "250 ml",
     "vitamins": [ [ "calcium", 96 ] ]
   },

diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
@@ -15,7 +15,8 @@
     "price_postapoc": 250,
     "material": "veggy",
     "volume": "1 L",
-    "flags": [ "EDIBLE_FROZEN", "MILLABLE", "RAW" ],
+    "milling": { "into": "flour", "conversion_rate": 15 },
+    "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "charges": 4,
     "vitamins": [ [ "calcium", 6 ], [ "iron", 29 ] ],
     "fun": -15
@@ -73,7 +74,8 @@
     "price_postapoc": 400,
     "material": "veggy",
     "volume": "500 ml",
-    "flags": [ "EDIBLE_FROZEN", "MILLABLE", "RAW" ],
+    "milling": { "into": "flour", "conversion_rate": 15 },
+    "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "charges": 2,
     "vitamins": [ [ "calcium", 3 ], [ "iron", 22 ] ],
     "fun": -10

diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
@@ -14,8 +14,9 @@
     "price": 120,
     "price_postapoc": 100,
     "material": "wheat",
+    "milling": { "into": "flour", "conversion_rate": 15 },
     "volume": "250 ml",
-    "flags": [ "EDIBLE_FROZEN", "MILLABLE", "RAW" ],
+    "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "vitamins": [ [ "calcium", 4 ], [ "iron", 40 ] ],
     "fun": -10
   },
@@ -180,7 +181,8 @@
     "price_postapoc": 100,
     "material": "wheat",
     "volume": "250 ml",
-    "flags": [ "EDIBLE_FROZEN", "MILLABLE", "RAW" ],
+    "milling": { "into": "flour", "conversion_rate": 3.75 },
+    "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "vitamins": [ [ "calcium", 3 ], [ "iron", 20 ] ],
     "fun": -10
   },

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -313,6 +313,7 @@
     "price_postapoc": 25,
     "material": "chitin",
     "flags": [ "NO_SALVAGE" ],
+    "milling": { "into": "meal_chitin_piece", "conversion_rate": 4 },
     "weight": "89 g",
     "volume": "250 ml",
     "bashing": 1,

diff --git a/data/json/items/melee/fake.json b/data/json/items/melee/fake.json
@@ -20,13 +20,12 @@
     "name": { "str": "monomolecular blade" },
     "description": "A foot-long blade made from high-tech alloy and edged with bonded nanocrystals.",
     "weight": "100 g",
-    "to_hit": 3,
     "color": "dark_gray",
     "symbol": "{",
     "material": [ "superalloy" ],
     "techniques": [ "WBLOCK_2" ],
     "volume": "750 ml",
-    "cutting": 36,
+    "cutting": 28,
     "flags": [ "UNARMED_WEAPON", "NO_UNWIELD", "UNBREAKABLE_MELEE", "TRADER_AVOID" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   }

diff --git a/data/json/items/melee/knives_kitchen.json b/data/json/items/melee/knives_kitchen.json
@@ -19,6 +19,7 @@
     "volume": "300 ml",
     "price": 3000,
     "price_postapoc": 50,
+    "to_hit": -1,
     "bashing": 2,
     "cutting": 10,
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 25 ] ],
@@ -35,7 +36,6 @@
     "volume": "100 ml",
     "price": 250,
     "price_postapoc": 50,
-    "to_hit": -1,
     "bashing": 2,
     "cutting": 7,
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 15 ] ],
@@ -53,7 +53,7 @@
     "volume": "30 ml",
     "price": 250,
     "price_postapoc": 50,
-    "to_hit": -1,
+    "to_hit": -2,
     "bashing": 1,
     "cutting": 6,
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 10 ] ],
@@ -71,6 +71,7 @@
     "volume": "200 ml",
     "price": 1500,
     "price_postapoc": 100,
+    "to_hit": -1,
     "bashing": 1,
     "cutting": 10,
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 10 ] ],
@@ -88,6 +89,7 @@
     "volume": "200 ml",
     "price": 1500,
     "price_postapoc": 50,
+    "to_hit": -3,
     "bashing": 1,
     "cutting": 8,
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 22 ] ],
@@ -123,6 +125,7 @@
     "volume": "250 ml",
     "price": 2500,
     "price_postapoc": 50,
+    "to_hit": -1,
     "bashing": 2,
     "cutting": 10,
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ],
@@ -140,6 +143,7 @@
     "volume": "300 ml",
     "price": 3500,
     "price_postapoc": 50,
+    "to_hit": -1,
     "bashing": 2,
     "cutting": 12,
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 25 ] ],