diff --git a/data/json/itemgroups/monster_drops_advtech.json b/data/json/itemgroups/monster_drops_advtech.json index 899a5234a9a66..809ca9705e7a2 100644 --- a/data/json/itemgroups/monster_drops_advtech.json +++ b/data/json/itemgroups/monster_drops_advtech.json @@ -66,53 +66,6 @@ "id": "molebot", "items": [ [ "spiked_plate", 15 ], [ "hard_plate", 30 ], [ "robot_controls", 5 ] ] }, - { - "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 ] - ] - }, { "type": "item_group", "id": "turret", diff --git a/data/json/itemgroups/obsolete.json b/data/json/itemgroups/obsolete.json index 32b5b44c2004d..800f7daf46b92 100644 --- a/data/json/itemgroups/obsolete.json +++ b/data/json/itemgroups/obsolete.json @@ -13,5 +13,52 @@ "id": "elec_parts", "type": "item_group", "items": [ { "group": "supplies_electronics", "prob": 100 } ] + }, + { + "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 ] + ] + }, + { + "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 ] + ] } ] diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index 0713a26dd4110..0d53fcb60660a 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -139,12 +139,9 @@ [ "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 ], diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json index 80b15457a23ef..12a2e587f3225 100644 --- a/data/json/items/book/electronics.json +++ b/data/json/items/book/electronics.json @@ -270,13 +270,6 @@ "description": "Assembly plans, design specs, and technical drawings for the skitterbot. 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_chickenbot", - "type": "BOOK", - "name": { "str": "chicken walker schematics", "str_pl": "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_hazmatbot", "type": "BOOK", @@ -305,20 +298,6 @@ "description": "Assembly plans, design specs, and technical drawings for the lab defense bot. 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": { "str": "tank drone schematics", "str_pl": "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": { "str": "tripod schematics", "str_pl": "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" - }, { "id": "schematics_dispatch", "type": "BOOK", diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index b70fa0b5a101b..b11bc4a1154cc 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -485,31 +485,6 @@ "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_copbot", "looks_like": "broken_copbot", @@ -691,86 +666,6 @@ "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" - } - }, { "id": "bot_turret_searchlight", "type": "TOOL", diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 25ad3fd857d77..5409521be1f0e 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -1047,57 +1047,6 @@ "to_hit": -3, "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, - { - "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" ] - }, { "type": "GENERIC", "id": "broken_mech_recon", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 907b1fe810ec6..9d277916da7da 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -1006,5 +1006,263 @@ "damage": 130, "recoil": 875, "extend": { "effects": [ "LARGE_BEANBAG" ] } + }, + { + "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" + }, + { + "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" ] + }, + { + "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" + }, + { + "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 + }, + { + "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" } ] diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index f176c72a8eb4b..3da285fbdbe4e 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -203,28 +203,6 @@ [ "underbarrel mount", 1 ] ] }, - { - "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": "plasma_rifle", "looks_like": "ar15", diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json index 46f009b9e8d1d..e4038e17414b4 100644 --- a/data/json/items/robot_parts.json +++ b/data/json/items/robot_parts.json @@ -83,20 +83,6 @@ "description": "This system can operate most conventional weapons.", "copy-from": "robot_module_abstract" }, - { - "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": "spidery_legs_small", @@ -209,34 +195,6 @@ "material": [ "steel", "plastic" ], "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": "copbot_chassis", @@ -263,19 +221,5 @@ "price": 100000, "material": [ "steel", "plastic" ], "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/json/mapgen/collapsed_tower.json b/data/json/mapgen/collapsed_tower.json index 173c6c414ef3e..f0878bb330727 100644 --- a/data/json/mapgen/collapsed_tower.json +++ b/data/json/mapgen/collapsed_tower.json @@ -182,7 +182,7 @@ { "item": "cleaning", "x": [ 11, 11 ], "y": [ 21, 22 ], "chance": 60 }, { "item": "cleaning", "x": [ 15, 15 ], "y": [ 21, 22 ], "chance": 60 } ], - "place_monster": [ { "monster": "mon_tripod", "x": [ 12, 13 ], "y": [ 20, 23 ] } ], + "place_monster": [ { "monster": "mon_talon_m202a1", "x": [ 12, 13 ], "y": [ 20, 23 ] } ], "monster": { " ": { "monster": "mon_zombie_living_wall", "chance": 20 } }, "place_monsters": [ { "monster": "GROUP_COLLAPSED_TOWER", "x": [ 0, 23 ], "y": [ 0, 15 ], "density": 2.5 }, diff --git a/data/json/mapgen/lab/lab_floorplans_finale1level.json b/data/json/mapgen/lab/lab_floorplans_finale1level.json index d3b2e9bd026df..0a7db4fa0685a 100644 --- a/data/json/mapgen/lab/lab_floorplans_finale1level.json +++ b/data/json/mapgen/lab/lab_floorplans_finale1level.json @@ -131,8 +131,8 @@ }, "mapping": { "r": { "item": { "item": "standard_template_construct" } }, "R": { "item": { "item": "nanomaterial" } } }, "place_monster": [ - { "monster": "mon_tripod", "x": [ 1, 4 ], "y": [ 20, 22 ], "chance": 90 }, - { "monster": "mon_tripod", "x": [ 19, 20 ], "y": [ 20, 22 ], "chance": 90 }, + { "monster": "mon_secubot", "x": [ 1, 4 ], "y": [ 20, 22 ], "chance": 90 }, + { "monster": "mon_secubot", "x": [ 19, 20 ], "y": [ 20, 22 ], "chance": 90 }, { "monster": "mon_zombie_scientist", "x": [ 2, 20 ], "y": [ 1, 9 ], "chance": 90, "repeat": [ 1, 2 ] }, { "monster": "mon_mech_lifter", "x": 2, "y": 2, "chance": 50 } ] diff --git a/data/json/mapgen/necropolis/necropolisB3.json b/data/json/mapgen/necropolis/necropolisB3.json index 27e238ee8d03d..49c9cea1a881f 100644 --- a/data/json/mapgen/necropolis/necropolisB3.json +++ b/data/json/mapgen/necropolis/necropolisB3.json @@ -2,8 +2,7 @@ { "name": "GROUP_NECROPOLIS_ROBOT", "type": "monstergroup", - "default": "mon_chickenbot", - "monsters": [ { "monster": "mon_tankbot", "freq": 20, "cost_multiplier": 0 } ] + "default": "mon_secubot" }, { "name": "GROUP_NECROPOLIS_VAULT3", diff --git a/data/json/monsters/monsters.json b/data/json/monsters/monsters.json index 0caa45d49a7bf..6769422fdd945 100644 --- a/data/json/monsters/monsters.json +++ b/data/json/monsters/monsters.json @@ -739,38 +739,6 @@ "death_function": [ "MELT" ], "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "NOGIB", "POISON", "FILTHY" ] }, - { - "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_chud", "type": "MONSTER", @@ -2796,48 +2764,6 @@ "upgrades": { "half_life": 10, "into": "mon_fungaloid" }, "flags": [ "STUMBLES", "FLIES", "POISON", "NO_BREATHE", "NOHEAD", "NOGIB" ] }, - { - "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_thing", "type": "MONSTER", @@ -2866,36 +2792,6 @@ "death_function": [ "MELT" ], "flags": [ "SMELLS", "HEARS", "NOHEAD", "BASHES", "GROUP_BASH", "SWIMS", "ATTACKMON", "PLASTIC", "ACIDPROOF", "NOGIB", "CLIMBS" ] }, - { - "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" ] - }, { "id": "mon_turret_searchlight", "type": "MONSTER", diff --git a/data/json/monsters/obsolete.json b/data/json/monsters/obsolete.json index 45e125c8c154d..1a55c325f7992 100644 --- a/data/json/monsters/obsolete.json +++ b/data/json/monsters/obsolete.json @@ -259,5 +259,109 @@ "death_function": [ "NORMAL" ], "flags": [ "SEES", "SMELLS", "FLIES", "VERMIN", "HIT_AND_RUN" ], "//": "id mon_wasp is already used, so changing would break tilests and other things" + }, + { + "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" ] + }, + { + "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_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" ] } ] diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 63aadd8578afd..f95621da6a057 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -1041,80 +1041,6 @@ [ [ "mil_plate", 20 ] ] ] }, - { - "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 ] ] - ] - }, { "result": "broken_nursebot", "type": "uncraft", @@ -1229,7 +1155,7 @@ [ [ "pathfinding_module", 1 ] ], [ [ "identification_module", 1 ] ], [ [ "tank_tread", 1 ] ], - [ [ "tankbot_chassis", 1 ] ], + [ [ "copbot_chassis", 1 ] ], [ [ "targeting_module", 1 ] ], [ [ "power_supply", 3 ] ], [ [ "plut_cell", 1 ] ], @@ -1253,7 +1179,7 @@ [ [ "pathfinding_module", 1 ] ], [ [ "identification_module", 1 ] ], [ [ "tank_tread", 1 ] ], - [ [ "tankbot_chassis", 1 ] ], + [ [ "copbot_chassis", 1 ] ], [ [ "targeting_module", 1 ] ], [ [ "power_supply", 3 ] ], [ [ "plut_cell", 1 ] ], diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index 81a9cb9088491..938417cc885e3 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -1754,116 +1754,6 @@ [ [ "steel_chunk", 6 ] ] ] }, - { - "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 ] ] - ] - }, { "type": "recipe", "result": "bot_antimateriel", diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 1a73a32837b27..33acd5a9f9a10 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2202,5 +2202,35 @@ "type": "recipe", "result": "scrambler", "obsolete": true + }, + { + "type": "recipe", + "result": "broken_chickenbot", + "obsolete": true + }, + { + "type": "recipe", + "result": "bot_chickenbot", + "obsolete": true + }, + { + "type": "recipe", + "result": "broken_tripod", + "obsolete": true + }, + { + "type": "recipe", + "result": "bot_tripod", + "obsolete": true + }, + { + "type": "recipe", + "result": "broken_tankbot", + "obsolete": true + }, + { + "type": "recipe", + "result": "bot_tankbot", + "obsolete": true } ] diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index c65d38e369b61..ebab90d2fffba 100644 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -1,75 +1,76 @@ # JSON Flags -* [Notes](#notes) -* [Inheritance](#inheritance) -* [TODO](#todo) -* [Ammo](#ammo) - + [Ammo type](#ammo-type) - + [Effects](#effects) -* [Armor](#armor) - + [Covers](#covers) - + [Flags](#flags) -* [Bionics](#bionics) -* [Books](#books) - + [Use actions](#use-actions) -* [Comestibles](#comestibles) - + [Comestible type](#comestible-type) - + [Addiction type](#addiction-type) - + [Use action](#use-action) - + [Flags](#flags-1) -* [Furniture and Terrain](#furniture-and-terrain) - + [Flags](#flags-2) - + [Examine Actions](#examine-actions) - + [Fungal Conversions Only](#fungal-conversions-only) - + [Furniture Only](#furniture-only) -* [Generic](#generic) - + [Flags](#flags-3) -* [Guns](#guns) - + [Firing modes](#firing-modes) - + [Faults](#faults) +- [JSON Flags](#json-flags) + - [Notes](#notes) + - [Inheritance](#inheritance) + - [TODO](#todo) + - [Ammo](#ammo) + - [Ammo type](#ammo-type) + - [Effects](#effects) + - [Armor](#armor) + - [Covers](#covers) - [Flags](#flags) - - [Parameters](#parameters) -* [Magazines](#magazines) -* [MAP SPECIALS](#map-specials) -* [Material Phases](#material-phases) -* [Melee](#melee) - + [Flags](#flags-4) -* [Monster Groups](#monster-groups) - + [Conditions](#conditions) - - [Seasons](#seasons) - - [Time of day](#time-of-day) -* [Monsters](#monsters) - + [Anger, Fear and Placation Triggers](#anger--fear-and-placation-triggers) - + [Categories](#categories) - + [Death Functions](#death-functions) - + [Flags](#flags-5) - + [Monster Defense and Attacks](#monster-defense-and-attacks) - + [Sizes](#sizes) - + [Special attacks](#special-attacks) -* [Mutations](#mutations) - + [Categories](#categories-1) -* [Overmap](#overmap) - + [Overmap connections](#overmap-connections) + - [Bionics](#bionics) + - [Books](#books) + - [Use actions](#use-actions) + - [Comestibles](#comestibles) + - [Comestible type](#comestible-type) + - [Addiction type](#addiction-type) + - [Use action](#use-action) + - [Flags](#flags-1) + - [Furniture and Terrain](#furniture-and-terrain) + - [Flags](#flags-2) + - [Examine Actions](#examine-actions) + - [Fungal Conversions Only](#fungal-conversions-only) + - [Furniture Only](#furniture-only) + - [Generic](#generic) + - [Flags](#flags-3) + - [Guns](#guns) + - [Firing modes](#firing-modes) + - [Faults](#faults) + - [Flags](#flags-4) + - [Parameters](#parameters) + - [Magazines](#magazines) + - [MAP SPECIALS](#map-specials) + - [Material Phases](#material-phases) + - [Melee](#melee) + - [Flags](#flags-5) + - [Monster Groups](#monster-groups) + - [Conditions](#conditions) + - [Seasons](#seasons) + - [Time of day](#time-of-day) + - [Monsters](#monsters) + - [Anger, Fear and Placation Triggers](#anger-fear-and-placation-triggers) + - [Categories](#categories) + - [Death Functions](#death-functions) - [Flags](#flags-6) - + [Overmap specials](#overmap-specials) - - [Flags](#flags-7) - + [Overmap terrains](#overmap-terrains) - - [Flags](#flags-8) -* [Recipes](#recipes) - + [Categories](#categories-2) - + [Flags](#flags-9) -* [Scenarios](#scenarios) - + [Flags](#flags-10) - - [Season Flags](#season-flags) -* [Skills](#skills) - + [Tags](#tags) -* [Techniques](#techniques) -* [Tools](#tools) - + [Flags](#flags-11) - + [Flags that apply to items](#flags-that-apply-to-items) -* [Vehicle Parts](#vehicle-parts) - + [Flags](#flags-12) - + [Fuel types](#fuel-types) + - [Monster Defense and Attacks](#monster-defense-and-attacks) + - [Sizes](#sizes) + - [Special attacks](#special-attacks) + - [Mutations](#mutations) + - [Flags](#flags-7) + - [Categories](#categories-1) + - [Overmap](#overmap) + - [Overmap connections](#overmap-connections) + - [Overmap specials](#overmap-specials) + - [Flags](#flags-8) + - [Overmap terrains](#overmap-terrains) + - [Flags](#flags-9) + - [Recipes](#recipes) + - [Categories](#categories-2) + - [Flags](#flags-10) + - [Scenarios](#scenarios) + - [Flags](#flags-11) + - [Season Flags](#season-flags) + - [Skills](#skills) + - [Tags](#tags) + - [Techniques](#techniques) + - [Tools](#tools) + - [Flags](#flags-12) + - [Flags that apply to items](#flags-that-apply-to-items) + - [Vehicle Parts](#vehicle-parts) + - [Flags](#flags-13) + - [Fuel types](#fuel-types) ## Notes @@ -1006,7 +1007,7 @@ Also see `monster_attacks.json` for more special attacks, for example, impale an - ```BRANDISH``` Brandish a knife at the player. - ```BREATHE``` Spawns a `breather` - ```CALLBLOBS``` Calls 2/3 of nearby blobs to defend this monster, and sends 1/3 of nearby blobs after the player. -- ```CHICKENBOT``` Robot can attack with tazer, M4, or MGL depending on distance. +- ```CHICKENBOT``` LEGACY - Robot can attack with tazer, M4, or MGL depending on distance. - ```COPBOT``` Cop-bot alerts and then tazes the player. - ```DANCE``` Monster dances. - ```DARKMAN``` Can cause darkness and wraiths to spawn.