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

Make laser weaponry deal 'Heat' type damage #40116

Merged
merged 7 commits into from
May 5, 2020
Merged

Make laser weaponry deal 'Heat' type damage #40116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e9131d
Alter the damage type/power draw of mainline laser weaponry
John-Candlebury May 4, 2020
9c6fc03
Alter the damage type/power draw of Aftershock's laser weaponry
John-Candlebury May 4, 2020
6731761
Alter the damage type if CRIT laser weaponry
John-Candlebury May 4, 2020
4594836
Alter the damage type/power draw of Modular turret mod laser weaponry
John-Candlebury May 4, 2020
24bd341
Remove duplicated damage entry in Aftershock file.
John-Candlebury May 4, 2020
0356875
Reduce armor penetraton of mainline laser weapons
John-Candlebury May 4, 2020
aebf1f6
Reduce Armor penetration of aftershock lasers
John-Candlebury May 4, 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
5 changes: 5 additions & 0 deletions data/json/ammo_effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@
"aoe": { "field_type": "fd_plasma", "intensity_min": 2, "intensity_max": 3, "chance": 50 },
"trail": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 2, "chance": 50 }
},
{
"id": "PLASMA_BUBBLE",
"type": "ammo_effect",
"aoe": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 3, "radius": 1, "chance": 10 }
},
{
"id": "EXPLOSIVE_HUGE",
"type": "ammo_effect",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/bio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"color": "magenta",
"skill": "pistol",
"range": 30,
"ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 15 },
"ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
"dispersion": 10,
"durability": 10,
"loudness": 7,
Expand Down
24 changes: 12 additions & 12 deletions data/json/items/gun/ups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"color": "cyan",
"skill": "rifle",
"range": 35,
"ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 20 },
"ranged_damage": { "damage_type": "electric", "amount": 45, "armor_penetration": 4 },
"dispersion": 10,
"durability": 10,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
"loudness": 23,
"ups_charges": 70,
"ups_charges": 60,
"reload": 0,
"valid_mod_locations": [
[ "accessories", 4 ],
Expand Down Expand Up @@ -55,14 +55,14 @@
"color": "blue",
"skill": "rifle",
"range": 30,
"ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 10 },
"ranged_damage": { "damage_type": "heat", "amount": 20, "armor_penetration": 4 },
"dispersion": 100,
"durability": 8,
"loudness": 12,
"ups_charges": 80,
"ups_charges": 20,
"reload": 0,
"modes": [ [ "DEFAULT", "3 rd.", 3 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "high auto", 15 ] ],
"ammo_effects": [ "LASER", "INCENDIARY" ],
"ammo_effects": [ "LASER", "PLASMA_BUBBLE", "INCENDIARY" ],
"flags": [
"NO_UNLOAD",
"NEVER_JAMS",
Expand Down Expand Up @@ -92,13 +92,13 @@
"color": "blue",
"skill": "rifle",
"range": 45,
"ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 20 },
"ranged_damage": { "damage_type": "heat", "amount": 30, "armor_penetration": 4 },
"dispersion": 15,
"durability": 8,
"loudness": 1,
"ups_charges": 180,
"ups_charges": 50,
"reload": 0,
"ammo_effects": [ "LASER", "INCENDIARY" ],
"ammo_effects": [ "LASER", "PLASMA_BUBBLE", "INCENDIARY" ],
"flags": [
"NO_UNLOAD",
"NEVER_JAMS",
Expand Down Expand Up @@ -129,7 +129,7 @@
"color": "magenta",
"skill": "rifle",
"range": 30,
"ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 15 },
"ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
"dispersion": 90,
"durability": 7,
"loudness": 8,
Expand Down Expand Up @@ -166,7 +166,7 @@
"color": "yellow",
"skill": "rifle",
"range": 30,
"ranged_damage": { "damage_type": "stab", "amount": 22, "armor_penetration": 15 },
"ranged_damage": { "damage_type": "heat", "amount": 25, "armor_penetration": 4 },
"dispersion": 10,
"durability": 8,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
Expand Down Expand Up @@ -205,11 +205,11 @@
"color": "magenta",
"skill": "pistol",
"range": 30,
"ranged_damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 15 },
"ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 },
"dispersion": 180,
"durability": 8,
"loudness": 7,
"ups_charges": 20,
"ups_charges": 10,
"reload": 200,
"valid_mod_locations": [
[ "accessories", 2 ],
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/items/gun/laser.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"description": "A powerful tri-barreled laser weapon, still mounted to the robotic hand of the wraitheon drone it originally belonged too. Can still be fired when connected to an UPS.",
"color": "red",
"range": 10,
"ranged_damage": { "damage_type": "stab", "amount": 25, "armor_penetration": 15 },
"ups_charges": 50,
"ranged_damage": { "damage_type": "heat", "amount": 25, "armor_penetration": 4 },
"ups_charges": 30,
"modes": [ [ "MULTI", "trilaser", 3 ] ],
"ammo_effects": [ "LASER" ],
"flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/items/weapons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 7 },
"reload_noise_volume": 0,
"loudness": 0,
"ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 15 },
"ranged_damage": { "damage_type": "heat", "amount": 30, "armor_penetration": 15 },
"range": 30,
"dispersion": 80,
"durability": 6,
Expand Down Expand Up @@ -173,7 +173,7 @@
"ammo": "battery",
"skill": "rifle",
"range": 10,
"ranged_damage": { "damage_type": "stab", "amount": 20 },
"ranged_damage": { "damage_type": "heat", "amount": 10 },
"dispersion": 150,
"durability": 10,
"loudness": 8,
Expand Down
6 changes: 3 additions & 3 deletions data/mods/CRT_EXPANSION/items/crt_gun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "red",
"skill": "pistol",
"range": 20,
"ranged_damage": { "damage_type": "stab", "amount": 6, "armor_penetration": 10 },
"ranged_damage": { "damage_type": "heat", "amount": 6, "armor_penetration": 10 },
"dispersion": 150,
"durability": 9,
"loudness": 14,
Expand Down Expand Up @@ -49,7 +49,7 @@
"color": "cyan",
"skill": "launcher",
"range": 30,
"ranged_damage": { "damage_type": "stab", "amount": 9, "armor_penetration": 8 },
"ranged_damage": { "damage_type": "heat", "amount": 9, "armor_penetration": 8 },
"dispersion": 45,
"durability": 9,
"loudness": 28,
Expand All @@ -75,7 +75,7 @@
"color": "blue",
"skill": "smg",
"range": 25,
"ranged_damage": { "damage_type": "stab", "amount": 13, "armor_penetration": 9 },
"ranged_damage": { "damage_type": "heat", "amount": 13, "armor_penetration": 9 },
"dispersion": 15,
"durability": 8,
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
Expand Down
3 changes: 1 addition & 2 deletions data/mods/Modular_Turrets/roboguns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@
"name": "integral laser emitter",
"skill": "rifle",
"range": 30,
"ranged_damage": 22,
"pierce": 15,
"ranged_damage": { "damage_type": "heat", "amount": 22, "armor_penetration": 15 },
"dispersion": 10,
"durability": 8,
"loudness": 12,
Expand Down