Assorted blazemod fixes

CleverRaven · Dec 30, 2019 · 2749f76 · 2749f76
1 parent 377fce1
commit 2749f76
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 51 deletions.
diff --git a/data/mods/blazemod/blaze_blob_parts.json b/data/mods/blazemod/blaze_blob_parts.json
@@ -47,12 +47,11 @@
     "color": "blue",
     "broken_color": "blue",
     "durability": 400,
-    "range": 1,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "bitergrow" } ],
     "requirements": { "repair": { "time": "5 m", "using": [ [ "blobrep", 1 ] ] } },
-    "descriptions": "A living blob, transformed into a heavy vehicle weapon.",
+    "description": "A living blob, transformed into a heavy vehicle weapon.",
     "flags": [ "TURRET", "FOLDABLE", "OBSTACLE" ]
   },
   {
@@ -66,7 +65,6 @@
     "color": "magenta",
     "broken_color": "magenta",
     "durability": 200,
-    "range": 8,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "cluttergrow" } ],
@@ -85,7 +83,6 @@
     "color": "light_blue",
     "broken_color": "light_blue",
     "durability": 200,
-    "range": 18,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "freeziegrow" } ],
@@ -200,7 +197,6 @@
     "color": "brown",
     "broken_color": "brown",
     "durability": 600,
-    "range": 1,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "fuzzlegrow" } ],
@@ -1179,7 +1175,6 @@
     "color": "blue",
     "broken_color": "blue",
     "durability": 1000,
-    "range": 1,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "horrorgrow" } ],
@@ -1197,7 +1192,6 @@
     "color": "brown",
     "broken_color": "brown",
     "durability": 200,
-    "range": 8,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "inkiegrow" } ],
@@ -1215,7 +1209,6 @@
     "color": "light_red",
     "broken_color": "light_red",
     "durability": 200,
-    "range": 8,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "meltiegrow" } ],
@@ -1631,7 +1624,6 @@
     "color": "red",
     "broken_color": "red",
     "durability": 200,
-    "range": 60,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "queengrow" } ],
@@ -1650,7 +1642,6 @@
     "color": "cyan",
     "broken_color": "cyan",
     "durability": 200,
-    "range": 18,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "razorqueengrow" } ],
@@ -1669,7 +1660,6 @@
     "color": "light_blue",
     "broken_color": "light_blue",
     "durability": 200,
-    "range": 16,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "sharpgrow" } ],
@@ -1688,7 +1678,6 @@
     "color": "blue",
     "broken_color": "blue",
     "durability": 200,
-    "range": 12,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "sicklegrow" } ],
@@ -1707,7 +1696,6 @@
     "color": "cyan",
     "broken_color": "cyan",
     "durability": 200,
-    "range": 16,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "sparkiegrow" } ],
@@ -1726,7 +1714,6 @@
     "color": "yellow",
     "broken_color": "yellow",
     "durability": 200,
-    "range": 8,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "stickiegrow" } ],
@@ -1745,7 +1732,6 @@
     "color": "light_red",
     "broken_color": "light_red",
     "durability": 200,
-    "range": 10,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "torchiegrow" } ],
@@ -1764,7 +1750,6 @@
     "color": "cyan",
     "broken_color": "cyan",
     "durability": 200,
-    "range": 12,
     "damage_modifier": 10,
     "folded_volume": 1,
     "breaks_into": [ { "item": "voideatergrow" } ],

diff --git a/data/mods/blazemod/blaze_other.json b/data/mods/blazemod/blaze_other.json
@@ -180,8 +180,7 @@
     "id": "turretframe",
     "type": "GENERIC",
     "category": "veh_parts",
-    "name": "turret chassis",
-    "name_plural": "turret chassis",
+    "name": { "str": "turret chassis", "str_pl": "turret chassis" },
     "description": "A frame capable of rotating a full 360 degrees, capable of mounting multiple weapon systems either welded directly onto it or secured via the straps.  It comes with a easily modified container for ammunition storage, a rudimentary ammo feed system for easy access, and a section for a movement system.  It is controlled by a targeting AI that can adapt to the usage of whatever weapon that has been loading, with proper programming.",
     "weight": "38604 g",
     "volume": "20 L",

diff --git a/data/mods/blazemod/blaze_other_parts.json b/data/mods/blazemod/blaze_other_parts.json
@@ -46,11 +46,11 @@
     "copy-from": "engine_combustion",
     "type": "vehicle_part",
     "fuel_type": "coal_lump",
-    "cold_affects_start": true,
     "looks_like": "diesel_engine_v12",
     "m2c": 75,
     "//": "45% energy efficiency",
