Merge pull request #12 from CleverRaven/master

BackToRootsDone
I-am-Erk · Jun 29, 2019 · 4ca6298 · 4ca6298
2 parents f2cc380 + 93da2fd
commit 4ca6298
Show file tree

Hide file tree

Showing 17 changed files with 3,361 additions and 1,723 deletions.
diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
@@ -303,7 +303,7 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 43,
-    "description": "A modest blue flower. The flower's roots are very bitter, but they're not meant to be eaten raw.",
+    "description": "A modest blue flower. The flower's roots are very bitter and not meant to be eaten raw.",
     "price": 110,
     "material": "veggy",
     "volume": 1,

diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json
@@ -31,6 +31,7 @@
     "death_drops": "mon_zombie_scientist_death_drops",
     "death_function": [ "NORMAL" ],
     "burn_into": "mon_zombie_scorched",
+    "upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_UPGRADE" },
     "flags": [
       "SEES",
       "HEARS",
@@ -82,6 +83,7 @@
     "special_attacks": [ [ "GRAB", 10 ], [ "scratch", 10 ] ],
     "death_drops": "mon_zombie_labsecurity_death_drops",
     "death_function": [ "NORMAL" ],
+    "upgrades": { "half_life": 28, "into_group": "GROUP_SOLDIER_UPGRADE" },
     "burn_into": "mon_zombie_scorched",
     "flags": [
       "SEES",

diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json
diff --git a/data/json/terrain.json b/data/json/terrain.json
@@ -290,7 +290,7 @@
     "color": "dark_gray",
     "move_cost": 4,
     "roof": "t_flat_roof",
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "FLAT" ],
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES" ],
     "bash": {
       "sound": "SCRRRASH!",
       "ter_set": "t_null",
@@ -331,7 +331,7 @@
     "symbol": ".",
     "color": "dark_gray",
     "move_cost": 4,
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "FLAT" ],
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES" ],
     "bash": {
       "sound": "SCRRRASH!",
       "ter_set": "t_null",
@@ -619,7 +619,7 @@
     "color": "brown_green",
     "move_cost": 5,
     "coverage": 50,
-    "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT", "PLOWABLE" ],
+    "flags": [ "TRANSPARENT", "DIGGABLE", "PLOWABLE" ],
     "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 40, "str_max": 100, "str_min_supported": 100, "bash_below": true }
   },
   {

diff --git a/data/mods/DinoMod/fieldoffice.json b/data/mods/DinoMod/fieldoffice.json
@@ -20,7 +20,8 @@
       [ "22_ratshot", 8 ],
       [ "browning_blr", 5 ],
       [ "remington_700", 10 ],
-      [ "270", 8 ],
+      [ "remington700_270", 10 ],
+      [ "270win_jsp", 8 ],
       [ "rifle_scope", 10 ],
       [ "laser_sight", 10 ],
       [ "rail_laser_sight", 10 ]

diff --git a/lang/extract_json_strings.py b/lang/extract_json_strings.py
@@ -83,6 +83,7 @@ def warning_supressed(filename):
     "monstergroup",
     "MONSTER_WHITELIST",
     "mutation_type",
+    "obsolete_terrain",
     "overlay_order",
     "overmap_connection",
     "overmap_location",