From 5bbd6e1c8ed53bc5d440ba990799266ec6738fd8 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Wed, 20 Nov 2019 16:56:53 -0800 Subject: [PATCH 01/17] Add mi-go atmosphere effect --- data/json/effects.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/json/effects.json b/data/json/effects.json index 10264381caef5..35117a01803d4 100644 --- a/data/json/effects.json +++ b/data/json/effects.json @@ -1817,6 +1817,26 @@ }, "int_decay_step": 0 }, + { + "type": "effect_type", + "id": "migo_atmosphere", + "name": [ "Alien gas" ], + "desc": [ "The air in here smells like vinegar and mold." ], + "apply_message": "The air in here smells like vinegar and mold, and hurts your lungs a bit.", + "rating": "bad", + "miss_messages": [ [ "You feel short of breath in this sweltering, foul air.", 2 ] ], + "harmful_cough": false, + "max_duration": "1 m", + "base_mods": { + "per_mod": [ -1 ], + "speed_mod": [ -10 ], + "cough_chance": [ 300, 1000 ], + "pain_min": [ 1 ], + "pain_chance": [ 300, 900 ], + "vomit_chance": [ 600, 1200 ] + }, + "show_in_info": true + }, { "type": "effect_type", "id": "has_og_comm_freq" From 4696dc1f6b83febc73eece6b210f2843c424d468 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 13:26:54 -0800 Subject: [PATCH 02/17] Add riot control turrets --- data/json/items/corpses/inactive_bots.json | 42 ++++++++++++---- data/json/items/generic.json | 16 +++++-- data/json/mapgen/office_tower_2.json | 2 +- data/json/mapgen/prison_1.json | 2 +- data/json/monsters/turrets.json | 50 ++++++++++++++++++++ data/json/recipes/recipe_deconstruction.json | 31 ++++++++++-- src/map_extras.cpp | 34 ++++++++----- 7 files changed, 145 insertions(+), 32 deletions(-) diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index 5c6be291af004..9cd6d72ad73a5 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -134,8 +134,8 @@ "type": "TOOL", "name": "inactive laser turret", "description": "This is an inactive laser turret. Using this item involves turning it on and placing it on the ground, where it will attach itself. If reprogrammed and rewired successfully the turret will identify you as a friendly, and attack all enemies with its revolving laser cannons. It requires sunlight in order to fire.", - "weight": "1450 g", - "volume": "3 L", + "weight": "65000 g", + "volume": "30 L", "price": 600000, "to_hit": -3, "bashing": 8, @@ -156,8 +156,8 @@ "type": "TOOL", "name": "inactive M2HB autonomous CROWS II", "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded .50 BMG rounds in your inventory (if you wish to divide your ammunition, set aside whatever .50 BMG rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M2HB.", - "weight": "1550 g", - "volume": "3500 ml", + "weight": "75000 g", + "volume": "35 L", "price": 500500, "to_hit": -3, "bashing": 8, @@ -230,8 +230,8 @@ "type": "TOOL", "name": "inactive autonomous M249 CROWS II", "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 5.56x45mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 5.56x45mm rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M249.", - "weight": "1507 g", - "volume": "3500 ml", + "weight": "75000 g", + "volume": "35 L", "price": 500000, "to_hit": -3, "bashing": 8, @@ -252,8 +252,8 @@ "type": "TOOL", "name": "inactive autonomous M240 CROWS II", "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 7.62x51mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 7.62x51mm rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M240.", - "weight": "1507 g", - "volume": "3500 ml", + "weight": "75000 g", + "volume": "35 L", "price": 500000, "to_hit": -3, "bashing": 8, @@ -269,13 +269,35 @@ "skill2": "computer" } }, + { + "id": "bot_turret_riot", + "type": "TOOL", + "name": "inactive riot control turret", + "description": "This is an inactive riot control turret. Using this item involves loading the unit with the factory-loaded beanbag rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its riot control gun.", + "weight": "75000 g", + "volume": "35 L", + "price": 200500, + "to_hit": -3, + "bashing": 8, + "material": [ "steel", "plastic" ], + "symbol": ";", + "color": "red", + "use_action": { + "type": "place_monster", + "monster_id": "mon_turret_riot", + "difficulty": 6, + "moves": 100, + "skill1": "electronics", + "skill2": "computer" + } + }, { "id": "bot_turret", "type": "TOOL", "name": "inactive turret", "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 9x19mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 9x19mm you do NOT want to give the turret) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the turret will then identify you as a friendly, and attack all enemies with its SMG.", - "weight": "1507 g", - "volume": "3 L", + "weight": "75000 g", + "volume": "35 L", "price": 400000, "to_hit": -3, "bashing": 8, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index b44fef2d75389..cbf41d1611fa0 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2832,20 +2832,30 @@ "description": "A broken turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.", "price": 1000, "material": [ "steel", "plastic" ], - "weight": "62650 g", + "weight": "72650 g", "volume": "30 L", "bashing": 4, "cutting": 4, "to_hit": -3, "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, + { + "type": "GENERIC", + "id": "broken_turret_riot", + "symbol": ",", + "color": "blue", + "name": "broken riot control turret", + "category": "other", + "description": "A broken riot control turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.", + "copy-from": "broken_turret" + }, { "type": "GENERIC", "id": "broken_turret_rifle", "symbol": ",", "color": "green", "name": "broken M249 autonomous CROWS II", - "weight": "70000 g", + "weight": "75000 g", "copy-from": "broken_turret" }, { @@ -2854,7 +2864,7 @@ "symbol": ",", "color": "green", "name": "broken M240 autonomous CROWS II", - "weight": "70000 g", + "weight": "75000 g", "copy-from": "broken_turret" }, { diff --git a/data/json/mapgen/office_tower_2.json b/data/json/mapgen/office_tower_2.json index 326fd9515730f..1dfe16498d816 100644 --- a/data/json/mapgen/office_tower_2.json +++ b/data/json/mapgen/office_tower_2.json @@ -229,7 +229,7 @@ ], "place_monsters": [ { "monster": "GROUP_OFFICE_TOWER_2", "x": [ 7, 21 ], "y": [ 13, 21 ], "chance": 2, "repeat": [ 1 ] } ], "place_monster": [ { "monster": "mon_zombie_scientist", "x": [ 7, 21 ], "y": [ 4, 10 ], "repeat": [ 1, 3 ] } ], - "monster": { "7": { "monster": "mon_turret_rifle" } } + "monster": { "7": { "monster": "mon_turret_riot" } } } }, { diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json index 550cf629684d0..5c21b25a3f44e 100644 --- a/data/json/mapgen/prison_1.json +++ b/data/json/mapgen/prison_1.json @@ -253,7 +253,7 @@ }, "place_monsters": [ { "monster": "GROUP_ZOMBIE_COP", "x": [ 35, 38 ], "y": [ 2, 7 ], "density": 0.2 } ], "monster": { - "7": { "monster": "mon_turret_rifle" }, + "7": { "monster": "mon_turret_riot" }, "Z": { "monster": "mon_zombie_prisoner" }, "C": { "monster": "mon_broken_cyborg" } } diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json index f43a39a4926f3..1e3a09aa3d1fe 100644 --- a/data/json/monsters/turrets.json +++ b/data/json/monsters/turrets.json @@ -220,5 +220,55 @@ "death_drops": { }, "death_function": [ "BROKEN" ], "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] + }, + { + "id": "mon_turret_riot", + "type": "MONSTER", + "name": "riot control turret", + "description": "These rapid-deployable tripod-mounted riot control turrets were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal beanbag rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation.", + "default_faction": "cop_bot", + "looks_like": "mon_turret", + "species": [ "ROBOT" ], + "diff": 20, + "volume": "62500 ml", + "weight": 172000, + "hp": 30, + "speed": 100, + "material": [ "steel" ], + "symbol": "2", + "color": "blue", + "aggression": 50, + "morale": 100, + "anger_triggers": [ "PLAYER_CLOSE", "HURT", "FRIEND_ATTACKED", "FRIEND_DIED" ], + "armor_bash": 14, + "armor_cut": 16, + "vision_day": 50, + "vision_night": 3, + "revert_to_itype": "bot_turret_riot", + "starting_ammo": { "shot_beanbag": 200 }, + "special_attacks": [ + { + "//": "For later: needs the ability to preferentially target legs and arms", + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "m1014", + "ammo_type": "shot_beanbag", + "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 30, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 200, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Universal curfew is in effect. Please return to your home. This unit is authorized to open fire.\"", + "targeting_volume": 50, + "no_ammo_sound": "a chk!" + } + ], + "death_drops": { }, + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] } ] diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 01e83e463285c..fe6bb6a29edb9 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -732,7 +732,7 @@ "result": "broken_turret", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -753,7 +753,7 @@ "result": "broken_turret_rifle", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -774,7 +774,7 @@ "result": "broken_crows_m240", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -795,7 +795,7 @@ "result": "broken_turret_bmg", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], @@ -812,11 +812,32 @@ [ [ "turret_chassis", 1 ] ] ] }, + { + "result": "broken_turret_riot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 4, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "m1014", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "robot_controls", 1 ] ], + [ [ "turret_chassis", 1 ] ] + ] + }, { "result": "broken_laserturret", "type": "uncraft", "skill_used": "electronics", - "difficulty": 3, + "difficulty": 4, "time": "1 h", "using": [ [ "soldering_standard", 10 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], diff --git a/src/map_extras.cpp b/src/map_extras.cpp index 119f7acf56f04..85eff6f5e8c02 100644 --- a/src/map_extras.cpp +++ b/src/map_extras.cpp @@ -108,6 +108,7 @@ static const mtype_id mon_dispatch( "mon_dispatch" ); static const mtype_id mon_tankbot( "mon_tankbot" ); static const mtype_id mon_turret_bmg( "mon_turret_bmg" ); static const mtype_id mon_turret_rifle( "mon_turret_rifle" ); +static const mtype_id mon_turret_riot( "mon_turret_riot" ); static const mtype_id mon_zombie_spitter( "mon_zombie_spitter" ); static const mtype_id mon_zombie_soldier( "mon_zombie_soldier" ); static const mtype_id mon_zombie_military_pilot( "mon_zombie_military_pilot" ); @@ -527,12 +528,14 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) const auto spawn_turret = [&]( int x, int y ) { if( one_in( 2 ) ) { m.add_spawn( mon_turret_bmg, 1, point( x, y ) ); - } else { + } else if( one_in( 2 ) ) { m.add_spawn( mon_turret_rifle, 1, point( x, y ) ); + } else { + m.add_spawn( mon_turret_riot, 1, point( x, y ) ); } }; bool mil = false; - if( one_in( 3 ) ) { + if( one_in( 6 ) ) { mil = true; } if( mil ) { //Military doesn't joke around with their barricades! @@ -573,14 +576,21 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) } } - if( one_in( 3 ) ) { // Chicken delivery - m.add_vehicle( vgroup_id( "military_vehicles" ), tripoint( 12, SEEY * 2 - 7, abs_sub.z ), 0, 70, - -1 ); - m.add_spawn( mon_chickenbot, 1, point( 12, 12 ) ); - } else if( one_in( 2 ) ) { // TAAANK + if( one_in( 2 ) ) { // The truck's wrecked...with fuel. Explosive barrel? m.add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, SEEY * 2 - 8 ), 0, 70, -1 ); - m.add_spawn( mon_tankbot, 1, point( 12, 12 ) ); + if( road_at_north ) { + spawn_turret( 12, 6 ); + } + if( road_at_east ) { + spawn_turret( 18, 12 ); + } + if( road_at_south ) { + spawn_turret( 12, 18 ); + } + if( road_at_west ) { + spawn_turret( 6, 12 ); + } } else { // Vehicle & turrets m.add_vehicle( vgroup_id( "military_vehicles" ), tripoint( 12, SEEY * 2 - 10, abs_sub.z ), 0, 70, -1 ); @@ -616,22 +626,22 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) if( road_at_north ) { line_furn( &m, f_barricade_road, 4, 3, 10, 3 ); line_furn( &m, f_barricade_road, 13, 3, 19, 3 ); - m.add_spawn( mon_turret_rifle, 1, point( 12, 1 ) ); + m.add_spawn( mon_turret_riot, 1, point( 12, 1 ) ); } if( road_at_east ) { line_furn( &m, f_barricade_road, SEEX * 2 - 3, 4, SEEX * 2 - 3, 10 ); line_furn( &m, f_barricade_road, SEEX * 2 - 3, 13, SEEX * 2 - 3, 19 ); - m.add_spawn( mon_turret_rifle, 1, point( SEEX * 2 - 1, 12 ) ); + m.add_spawn( mon_turret_riot, 1, point( SEEX * 2 - 1, 12 ) ); } if( road_at_south ) { line_furn( &m, f_barricade_road, 4, SEEY * 2 - 3, 10, SEEY * 2 - 3 ); line_furn( &m, f_barricade_road, 13, SEEY * 2 - 3, 19, SEEY * 2 - 3 ); - m.add_spawn( mon_turret_rifle, 1, point( 12, SEEY * 2 - 1 ) ); + m.add_spawn( mon_turret_riot, 1, point( 12, SEEY * 2 - 1 ) ); } if( road_at_west ) { line_furn( &m, f_barricade_road, 3, 4, 3, 10 ); line_furn( &m, f_barricade_road, 3, 13, 3, 19 ); - m.add_spawn( mon_turret_rifle, 1, point( 1, 12 ) ); + m.add_spawn( mon_turret_riot, 1, point( 1, 12 ) ); } m.add_vehicle( vproto_id( "policecar" ), point( 8, 6 ), 20 ); From ba48ecd158f2491bef317c30ca892b36bb0646b2 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 13:27:51 -0800 Subject: [PATCH 03/17] Update map_extras.cpp --- src/map_extras.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map_extras.cpp b/src/map_extras.cpp index 85eff6f5e8c02..bf8bb70fe7eec 100644 --- a/src/map_extras.cpp +++ b/src/map_extras.cpp @@ -526,7 +526,7 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) const bool road_at_east = is_ot_match( "road", east, ot_match_type::type ); const auto spawn_turret = [&]( int x, int y ) { - if( one_in( 2 ) ) { + if( one_in( 3 ) ) { m.add_spawn( mon_turret_bmg, 1, point( x, y ) ); } else if( one_in( 2 ) ) { m.add_spawn( mon_turret_rifle, 1, point( x, y ) ); From b8d9b651463bb2d055225cb3cc9672d37f6de651 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 14:30:56 -0800 Subject: [PATCH 04/17] Update src/map_extras.cpp Co-Authored-By: anothersimulacrum --- src/map_extras.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map_extras.cpp b/src/map_extras.cpp index bf8bb70fe7eec..febc9a1cbbfcf 100644 --- a/src/map_extras.cpp +++ b/src/map_extras.cpp @@ -578,7 +578,7 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) if( one_in( 2 ) ) { // The truck's wrecked...with fuel. Explosive barrel? - m.add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, SEEY * 2 - 8 ), 0, 70, -1 ); + m.add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, SEEY * 2 - 12 ), 0, 70, -1 ); if( road_at_north ) { spawn_turret( 12, 6 ); } From d1cb7ee96be23972996c6bff581519c2bd0049c2 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 14:31:30 -0800 Subject: [PATCH 05/17] Update data/json/items/generic.json Co-Authored-By: anothersimulacrum --- data/json/items/generic.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index cbf41d1611fa0..fea537fdfb7b5 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2845,7 +2845,6 @@ "symbol": ",", "color": "blue", "name": "broken riot control turret", - "category": "other", "description": "A broken riot control turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.", "copy-from": "broken_turret" }, From aa1bca2642d2363a87ca1e277355a8f0a98fed47 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 14:40:00 -0800 Subject: [PATCH 06/17] further adjust turret size --- data/json/items/corpses/inactive_bots.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index 9cd6d72ad73a5..6f490f70bbb70 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -156,8 +156,8 @@ "type": "TOOL", "name": "inactive M2HB autonomous CROWS II", "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded .50 BMG rounds in your inventory (if you wish to divide your ammunition, set aside whatever .50 BMG rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M2HB.", - "weight": "75000 g", - "volume": "35 L", + "weight": "172000 g", + "volume": "62500 ml", "price": 500500, "to_hit": -3, "bashing": 8, @@ -230,8 +230,8 @@ "type": "TOOL", "name": "inactive autonomous M249 CROWS II", "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 5.56x45mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 5.56x45mm rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M249.", - "weight": "75000 g", - "volume": "35 L", + "weight": "172000 g", + "volume": "60 L", "price": 500000, "to_hit": -3, "bashing": 8, @@ -252,8 +252,8 @@ "type": "TOOL", "name": "inactive autonomous M240 CROWS II", "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 7.62x51mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 7.62x51mm rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M240.", - "weight": "75000 g", - "volume": "35 L", + "weight": "172000 g", + "volume": "60 L", "price": 500000, "to_hit": -3, "bashing": 8, @@ -274,8 +274,8 @@ "type": "TOOL", "name": "inactive riot control turret", "description": "This is an inactive riot control turret. Using this item involves loading the unit with the factory-loaded beanbag rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its riot control gun.", - "weight": "75000 g", - "volume": "35 L", + "weight": "125000 g", + "volume": "60 L", "price": 200500, "to_hit": -3, "bashing": 8, From 7805fff14039cdef0dda26e0f07717d3aa1af9c5 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 14:51:27 -0800 Subject: [PATCH 07/17] change secubots for riot turrets in prisons --- data/json/mapgen/prison_1.json | 8 ++-- data/json/monstergroups/monstergroups.json | 39 ------------------ data/json/monstergroups/robots.json | 47 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 43 deletions(-) create mode 100644 data/json/monstergroups/robots.json diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json index 5c21b25a3f44e..27ecc13cb1147 100644 --- a/data/json/mapgen/prison_1.json +++ b/data/json/mapgen/prison_1.json @@ -178,11 +178,11 @@ "place_item": [ { "item": "visions_solitude", "x": 16, "y": 108, "amount": 1 } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 15, 20 ], "y": [ 34, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_ROBOT_SECUBOT", "x": [ 15, 20 ], "y": [ 39, 42 ], "density": 0.1 }, + { "monster": "GROUP_TURRET_RIOT", "x": [ 15, 20 ], "y": [ 39, 42 ], "density": 0.1 }, { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 15, 20 ], "y": [ 44, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_ROBOT_SECUBOT", "x": [ 32, 39 ], "y": [ 39, 42 ], "density": 0.1 }, + { "monster": "GROUP_TURRET_RIOT", "x": [ 32, 39 ], "y": [ 39, 42 ], "density": 0.1 }, { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 51, 56 ], "y": [ 34, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_ROBOT_SECUBOT", "x": [ 51, 56 ], "y": [ 39, 42 ], "density": 0.1 }, + { "monster": "GROUP_TURRET_RIOT", "x": [ 51, 56 ], "y": [ 39, 42 ], "density": 0.1 }, { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 51, 56 ], "y": [ 44, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, { "monster": "GROUP_ROBOT_EYEBOT", "x": [ 24, 47 ], "y": [ 0, 13 ], "density": 0.1 }, { "monster": "GROUP_ROBOT_EYEBOT", "x": [ 27, 44 ], "y": [ 52, 60 ], "density": 0.1 }, @@ -454,7 +454,7 @@ ",": [ { "monster": "mon_zombie_cop", "chance": 1 }, { "monster": "mon_zombie_prisoner", "chance": 2 } ], "^": { "monster": "mon_zombie_brute", "chance": 1 }, " ": { "monster": "mon_dog_zombie_cop", "chance": 1 }, - ".": { "monster": "mon_secubot", "chance": 1 }, + ".": { "monster": "mon_turret_riot", "chance": 1 }, "U": { "monster": "mon_dog_gshepherd", "chance": 10 }, ":": { "monster": "mon_dog_gshepherd", "chance": 1 } }, diff --git a/data/json/monstergroups/monstergroups.json b/data/json/monstergroups/monstergroups.json index 43a78b86e62ba..cf0ae6a76cfc6 100644 --- a/data/json/monstergroups/monstergroups.json +++ b/data/json/monstergroups/monstergroups.json @@ -4351,27 +4351,6 @@ "default": "mon_spider_web", "monsters": [ ] }, - { - "type": "monstergroup", - "name": "GROUP_ROBOT", - "default": "mon_manhack", - "monsters": [ - { "monster": "mon_skitterbot", "freq": 220, "cost_multiplier": 0 }, - { "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 }, - { "monster": "mon_talon_m202a1", "freq": 75, "cost_multiplier": 0 }, - { "monster": "mon_copbot", "freq": 0, "cost_multiplier": 0 }, - { "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 }, - { "monster": "mon_tripod", "freq": 110, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 60, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 20, "cost_multiplier": 0 } - ] - }, - { - "type": "monstergroup", - "name": "GROUP_TURRET", - "default": "mon_turret_rifle", - "monsters": [ { "monster": "mon_turret_bmg", "freq": 50, "cost_multiplier": 2 } ] - }, { "type": "monstergroup", "name": "GROUP_POLICE", @@ -5080,18 +5059,6 @@ "default": "mon_zombie_cop", "monsters": [ { "monster": "mon_zombie_cop", "freq": 100, "cost_multiplier": 0 } ] }, - { - "type": "monstergroup", - "name": "GROUP_ROBOT_EYEBOT", - "default": "mon_eyebot", - "monsters": [ { "monster": "mon_eyebot", "freq": 100, "cost_multiplier": 0 } ] - }, - { - "type": "monstergroup", - "name": "GROUP_ROBOT_SECUBOT", - "default": "mon_secubot", - "monsters": [ { "monster": "mon_secubot", "freq": 100, "cost_multiplier": 0 } ] - }, { "type": "monstergroup", "name": "GROUP_PARK_ANIMAL", @@ -5315,12 +5282,6 @@ "default": "mon_dark_wyrm", "monsters": [ { "monster": "mon_dark_wyrm", "freq": 40, "cost_multiplier": 1 } ] }, - { - "name": "GROUP_HAZMATBOT", - "type": "monstergroup", - "default": "mon_hazmatbot", - "monsters": [ { "monster": "mon_hazmatbot", "freq": 40, "cost_multiplier": 1 } ] - }, { "name": "GROUP_STRAY_DOGS", "type": "monstergroup", diff --git a/data/json/monstergroups/robots.json b/data/json/monstergroups/robots.json new file mode 100644 index 0000000000000..8ed465b5dc76f --- /dev/null +++ b/data/json/monstergroups/robots.json @@ -0,0 +1,47 @@ +[ + { + "type": "monstergroup", + "name": "GROUP_ROBOT", + "default": "mon_manhack", + "monsters": [ + { "monster": "mon_skitterbot", "freq": 220, "cost_multiplier": 0 }, + { "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 }, + { "monster": "mon_talon_m202a1", "freq": 75, "cost_multiplier": 0 }, + { "monster": "mon_copbot", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 }, + { "monster": "mon_tripod", "freq": 110, "cost_multiplier": 0 }, + { "monster": "mon_chickenbot", "freq": 60, "cost_multiplier": 0 }, + { "monster": "mon_tankbot", "freq": 20, "cost_multiplier": 0 } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_TURRET", + "default": "mon_turret_rifle", + "monsters": [ { "monster": "mon_turret_bmg", "freq": 50, "cost_multiplier": 2 } ] + }, + { + "name": "GROUP_HAZMATBOT", + "type": "monstergroup", + "default": "mon_hazmatbot", + "monsters": [ { "monster": "mon_hazmatbot", "freq": 40, "cost_multiplier": 1 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_ROBOT_EYEBOT", + "default": "mon_eyebot", + "monsters": [ { "monster": "mon_eyebot", "freq": 100, "cost_multiplier": 0 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_ROBOT_SECUBOT", + "default": "mon_secubot", + "monsters": [ { "monster": "mon_secubot", "freq": 100, "cost_multiplier": 0 } ] + }, + { + "type": "monstergroup", + "name": "GROUP_TURRET_RIOT", + "default": "mon_turret_riot", + "monsters": [ { "monster": "mon_turret_riot", "freq": 100, "cost_multiplier": 0 } ] + } +] \ No newline at end of file From d3e21a1813c51a288d38e30a2941ee8c9f32b016 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 15:00:18 -0800 Subject: [PATCH 08/17] switch to 40mm --- data/json/monsters/turrets.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json index 1e3a09aa3d1fe..f82b5cfa013f2 100644 --- a/data/json/monsters/turrets.json +++ b/data/json/monsters/turrets.json @@ -225,7 +225,7 @@ "id": "mon_turret_riot", "type": "MONSTER", "name": "riot control turret", - "description": "These rapid-deployable tripod-mounted riot control turrets were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal beanbag rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation.", + "description": "These rapid-deployable CROWS-based riot control turrets were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation.", "default_faction": "cop_bot", "looks_like": "mon_turret", "species": [ "ROBOT" ], @@ -245,15 +245,15 @@ "vision_day": 50, "vision_night": 3, "revert_to_itype": "bot_turret_riot", - "starting_ammo": { "shot_beanbag": 200 }, + "starting_ammo": { "40mm_beanbag": 200 }, "special_attacks": [ { "//": "For later: needs the ability to preferentially target legs and arms", "type": "gun", "cooldown": 1, "move_cost": 150, - "gun_type": "m1014", - "ammo_type": "shot_beanbag", + "gun_type": "mark19", + "ammo_type": "40mm_beanbag", "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], "fake_dex": 12, "ranges": [ [ 0, 30, "DEFAULT" ] ], From b66c16f91f94042a6255a8faa04b9a426e50861e Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 15:05:30 -0800 Subject: [PATCH 09/17] remove chickenbots, tankbots, and tripods from monster groups --- data/json/monstergroups/monstergroups.json | 1 - data/json/monstergroups/robots.json | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/data/json/monstergroups/monstergroups.json b/data/json/monstergroups/monstergroups.json index cf0ae6a76cfc6..f56f7b4ce35ec 100644 --- a/data/json/monstergroups/monstergroups.json +++ b/data/json/monstergroups/monstergroups.json @@ -4261,7 +4261,6 @@ { "monster": "mon_zombie_technician", "freq": 50, "cost_multiplier": 3 }, { "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 }, { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 }, - { "monster": "mon_chickenbot", "freq": 1, "cost_multiplier": 50 }, { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 50 }, { "monster": "mon_skeleton_hulk", "freq": 1, "cost_multiplier": 50 } ] diff --git a/data/json/monstergroups/robots.json b/data/json/monstergroups/robots.json index 8ed465b5dc76f..97c0180df4564 100644 --- a/data/json/monstergroups/robots.json +++ b/data/json/monstergroups/robots.json @@ -8,10 +8,7 @@ { "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 }, { "monster": "mon_talon_m202a1", "freq": 75, "cost_multiplier": 0 }, { "monster": "mon_copbot", "freq": 0, "cost_multiplier": 0 }, - { "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 }, - { "monster": "mon_tripod", "freq": 110, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 60, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 20, "cost_multiplier": 0 } + { "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 } ] }, { From 28d19ff112f90df9c149d003f84c955d8bdd9a1b Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 15:23:11 -0800 Subject: [PATCH 10/17] add a sponge round instead of beanbag beanbag was too fatal --- data/json/items/ammo/40mm.json | 11 +++++++++++ data/json/monsters/turrets.json | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/40mm.json b/data/json/items/ammo/40mm.json index d1daa51eb812b..ac38096f3435d 100644 --- a/data/json/items/ammo/40mm.json +++ b/data/json/items/ammo/40mm.json @@ -29,6 +29,17 @@ "damage": 20, "extend": { "effects": [ "LARGE_BEANBAG" ] } }, + { + "id": "40mm_sponge", + "copy-from": "40mm_grenade", + "type": "AMMO", + "name": "40mm sponge", + "description": "A 40mm sponge round that delivers strong impact on target, causing pain and disorientation. May still injure or kill.", + "price": 5000, + "price_postapoc": 10000, + "damage": 5, + "extend": { "effects": [ "BEANBAG" ] } + }, { "id": "40mm_concussive", "copy-from": "40mm_grenade", diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json index f82b5cfa013f2..5f6769b701d29 100644 --- a/data/json/monsters/turrets.json +++ b/data/json/monsters/turrets.json @@ -245,7 +245,7 @@ "vision_day": 50, "vision_night": 3, "revert_to_itype": "bot_turret_riot", - "starting_ammo": { "40mm_beanbag": 200 }, + "starting_ammo": { "40mm_sponge": 100 }, "special_attacks": [ { "//": "For later: needs the ability to preferentially target legs and arms", @@ -253,7 +253,7 @@ "cooldown": 1, "move_cost": 150, "gun_type": "mark19", - "ammo_type": "40mm_beanbag", + "ammo_type": "40mm_sponge", "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], "fake_dex": 12, "ranges": [ [ 0, 30, "DEFAULT" ] ], From ee7be132505121168737a4444d7f47623bb4619d Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 15:29:19 -0800 Subject: [PATCH 11/17] Update robots.json --- data/json/monstergroups/robots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monstergroups/robots.json b/data/json/monstergroups/robots.json index 97c0180df4564..d4cbf677275ba 100644 --- a/data/json/monstergroups/robots.json +++ b/data/json/monstergroups/robots.json @@ -41,4 +41,4 @@ "default": "mon_turret_riot", "monsters": [ { "monster": "mon_turret_riot", "freq": 100, "cost_multiplier": 0 } ] } -] \ No newline at end of file +] From 3a03323f4eed85d8411d83b4d7cc4ec5cc4921bb Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 16:52:18 -0800 Subject: [PATCH 12/17] change to an m203 array instead of a mark 19 --- data/json/items/gun/40mm.json | 23 +++++++++++++++++++++++ data/json/monsters/turrets.json | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/data/json/items/gun/40mm.json b/data/json/items/gun/40mm.json index 8d535c4bf967d..4a9e10dad243c 100644 --- a/data/json/items/gun/40mm.json +++ b/data/json/items/gun/40mm.json @@ -180,5 +180,28 @@ "clip_size": 3, "modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ], [ "MULTI", "multi", 3, [ "NPC_AVOID", "SIMULTANEOUS" ] ] ], "proportional": { "weight": 1.5, "volume": 1.8, "price": 2 } + }, + { + "id": "pseudo_m203", + "copy-from": "launcher_base", + "looks_like": "m203", + "type": "GUN", + "name": "M203 array", + "description": "Six M203 grenade launchers for use on an automated 40mm turret.", + "weight": "8200 g", + "volume": "4 L", + "price": 250000, + "to_hit": -1, + "bashing": 14, + "material": "steel", + "ammo": "40mm", + "range": 30, + "ranged_damage": 1, + "dispersion": 300, + "durability": 10, + "reload": 400, + "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ], + "magazines": [ [ "40mm", [ "belt40mm" ] ] ], + "flags": [ "MOUNTED_GUN" ] } ] diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json index 5f6769b701d29..7b51ea0ef307f 100644 --- a/data/json/monsters/turrets.json +++ b/data/json/monsters/turrets.json @@ -225,7 +225,7 @@ "id": "mon_turret_riot", "type": "MONSTER", "name": "riot control turret", - "description": "These rapid-deployable CROWS-based riot control turrets were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation.", + "description": "These rapid-deployable riot control turrets were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation.", "default_faction": "cop_bot", "looks_like": "mon_turret", "species": [ "ROBOT" ], @@ -252,7 +252,7 @@ "type": "gun", "cooldown": 1, "move_cost": 150, - "gun_type": "mark19", + "gun_type": "pseudo_m203", "ammo_type": "40mm_sponge", "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], "fake_dex": 12, From 967375654cd2cbca70f9e1841103b568e2fcaa2a Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 22:26:29 -0800 Subject: [PATCH 13/17] Update data/json/items/gun/40mm.json Co-Authored-By: Tonkatsu --- data/json/items/gun/40mm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/40mm.json b/data/json/items/gun/40mm.json index 4a9e10dad243c..0e14d2faf0da6 100644 --- a/data/json/items/gun/40mm.json +++ b/data/json/items/gun/40mm.json @@ -201,7 +201,7 @@ "durability": 10, "reload": 400, "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ], - "magazines": [ [ "40mm", [ "belt40mm" ] ] ], + "clip_size": 16, "flags": [ "MOUNTED_GUN" ] } ] From ec0149c7ba064c6009bb9e49a226a28f455ae39c Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 2 Dec 2019 22:58:33 -0800 Subject: [PATCH 14/17] Change description --- data/json/monsters/turrets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json index 7b51ea0ef307f..3c40c27bcc7a7 100644 --- a/data/json/monsters/turrets.json +++ b/data/json/monsters/turrets.json @@ -224,8 +224,8 @@ { "id": "mon_turret_riot", "type": "MONSTER", - "name": "riot control turret", - "description": "These rapid-deployable riot control turrets were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation.", + "name": "riot control platform", + "description": "These six-wheeled riot control platforms were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation. On the bright side, although it shoots autonomously, it requires a human operator to relocate, so it's not so mobile anymore.", "default_faction": "cop_bot", "looks_like": "mon_turret", "species": [ "ROBOT" ], From 4b55e6cd8d689d9b772677774657929a9707f847 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Fri, 6 Dec 2019 11:07:22 -0800 Subject: [PATCH 15/17] Update data/json/recipes/recipe_deconstruction.json Co-Authored-By: Tonkatsu --- data/json/recipes/recipe_deconstruction.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index fe6bb6a29edb9..bc653169974cc 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -826,7 +826,7 @@ [ [ "targeting_module", 1 ] ], [ [ "identification_module", 1 ] ], [ [ "sensor_module", 1 ] ], - [ [ "m1014", 1 ] ], + [ [ "m203", 16 ] ], [ [ "small_storage_battery", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "robot_controls", 1 ] ], From dc5eaf7d2bf0eb2c1e2d47fd4d9d808768e61f03 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Fri, 6 Dec 2019 11:14:42 -0800 Subject: [PATCH 16/17] Update recipe_deconstruction.json --- data/json/recipes/recipe_deconstruction.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index bc653169974cc..af2ddd6fa90be 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -828,9 +828,11 @@ [ [ "sensor_module", 1 ] ], [ [ "m203", 16 ] ], [ [ "small_storage_battery", 1 ] ], - [ [ "power_supply", 1 ] ], + [ [ "power_supply", 3 ] ], + [ [ "antenna", 1 ] ], [ [ "robot_controls", 1 ] ], - [ [ "turret_chassis", 1 ] ] + [ [ "omni_wheel", 1 ] ], + [ [ "copbot_chassis", 1 ] ] ] }, { From fa87893a11a3a1fe2e4d877fe68c2dc6686ed8de Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 9 Dec 2019 19:58:51 -0800 Subject: [PATCH 17/17] Apply suggestions from code review Co-Authored-By: Kevin Granade --- src/map_extras.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map_extras.cpp b/src/map_extras.cpp index febc9a1cbbfcf..46f7ace779c9f 100644 --- a/src/map_extras.cpp +++ b/src/map_extras.cpp @@ -576,9 +576,9 @@ static void mx_roadblock( map &m, const tripoint &abs_sub ) } } - if( one_in( 2 ) ) { + if( one_in( 2 ) ) { // The truck's wrecked...with fuel. Explosive barrel? - m.add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, SEEY * 2 - 12 ), 0, 70, -1 ); + m.add_vehicle( vproto_id( "military_cargo_truck" ), point( 12, SEEY * 2 - 12 ), 0, 70, -1 ); if( road_at_north ) { spawn_turret( 12, 6 ); }