From 14ab8d741e98802f46ebfc4caa0604d32610dd35 Mon Sep 17 00:00:00 2001 From: va5h <12gaugeblues@gmail.com> Date: Mon, 20 Jan 2020 18:32:11 +0300 Subject: [PATCH] retrofitted - [CR] Update Modular Turrets and Salvaged Robots to match Mainline style and recipes Fixes #35689 (#35752) 00fbf229c778dc03025982dc4d90b3d7a05c4a5d --- data/mods/Modular_Turrets/monster.json | 68 +++---- data/mods/Modular_Turrets/uncraft.json | 3 - data/mods/Modular_Turrets/uncraft_corpse.json | 180 +++++++++++------- data/mods/Salvaged_Robots/monsters.json | 94 ++++----- data/mods/Salvaged_Robots/recipe.json | 27 ++- data/mods/Salvaged_Robots/uncraft_corpse.json | 100 +++++----- 6 files changed, 272 insertions(+), 200 deletions(-) diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json index 4e27c2f7c4b28..c1b765fe26d82 100644 --- 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 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 ] ], diff --git a/data/mods/Modular_Turrets/uncraft_corpse.json b/data/mods/Modular_Turrets/uncraft_corpse.json index 36facd696a044..5113e958822ce 100644 --- a/data/mods/Modular_Turrets/uncraft_corpse.json +++ b/data/mods/Modular_Turrets/uncraft_corpse.json @@ -7,7 +7,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", @@ -27,7 +36,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", @@ -37,7 +54,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", @@ -47,7 +72,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", @@ -57,7 +90,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", @@ -68,12 +109,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 ] ] ] }, { @@ -88,13 +130,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 ] ] ] @@ -111,13 +151,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 ] ] ] @@ -134,13 +172,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 ] ] ] @@ -325,16 +361,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 ] ] ] }, { @@ -356,6 +394,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 ] ], @@ -363,9 +405,6 @@ [ [ "motor", 1 ] ], [ [ "frame", 1 ] ], [ [ "wheel_small", 3 ] ], - [ [ "processor", 3 ] ], - [ [ "RAM", 2 ] ], - [ [ "e_scrap", 3 ] ], [ [ "plastic_chunk", 6 ] ], [ [ "steel_chunk", 12 ] ] ] @@ -395,13 +434,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 ] ] ] }, { @@ -423,17 +464,20 @@ "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 ] ], + [ [ "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 ] ] + [ [ "solar_cell", 2 ] ] ] }, { @@ -500,18 +544,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 ] ] ] }, { @@ -523,16 +568,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 ] ] ] diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json index 3bfe445ae3924..d9f82dbe48809 100644 --- a/data/mods/Salvaged_Robots/monsters.json +++ b/data/mods/Salvaged_Robots/monsters.json @@ -188,7 +188,6 @@ "default_faction": "defense_bot", "diff": 2, "color": "light_blue", - "luminance": 100, "revert_to_itype": "bot_turret_water", "starting_ammo": { "water": 1000 }, "special_attacks": [ @@ -268,7 +267,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", @@ -353,7 +351,8 @@ "fake_dex": 8, "ranges": [ [ 0, 3, "BURST" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_utilibot_fire", @@ -378,7 +377,7 @@ "ranges": [ [ 0, 5, "BURST" ] ] } ], - "extend": { "flags": [ "FIREPROOF", "BASHES" ] } + "extend": { "flags": [ "FIREPROOF", "BASHES", "DROPS_AMMO" ] } }, { "id": "mon_utilibot_blob", @@ -444,7 +443,7 @@ } ], "death_drops": { "groups": [ [ "broken_robots", 1 ], [ "beehive", 1 ] ] }, - "extend": { "flags": [ "STUMBLES" ] } + "extend": { "flags": [ "STUMBLES", "DROPS_AMMO" ] } }, { "id": "mon_medibot", @@ -628,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", @@ -694,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", @@ -707,7 +706,8 @@ "no_ammo_sound": "click click!", "ranges": [ [ 0, 8, "DEFAULT" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "abstract": "mon_milbot_base", @@ -726,7 +726,6 @@ "color": "red_green", "aggression": 100, "morale": 100, - "luminance": 20, "melee_skill": 4, "melee_dice": 2, "melee_dice_sides": 4, @@ -749,13 +748,12 @@ "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, "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", @@ -776,7 +774,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", @@ -786,7 +785,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 +805,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_308", @@ -816,8 +816,7 @@ "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": 100 }, + "starting_ammo": { "762_51": 1000 }, "revert_to_itype": "bot_milbot_308", "special_attacks": [ { @@ -838,7 +837,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_50bmg", @@ -848,8 +848,7 @@ "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": 100 }, + "starting_ammo": { "50bmg": 400 }, "special_attacks": [ { "type": "gun", @@ -869,7 +868,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_8x40mm", @@ -879,8 +879,7 @@ "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": 100 }, + "starting_ammo": { "8mm_caseless": 1200 }, "special_attacks": [ { "type": "gun", @@ -900,7 +899,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_needle", @@ -910,8 +910,7 @@ "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": 100 }, + "starting_ammo": { "5x50dart": 1000 }, "special_attacks": [ { "type": "gun", @@ -931,7 +930,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_40mm", @@ -942,7 +942,6 @@ "diff": 20, "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], "color": "dark_gray_red", - "luminance": 50, "starting_ammo": { "40x46mm_m433": 100 }, "special_attacks": [ { @@ -963,7 +962,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_flame", @@ -973,8 +973,8 @@ "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 }, - "extend": { "flags": [ "FIREPROOF" ] }, + "starting_ammo": { "napalm": 1000 }, + "extend": { "flags": [ "FIREPROOF", "DROPS_AMMO" ] }, "special_attacks": [ { "type": "gun", @@ -1023,7 +1023,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", @@ -1051,7 +1050,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": [ { @@ -1079,6 +1078,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", @@ -1135,7 +1135,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", @@ -1162,7 +1161,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, @@ -1170,7 +1168,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", @@ -1183,7 +1181,8 @@ "no_ammo_sound": "click!", "ranges": [ [ 0, 3, "DEFAULT" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_defbot_samurai", @@ -1231,7 +1230,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 ], { @@ -1246,7 +1245,7 @@ "ranges": [ [ 0, 10, "DEFAULT" ] ] } ], - "extend": { "flags": [ "FIREPROOF" ] } + "extend": { "flags": [ "FIREPROOF", "DROPS_AMMO" ] } }, { "id": "mon_milbot_gaurdian", @@ -1262,7 +1261,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", @@ -1275,7 +1274,8 @@ "no_ammo_sound": "click click!", "ranges": [ [ 0, 10, "AUTO" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_deluxe", @@ -1301,7 +1301,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", @@ -1314,7 +1314,8 @@ "ranges": [ [ 0, 16, "BURST" ] ], "require_targeting_player": true } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_milbot_defender", @@ -1330,7 +1331,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", @@ -1351,7 +1352,8 @@ "targeting_sound": "\"Hostile Detected.\"", "targeting_volume": 10 } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_advbot_glitter", @@ -1377,7 +1379,8 @@ "fake_dex": 8, "ranges": [ [ 0, 5, "AUTO" ] ] } - ] + ], + "extend": { "flags": [ "DROPS_AMMO" ] } }, { "id": "mon_advbot_bitter", @@ -1389,7 +1392,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 } ], diff --git a/data/mods/Salvaged_Robots/recipe.json b/data/mods/Salvaged_Robots/recipe.json index 720c3dd4443b4..fc3d4089a2308 100644 --- a/data/mods/Salvaged_Robots/recipe.json +++ b/data/mods/Salvaged_Robots/recipe.json @@ -42,21 +42,42 @@ "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 ] ], + [ [ "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 ] ], + [ [ "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 ] ], + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] }, { "abstract": "bot_autoarmor_repair", diff --git a/data/mods/Salvaged_Robots/uncraft_corpse.json b/data/mods/Salvaged_Robots/uncraft_corpse.json index 148727113fc0f..3583c45105cca 100644 --- a/data/mods/Salvaged_Robots/uncraft_corpse.json +++ b/data/mods/Salvaged_Robots/uncraft_corpse.json @@ -17,12 +17,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 ] ] ] }, { @@ -34,12 +35,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 ] ] ] }, { @@ -51,12 +54,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 ] ] + [ [ "element", 1 ] ], + [ [ "ai_module_basic", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] ] }, { @@ -68,12 +72,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 ] ] ] }, { @@ -251,16 +255,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 ] ] ] }, { @@ -382,12 +390,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 ] ] ] }, { @@ -495,15 +501,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 ] ] ] @@ -637,15 +647,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 ] ]