-    "description": "A closed cycle, external combustion steam turbine.  Burns coal from a bunker in the vehicle to produce steam."
+    "description": "A closed cycle, external combustion steam turbine.  Burns coal from a bunker in the vehicle to produce steam.",
+    "extend": { "flags": [ "E_COLD_START" ] }
   },
   {
     "id": "engine_steam_turbine_small",
@@ -328,7 +328,6 @@
     "id": "turretframe",
     "type": "vehicle_part",
     "name": "turret chassis",
-    "name_plural": "turret chassis",
     "item": "turretframe",
     "symbol": "Y",
     "broken_symbol": "#",

diff --git a/data/mods/blazemod/blaze_override.json b/data/mods/blazemod/blaze_override.json
@@ -14,8 +14,7 @@
     "copy-from": "flamethrower",
     "type": "vehicle_part",
     "name": "manual flamethrower",
-    "broken_symbol": "#",
-    "range": 5
+    "broken_symbol": "#"
   },
   {
     "id": "auto_m1918",
@@ -25,88 +24,78 @@
     "symbol": "t",
     "broken_symbol": "#",
     "color": "brown",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "am249",
     "copy-from": "m249",
     "type": "vehicle_part",
     "name": "M249 turret",
     "broken_symbol": "#",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "aplasma_gun",
     "copy-from": "plasma_gun",
     "type": "vehicle_part",
     "name": "plasma turret",
-    "broken_symbol": "#",
-    "range": 12
+    "broken_symbol": "#"
   },
   {
     "id": "afusion_gun",
     "copy-from": "fusion_gun",
     "type": "vehicle_part",
     "name": "fusion turret",
     "broken_symbol": "#",
-    "size": 10,
-    "range": 12
+    "size": 10
   },
   {
     "id": "am2browning",
     "copy-from": "mounted_browning",
     "type": "vehicle_part",
     "name": "M2 Browning turret",
     "broken_symbol": "#",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "auto_m240",
     "copy-from": "mounted_m240",
     "type": "vehicle_part",
     "name": "M240 turret",
     "broken_symbol": "#",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "auto_m60",
     "copy-from": "mounted_m60",
     "type": "vehicle_part",
     "name": "M60 turret",
     "broken_symbol": "#",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "auto_abzats",
     "copy-from": "mounted_bigun",
     "type": "vehicle_part",
     "name": "auto-shotgun turret",
     "broken_symbol": "#",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "auto_m134",
     "copy-from": "mounted_m134",
     "type": "vehicle_part",
     "name": "M134D-H Minigun turret",
     "broken_symbol": "#",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "auto_mk19",
     "copy-from": "mounted_mk19",
     "type": "vehicle_part",
     "name": "Mark 19 turret",
     "broken_symbol": "#",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "auto_rm614",
@@ -115,8 +104,7 @@
     "name": "RM614 turret",
     "broken_symbol": "#",
     "broken_color": "light_gray",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "auto_rm298",
@@ -125,16 +113,14 @@
     "name": "RM298 turret",
     "broken_symbol": "#",
     "broken_color": "light_gray",
-    "size": 40,
-    "range": 12
+    "size": 40
   },
   {
     "id": "awatercannon",
     "copy-from": "watercannon",
     "type": "vehicle_part",
     "name": "water cannon turret",
-    "broken_symbol": "#",
-    "range": 7
+    "broken_symbol": "#"
   },
   {
     "id": "pool_ball",

diff --git a/data/mods/blazemod/blaze_test.json b/data/mods/blazemod/blaze_test.json
@@ -874,7 +874,6 @@
     "color": "pink",
     "broken_color": "pink",
     "size": 10,
-    "range": 18,
     "folded_volume": 20,
     "breaks_into": [ { "item": "vortexcannon", "count": [ 0, 1 ] } ],
     "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }

diff --git a/data/mods/blazemod/snippets.json b/data/mods/blazemod/snippets.json
@@ -17,7 +17,7 @@
         "text": "\"Day 40.  Controls broken-- car's magic reactor makes it goes inexorably forward.  Giant rollers on front demolish forest.  Maine, here I come.\""
       },
       { "id": "note_blazemod_5", "text": "\"my car is a diamond in the rough… literally\"" },
-      { "id": "note_blazemod_6", "text": "\"M249 TURRET NODDED.  IS TURRET ALIVE? FINALLY, SOMEBODY TO TALK TO!\"" },
+      { "id": "note_blazemod_6", "text": "\"M249 TURRET NODDED.  IS TURRET ALIVE?  FINALLY, SOMEBODY TO TALK TO!\"" },
       { "id": "note_blazemod_7", "text": "\"Added so many things to my taxi that it went a-blaze.  Whoops.\"" },
       {
         "id": "note_blazemod_8",