From 6d3ae1aa9bbb3ddfc604446ce337208fe052bf30 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 25 Dec 2019 17:40:42 -0500 Subject: [PATCH 1/5] Moving #36438 to Aftershock I moved the parts I understood and didn't move the specific mapgens. Will likely create own lab finales eventually. --- data/mods/Aftershock/items/afs_books.json | 24 +++ .../Aftershock/items/afs_inactiverobot.json | 156 ++++++++++++++++++ .../Aftershock/items/afs_item_groups.json | 24 +++ data/mods/Aftershock/items/afs_weapons.json | 24 ++- data/mods/Aftershock/items/monsterdrops.json | 49 ++++++ data/mods/Aftershock/items/robotparts.json | 58 +++++++ data/mods/Aftershock/mobs/afs_robots.json | 104 ++++++++++++ .../mods/Aftershock/recipes/afs__recipes.json | 110 ++++++++++++ .../recipes/afs_deconstruction.json | 74 +++++++++ 9 files changed, 622 insertions(+), 1 deletion(-) create mode 100644 data/mods/Aftershock/items/monsterdrops.json create mode 100644 data/mods/Aftershock/items/robotparts.json diff --git a/data/mods/Aftershock/items/afs_books.json b/data/mods/Aftershock/items/afs_books.json index 883b3901209d9..c72a449ded28e 100644 --- a/data/mods/Aftershock/items/afs_books.json +++ b/data/mods/Aftershock/items/afs_books.json @@ -113,5 +113,29 @@ "intelligence": 13, "fun": -1, "time": "50 m" + }, + { + "id": "schematics_chickenbot", + "type": "BOOK", + "name": "chicken walker schematics", + "name_plural": "chicken walker schematics", + "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the chicken walker. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" + }, + { + "id": "schematics_tankbot", + "type": "BOOK", + "name": "tank drone schematics", + "name_plural": "tank drone schematics", + "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the tank drone. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" + }, + { + "id": "schematics_tripod", + "type": "BOOK", + "name": "tripod schematics", + "name_plural": "tripod schematics", + "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", + "copy-from": "schematics_generic" } ] diff --git a/data/mods/Aftershock/items/afs_inactiverobot.json b/data/mods/Aftershock/items/afs_inactiverobot.json index fc15cd76393d0..2debba1d408c3 100644 --- a/data/mods/Aftershock/items/afs_inactiverobot.json +++ b/data/mods/Aftershock/items/afs_inactiverobot.json @@ -20,5 +20,161 @@ "skill1": "cooking", "skill2": "computer" } + }, + { + "id": "bot_chickenbot", + "type": "TOOL", + "name": "inactive chicken walker", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "120000 g", + "volume": "92500 ml", + "price": 50000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_chickenbot", + "friendly_msg": "The chicken walker rises to its feet, sways away from you and begins surveying the area.", + "hostile_msg": "The chicken walker whirrs and aims directly at you. Take cover!", + "//": "Milspec, but was deployed in active service implying a reliable IFF", + "difficulty": 9, + "moves": 250, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_tankbot", + "looks_like": "broken_tankbot", + "type": "TOOL", + "name": "inactive tank drone", + "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "200000 g", + "//": "cheating a bit with the volume due to lack of proper vehicle storage options", + "volume": "250 L", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tankbot", + "friendly_msg": "The tank drone rolls out and begins acquiring targets.", + "hostile_msg": "The tank drone swivels its turret and aims directly at you. Don your brown pants!", + "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a robo-tank?", + "difficulty": 10, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "broken_chickenbot", + "looks_like": "broken_tripod", + "type": "TOOL", + "name": "inactive chicken walker", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "190000 g", + "//": "cheating a bit with the volume due to lack of proper vehicle storage options", + "volume": "250 L", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_chickenbot", + "friendly_msg": "The chicken bot rolls out and begins acquiring targets.", + "hostile_msg": "The chicken bot swivels its turret and aims directly at you. Don your brown pants!", + "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a chicken walker?", + "difficulty": 10, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_tripod", + "looks_like": "broken_tripod", + "type": "TOOL", + "name": "inactive tripod", + "description": "This is an inactive Honda Regnal. Using this item involves placing it on the ground, wondering how it fuels its flamethrower and turning it on. If reprogrammed and rewired successfully the tribot will then identify you as an ally, roam around or follow you, and impale hostiles with its spiked cable weapons.", + "weight": "120000 g", + "volume": "92500 ml", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tripod", + "friendly_msg": "The tribot rises to its feet and scans the area for contaminants.", + "hostile_msg": "The tribot glowers down at you and ignites its flamethrower. Turns out you hate the smell of napalm.", + "//": "No observed open deployment, likely a prototype or secret project", + "difficulty": 15, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "type": "GENERIC", + "id": "broken_tripod", + "symbol": ",", + "color": "green", + "name": "broken tribot", + "category": "other", + "description": "A broken tribot. Now that its legs lie broken and immobile, the world seems a little less threatening. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "430000 g", + "volume": "187500 ml", + "bashing": 10, + "cutting": 6, + "to_hit": -2, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_tankbot", + "symbol": ",", + "color": "green", + "name": "broken tank drone", + "category": "other", + "description": "A broken tank drone. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "1223850 g", + "volume": "875 L", + "bashing": 20, + "cutting": 15, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] + }, + { + "type": "GENERIC", + "id": "broken_chickenbot", + "symbol": ",", + "color": "green", + "name": "broken chickenbot", + "category": "other", + "description": "A broken chicken walker. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", + "price": 1000, + "material": [ "steel", "plastic" ], + "weight": "1023850 g", + "volume": "1100 L", + "bashing": 20, + "cutting": 15, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] } ] diff --git a/data/mods/Aftershock/items/afs_item_groups.json b/data/mods/Aftershock/items/afs_item_groups.json index 88212c58a12bb..68cd58024bde9 100644 --- a/data/mods/Aftershock/items/afs_item_groups.json +++ b/data/mods/Aftershock/items/afs_item_groups.json @@ -53,5 +53,29 @@ [ "arrow_metal", 25 ], [ "bolt_steel", 10 ] ] + }, + { + "id": "schematics", + "//": "override of vanilla schematics, includes tripod, chickenbot, tankbot", + "type": "item_group", + "items": [ + [ "schematics_nursebot", 10 ], + [ "schematics_grocerybot", 20 ], + [ "schematics_copbot", 50 ], + [ "schematics_eyebot", 50 ], + [ "schematics_secubot", 50 ], + [ "schematics_skitterbot", 50 ], + [ "schematics_chickenbot", 5 ], + [ "schematics_hazmatbot", 50 ], + [ "schematics_riotbot", 50 ], + [ "schematics_sciencebot", 10 ], + [ "schematics_tankbot", 5 ], + [ "schematics_tripod", 5 ], + [ "schematics_molebot", 20 ], + [ "schematics_dispatch", 25 ], + [ "schematics_dispatch_military", 20 ], + [ "schematics_antimateriel", 20 ], + [ "schematics_searchlight", 50 ] + ] } ] diff --git a/data/mods/Aftershock/items/afs_weapons.json b/data/mods/Aftershock/items/afs_weapons.json index feef5aef22994..32a142c4b273b 100644 --- a/data/mods/Aftershock/items/afs_weapons.json +++ b/data/mods/Aftershock/items/afs_weapons.json @@ -187,5 +187,27 @@ [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] ], "flags": [ "NEVER_JAMS", "FIRE_20", "NON-FOULING" ] - } + }, + { + "id": "TANK", + "looks_like": "m79", + "type": "GUN", + "symbol": "(", + "color": "green", + "name": "Tankbot Main Gun", + "name_plural": "Tankbot Main Gun", + "description": "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!", + "price": 99999999, + "material": "steel", + "skill": "launcher", + "ammo": "120mm", + "weight": "2500 g", + "volume": "2500 ml", + "bashing": 6, + "to_hit": -3, + "dispersion": 60, + "durability": 9, + "clip_size": 1, + "loudness": 300 + } ] diff --git a/data/mods/Aftershock/items/monsterdrops.json b/data/mods/Aftershock/items/monsterdrops.json new file mode 100644 index 0000000000000..2e8857996213e --- /dev/null +++ b/data/mods/Aftershock/items/monsterdrops.json @@ -0,0 +1,49 @@ +[ + { + "type": "item_group", + "id": "tripod", + "items": [ + { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, + [ "kevlar_plate", 10 ], + [ "ceramic_armor", 15 ], + [ "alloy_plate", 10 ], + [ "robot_controls", 3 ] + ] + }, + { + "type": "item_group", + "id": "chickenbot", + "items": [ + [ "robot_controls", 5 ], + [ "ai_module", 5 ], + [ "sensor_module", 5 ], + [ "memory_module", 5 ], + [ "pathfinding_module", 5 ], + [ "identification_module", 5 ], + [ "reverse_jointed_legs", 40 ], + [ "chickenbot_chassis", 40 ], + [ "targeting_module", 5 ], + [ "gun_module", 30 ], + [ "mark19", 5 ], + [ "tazer", 5 ], + [ "m249", 5 ], + [ "storage_battery", 5 ], + [ "plut_cell", 5 ], + [ "mil_plate", 2 ] + ] + }, + { + "type": "item_group", + "id": "tankbot", + "items": [ + [ "tazer", 3 ], + { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 }, + [ "556", 8 ], + [ "alloy_plate", 10 ], + [ "kevlar_plate", 10 ], + [ "ceramic_armor", 10 ], + [ "hard_plate", 30 ], + [ "robot_controls", 5 ] + ] + } +] diff --git a/data/mods/Aftershock/items/robotparts.json b/data/mods/Aftershock/items/robotparts.json new file mode 100644 index 0000000000000..49ea5b32e52a3 --- /dev/null +++ b/data/mods/Aftershock/items/robotparts.json @@ -0,0 +1,58 @@ +[ + { + "type": "GENERIC", + "id": "spidery_legs_big", + "name": "set of spidery legs", + "name_plural": "sets of spidery legs", + "description": "A set of big pointy legs, like the ones found under a tripod.", + "symbol": "W", + "color": "light_gray", + "weight": "40000 g", + "volume": "20 L", + "price": 200000, + "material": "steel", + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "tripod_chassis", + "name": "tripod chassis", + "name_plural": "tripod chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the tripod.", + "symbol": "c", + "color": "light_gray", + "weight": "40000 g", + "volume": "70000 ml", + "price": 200000, + "material": [ "steel" ], + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "chickenbot_chassis", + "name": "chicken walker chassis", + "name_plural": "chicken walker chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the chicken walker.", + "symbol": "c", + "color": "light_gray", + "weight": "60000 g", + "volume": "80000 ml", + "price": 300000, + "material": [ "steel" ], + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "tankbot_chassis", + "name": "Beagle chassis", + "name_plural": "Beagle chassis", + "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Beagle tank.", + "symbol": "c", + "color": "light_gray", + "weight": "150000 g", + "volume": "575000 ml", + "price": 1000000, + "material": [ "steel" ], + "category": "spare_parts" + } +] diff --git a/data/mods/Aftershock/mobs/afs_robots.json b/data/mods/Aftershock/mobs/afs_robots.json index 42e052301ade5..c608d7e67d9d3 100644 --- a/data/mods/Aftershock/mobs/afs_robots.json +++ b/data/mods/Aftershock/mobs/afs_robots.json @@ -33,5 +33,109 @@ "death_drops": { }, "death_function": [ "BROKEN" ], "flags": [ "SEES", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] + }, + { + "id": "mon_chickenbot", + "type": "MONSTER", + "name": "chicken walker", + "description": "The Northrop ATSV, a massive, heavily-armed and armored robot walking on a pair of reverse-jointed legs. Armed with a 40mm anti-vehicle grenade launcher, 5.56 anti-personnel gun, and the ability to electrify itself against attackers, it is an effective automated sentry, though production was limited due to a legal dispute.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "92500 ml", + "weight": "120 kg", + "hp": 90, + "speed": 115, + "material": [ "steel" ], + "symbol": "R", + "color": "red", + "aggression": 100, + "morale": 100, + "melee_skill": 3, + "melee_dice": 3, + "melee_dice_sides": 3, + "melee_cut": 0, + "armor_bash": 18, + "armor_cut": 14, + "vision_day": 50, + "vision_night": 35, + "revert_to_itype": "bot_chickenbot", + "starting_ammo": { "40x46mm_m433": 100, "556": 1000 }, + "path_settings": { "max_dist": 10 }, + "special_attacks": [ [ "CHICKENBOT", 4 ] ], + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS", "DROPS_AMMO" ] + }, + { + "id": "mon_tankbot", + "type": "MONSTER", + "name": "Beagle Mini-Tank UGV", + "description": "The Northrop Beagle is a refrigerator-sized urban warfare UGV. Sporting an anti-tank missile launcher, 40mm grenade launcher, and numerous anti-infantry weapons, it's designed for high-risk urban fighting.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 30, + "volume": "875000 ml", + "weight": "200 kg", + "hp": 240, + "speed": 75, + "material": [ "steel" ], + "symbol": "R", + "color": "dark_gray", + "aggression": 100, + "morale": 100, + "melee_skill": 5, + "melee_dice": 5, + "melee_dice_sides": 5, + "melee_cut": 0, + "armor_bash": 90, + "armor_cut": 90, + "vision_day": 50, + "revert_to_itype": "bot_tankbot", + "starting_ammo": { "40x46mm_m433": 200, "556": 3000 }, + "path_settings": { "max_dist": 20 }, + "special_attacks": [ [ "MULTI_ROBOT", 3 ] ], + "death_function": [ "BROKEN" ], + "flags": [ + "SEES", + "HEARS", + "GOODHEARING", + "NOHEAD", + "BASHES", + "DESTROYS", + "NO_BREATHE", + "ELECTRONIC", + "PRIORITIZE_TARGETS", + "DROPS_AMMO" + ] + }, + { + "id": "mon_tripod", + "type": "MONSTER", + "name": "tripod", + "description": "The Honda Regnal, a tall robot walking on three spidery legs. For weapons, it has a trio of spiked retractable cables and a flamethrower mounted on its head.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "92500 ml", + "weight": "120 kg", + "hp": 80, + "speed": 90, + "material": [ "steel" ], + "symbol": "R", + "color": "white", + "aggression": 100, + "morale": 100, + "melee_skill": 10, + "melee_dice": 3, + "melee_dice_sides": 12, + "melee_cut": 6, + "armor_bash": 12, + "armor_cut": 8, + "path_settings": { "max_dist": 5 }, + "revert_to_itype": "bot_tripod", + "special_attacks": [ [ "FLAMETHROWER", 10 ] ], + "death_drops": { "groups": [ [ "robots", 4 ], [ "tripod", 1 ] ] }, + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "HEARS", "GOODHEARING", "BASHES", "NO_BREATHE", "ELECTRONIC", "CLIMBS", "PRIORITIZE_TARGETS" ] } ] diff --git a/data/mods/Aftershock/recipes/afs__recipes.json b/data/mods/Aftershock/recipes/afs__recipes.json index 02c27e337db45..a41cb50105c91 100644 --- a/data/mods/Aftershock/recipes/afs__recipes.json +++ b/data/mods/Aftershock/recipes/afs__recipes.json @@ -424,5 +424,115 @@ [ [ "cable", 3 ] ], [ [ "plastic_chunk", 3 ] ] ] + }, + { + "type": "recipe", + "result": "bot_tankbot", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_OTHER", + "skill_used": "electronics", + "skills_required": [ [ "mechanics", 9 ], [ "computer", 8 ] ], + "reversible": true, + "decomp_learn": 8, + "book_learn": [ [ "schematics_tankbot", 9 ] ], + "difficulty": 9, + "time": "1 h 15 m", + "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "qualities": [ + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "WRENCH", "level": 2 }, + { "id": "WRENCH_FINE", "level": 1 } + ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "tank_tread", 1 ] ], + [ [ "tankbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "flamethrower", 1 ] ], + [ [ "tazer", 1 ] ], + [ [ "m4a1", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] + }, + { + "type": "recipe", + "result": "bot_tripod", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_OTHER", + "skill_used": "electronics", + "skills_required": [ [ "mechanics", 9 ], [ "computer", 8 ] ], + "reversible": true, + "decomp_learn": 8, + "book_learn": [ [ "schematics_tripod", 9 ] ], + "difficulty": 9, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], + "qualities": [ + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "WRENCH", "level": 2 }, + { "id": "WRENCH_FINE", "level": 1 } + ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "spidery_legs_big", 1 ] ], + [ [ "tripod_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "power_supply", 12 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "flamethrower", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "bot_chickenbot", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_OTHER", + "skill_used": "electronics", + "skills_required": [ [ "mechanics", 10 ], [ "computer", 9 ] ], + "reversible": true, + "decomp_learn": 9, + "book_learn": [ [ "schematics_chickenbot", 10 ] ], + "difficulty": 10, + "time": "1 h 15 m", + "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "qualities": [ + { "id": "SCREW", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "WRENCH", "level": 2 }, + { "id": "WRENCH_FINE", "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 ] ], + [ [ "mark19", 1 ] ], + [ [ "tazer", 1 ] ], + [ [ "m249", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] } ] diff --git a/data/mods/Aftershock/recipes/afs_deconstruction.json b/data/mods/Aftershock/recipes/afs_deconstruction.json index 23d3494fe4e61..39a4010a214e9 100644 --- a/data/mods/Aftershock/recipes/afs_deconstruction.json +++ b/data/mods/Aftershock/recipes/afs_deconstruction.json @@ -16,5 +16,79 @@ [ [ "sensory_cluster", 1 ] ], [ [ "bioweapon_chassis", 1 ] ] ] + }, + { + "result": "broken_tankbot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "10 h", + "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 ] ], + [ [ "tank_tread", 1 ] ], + [ [ "tankbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "flamethrower", 1 ] ], + [ [ "tazer", 1 ] ], + [ [ "m4a1", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] + }, + { + "result": "broken_chickenbot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "10 h", + "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 ] ], + [ [ "chickenbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "m249", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] + }, + { + "result": "broken_tripod", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "5 h", + "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 10 ] ], + "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 ] ], + [ [ "spidery_legs_big", 1 ] ], + [ [ "tripod_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "power_supply", 12 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "flamethrower", 1 ] ] + ] } ] From 7193ff17bf203b49543af105db8c7e7235cd6d03 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 25 Dec 2019 17:58:11 -0500 Subject: [PATCH 2/5] Update afs_weapons.json --- data/mods/Aftershock/items/afs_weapons.json | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/data/mods/Aftershock/items/afs_weapons.json b/data/mods/Aftershock/items/afs_weapons.json index 32a142c4b273b..61f5900f8572a 100644 --- a/data/mods/Aftershock/items/afs_weapons.json +++ b/data/mods/Aftershock/items/afs_weapons.json @@ -189,25 +189,25 @@ "flags": [ "NEVER_JAMS", "FIRE_20", "NON-FOULING" ] }, { - "id": "TANK", - "looks_like": "m79", - "type": "GUN", - "symbol": "(", - "color": "green", - "name": "Tankbot Main Gun", - "name_plural": "Tankbot Main Gun", - "description": "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!", - "price": 99999999, - "material": "steel", - "skill": "launcher", - "ammo": "120mm", - "weight": "2500 g", - "volume": "2500 ml", - "bashing": 6, - "to_hit": -3, - "dispersion": 60, - "durability": 9, - "clip_size": 1, - "loudness": 300 - } + "id": "TANK", + "looks_like": "m79", + "type": "GUN", + "symbol": "(", + "color": "green", + "name": "Tankbot Main Gun", + "name_plural": "Tankbot Main Gun", + "description": "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!", + "price": 99999999, + "material": "steel", + "skill": "launcher", + "ammo": "120mm", + "weight": "2500 g", + "volume": "2500 ml", + "bashing": 6, + "to_hit": -3, + "dispersion": 60, + "durability": 9, + "clip_size": 1, + "loudness": 300 + } ] From c8832611e8df27b7041a1bdb462d954a87838b79 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 29 Dec 2019 01:53:24 -0500 Subject: [PATCH 3/5] Update afs_deconstruction.json --- data/mods/Aftershock/recipes/afs_deconstruction.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/Aftershock/recipes/afs_deconstruction.json b/data/mods/Aftershock/recipes/afs_deconstruction.json index 63c2354531c4c..3ee9150ebaa36 100644 --- a/data/mods/Aftershock/recipes/afs_deconstruction.json +++ b/data/mods/Aftershock/recipes/afs_deconstruction.json @@ -90,6 +90,7 @@ [ [ "power_supply", 12 ] ], [ [ "storage_battery", 1 ] ], [ [ "flamethrower", 1 ] ] + ] }, { "result": "broken_afs_mon_sentinel_lx", From d35eca8715907cfaea8ed56e2a1ad33c42729057 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 29 Dec 2019 01:54:01 -0500 Subject: [PATCH 4/5] Update afs_deconstruction.json --- data/mods/Aftershock/recipes/afs_deconstruction.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/recipes/afs_deconstruction.json b/data/mods/Aftershock/recipes/afs_deconstruction.json index 3ee9150ebaa36..9114be0f469b5 100644 --- a/data/mods/Aftershock/recipes/afs_deconstruction.json +++ b/data/mods/Aftershock/recipes/afs_deconstruction.json @@ -91,7 +91,7 @@ [ [ "storage_battery", 1 ] ], [ [ "flamethrower", 1 ] ] ] - }, + }, { "result": "broken_afs_mon_sentinel_lx", "type": "uncraft", From cf52fe36ee25448336ae0fc56829803ce6087230 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 29 Dec 2019 14:57:03 -0500 Subject: [PATCH 5/5] Update afs_robots.json --- data/mods/Aftershock/mobs/afs_robots.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Aftershock/mobs/afs_robots.json b/data/mods/Aftershock/mobs/afs_robots.json index b30a9b24fa951..f9a707fee7edb 100644 --- a/data/mods/Aftershock/mobs/afs_robots.json +++ b/data/mods/Aftershock/mobs/afs_robots.json @@ -190,6 +190,5 @@ "PATH_AVOID_DANGER_2", "HIT_AND_RUN" ] - } ]