From 33f987d7f791b2fc84ddf9eb621ee5a514adc79f Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Thu, 18 Feb 2021 20:44:39 +1300 Subject: [PATCH] Tazer drone iii (#47353) --- data/json/items/corpses/inactive_bots.json | 26 ++++++++++++++++++++++ data/json/items/generic.json | 18 +++++++++++++++ data/json/monstergroups/lab.json | 2 ++ data/json/monsters/drones.json | 14 ++++++++++++ data/json/recipes/other/bots.json | 26 ++++++++++++++++++++++ 5 files changed, 86 insertions(+) diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index 4eb2412326a20..abe50e4bbf6cb 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -740,5 +740,31 @@ "moves": 150, "skills": [ "electronics", "computer" ] } + }, + { + "id": "bot_tazer_hack", + "type": "TOOL", + "name": { "str": "inactive tazer hack" }, + "description": "This is an inactive tazer hack. Hacks are fist-sized robots that fly through the air. This one has a tazer and attacks by flying at its target and delivering an electric shock. Use this item to reprogram and release the tazer hack. Electronics and computer skills determine if the targeting matrix is reprogrammed successfully.", + "weight": "4700 g", + "volume": "750 ml", + "price": 64500, + "price_postapoc": 3000, + "to_hit": -3, + "bashing": 6, + "cutting": 6, + "material": [ "aluminum", "plastic" ], + "symbol": ",", + "color": "cyan", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tazer_hack", + "friendly_msg": "The tazer hack flies from your hand and surveys the area!", + "hostile_msg": "You misprogram the tazer hack; run!", + "difficulty": 3, + "moves": 60, + "place_randomly": true, + "skills": [ "electronics", "computer" ] + } } ] diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 0b48a50938a2b..468efcc0ab120 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -3390,5 +3390,23 @@ ] } ] + }, + { + "type": "GENERIC", + "id": "broken_tazer_hack", + "symbol": ",", + "color": "green", + "name": { "str": "broken tazer hack" }, + "category": "other", + "description": "A broken tazer hack, with its propellers still and tazer inert. Could be gutted for parts.", + "price": 1000, + "price_postapoc": 10, + "material": [ "steel", "plastic" ], + "weight": "100 kg", + "volume": "65 L", + "bashing": 4, + "cutting": 4, + "to_hit": -3, + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] } ] diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json index 029c7f53c004b..00344d5b7347f 100644 --- a/data/json/monstergroups/lab.json +++ b/data/json/monstergroups/lab.json @@ -95,6 +95,7 @@ { "monster": "mon_zombie_labsecurity", "freq": 700, "cost_multiplier": 2 }, { "monster": "mon_science_bot", "freq": 50, "cost_multiplier": 4 }, { "monster": "mon_manhack", "freq": 200, "cost_multiplier": 0 }, + { "monster": "mon_tazer_hack", "freq": 150, "cost_multiplier": 0 }, { "monster": "mon_manhack", "freq": 45, "cost_multiplier": 0, "pack_size": [ 2, 3 ] }, { "monster": "mon_skitterbot", "freq": 85, "cost_multiplier": 0 }, { "monster": "mon_skitterbot", "freq": 85, "cost_multiplier": 0, "pack_size": [ 2, 3 ] }, @@ -145,6 +146,7 @@ { "monster": "mon_zombie_labsecurity", "freq": 40, "cost_multiplier": 0, "pack_size": [ 2, 3 ] }, { "monster": "mon_zombie_hazmat", "freq": 40, "cost_multiplier": 1, "pack_size": [ 1, 3 ] }, { "monster": "mon_manhack", "freq": 20, "cost_multiplier": 1, "pack_size": [ 3, 12 ] }, + { "monster": "mon_tazer_hack", "freq": 20, "cost_multiplier": 1, "pack_size": [ 1, 5 ] }, { "monster": "mon_mutant_experimental", "freq": 10, "cost_multiplier": 0, "pack_size": [ 1, 3 ] }, { "monster": "mon_skitterbot", "freq": 10, "cost_multiplier": 0, "pack_size": [ 2, 3 ] }, { "monster": "mon_zombie_phase_skulker", "freq": 10, "cost_multiplier": 0, "pack_size": [ 2, 3 ] }, diff --git a/data/json/monsters/drones.json b/data/json/monsters/drones.json index e902291d66fe5..61bee7c3eba09 100644 --- a/data/json/monsters/drones.json +++ b/data/json/monsters/drones.json @@ -185,5 +185,19 @@ "PRIORITIZE_TARGETS", "HIT_AND_RUN" ] + }, + { + "id": "mon_tazer_hack", + "copy-from": "base_drone", + "type": "MONSTER", + "name": { "str": "tazer hack" }, + "description": "An automated drone, this small quadcopter robot appears to have a tazer strapped to the front. While extremely fast, it is very fragile.", + "diff": 10, + "speed": 350, + "color": "cyan", + "armor_cut": 2, + "armor_bullet": 1, + "revert_to_itype": "bot_tazer_hack", + "special_attacks": [ [ "TAZER", 5 ] ] } ] diff --git a/data/json/recipes/other/bots.json b/data/json/recipes/other/bots.json index 413f27a8c981b..8ff9c11997cfd 100644 --- a/data/json/recipes/other/bots.json +++ b/data/json/recipes/other/bots.json @@ -791,5 +791,31 @@ [ [ "floodlight", 1 ] ], [ [ "turret_chassis", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "bot_tazer_hack", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_OTHER", + "skill_used": "electronics", + "skills_required": [ [ "mechanics", 4 ], [ "computer", 4 ] ], + "difficulty": 6, + "time": "50 m", + "reversible": true, + "decomp_learn": 7, + "book_learn": [ [ "recipe_lab_elec", 5 ], [ "textbook_robots", 6 ] ], + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "tazer", 1 ] ], + [ [ "ai_module_basic", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "quad_rotors", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "identification_module", 1 ] ] + ] } ]