From c9ae45a0450f2a25a17671d81b7a95f1f90a884f Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Sun, 24 Nov 2019 21:00:01 -0500 Subject: [PATCH 01/24] Update uncraft_corpse.json --- data/mods/Modular_Turrets/uncraft_corpse.json | 179 +++++++++++------- 1 file changed, 112 insertions(+), 67 deletions(-) diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index 867371c6a9e3f..8a58d0fe974b3 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -8,7 +8,16 @@ "time": 2000, "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], [ [ "motor_micro", 1 ] ] ] + "components": [ + [ [ "ai_module_basic", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "spike", 2 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "result": "broken_flashbang_hack", @@ -30,7 +39,15 @@ "time": 2000, "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], [ [ "motor_micro", 1 ] ] ] + "components": [ + [ [ "ai_module_basic", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "result": "broken_EMP_hack", @@ -41,7 +58,15 @@ "time": 2000, "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], [ [ "motor_micro", 1 ] ] ] + "components": [ + [ [ "ai_module_basic", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "result": "broken_grenade_hack", @@ -52,7 +77,15 @@ "time": 2000, "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], [ [ "motor_micro", 1 ] ] ] + "components": [ + [ [ "ai_module_basic", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "result": "broken_c4_hack", @@ -63,7 +96,15 @@ "time": 2000, "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 1 ] ], [ [ "scrap", 2 ] ], [ [ "e_scrap", 1 ] ], [ [ "motor_micro", 1 ] ] ] + "components": [ + [ [ "ai_module_basic", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "result": "broken_mininuke_hack", @@ -75,12 +116,13 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "processor", 2 ] ], - [ [ "plut_cell", 2 ] ], + [ [ "ai_module_basic", 1 ] ], [ [ "RAM", 1 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 1 ] ], - [ [ "motor_micro", 1 ] ] + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] ] }, { @@ -95,13 +137,11 @@ [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], [ [ "identification_module", 1 ] ], - [ [ "lightstrip_inactive", 3 ] ], - [ [ "plut_cell", 1 ] ], - [ [ "lens", 2 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 4 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 1 ] ], [ [ "robot_controls", 1 ] ], [ [ "turret_chassis", 1 ] ] ] @@ -118,13 +158,11 @@ [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], [ [ "identification_module", 1 ] ], - [ [ "lightstrip_inactive", 3 ] ], - [ [ "plut_cell", 1 ] ], - [ [ "lens", 2 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 4 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 1 ] ], [ [ "robot_controls", 1 ] ], [ [ "turret_chassis", 1 ] ] ] @@ -141,13 +179,11 @@ [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], [ [ "memory_module", 1 ] ], - [ [ "pathfinding_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], [ [ "identification_module", 1 ] ], - [ [ "lightstrip_inactive", 3 ] ], - [ [ "plut_cell", 1 ] ], - [ [ "lens", 2 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 4 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 1 ] ], [ [ "robot_controls", 1 ] ], [ [ "turret_chassis", 1 ] ] ] @@ -334,16 +370,18 @@ "using": [ [ "soldering_standard", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ + [ [ "ai_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "sensor_module", 1 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 2 ] ], - [ [ "motor_micro", 4 ] ], [ [ "foldframe", 1 ] ], - [ [ "processor", 2 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], - [ [ "plastic_chunk", 6 ] ], - [ [ "scrap", 12 ] ], - [ [ "lens", 4 ] ] + [ [ "RAM", 1 ] ], + [ [ "processor", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "lens", 1 ] ] ] }, { @@ -365,6 +403,10 @@ "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ + [ [ "ai_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "sensor_module", 1 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "medium_storage_battery", 1 ] ], @@ -372,9 +414,6 @@ [ [ "motor", 1 ] ], [ [ "frame", 1 ] ], [ [ "wheel_small", 3 ] ], - [ [ "processor", 3 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], [ [ "plastic_chunk", 6 ] ], [ [ "steel_chunk", 12 ] ] ] @@ -404,13 +443,15 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "time": 30000, "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "targeting_module", 1 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 2 ] ], [ [ "motor_small", 1 ] ], - [ [ "processor", 2 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 2 ] ], - [ [ "steel_chunk", 3 ] ] + [ [ "spidery_legs_small", 1 ] ], ] }, { @@ -431,18 +472,20 @@ "time": 120000, "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ + "components": [[ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "omni_wheel", 1 ] ], + [ [ "copbot_chassis", 1 ] ], + [ [ "android_arms", 1 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "medium_storage_battery", 1 ] ], [ [ "solar_cell", 2 ] ], - [ [ "motor", 1 ] ], - [ [ "hdframe", 1 ] ], - [ [ "wheel_small", 4 ] ], - [ [ "processor", 3 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], - [ [ "steel_chunk", 12 ] ] ] }, { @@ -509,18 +552,19 @@ "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "reverse_jointed_legs", 1 ] ], + [ [ "chickenbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "medium_storage_battery", 2 ] ], - [ [ "motor", 1 ] ], - [ [ "hdframe", 1 ] ], - [ [ "foldframe", 2 ] ], - [ [ "processor", 3 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], - [ [ "kevlar_plate", 8 ] ], - [ [ "steel_chunk", 8 ] ], - [ [ "scrap", 8 ] ] + [ [ "mil_plate", 2 ] ] ] }, { @@ -532,16 +576,17 @@ "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], [ [ "minireactor", 1 ] ], [ [ "storage_battery", 1 ] ], - [ [ "mil_plate", 6 ] ], - [ [ "hdframe", 1 ] ], - [ [ "motor_enhanced", 1 ] ], - [ [ "power_supply", 8 ] ], - [ [ "RAM", 4 ] ], - [ [ "plastic_chunk", 4 ] ], - [ [ "spiked_plate", 1 ] ], - [ [ "steel_chunk", 15 ] ], + [ [ "tank_tread", 1 ] ], + [ [ "tankbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], [ [ "mil_plate", 2 ] ], [ [ "robot_controls", 1 ] ] ] From 03804864d4ade4fde9a9c996c27a4b6a29106974 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Sun, 24 Nov 2019 22:42:12 -0500 Subject: [PATCH 02/24] Update uncraft_corpse.json --- data/mods/Salvaged_Robots/uncraft_corpse.json | 75 +++++++++++-------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index 3130245aa672b..031fc64bf449b 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -18,12 +18,13 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "processor", 2 ] ], [ [ "lightstrip_inactive", 2 ] ], - [ [ "RAM", 1 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 1 ] ], - [ [ "motor_micro", 1 ] ] + [ [ "ai_module_basic", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] ] }, { @@ -36,12 +37,14 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "processor", 2 ] ], - [ [ "lightstrip_inactive", 2 ] ], - [ [ "RAM", 1 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 1 ] ], - [ [ "motor_micro", 1 ] ] + [ [ "lightstrip_inactive", 1 ] ], + [ [ "element", 1 ] ], + [ [ "ai_module_basic", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] ] }, { @@ -54,12 +57,14 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "processor", 2 ] ], - [ [ "lightstrip_inactive", 2 ] ], - [ [ "RAM", 1 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 1 ] ], - [ [ "motor_micro", 1 ] ] + [ [ "lightstrip_inactive", 1 ] ], + [ [ "element", 1 ] ], + [ [ "ai_module_basic", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] ] }, { @@ -72,12 +77,12 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "processor", 2 ] ], - [ [ "lightstrip_inactive", 2 ] ], - [ [ "RAM", 1 ] ], - [ [ "scrap", 2 ] ], - [ [ "e_scrap", 1 ] ], - [ [ "motor_micro", 1 ] ] + [ [ "ai_module_basic", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] ] }, { @@ -499,15 +504,19 @@ "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "robot_controls", 1 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "medium_storage_battery", 1 ] ], [ [ "motor", 1 ] ], [ [ "hdframe", 1 ] ], - [ [ "wheel_small", 4 ] ], - [ [ "processor", 3 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], + [ [ "omni_wheel", 1 ] ], [ [ "kevlar_plate", 8 ] ], [ [ "steel_chunk", 8 ] ] ] @@ -641,15 +650,19 @@ "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "robot_controls", 1 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "medium_storage_battery", 1 ] ], [ [ "motor", 1 ] ], [ [ "frame", 1 ] ], - [ [ "wheel_small", 4 ] ], - [ [ "processor", 5 ] ], - [ [ "RAM", 5 ] ], - [ [ "e_scrap", 6 ] ], + [ [ "omni_wheel", 1 ] ], [ [ "alloy_plate", 6 ] ], [ [ "plastic_chunk", 6 ] ], [ [ "steel_chunk", 3 ] ] From 803e2df39e10be010a6bd1f34857e095752d1d30 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Sun, 24 Nov 2019 23:22:54 -0500 Subject: [PATCH 03/24] Update uncraft_corpse.json --- data/mods/Salvaged_Robots/uncraft_corpse.json | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index 031fc64bf449b..c43300d4aa71c 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -260,16 +260,20 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "time": 30000, "components": [ + [ [ "ai_module_advanced", 1 ] ], + [ [ "self_monitoring_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 2 ] ], [ [ "small_storage_battery", 2 ] ], [ [ "solar_cell", 2 ] ], - [ [ "motor", 1 ] ], - [ [ "processor", 3 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], - [ [ "plastic_chunk", 6 ] ], - [ [ "steel_chunk", 12 ] ] + [ [ "android_chassis", 1 ] ], + [ [ "android_arms", 2 ] ], + [ [ "plastic_chunk", 2 ] ], + [ [ "steel_chunk", 4 ] ] ] }, { @@ -391,12 +395,10 @@ [ [ "small_storage_battery", 3 ] ], [ [ "bio_digestion", 1 ] ], [ [ "bone", 1 ] ], - [ [ "motor_small", 1 ] ], - [ [ "xlframe", 1 ] ], - [ [ "processor", 3 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], - [ [ "steel_chunk", 12 ] ] + [ [ "android_legs", 1 ] ], + [ [ "android_chassis", 1 ] ], + [ [ "android_arms", 1 ] ], + [ [ "robot_controls", 1 ] ], ] }, { From 9295e4b7884d70c13938751ec46c99b5a1d02d76 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 22:34:56 -0500 Subject: [PATCH 04/24] Add DROPS_AMMO and appropriate ammo count Tried to match ammo counts to mainline turrets (probably overkill) and keep within some similar size constraints. --- data/mods/Salvaged_Robots/monsters.json | 82 +++++++++++++++---------- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json index 32dda3e4dbfa4..edc5f6a678765 100644 --- a/data/mods/Salvaged_Robots/monsters.json +++ b/data/mods/Salvaged_Robots/monsters.json @@ -351,7 +351,8 @@ "range": 3, "ranges": [ [ 0, 3, "BURST" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_utilibot_fire", @@ -377,7 +378,7 @@ "ranges": [ [ 0, 5, "BURST" ] ] } ], - "extend": { "flags": [ "FIREPROOF", "BASHES" ] } + "extend": { "flags": [ "FIREPROOF", "BASHES", "DROPS_AMMO" ] } }, { "id": "mon_utilibot_blob", @@ -444,7 +445,7 @@ } ], "death_drops": { "groups": [ [ "broken_robots", 1 ], [ "beehive", 1 ] ] }, - "extend": { "flags": [ "STUMBLES" ] } + "extend": { "flags": [ "STUMBLES", "DROPS_AMMO" ] } }, { "id": "mon_medibot", @@ -626,7 +627,7 @@ "armor_cut": 8, "vision_day": 20, "revert_to_itype": "bot_skitterbot_hunter", - "starting_ammo": { "8mm_caseless": 50 }, + "starting_ammo": { "8mm_caseless": 120 }, "special_attacks": [ { "type": "gun", @@ -640,7 +641,7 @@ "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } - ] + ], }, { "id": "mon_broken_cyborg", @@ -692,7 +693,7 @@ "name": "security robot", "description": "An automated defense robot still active due to its internal power source. This one is equipped with an electric prod and an integrated shotgun.", "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "starting_ammo": { "shot_00": 100 }, + "starting_ammo": { "shot_00": 400 }, "special_attacks": [ { "type": "gun", @@ -706,7 +707,8 @@ "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "abstract": "mon_milbot_base", @@ -753,7 +755,7 @@ "melee_dice_sides": 4, "attack_effs": [ { "id": "downed", "chance": 10, "duration": 10 }, { "id": "stunned", "chance": 5, "duration": 10 } ], "dodge": 5, - "starting_ammo": { "paintball": 500 }, + "starting_ammo": { "paintball": 1000 }, "special_attacks": [ { "type": "gun", @@ -775,7 +777,8 @@ "targeting_volume": 10 } ], - "death_drops": { "groups": [ [ "broken_robots", 1 ], [ "milbot_trainer", 1 ] ] } + "death_drops": { "groups": [ [ "broken_robots", 1 ], [ "milbot_trainer", 1 ] ] }, + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_556", @@ -785,7 +788,7 @@ "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 5.56mm firearm.", "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "starting_ammo": { "556": 100 }, + "starting_ammo": { "556": 1600 }, "special_attacks": [ { "type": "gun", @@ -806,7 +809,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_308", @@ -817,7 +821,7 @@ "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "luminance": 100, - "starting_ammo": { "762_51": 100 }, + "starting_ammo": { "762_51": 1000 }, "revert_to_itype": "bot_milbot_308", "special_attacks": [ { @@ -839,7 +843,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_50bmg", @@ -850,7 +855,7 @@ "diff": 30, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "luminance": 100, - "starting_ammo": { "50bmg": 100 }, + "starting_ammo": { "50bmg": 400 }, "special_attacks": [ { "type": "gun", @@ -871,7 +876,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_8x40mm", @@ -882,7 +888,7 @@ "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "luminance": 100, - "starting_ammo": { "8mm_caseless": 100 }, + "starting_ammo": { "8mm_caseless": 1200 }, "special_attacks": [ { "type": "gun", @@ -903,7 +909,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_needle", @@ -914,7 +921,7 @@ "diff": 15, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "luminance": 100, - "starting_ammo": { "5x50dart": 100 }, + "starting_ammo": { "5x50dart": 1000 }, "special_attacks": [ { "type": "gun", @@ -935,7 +942,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_40mm", @@ -968,7 +976,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_flame", @@ -978,7 +987,7 @@ "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated flamethrower.", "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "starting_ammo": { "napalm": 200 }, + "starting_ammo": { "napalm": 1000 }, "extend": { "flags": [ "FIREPROOF" ] }, "special_attacks": [ { @@ -999,7 +1008,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "abstract": "mon_advbot_base", @@ -1087,6 +1097,7 @@ "name": "railgun robot", "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful railgun.", "diff": 30, + "starting_ammo": { "steel_rail": 100 }, "special_attacks": [ { "type": "gun", @@ -1181,7 +1192,7 @@ "dodge": 3, "vision_day": 10, "revert_to_itype": "bot_defbot_cowboy", - "starting_ammo": { "shot_00": 100 }, + "starting_ammo": { "shot_00": 400 }, "special_attacks": [ { "type": "gun", @@ -1195,7 +1206,8 @@ "range": 3, "ranges": [ [ 0, 3, "DEFAULT" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_defbot_samurai", @@ -1243,7 +1255,7 @@ "vision_day": 50, "revert_to_itype": "bot_defbot_paladin", "emit_fields": [ "emit_smoke_trail" ], - "starting_ammo": { "gasoline": 100 }, + "starting_ammo": { "gasoline": 1000 }, "special_attacks": [ [ "PARROT", 0 ], { @@ -1259,7 +1271,7 @@ "ranges": [ [ 0, 10, "DEFAULT" ] ] } ], - "extend": { "flags": [ "FIREPROOF" ] } + "extend": { "flags": [ "FIREPROOF", "DROPS_AMMO" ] } }, { "id": "mon_milbot_gaurdian", @@ -1275,7 +1287,7 @@ "melee_dice_sides": 4, "vision_day": 10, "revert_to_itype": "bot_milbot_gaurdian", - "starting_ammo": { "9mm": 200 }, + "starting_ammo": { "9mm": 2000 }, "special_attacks": [ { "type": "gun", @@ -1289,7 +1301,8 @@ "range": "10", "ranges": [ [ 0, 10, "AUTO" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_deluxe", @@ -1315,7 +1328,7 @@ "melee_dice_sides": 4, "vision_day": 20, "revert_to_itype": "bot_milbot_protector", - "starting_ammo": { "556": 200 }, + "starting_ammo": { "556": 1600 }, "special_attacks": [ { "type": "gun", @@ -1329,7 +1342,8 @@ "ranges": [ [ 0, 16, "BURST" ] ], "require_targeting_player": true } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_defender", @@ -1345,7 +1359,7 @@ "melee_dice_sides": 4, "vision_day": 50, "revert_to_itype": "bot_milbot_defender", - "starting_ammo": { "50bmg": 100 }, + "starting_ammo": { "50bmg": 400 }, "special_attacks": [ { "type": "gun", @@ -1367,7 +1381,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_advbot_glitter", @@ -1394,7 +1409,8 @@ "range": 5, "ranges": [ [ 0, 5, "AUTO" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_advbot_bitter", From a03ecb5896d9c4c647e56e3ab3259663f6a110cb Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 22:44:33 -0500 Subject: [PATCH 05/24] Add DROPS_AMMO to turrets and appropriate ammo count Trying to solve the issue of non-dropping ammunition from Modular Turrets. Base_turret was missing DROPS_AMMO flag that mainline turrets have. Perhaps this will solve the issue. Tried to get ammo counts to match mainline turrets as well. --- data/mods/Modular_Turrets/monster.json | 38 ++++++++++++++------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index cac7b0df758be..9ed3e52f187fb 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -17,8 +17,8 @@ "armor_cut": 16, "armor_acid": 14, "death_function": [ "BROKEN" ], - "death_drops": "broken_robots", - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] + "death_drops": "broken_robots + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] }, { "id": "mon_turret_disarmed", @@ -68,7 +68,7 @@ "color": "light_gray", "luminance": 200, "revert_to_itype": "bot_turret_9mm", - "starting_ammo": { "9mm": 100 }, + "starting_ammo": { "9mm": 2000 }, "special_attacks": [ { "type": "gun", @@ -94,7 +94,7 @@ "color": "red", "luminance": 200, "revert_to_itype": "bot_turret_shot", - "starting_ammo": { "shot_00": 100 }, + "starting_ammo": { "shot_00": 400 }, "special_attacks": [ { "type": "gun", @@ -121,7 +121,7 @@ "color": "blue", "luminance": 300, "revert_to_itype": "bot_turret_teargas", - "starting_ammo": { "40mm_teargas": 50 }, + "starting_ammo": { "40mm_teargas": 100 }, "special_attacks": [ { "type": "gun", @@ -148,7 +148,7 @@ "color": "blue", "luminance": 300, "revert_to_itype": "bot_turret_beanbag", - "starting_ammo": { "40mm_beanbag": 50 }, + "starting_ammo": { "40mm_beanbag": 100 }, "special_attacks": [ { "type": "gun", @@ -175,7 +175,7 @@ "color": "green", "luminance": 200, "revert_to_itype": "bot_milturret_556", - "starting_ammo": { "556": 100 }, + "starting_ammo": { "556": 1600 }, "special_attacks": [ { "type": "gun", @@ -209,7 +209,7 @@ "color": "green", "luminance": 200, "revert_to_itype": "bot_milturret_308", - "starting_ammo": { "762_51": 100 }, + "starting_ammo": { "762_51": 1000 }, "special_attacks": [ { "type": "gun", @@ -243,7 +243,7 @@ "color": "green", "luminance": 200, "revert_to_itype": "bot_milturret_50bmg", - "starting_ammo": { "50bmg": 100 }, + "starting_ammo": { "50bmg": 400 }, "special_attacks": [ { "type": "gun", @@ -278,7 +278,7 @@ "color": "green", "luminance": 200, "revert_to_itype": "bot_milturret_8x40mm", - "starting_ammo": { "8mm_caseless": 100 }, + "starting_ammo": { "8mm_caseless": 1200 }, "special_attacks": [ { "type": "gun", @@ -312,7 +312,7 @@ "color": "green", "luminance": 200, "revert_to_itype": "bot_milturret_needle", - "starting_ammo": { "5x50dart": 100 }, + "starting_ammo": { "5x50dart": 1000 }, "special_attacks": [ { "type": "gun", @@ -346,7 +346,7 @@ "color": "red", "luminance": 200, "revert_to_itype": "bot_milturret_40mm", - "starting_ammo": { "40mm_frag": 50 }, + "starting_ammo": { "40mm_frag": 100 }, "special_attacks": [ { "type": "gun", @@ -380,7 +380,7 @@ "color": "red", "luminance": 200, "revert_to_itype": "bot_milturret_flame", - "starting_ammo": { "napalm": 100 }, + "starting_ammo": { "napalm": 1000 }, "special_attacks": [ { "type": "gun", @@ -433,6 +433,7 @@ "targeting_volume": 20 } ] + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] }, { "id": "mon_advturret_acid", @@ -459,6 +460,7 @@ "ranges": [ [ 0, 20, "DEFAULT" ] ] } ] + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] }, { "id": "mon_advturret_plasma", @@ -490,7 +492,7 @@ "targeting_volume": 10 } ], - "extend": { "flags": [ "FIREPROOF" ] } + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "FIREPROOF" ] }, { "id": "mon_advturret_rail", @@ -504,7 +506,7 @@ "color": "magenta", "luminance": 300, "revert_to_itype": "bot_advturret_rail", - "starting_ammo": { "steel_rail": 100 }, + "starting_ammo": { "steel_rail": 200 }, "special_attacks": [ { "type": "gun", @@ -556,7 +558,7 @@ "targeting_volume": 10 } ], - "extend": { "flags": [ "ELECTRIC" ] } + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "ELECTRIC" ] }, { "id": "mon_advturret_emp", @@ -587,7 +589,7 @@ "targeting_volume": 10 } ], - "extend": { "flags": [ "ELECTRIC" ] } + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "ELECTRIC" ] }, { "id": "mon_turret_gnome", @@ -601,7 +603,7 @@ "diff": 10, "color": "red", "revert_to_itype": "bot_turret_gnome", - "starting_ammo": { "9mm": 100 }, + "starting_ammo": { "9mm": 2000 }, "special_attacks": [ { "type": "gun", From e7674fba5c47c9416c638ba34295161161eabcc2 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 22:49:41 -0500 Subject: [PATCH 06/24] Fixed Syntax (again) --- data/mods/Modular_Turrets/monster.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index 9ed3e52f187fb..84e46d34da320 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -17,7 +17,7 @@ "armor_cut": 16, "armor_acid": 14, "death_function": [ "BROKEN" ], - "death_drops": "broken_robots + "death_drops": "broken_robots" "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] }, { @@ -432,7 +432,7 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 20 } - ] + ], "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] }, { @@ -459,7 +459,7 @@ "require_targeting_player": false, "ranges": [ [ 0, 20, "DEFAULT" ] ] } - ] + ], "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] }, { From 1b5725c769171a881a4b6a8a198032a72b23f12c Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 22:57:01 -0500 Subject: [PATCH 07/24] More syntax Wily little comma! --- data/mods/Modular_Turrets/monster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index 84e46d34da320..f619ac695a393 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -17,7 +17,7 @@ "armor_cut": 16, "armor_acid": 14, "death_function": [ "BROKEN" ], - "death_drops": "broken_robots" + "death_drops": "broken_robots", "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] }, { From 0400a9e8099b380fd860e49685afb034b6b40514 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 23:03:27 -0500 Subject: [PATCH 08/24] Syntax error Dastardly rogue commas --- data/mods/Modular_Turrets/uncraft_corpse.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index 8a58d0fe974b3..b6f802539cd2c 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -451,7 +451,7 @@ [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 2 ] ], [ [ "motor_small", 1 ] ], - [ [ "spidery_legs_small", 1 ] ], + [ [ "spidery_legs_small", 1 ] ] ] }, { @@ -485,7 +485,7 @@ [ [ "robopart_microreactor", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "medium_storage_battery", 1 ] ], - [ [ "solar_cell", 2 ] ], + [ [ "solar_cell", 2 ] ] ] }, { From 05a7345e1b402ddee18fb2405486769466d7a1a2 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 23:18:26 -0500 Subject: [PATCH 09/24] Linting --- data/mods/Modular_Turrets/uncraft_corpse.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index b6f802539cd2c..18880ac3aec8d 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -472,7 +472,8 @@ "time": 120000, "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [[ [ "ai_module", 1 ] ], + "components": [ + [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], [ [ "memory_module", 1 ] ], [ [ "pathfinding_module", 1 ] ], @@ -622,3 +623,4 @@ ] } ] + From fc6a9df72f4925baaa6fa5db9a30d190e11aab38 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 23:20:58 -0500 Subject: [PATCH 10/24] Linting --- data/mods/Salvaged_Robots/uncraft_corpse.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index c43300d4aa71c..942303adee07e 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -398,7 +398,7 @@ [ [ "android_legs", 1 ] ], [ [ "android_chassis", 1 ] ], [ [ "android_arms", 1 ] ], - [ [ "robot_controls", 1 ] ], + [ [ "robot_controls", 1 ] ] ] }, { @@ -829,3 +829,4 @@ ] } ] + From f080d31aa96c3db08f864a62658f175b4639fec8 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 23:25:53 -0500 Subject: [PATCH 11/24] Linting --- data/mods/Salvaged_Robots/monsters.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json index edc5f6a678765..0252717ed6c78 100644 --- a/data/mods/Salvaged_Robots/monsters.json +++ b/data/mods/Salvaged_Robots/monsters.json @@ -641,7 +641,7 @@ "range": 10, "ranges": [ [ 0, 10, "DEFAULT" ] ] } - ], + ] }, { "id": "mon_broken_cyborg", @@ -988,7 +988,7 @@ "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "starting_ammo": { "napalm": 1000 }, - "extend": { "flags": [ "FIREPROOF" ] }, + "extend": { "flags": [ "FIREPROOF", "DROPS_AMMO" ] }, "special_attacks": [ { "type": "gun", @@ -1008,8 +1008,7 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ], - "extend": { "flags": [ "DROPS_AMMO" ] } + ] }, { "abstract": "mon_advbot_base", From 36d35d73e3b43bad1a7d4b93a70466aed5766068 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 23:38:34 -0500 Subject: [PATCH 12/24] Linting (again?) Validator said to lint, even though I did? --- data/mods/Modular_Turrets/uncraft_corpse.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index 18880ac3aec8d..fb5a3bb0fd746 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -624,3 +624,4 @@ } ] + From afe1ca038a32deaaf850b67e01d66749047d3c48 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Mon, 25 Nov 2019 23:49:51 -0500 Subject: [PATCH 13/24] Linting --- data/mods/Modular_Turrets/monster.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index f619ac695a393..ecba2efffbedc 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -619,3 +619,4 @@ "death_drops": { "groups": [ [ "broken_robots", 10 ], [ "broken_ceramics", 10 ] ] } } ] + From 333c5add851bb6b4a4252193138056da92f77026 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Tue, 26 Nov 2019 00:06:45 -0500 Subject: [PATCH 14/24] Deleted spaces --- data/mods/Modular_Turrets/uncraft_corpse.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index fb5a3bb0fd746..29497e763d0b1 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -623,5 +623,3 @@ ] } ] - - From 4936b3627193fa87dfb5397f4d673842bb1d0e63 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Tue, 26 Nov 2019 00:07:54 -0500 Subject: [PATCH 15/24] Cleanup spaces --- data/mods/Modular_Turrets/monster.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index ecba2efffbedc..f619ac695a393 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -619,4 +619,3 @@ "death_drops": { "groups": [ [ "broken_robots", 10 ], [ "broken_ceramics", 10 ] ] } } ] - From 7d09e13ea18f256a3c66c36caa4b360f6ffb5c81 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Tue, 26 Nov 2019 00:08:40 -0500 Subject: [PATCH 16/24] Cleanup Spaces --- data/mods/Salvaged_Robots/uncraft_corpse.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index 942303adee07e..d2de066570e0f 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -829,4 +829,3 @@ ] } ] - From cb319ea2f30c2ab7cbd09d26d3fd9a27778d64fe Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Tue, 26 Nov 2019 00:09:11 -0500 Subject: [PATCH 17/24] Cleanup spaces From 7db0f6667716e57b1b8da4bc69025f50a9972eda Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Tue, 26 Nov 2019 00:22:54 -0500 Subject: [PATCH 18/24] Add Modules to Auto armor recipes Added various modules minus the gun module, as the auto armor does not use a gun. --- data/mods/Salvaged_Robots/recipe.json | 30 ++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/data/mods/Salvaged_Robots/recipe.json b/data/mods/Salvaged_Robots/recipe.json index 2e51080582a10..84e46b35febca 100644 --- a/data/mods/Salvaged_Robots/recipe.json +++ b/data/mods/Salvaged_Robots/recipe.json @@ -42,21 +42,45 @@ "type": "recipe", "id_suffix": "from_parts", "copy-from": "bot_autoarmor_base", - "components": [ [ [ "power_armor_light", 1 ] ], [ [ "power_armor_frame", 1 ] ], [ [ "robopart_ai_core", 1 ] ] ] + "components": [ + [ [ "power_armor_light", 1 ] ], + [ [ "power_armor_frame", 1 ] ], + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "result": "bot_autoarmor_basic", "type": "recipe", "id_suffix": "from_parts", "copy-from": "bot_autoarmor_base", - "components": [ [ [ "power_armor_basic", 1 ] ], [ [ "power_armor_frame", 1 ] ], [ [ "robopart_ai_core", 1 ] ] ] + "components": [ + [ [ "power_armor_basic", 1 ] ], + [ [ "power_armor_frame", 1 ] ], + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "result": "bot_autoarmor_heavy", "type": "recipe", "id_suffix": "from_parts", "copy-from": "bot_autoarmor_base", - "components": [ [ [ "power_armor_heavy", 1 ] ], [ [ "power_armor_frame", 1 ] ], [ [ "robopart_ai_core", 1 ] ] ] + "components": [ + [ [ "power_armor_heavy", 1 ] ], + [ [ "power_armor_frame", 1 ] ], + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "abstract": "bot_autoarmor_repair", From 14e06aaadac106a1eb1d12a90226a3440df8977e Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Tue, 26 Nov 2019 23:47:45 -0500 Subject: [PATCH 19/24] Fix flag structure and ammunition flags/count Fixed the structure of flags so DROPS_AMMO and immunity flags are again extended so potential changes to base are easier to implement. This would likely be a tidiness issue later. Removed the DROPS_AMMO flag from liquid turrets as they drop inappropriate containers full of liquid. For instance, if ammo count is 10, it drops ten jerrycans full of napalm, however, when placing the turret, it only takes 10 fuel from the jerrycan, making it an infinite napalm loop. Reduced count of "small pillbox" described turrets. Turrets' max ammo when activated is based on the amount in "starting_ammo", so if set to 1, it will only load 1 round. It will ignore the magazine size of the robogun that it uses. Anyway, I upped the amount fuel in the flamer turret to 10000 to represent using an entire jerrycan of napalm as fuel. I'll need to add flags to the robogun_flamer so that it fires more than 1 round at a time like a normal flamethrower. --- data/mods/Modular_Turrets/monster.json | 62 +++++++++++++++----------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index f619ac695a393..aa3649cff211d 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -18,7 +18,7 @@ "armor_acid": 14, "death_function": [ "BROKEN" ], "death_drops": "broken_robots", - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] }, { "id": "mon_turret_disarmed", @@ -68,7 +68,7 @@ "color": "light_gray", "luminance": 200, "revert_to_itype": "bot_turret_9mm", - "starting_ammo": { "9mm": 2000 }, + "starting_ammo": { "9mm": 100 }, "special_attacks": [ { "type": "gun", @@ -80,7 +80,8 @@ "no_ammo_sound": "click click!", "ranges": [ [ 0, 2, "BURST" ], [ 3, 6, "AUTO" ], [ 7, 12, "DEFAULT" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_turret_shot", @@ -94,7 +95,7 @@ "color": "red", "luminance": 200, "revert_to_itype": "bot_turret_shot", - "starting_ammo": { "shot_00": 400 }, + "starting_ammo": { "shot_00": 100 }, "special_attacks": [ { "type": "gun", @@ -107,7 +108,8 @@ "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_turret_teargas", @@ -121,7 +123,7 @@ "color": "blue", "luminance": 300, "revert_to_itype": "bot_turret_teargas", - "starting_ammo": { "40mm_teargas": 100 }, + "starting_ammo": { "40mm_teargas": 50 }, "special_attacks": [ { "type": "gun", @@ -134,7 +136,8 @@ "range": 18, "ranges": [ [ 0, 6, "DEFAULT" ], [ 7, 12, "BURST" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_turret_beanbag", @@ -148,7 +151,7 @@ "color": "blue", "luminance": 300, "revert_to_itype": "bot_turret_beanbag", - "starting_ammo": { "40mm_beanbag": 100 }, + "starting_ammo": { "40mm_beanbag": 50 }, "special_attacks": [ { "type": "gun", @@ -161,7 +164,8 @@ "range": 8, "ranges": [ [ 0, 8, "DEFAULT" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milturret_556", @@ -195,7 +199,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milturret_308", @@ -229,7 +234,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milturret_50bmg", @@ -264,7 +270,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milturret_8x40mm", @@ -298,7 +305,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milturret_needle", @@ -332,7 +340,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milturret_40mm", @@ -346,7 +355,7 @@ "color": "red", "luminance": 200, "revert_to_itype": "bot_milturret_40mm", - "starting_ammo": { "40mm_frag": 100 }, + "starting_ammo": { "40mm_frag": 50 }, "special_attacks": [ { "type": "gun", @@ -366,7 +375,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milturret_flame", @@ -380,7 +390,7 @@ "color": "red", "luminance": 200, "revert_to_itype": "bot_milturret_flame", - "starting_ammo": { "napalm": 1000 }, + "starting_ammo": { "napalm": 10000 }, "special_attacks": [ { "type": "gun", @@ -432,8 +442,7 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 20 } - ], - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] + ] }, { "id": "mon_advturret_acid", @@ -459,8 +468,7 @@ "require_targeting_player": false, "ranges": [ [ 0, 20, "DEFAULT" ] ] } - ], - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] + ] }, { "id": "mon_advturret_plasma", @@ -492,7 +500,7 @@ "targeting_volume": 10 } ], - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "FIREPROOF" ] + "extend": { "flags": [ "FIREPROOF" ] } }, { "id": "mon_advturret_rail", @@ -526,7 +534,8 @@ "targeting_sound": "\"Hostile detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_advturret_lightning", @@ -558,7 +567,7 @@ "targeting_volume": 10 } ], - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "ELECTRIC" ] + "extend": { "flags": [ "ELECTRIC" ] } }, { "id": "mon_advturret_emp", @@ -589,7 +598,7 @@ "targeting_volume": 10 } ], - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "ELECTRIC" ] + "extend": { "flags": [ "ELECTRIC" ] } }, { "id": "mon_turret_gnome", @@ -603,7 +612,7 @@ "diff": 10, "color": "red", "revert_to_itype": "bot_turret_gnome", - "starting_ammo": { "9mm": 2000 }, + "starting_ammo": { "9mm": 100 }, "special_attacks": [ { "type": "gun", @@ -616,6 +625,7 @@ "ranges": [ [ 0, 2, "BURST" ], [ 3, 6, "AUTO" ], [ 7, 12, "DEFAULT" ] ] } ], + "extend": { "flags": [ "DROPS_AMMO" ] }, "death_drops": { "groups": [ [ "broken_robots", 10 ], [ "broken_ceramics", 10 ] ] } } ] From 024b1222b4f41eeabecc4c0cd5b7fffa9b8343ff Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Wed, 27 Nov 2019 02:11:29 -0500 Subject: [PATCH 20/24] Remove lights from Turrets to match Main --- data/mods/Modular_Turrets/monster.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index aa3649cff211d..3221e5079a2d0 100644 --- a/data/mods/Modular_Turrets/monster.json +++ b/data/mods/Modular_Turrets/monster.json @@ -30,7 +30,6 @@ "default_faction": "defense_bot", "diff": 14, "color": "light_gray", - "luminance": 200, "revert_to_itype": "bot_turret_disarmed" }, { @@ -41,7 +40,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" }, { @@ -53,7 +51,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" }, { @@ -66,7 +63,6 @@ "default_faction": "defense_bot", "diff": 10, "color": "light_gray", - "luminance": 200, "revert_to_itype": "bot_turret_9mm", "starting_ammo": { "9mm": 100 }, "special_attacks": [ @@ -93,7 +89,6 @@ "default_faction": "defense_bot", "diff": 10, "color": "red", - "luminance": 200, "revert_to_itype": "bot_turret_shot", "starting_ammo": { "shot_00": 100 }, "special_attacks": [ @@ -121,7 +116,6 @@ "default_faction": "cop_bot", "diff": 10, "color": "blue", - "luminance": 300, "revert_to_itype": "bot_turret_teargas", "starting_ammo": { "40mm_teargas": 50 }, "special_attacks": [ @@ -149,7 +143,6 @@ "default_faction": "cop_bot", "diff": 5, "color": "blue", - "luminance": 300, "revert_to_itype": "bot_turret_beanbag", "starting_ammo": { "40mm_beanbag": 50 }, "special_attacks": [ @@ -177,7 +170,6 @@ "default_faction": "military", "diff": 20, "color": "green", - "luminance": 200, "revert_to_itype": "bot_milturret_556", "starting_ammo": { "556": 1600 }, "special_attacks": [ @@ -212,7 +204,6 @@ "default_faction": "military", "diff": 20, "color": "green", - "luminance": 200, "revert_to_itype": "bot_milturret_308", "starting_ammo": { "762_51": 1000 }, "special_attacks": [ @@ -247,7 +238,6 @@ "default_faction": "military", "diff": 30, "color": "green", - "luminance": 200, "revert_to_itype": "bot_milturret_50bmg", "starting_ammo": { "50bmg": 400 }, "special_attacks": [ @@ -283,7 +273,6 @@ "default_faction": "military", "diff": 20, "color": "green", - "luminance": 200, "revert_to_itype": "bot_milturret_8x40mm", "starting_ammo": { "8mm_caseless": 1200 }, "special_attacks": [ @@ -318,7 +307,6 @@ "default_faction": "military", "diff": 20, "color": "green", - "luminance": 200, "revert_to_itype": "bot_milturret_needle", "starting_ammo": { "5x50dart": 1000 }, "special_attacks": [ @@ -353,7 +341,6 @@ "default_faction": "military", "diff": 20, "color": "red", - "luminance": 200, "revert_to_itype": "bot_milturret_40mm", "starting_ammo": { "40mm_frag": 50 }, "special_attacks": [ @@ -388,7 +375,6 @@ "default_faction": "military", "diff": 20, "color": "red", - "luminance": 200, "revert_to_itype": "bot_milturret_flame", "starting_ammo": { "napalm": 10000 }, "special_attacks": [ @@ -423,7 +409,6 @@ "default_faction": "military", "diff": 20, "color": "yellow", - "luminance": 300, "revert_to_itype": "bot_advturret_laser", "special_attacks": [ { @@ -454,7 +439,6 @@ "default_faction": "military", "diff": 10, "color": "light_green", - "luminance": 300, "revert_to_itype": "bot_advturret_acid", "special_attacks": [ { @@ -480,7 +464,6 @@ "default_faction": "military", "diff": 20, "color": "magenta", - "luminance": 300, "revert_to_itype": "bot_advturret_plasma", "special_attacks": [ { @@ -512,7 +495,6 @@ "default_faction": "military", "diff": 30, "color": "magenta", - "luminance": 300, "revert_to_itype": "bot_advturret_rail", "starting_ammo": { "steel_rail": 200 }, "special_attacks": [ @@ -547,7 +529,6 @@ "default_faction": "military", "diff": 20, "color": "yellow", - "luminance": 300, "revert_to_itype": "bot_advturret_lightning", "special_attacks": [ { @@ -579,7 +560,6 @@ "default_faction": "military", "diff": 10, "color": "yellow", - "luminance": 300, "revert_to_itype": "bot_advturret_emp", "special_attacks": [ { From 75e5842333425956bdaec834a1d3aaf256bb7a82 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Wed, 27 Nov 2019 02:22:01 -0500 Subject: [PATCH 21/24] Remove Lights from some robots Robots that intentionally produce light as a function were left alone. Removed lights from most others. Electrical attack robots will still give off light as if they were a shocker. --- data/mods/Salvaged_Robots/monsters.json | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json index 0252717ed6c78..9f02fce13ad04 100644 --- a/data/mods/Salvaged_Robots/monsters.json +++ b/data/mods/Salvaged_Robots/monsters.json @@ -186,7 +186,6 @@ "default_faction": "defense_bot", "diff": 2, "color": "light_blue", - "luminance": 100, "revert_to_itype": "bot_turret_water", "starting_ammo": { "water": 1000 }, "special_attacks": [ @@ -265,7 +264,6 @@ "copy-from": "mon_eyebot", "name": "burning eye", "color": "red", - "luminance": 100, "armor_fire": 12, "description": "A salvaged eyebot refitted with a laser weapon. The lack of recoil allows the hovering robot to aim and fire without penalty. It has decent range and damage, but requires an extended recharge time between shots.", "revert_to_itype": "bot_eyebot_burn", @@ -726,7 +724,6 @@ "color": "red_green", "aggression": 100, "morale": 100, - "luminance": 20, "melee_skill": 4, "melee_dice": 2, "melee_dice_sides": 4, @@ -749,7 +746,6 @@ "name": "military robot", "description": "A military training robot still operating due to its internal power core. This one is armed with a high power paintball gun and a foam baton.", "diff": 2, - "luminance": 50, "melee_skill": 6, "melee_dice": 1, "melee_dice_sides": 4, @@ -820,7 +816,6 @@ "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 7.62mm firearm.", "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "luminance": 100, "starting_ammo": { "762_51": 1000 }, "revert_to_itype": "bot_milbot_308", "special_attacks": [ @@ -854,7 +849,6 @@ "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 50 caliber firearm.", "diff": 30, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "luminance": 100, "starting_ammo": { "50bmg": 400 }, "special_attacks": [ { @@ -887,7 +881,6 @@ "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 8mm firearm.", "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "luminance": 100, "starting_ammo": { "8mm_caseless": 1200 }, "special_attacks": [ { @@ -920,7 +913,6 @@ "description": "A military robot still operating due to its internal power core. This one is armed with an electric prod and an integrated 5x50mm flechette gun.", "diff": 15, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], - "luminance": 100, "starting_ammo": { "5x50dart": 1000 }, "special_attacks": [ { @@ -954,7 +946,6 @@ "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "color": "dark_gray_red", - "luminance": 50, "starting_ammo": { "40mm_frag": 100 }, "special_attacks": [ { @@ -1038,7 +1029,6 @@ "name": "laser-emitting robot", "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful laser-emitter.", "diff": 20, - "luminance": 120, "special_attacks": [ { "type": "gun", @@ -1067,7 +1057,7 @@ "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful plasma-ejector.", "diff": 20, "color": "magenta", - "luminance": 200, + "luminance": 20, "extend": { "flags": [ "FIREPROOF" ] }, "special_attacks": [ { @@ -1155,7 +1145,6 @@ "name": "EMP-projecting robot", "description": "An advanced robot still functioning due to its internal fusion core. This model is furnished with a powerful EMP-projector.", "diff": 10, - "luminance": 120, "special_attacks": [ { "type": "gun", @@ -1183,7 +1172,6 @@ "description": "A salvaged defense robot refitted with a shotgun and two circular buzzsaws. Due to bootleg targeting software, it can only attack nearby targets.", "speed": 100, "color": "brown", - "luminance": 0, "melee_skill": 2, "melee_dice": 1, "melee_dice_sides": 4, @@ -1421,7 +1409,6 @@ "color": "light_green", "speed": 100, "hp": 60, - "luminance": 0, "revert_to_itype": "bot_advbot_bitter", "melee_skill": 4, "melee_damage": [ { "damage_type": "acid", "amount": 8 } ], From 5b2814eae231b7f9dfe4a98c787c2b04a1d30a70 Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Wed, 27 Nov 2019 21:54:44 -0500 Subject: [PATCH 22/24] Remove lightstrip from Arson hack Presumably its light comes from pilot light. --- data/mods/Salvaged_Robots/uncraft_corpse.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index d2de066570e0f..a6f8f3c52f12a 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -57,7 +57,6 @@ "using": [ [ "soldering_standard", 5 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "lightstrip_inactive", 1 ] ], [ [ "element", 1 ] ], [ [ "ai_module_basic", 1 ] ], [ [ "small_storage_battery", 1 ] ], From 84d0ed0e23366d416be683530aca9903ea8399bf Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Wed, 27 Nov 2019 22:19:01 -0500 Subject: [PATCH 23/24] Removed Lighstrips from turrets Already removed luminance from turrets, needed to remove lightstrips from uncraft recipes. --- data/mods/Modular_Turrets/uncraft.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/mods/Modular_Turrets/uncraft.json b/data/mods/Modular_Turrets/uncraft.json index 9f2951138947e..45d5821013400 100644 --- 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 ] ], From e914500400109035eb50ad3ead6b9c94c9c6967f Mon Sep 17 00:00:00 2001 From: CSHague <58125670+CSHague@users.noreply.github.com> Date: Thu, 5 Dec 2019 21:47:18 -0500 Subject: [PATCH 24/24] Remove power armor backpack frames --- data/mods/Salvaged_Robots/recipe.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/mods/Salvaged_Robots/recipe.json b/data/mods/Salvaged_Robots/recipe.json index 84e46b35febca..be460ecccfdea 100644 --- a/data/mods/Salvaged_Robots/recipe.json +++ b/data/mods/Salvaged_Robots/recipe.json @@ -44,7 +44,6 @@ "copy-from": "bot_autoarmor_base", "components": [ [ [ "power_armor_light", 1 ] ], - [ [ "power_armor_frame", 1 ] ], [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], [ [ "memory_module", 1 ] ], @@ -59,7 +58,6 @@ "copy-from": "bot_autoarmor_base", "components": [ [ [ "power_armor_basic", 1 ] ], - [ [ "power_armor_frame", 1 ] ], [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], [ [ "memory_module", 1 ] ], @@ -74,7 +72,6 @@ "copy-from": "bot_autoarmor_base", "components": [ [ [ "power_armor_heavy", 1 ] ], - [ [ "power_armor_frame", 1 ] ], [ [ "ai_module", 1 ] ], [ [ "sensor_module", 1 ] ], [ [ "memory_module", 1 ] ],