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.

Sign up for GitHub

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

Remove laserturret #40695

Merged
merged 4 commits into from
May 26, 2020
Merged

Remove laserturret #40695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
873d497
Remove laserturret
May 19, 2020
468108d
Remove laser cannons
May 23, 2020
2c089a6
Fix skills listing.
kevingranade May 24, 2020
5d836c0
Apply suggestions from code review
ZhilkinSerg May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@
"subtype": "distribution",
"entries": [ { "item": "9mm", "prob": 8 } ]
},
{
"type": "item_group",
"id": "laserturret",
"subtype": "distribution",
"entries": [ { "item": "cerberus_laser", "prob": 1 } ]
},
{
"type": "item_group",
"id": "turret_rifle",
Expand Down
2 changes: 0 additions & 2 deletions data/json/itemgroups/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
{ "item": "bio_blade", "prob": 10 },
{ "item": "bio_speed", "prob": 10 },
{ "item": "bot_c4_hack", "prob": 30 },
{ "item": "bot_laserturret", "prob": 20 },
{ "item": "c4", "prob": 50 },
{ "item": "canister_goo", "prob": 80 },
{ "item": "cleansuit", "prob": 100 },
Expand Down Expand Up @@ -87,7 +86,6 @@
"subtype": "distribution",
"entries": [
{ "item": "12mm", "prob": 10 },
{ "item": "bot_laserturret", "prob": 10 },
{ "item": "alloy_plate", "prob": 10 },
{ "item": "plasma_gun", "prob": 10 },
{ "item": "can_sealer", "prob": 10 },
Expand Down
1 change: 0 additions & 1 deletion data/json/itemgroups/military.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@
{ "item": "match_trigger", "prob": 2 },
{ "item": "grapnel", "prob": 1 },
{ "item": "bucket", "prob": 4 },
{ "item": "bot_laserturret", "prob": 1 },
{ "item": "sheath", "prob": 13 },
{ "item": "bootsheath", "prob": 8 },
{ "item": "toolbox", "prob": 1 },
Expand Down
22 changes: 0 additions & 22 deletions data/json/items/corpses/inactive_bots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,28 +129,6 @@
"skills": [ "electronics", "computer" ]
}
},
{
"id": "bot_laserturret",
"type": "TOOL",
"name": { "str": "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": "40750 g",
"volume": "30 L",
"price": 600000,
"price_postapoc": 12000,
"to_hit": -3,
"bashing": 8,
"material": [ "steel", "plastic" ],
"symbol": ";",
"color": "white",
"use_action": {
"type": "place_monster",
"monster_id": "mon_laserturret",
"difficulty": 6,
"moves": 100,
"skills": [ "electronics", "computer" ]
}
},
{
"id": "bot_antimateriel",
"type": "TOOL",
Expand Down
23 changes: 0 additions & 23 deletions data/json/items/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2647,20 +2647,6 @@
"volume": "250 ml",
"category": "spare_parts"
},
{
"id": "cerberus_laser",
"type": "GENERIC",
"symbol": "(",
"color": "magenta",
"name": { "str": "TX-5LR Laser Cannon" },
"description": "A laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret. Unusable as a weapon on its own without the necessary parts.",
"price": 5000000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
"weight": "5000 g",
"volume": "750 ml",
"category": "spare_parts"
},
{
"id": "light_bulb",
"type": "GENERIC",
Expand Down Expand Up @@ -2935,15 +2921,6 @@
"weight": "100 kg",
"copy-from": "broken_turret"
},
{
"type": "GENERIC",
"id": "broken_laserturret",
"symbol": ",",
"color": "green",
"name": { "str": "broken laser turret" },
"weight": "110 kg",
"copy-from": "broken_turret"
},
{
"type": "GENERIC",
"id": "broken_secubot",
Expand Down
37 changes: 0 additions & 37 deletions data/json/items/gun/ups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,43 +111,6 @@
"NEEDS_NO_LUBE"
]
},
{
"id": "laser_cannon",
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": { "str": "handheld laser cannon" },
"description": "This is a laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret that has been modified to use UPS power for firing.",
"weight": "5140 g",
"volume": "1500 ml",
"price": 400000,
"price_postapoc": 8000,
"to_hit": -1,
"bashing": 4,
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "magenta",
"skill": "rifle",
"range": 30,
"ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
"dispersion": 90,
"durability": 7,
"loudness": 8,
"ups_charges": 25,
"reload": 200,
"valid_mod_locations": [
[ "emitter", 1 ],
[ "lens", 1 ],
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
"flags": [ "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
},
{
"id": "laser_rifle",
"looks_like": "ar15",
Expand Down
82 changes: 82 additions & 0 deletions data/json/items/obsolete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2717,5 +2717,87 @@
"item_restriction": [ "ak74mag", "rpk74mag" ]
}
]
},
{
"id": "bot_laserturret",
"type": "TOOL",
"name": { "str": "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": "40750 g",
"volume": "30 L",
"price": 600000,
"price_postapoc": 12000,
"to_hit": -3,
"bashing": 8,
"material": [ "steel", "plastic" ],
"symbol": ";",
"color": "white",
"use_action": {
"type": "place_monster",
"monster_id": "mon_laserturret",
"difficulty": 6,
"moves": 100,
"skills": [ "electronics", "computer" ]
}
},
{
"type": "GENERIC",
"id": "broken_laserturret",
"symbol": ",",
"color": "green",
"name": { "str": "broken laser turret" },
"weight": "110 kg",
"copy-from": "broken_turret"
},
{
"id": "cerberus_laser",
"type": "GENERIC",
"symbol": "(",
"color": "magenta",
"name": { "str": "TX-5LR Laser Cannon" },
"description": "A laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret. Unusable as a weapon on its own without the necessary parts.",
"price": 5000000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
"weight": "5000 g",
"volume": "750 ml",
"category": "spare_parts"
},
{
"id": "laser_cannon",
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": { "str": "handheld laser cannon" },
"description": "This is a laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret that has been modified to use UPS power for firing.",
"weight": "5140 g",
"volume": "1500 ml",
"price": 400000,
"price_postapoc": 8000,
"to_hit": -1,
"bashing": 4,
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "magenta",
"skill": "rifle",
"range": 30,
"ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
"dispersion": 90,
"durability": 7,
"loudness": 8,
"ups_charges": 25,
"reload": 200,
"valid_mod_locations": [
[ "emitter", 1 ],
[ "lens", 1 ],
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
"flags": [ "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
}
]
37 changes: 37 additions & 0 deletions data/json/monsters/obsolete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,5 +367,42 @@
"special_attacks": [ [ "CHICKENBOT", 4 ] ],
"death_function": [ "BROKEN" ],
"flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS", "DROPS_AMMO" ]
},
{
"id": "mon_laserturret",
"type": "MONSTER",
"name": { "str": "laser turret" },
"description": "The TX-5LR Cerberus is an upgrade to its predecessors. It features a state of the art revolving laser cannon system with three barrels that charge from solar cells embedded in its hull.",
"default_faction": "military",
"species": [ "ROBOT" ],
"diff": 20,
"volume": "30000 ml",
"weight": "40750 g",
"hp": 30,
"speed": 100,
"material": [ "steel" ],
"symbol": "2",
"color": "white",
"aggression": 100,
"morale": 100,
"armor_bash": 14,
"armor_cut": 16,
"armor_bullet": 13,
"vision_day": 50,
"revert_to_itype": "bot_laserturret",
"special_attacks": [
{
"type": "gun",
"cooldown": 1,
"gun_type": "laser_cannon",
"fake_skills": [ [ "gun", 4 ], [ "rifle", 8 ] ],
"ranges": [ [ 0, 30, "DEFAULT" ] ],
"require_sunlight": true
}
],
"special_when_hit": [ "RETURN_FIRE", 100 ],
"death_drops": { },
"death_function": [ "BROKEN" ],
"flags": [ "SEES", "NOHEAD", "ELECTRONIC", "COLDPROOF", "IMMOBILE", "NO_BREATHE" ]
}
]
37 changes: 0 additions & 37 deletions data/json/monsters/turrets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,43 +75,6 @@
"death_function": [ "FOCUSEDBEAM" ],
"flags": [ "SEES", "NOHEAD", "ELECTRONIC", "COLDPROOF", "IMMOBILE", "NO_BREATHE", "PRIORITIZE_TARGETS" ]
},
{
"id": "mon_laserturret",
"type": "MONSTER",
"name": { "str": "laser turret" },
"description": "The TX-5LR Cerberus is an upgrade to its predecessors. It features a state of the art revolving laser cannon system with three barrels that charge from solar cells embedded in its hull.",
"default_faction": "military",
"species": [ "ROBOT" ],
"diff": 20,
"volume": "30000 ml",
"weight": "40750 g",
"hp": 30,
"speed": 100,
"material": [ "steel" ],
"symbol": "2",
"color": "white",
"aggression": 100,
"morale": 100,
"armor_bash": 14,
"armor_cut": 16,
"armor_bullet": 13,
"vision_day": 50,
"revert_to_itype": "bot_laserturret",
"special_attacks": [
{
"type": "gun",
"cooldown": 1,
"gun_type": "laser_cannon",
"fake_skills": [ [ "gun", 4 ], [ "rifle", 8 ] ],
"ranges": [ [ 0, 30, "DEFAULT" ] ],
"require_sunlight": true
}
],
"special_when_hit": [ "RETURN_FIRE", 100 ],
"death_drops": { },
"death_function": [ "BROKEN" ],
"flags": [ "SEES", "NOHEAD", "ELECTRONIC", "COLDPROOF", "IMMOBILE", "NO_BREATHE" ]
},
{
"id": "mon_turret_bmg",
"type": "MONSTER",
Expand Down
22 changes: 0 additions & 22 deletions data/json/recipes/recipe_deconstruction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,28 +948,6 @@
[ [ "copbot_chassis", 1 ] ]
]
},
{
"result": "broken_laserturret",
"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 ] ],
[ [ "laser_cannon", 1 ] ],
[ [ "medium_storage_battery", 1 ] ],
[ [ "solar_cell", 4 ] ],
[ [ "power_supply", 1 ] ],
[ [ "robot_controls", 1 ] ],
[ [ "turret_chassis", 1 ] ]
]
},
{
"result": "broken_science_bot",
"type": "uncraft",
Expand Down
33 changes: 0 additions & 33 deletions data/json/recipes/recipe_electronics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,39 +1294,6 @@
[ [ "spring", 2 ] ]
]
},
{
"type": "recipe",
"result": "bot_laserturret",
"category": "CC_ELECTRONIC",
"subcategory": "CSC_ELECTRONIC_OTHER",
"skill_used": "electronics",
"skills_required": [ [ "mechanics", 8 ], [ "computer", 5 ] ],
"difficulty": 8,
"time": "30 m",
"reversible": true,
"decomp_learn": 9,
"book_learn": [ [ "recipe_lab_elec", 8 ] ],
"using": [ [ "soldering_standard", 14 ] ],
"qualities": [
{ "id": "SCREW", "level": 1 },
{ "id": "SCREW_FINE", "level": 1 },
{ "id": "WRENCH", "level": 2 },
{ "id": "WRENCH_FINE", "level": 1 }
],
"components": [
[ [ "ai_module", 1 ] ],
[ [ "gun_module", 1 ] ],
[ [ "targeting_module", 1 ] ],
[ [ "identification_module", 1 ] ],
[ [ "sensor_module", 1 ] ],
[ [ "laser_cannon", 1 ] ],
[ [ "medium_storage_battery", 1 ] ],
[ [ "solar_cell", 4 ] ],
[ [ "power_supply", 1 ] ],
[ [ "robot_controls", 1 ] ],
[ [ "turret_chassis", 1 ] ]
]
},
{
"type": "recipe",
"result": "bot_rifleturret",
Expand Down
Loading