Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

turret/vehicle ammo fix based on research #36083

Merged
merged 12 commits into from
Dec 20, 2019
29 changes: 28 additions & 1 deletion data/json/items/corpses/inactive_bots.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
"id": "bot_secubot",
"type": "TOOL",
"name": "inactive TALON UGV",
"description": "This is an inactive TALON UGV equipped with an M16A4. 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 you do NOT want to give the robot) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the security bot will then identify you as a friendly, roam around or follow you, and attack all enemies with its rifle.",
"description": "This is an inactive TALON UGV equipped with an M249. 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 you do NOT want to give the robot) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the security bot will then identify you as a friendly, roam around or follow you, and attack all enemies with its rifle.",
"weight": "40750 g",
"volume": "30 L",
"price": 750000,
Expand Down Expand Up @@ -696,6 +696,33 @@
"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.",
misterprimus marked this conversation as resolved.
Show resolved Hide resolved
"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!",
misterprimus marked this conversation as resolved.
Show resolved Hide resolved
"//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a chicken walker?",
misterprimus marked this conversation as resolved.
Show resolved Hide resolved
"difficulty": 10,
"moves": 500,
"skill1": "electronics",
"skill2": "computer"
}
},
{
"id": "bot_tripod",
"looks_like": "broken_tripod",
Expand Down
17 changes: 17 additions & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,23 @@
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"type": "GENERIC",
"id": "broken_chickenbot",
"symbol": ",",
"color": "green",
"name": "broken chickenbot",
"category": "other",
"description": "A broken chickenwalker. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.",
misterprimus marked this conversation as resolved.
Show resolved Hide resolved
"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",
Expand Down
8 changes: 4 additions & 4 deletions data/json/monsters/defense_bot.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"id": "mon_secubot",
"type": "MONSTER",
"name": { "str": "M16A4 autonomous TALON UGV" },
"description": "A TALON unmanned ground vehicle equipped with an M16A4. It is a small tracked UGV with an array of motors and sensors covering its weapon mount.",
"name": "M249 autonomous TALON UGV",
"description": "A TALON unmanned ground vehicle equipped with an M249. It is a small tracked UGV with an array of motors and sensors covering its weapon mount.",
"default_faction": "defense_bot",
"species": [ "ROBOT" ],
"diff": 10,
Expand All @@ -20,13 +20,13 @@
"armor_cut": 14,
"vision_day": 50,
"revert_to_itype": "bot_secubot",
"starting_ammo": { "556": 30 },
"starting_ammo": { "556": 900 },
"special_attacks": [
{
"type": "gun",
"cooldown": 1,
"move_cost": 150,
"gun_type": "m16a4",
"gun_type": "m249",
"ammo_type": "556",
"fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
"fake_dex": 12,
Expand Down
19 changes: 14 additions & 5 deletions data/json/monsters/monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,8 @@
"starting_ammo": { "40mm_frag": 100, "556": 1000 },
"path_settings": { "max_dist": 10 },
"special_attacks": [ [ "CHICKENBOT", 4 ] ],
"death_drops": { "groups": [ [ "robots", 4 ], [ "chickenbot", 4, 6 ] ] },
"death_function": [ "EXPLODE" ],
"flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS" ]
"death_function": [ "BROKEN" ],
"flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS", "DROPS_AMMO" ]
},
{
"id": "mon_chud",
Expand Down Expand Up @@ -2825,9 +2824,19 @@
"starting_ammo": { "40mm_frag": 200, "556": 3000 },
"path_settings": { "max_dist": 20 },
"special_attacks": [ [ "MULTI_ROBOT", 3 ] ],
"death_drops": { "groups": [ [ "robots", 4 ] ] },
"death_function": [ "BROKEN" ],
"flags": [ "SEES", "HEARS", "GOODHEARING", "NOHEAD", "BASHES", "DESTROYS", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS" ]
"flags": [
"SEES",
"HEARS",
"GOODHEARING",
"NOHEAD",
"BASHES",
"DESTROYS",
"NO_BREATHE",
"ELECTRONIC",
"PRIORITIZE_TARGETS",
"DROPS_AMMO"
]
},
{
"id": "mon_thing",
Expand Down
8 changes: 4 additions & 4 deletions data/json/monsters/turrets.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"armor_cut": 16,
"vision_night": 3,
"revert_to_itype": "bot_turret",
"starting_ammo": { "9mm": 30 },
"starting_ammo": { "9mm": 1500 },
misterprimus marked this conversation as resolved.
Show resolved Hide resolved
"special_attacks": [
{
"type": "gun",
Expand Down Expand Up @@ -104,7 +104,7 @@
"vision_day": 50,
"vision_night": 3,
"revert_to_itype": "bot_antimateriel",
"starting_ammo": { "50bmg": 400 },
"starting_ammo": { "50bmg": 100 },
"special_attacks": [
{
"type": "gun",
Expand Down Expand Up @@ -152,7 +152,7 @@
"vision_day": 50,
"vision_night": 3,
"revert_to_itype": "bot_rifleturret",
"starting_ammo": { "556": 1600 },
"starting_ammo": { "556": 900 },
"special_attacks": [
{
"type": "gun",
Expand Down Expand Up @@ -200,7 +200,7 @@
"vision_day": 50,
"vision_night": 3,
"revert_to_itype": "bot_crows_m240",
"starting_ammo": { "762_51": 1000 },
"starting_ammo": { "762_51": 450 },
"special_attacks": [
{
"type": "gun",
Expand Down
26 changes: 25 additions & 1 deletion data/json/recipes/recipe_deconstruction.json
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@
[ [ "gun_module", 1 ] ],
[ [ "power_supply", 4 ] ],
[ [ "solar_cell", 2 ] ],
[ [ "m16a4", 1 ] ],
[ [ "m249", 1 ] ],
[ [ "canister_empty", 1 ] ]
]
},
Expand Down Expand Up @@ -947,6 +947,30 @@
[ [ "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 ] ],
[ [ "m4a1", 1 ] ],
misterprimus marked this conversation as resolved.
Show resolved Hide resolved
[ [ "power_supply", 20 ] ],
[ [ "storage_battery", 1 ] ],
[ [ "plut_cell", 4 ] ],
[ [ "mil_plate", 2 ] ]
]
},
{
"result": "broken_tripod",
"type": "uncraft",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/recipe_electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@
[ [ "gun_module", 1 ] ],
[ [ "power_supply", 4 ] ],
[ [ "solar_cell", 2 ] ],
[ [ "m16a4", 1 ] ],
[ [ "m249", 1 ] ],
[ [ "canister_empty", 1 ] ]
]
},
Expand Down