From 9e9131dc6c31a09cc03a650cb10ef8fd236d0faa Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sun, 3 May 2020 18:28:59 -0600 Subject: [PATCH 1/7] Alter the damage type/power draw of mainline laser weaponry --- data/json/ammo_effects.json | 5 +++++ data/json/items/gun/bio.json | 2 +- data/json/items/gun/ups.json | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index b668e31b22b71..946a75215ebbf 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -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", diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json index f8f9f6f5603c7..83ba157d5cd0a 100644 --- a/data/json/items/gun/bio.json +++ b/data/json/items/gun/bio.json @@ -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": 15 }, "dispersion": 10, "durability": 10, "loudness": 7, diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json index b51d092deb626..6796517976cc5 100644 --- a/data/json/items/gun/ups.json +++ b/data/json/items/gun/ups.json @@ -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": 20 }, "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 ], @@ -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": 20 }, "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", @@ -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": 20 }, "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", @@ -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": 15 }, "dispersion": 90, "durability": 7, "loudness": 8, @@ -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": 15 }, "dispersion": 10, "durability": 8, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], @@ -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": 15 }, "dispersion": 180, "durability": 8, "loudness": 7, - "ups_charges": 20, + "ups_charges": 10, "reload": 200, "valid_mod_locations": [ [ "accessories", 2 ], From 9c6fc03268ab03044dfa1389449ccacb3946448b Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sun, 3 May 2020 18:29:17 -0600 Subject: [PATCH 2/7] Alter the damage type/power draw of Aftershock's laser weaponry --- data/mods/Aftershock/items/gun/laser.json | 5 +++-- data/mods/Aftershock/items/weapons.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json index c44c67eb0bfc2..015333cc39886 100644 --- a/data/mods/Aftershock/items/gun/laser.json +++ b/data/mods/Aftershock/items/gun/laser.json @@ -12,6 +12,7 @@ "color": "cyan", "range": 10, "ranged_damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 15 }, + "ranged_damage": { "damage_type": "heat", "amount": 5, "armor_penetration": 15 }, "dispersion": 500, "ups_charges": 25, "ammo_effects": [ "LASER", "BEANBAG" ], @@ -25,8 +26,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": 15 }, + "ups_charges": 30, "modes": [ [ "MULTI", "trilaser", 3 ] ], "ammo_effects": [ "LASER" ], "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ] diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json index 8230e5a7e7d64..1ea37965d17d8 100644 --- a/data/mods/Aftershock/items/weapons.json +++ b/data/mods/Aftershock/items/weapons.json @@ -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, @@ -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, From 6731761ee1d0fad9938d065f8a66b04f428319fe Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sun, 3 May 2020 18:32:01 -0600 Subject: [PATCH 3/7] Alter the damage type if CRIT laser weaponry --- data/mods/CRT_EXPANSION/items/crt_gun.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json index 65f351baf1a8a..dec62707f69ee 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gun.json +++ b/data/mods/CRT_EXPANSION/items/crt_gun.json @@ -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, @@ -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, @@ -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 ] ], From 459483650ab7a3894e40455f3b53e65f6a655217 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sun, 3 May 2020 18:32:20 -0600 Subject: [PATCH 4/7] Alter the damage type/power draw of Modular turret mod laser weaponry --- data/mods/Modular_Turrets/roboguns.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/mods/Modular_Turrets/roboguns.json b/data/mods/Modular_Turrets/roboguns.json index 7eb1d1e0c52a2..5dad0377169f9 100644 --- a/data/mods/Modular_Turrets/roboguns.json +++ b/data/mods/Modular_Turrets/roboguns.json @@ -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, From 24bd341af58f9456ba627650155d6e1704e26456 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Sun, 3 May 2020 20:06:56 -0600 Subject: [PATCH 5/7] Remove duplicated damage entry in Aftershock file. --- data/mods/Aftershock/items/gun/laser.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json index 015333cc39886..59e98bc2684ea 100644 --- a/data/mods/Aftershock/items/gun/laser.json +++ b/data/mods/Aftershock/items/gun/laser.json @@ -12,7 +12,6 @@ "color": "cyan", "range": 10, "ranged_damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 15 }, - "ranged_damage": { "damage_type": "heat", "amount": 5, "armor_penetration": 15 }, "dispersion": 500, "ups_charges": 25, "ammo_effects": [ "LASER", "BEANBAG" ], From 0356875d76981c50887435a5e34522dc12170eb6 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Mon, 4 May 2020 11:38:39 -0600 Subject: [PATCH 6/7] Reduce armor penetraton of mainline laser weapons --- data/json/items/gun/bio.json | 2 +- data/json/items/gun/ups.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json index 83ba157d5cd0a..69b9216d8b776 100644 --- a/data/json/items/gun/bio.json +++ b/data/json/items/gun/bio.json @@ -58,7 +58,7 @@ "color": "magenta", "skill": "pistol", "range": 30, - "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 15 }, + "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 }, "dispersion": 10, "durability": 10, "loudness": 7, diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json index 6796517976cc5..903fe6c613b61 100644 --- a/data/json/items/gun/ups.json +++ b/data/json/items/gun/ups.json @@ -17,7 +17,7 @@ "color": "cyan", "skill": "rifle", "range": 35, - "ranged_damage": { "damage_type": "electric", "amount": 45, "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 ] ], @@ -55,7 +55,7 @@ "color": "blue", "skill": "rifle", "range": 30, - "ranged_damage": { "damage_type": "heat", "amount": 20, "armor_penetration": 20 }, + "ranged_damage": { "damage_type": "heat", "amount": 20, "armor_penetration": 4 }, "dispersion": 100, "durability": 8, "loudness": 12, @@ -92,7 +92,7 @@ "color": "blue", "skill": "rifle", "range": 45, - "ranged_damage": { "damage_type": "heat", "amount": 30, "armor_penetration": 20 }, + "ranged_damage": { "damage_type": "heat", "amount": 30, "armor_penetration": 4 }, "dispersion": 15, "durability": 8, "loudness": 1, @@ -129,7 +129,7 @@ "color": "magenta", "skill": "rifle", "range": 30, - "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 15 }, + "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 }, "dispersion": 90, "durability": 7, "loudness": 8, @@ -166,7 +166,7 @@ "color": "yellow", "skill": "rifle", "range": 30, - "ranged_damage": { "damage_type": "heat", "amount": 25, "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 ] ], @@ -205,7 +205,7 @@ "color": "magenta", "skill": "pistol", "range": 30, - "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 15 }, + "ranged_damage": { "damage_type": "heat", "amount": 10, "armor_penetration": 4 }, "dispersion": 180, "durability": 8, "loudness": 7, From aebf1f6cea51fbff4f0de95ea1b49b9eccdf9813 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Mon, 4 May 2020 11:39:03 -0600 Subject: [PATCH 7/7] Reduce Armor penetration of aftershock lasers --- data/mods/Aftershock/items/gun/laser.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json index 59e98bc2684ea..0490ba013d6aa 100644 --- a/data/mods/Aftershock/items/gun/laser.json +++ b/data/mods/Aftershock/items/gun/laser.json @@ -25,7 +25,7 @@ "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": "heat", "amount": 25, "armor_penetration": 15 }, + "ranged_damage": { "damage_type": "heat", "amount": 25, "armor_penetration": 4 }, "ups_charges": 30, "modes": [ [ "MULTI", "trilaser", 3 ] ], "ammo_effects": [ "LASER" ],