retrofitted - [CR] Update Modular Turrets and Salvaged Robots to matc…

…h Mainline style and recipes Fixes CleverRaven#35689 (CleverRaven#35752) 00fbf22
va5h · Jan 20, 2020 · 14ab8d7 · 14ab8d7
1 parent e16b380
commit 14ab8d7
Show file tree

Hide file tree

Showing 6 changed files with 272 additions and 200 deletions.
diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json
@@ -31,7 +31,6 @@
     "default_faction": "defense_bot",
     "diff": 14,
     "color": "light_gray",
-    "luminance": 200,
     "revert_to_itype": "bot_turret_disarmed"
   },
   {
@@ -42,7 +41,6 @@
     "symbol": "t",
     "description": "The Leadworks LLC's TX series turret, a military-grade automated gun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike.  It requires a integrated gun module to operate.",
     "color": "light_gray",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_disarmed"
   },
   {
@@ -54,7 +52,6 @@
     "description": "The DoubleTech T-series turret, an advanced automated gun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike.  It requires an integrated gun module to function.",
     "default_faction": "defense_bot",
     "color": "light_gray",
-    "luminance": 200,
     "revert_to_itype": "bot_advturret_disarmed"
   },
   {
@@ -67,7 +64,6 @@
     "default_faction": "defense_bot",
     "diff": 10,
     "color": "light_gray",
-    "luminance": 200,
     "revert_to_itype": "bot_turret_9mm",
     "starting_ammo": { "9mm": 100 },
     "special_attacks": [
@@ -81,7 +77,8 @@
         "no_ammo_sound": "click click!",
         "ranges": [ [ 0, 2, "BURST" ], [ 3, 6, "AUTO" ], [ 7, 12, "DEFAULT" ] ]
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_turret_shot",
@@ -93,7 +90,6 @@
     "default_faction": "defense_bot",
     "diff": 10,
     "color": "red",
-    "luminance": 200,
     "revert_to_itype": "bot_turret_shot",
     "starting_ammo": { "shot_00": 100 },
     "special_attacks": [
@@ -107,7 +103,8 @@
         "no_ammo_sound": "click click!",
         "ranges": [ [ 0, 8, "DEFAULT" ] ]
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_turret_teargas",
@@ -119,7 +116,6 @@
     "default_faction": "cop_bot",
     "diff": 10,
     "color": "blue",
-    "luminance": 300,
     "revert_to_itype": "bot_turret_teargas",
     "starting_ammo": { "40x46mm_m651": 50 },
     "special_attacks": [
@@ -133,7 +129,8 @@
         "no_ammo_sound": "click click!",
         "ranges": [ [ 0, 6, "DEFAULT" ], [ 7, 12, "BURST" ] ]
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_turret_beanbag",
@@ -145,7 +142,6 @@
     "default_faction": "cop_bot",
     "diff": 5,
     "color": "blue",
-    "luminance": 300,
     "revert_to_itype": "bot_turret_beanbag",
     "starting_ammo": { "40x46mm_m1006": 50 },
     "special_attacks": [
@@ -159,7 +155,8 @@
         "no_ammo_sound": "click click!",
         "ranges": [ [ 0, 8, "DEFAULT" ] ]
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_milturret_556",
@@ -171,9 +168,8 @@
     "default_faction": "military",
     "diff": 20,
     "color": "green",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_556",
-    "starting_ammo": { "556": 100 },
+    "starting_ammo": { "556": 1600 },
     "special_attacks": [
       {
         "type": "gun",
@@ -192,7 +188,8 @@
         "targeting_sound": "\"Hostile Detected.\"",
         "targeting_volume": 10
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_milturret_308",
@@ -204,9 +201,8 @@
     "default_faction": "military",
     "diff": 20,
     "color": "green",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_308",
-    "starting_ammo": { "762_51": 100 },
+    "starting_ammo": { "762_51": 1000 },
     "special_attacks": [
       {
         "type": "gun",
@@ -225,7 +221,8 @@
         "targeting_sound": "\"Hostile Detected.\"",
         "targeting_volume": 10
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_milturret_50bmg",
@@ -237,9 +234,8 @@
     "default_faction": "military",
     "diff": 30,
     "color": "green",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_50bmg",
-    "starting_ammo": { "50bmg": 100 },
+    "starting_ammo": { "50bmg": 400 },
     "special_attacks": [
       {
         "type": "gun",
@@ -259,7 +255,8 @@
         "targeting_sound": "\"Hostile Detected.\"",
         "targeting_volume": 10
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_milturret_8x40mm",
@@ -271,9 +268,8 @@
     "default_faction": "military",
     "diff": 20,
     "color": "green",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_8x40mm",
-    "starting_ammo": { "8mm_caseless": 100 },
+    "starting_ammo": { "8mm_caseless": 1200 },
     "special_attacks": [
       {
         "type": "gun",
@@ -292,7 +288,8 @@
         "targeting_sound": "\"Hostile Detected.\"",
         "targeting_volume": 10
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_milturret_needle",
@@ -304,9 +301,8 @@
     "default_faction": "military",
     "diff": 20,
     "color": "green",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_needle",
-    "starting_ammo": { "5x50dart": 100 },
+    "starting_ammo": { "5x50dart": 1000 },
     "special_attacks": [
       {
         "type": "gun",
@@ -325,7 +321,8 @@
         "targeting_sound": "\"Hostile Detected.\"",
         "targeting_volume": 10
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_milturret_40mm",
@@ -337,7 +334,6 @@
     "default_faction": "military",
     "diff": 20,
     "color": "red",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_40mm",
     "starting_ammo": { "40x46mm_m433": 50 },
     "special_attacks": [
@@ -358,7 +354,8 @@
         "targeting_sound": "\"Hostile Detected.\"",
         "targeting_volume": 10
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_milturret_flame",
@@ -370,9 +367,8 @@
     "default_faction": "military",
     "diff": 20,
     "color": "red",
-    "luminance": 200,
     "revert_to_itype": "bot_milturret_flame",
-    "starting_ammo": { "napalm": 100 },
+    "starting_ammo": { "napalm": 10000 },
     "special_attacks": [
       {
         "type": "gun",
@@ -404,7 +400,6 @@
     "default_faction": "military",
     "diff": 20,
     "color": "yellow",
-    "luminance": 300,
     "revert_to_itype": "bot_advturret_laser",
     "special_attacks": [
       {
@@ -434,7 +429,6 @@
     "default_faction": "military",
     "diff": 10,
     "color": "light_green",
-    "luminance": 300,
     "revert_to_itype": "bot_advturret_acid",
     "special_attacks": [
       {
@@ -460,7 +454,6 @@
     "default_faction": "military",
     "diff": 20,
     "color": "magenta",
-    "luminance": 300,
     "revert_to_itype": "bot_advturret_plasma",
     "special_attacks": [
       {
@@ -491,9 +484,8 @@
     "default_faction": "military",
     "diff": 30,
     "color": "magenta",
-    "luminance": 300,
     "revert_to_itype": "bot_advturret_rail",
-    "starting_ammo": { "steel_rail": 100 },
+    "starting_ammo": { "steel_rail": 200 },
     "special_attacks": [
       {
         "type": "gun",
@@ -512,7 +504,8 @@
         "targeting_sound": "\"Hostile detected.\"",
         "targeting_volume": 10
       }
-    ]
+    ],
+    "extend": { "flags": [ "DROPS_AMMO" ] }
   },
   {
     "id": "mon_advturret_lightning",
@@ -524,7 +517,6 @@
     "default_faction": "military",
     "diff": 20,
     "color": "yellow",
-    "luminance": 300,
     "revert_to_itype": "bot_advturret_lightning",
     "special_attacks": [
       {
@@ -555,7 +547,6 @@
     "default_faction": "military",
     "diff": 10,
     "color": "yellow",
-    "luminance": 300,
     "revert_to_itype": "bot_advturret_emp",
     "special_attacks": [
       {
@@ -600,6 +591,7 @@
         "ranges": [ [ 0, 2, "BURST" ], [ 3, 6, "AUTO" ], [ 7, 12, "DEFAULT" ] ]
       }
     ],
+    "extend": { "flags": [ "DROPS_AMMO" ] },
     "death_drops": { "groups": [ [ "broken_robots", 10 ], [ "broken_ceramics", 10 ] ] }
   }
 ]
diff --git a/data/mods/Modular_Turrets/uncraft.json b/data/mods/Modular_Turrets/uncraft.json
@@ -314,7 +314,6 @@
       [ [ "memory_module", 1 ] ],
       [ [ "pathfinding_module", 1 ] ],
       [ [ "identification_module", 1 ] ],
-      [ [ "lightstrip_inactive", 3 ] ],
       [ [ "lens", 3 ] ],
       [ [ "scrap", 2 ] ],
       [ [ "e_scrap", 1 ] ],
@@ -335,7 +334,6 @@
       [ [ "memory_module", 1 ] ],
       [ [ "pathfinding_module", 1 ] ],
       [ [ "identification_module", 1 ] ],
-      [ [ "lightstrip_inactive", 3 ] ],
       [ [ "lens", 3 ] ],
       [ [ "scrap", 2 ] ],
       [ [ "e_scrap", 2 ] ],
@@ -356,7 +354,6 @@
       [ [ "memory_module", 1 ] ],
       [ [ "pathfinding_module", 1 ] ],
       [ [ "identification_module", 1 ] ],
-      [ [ "lightstrip_inactive", 3 ] ],
       [ [ "lens", 3 ] ],
       [ [ "scrap", 2 ] ],
       [ [ "e_scrap", 5 ] ],