From e4999e95b633984b68306593f9558dc3817afaf4 Mon Sep 17 00:00:00 2001 From: Hecter94 Date: Sat, 4 May 2024 13:44:32 -0400 Subject: [PATCH 1/4] Nerf Turn Rates --- data/bunrodea/bunrodea weapons.txt | 2 +- data/gegno/gegno outfits.txt | 10 +++++----- data/hai/hai outfits.txt | 4 ++-- data/human/weapons.txt | 22 +++++++++++----------- data/kahet/kahet outfits.txt | 4 ++-- data/korath/korath weapons.txt | 20 ++++++++++---------- data/pug/pug outfits.txt | 2 +- data/remnant/remnant outfits.txt | 4 ++-- data/sheragi/sheragi outfits.txt | 2 +- data/wanderer/wanderer outfits.txt | 6 +++--- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/data/bunrodea/bunrodea weapons.txt b/data/bunrodea/bunrodea weapons.txt index fc8027c24823..5effbc573e33 100644 --- a/data/bunrodea/bunrodea weapons.txt +++ b/data/bunrodea/bunrodea weapons.txt @@ -50,7 +50,7 @@ outfit "Locust Turret" sound "locust blaster" "hit effect" "bullet impact" "inaccuracy" 5 - "turret turn" 6 + "turret turn" 2. "velocity" 10 "random velocity" 2 "lifetime" 40 diff --git a/data/gegno/gegno outfits.txt b/data/gegno/gegno outfits.txt index 452fe8866b1e..6caa771d0d44 100644 --- a/data/gegno/gegno outfits.txt +++ b/data/gegno/gegno outfits.txt @@ -436,7 +436,7 @@ outfit "Irate Cannon Turret" "live effect" "irate smoke" 12 "hit effect" "tiny explosion" "inaccuracy" 2 - "turret turn" 2 + "turret turn" 2. "velocity" 22 "lifetime" 15 "reload" 10 @@ -517,7 +517,7 @@ outfit "Choleric Cannon Turret" "live effect" "choleric smoke" 24 "hit effect" "small explosion" "inaccuracy" 2 - "turret turn" 1.2 + "turret turn" 1.3 "velocity" 9 "lifetime" 55 "reload" 80 @@ -602,7 +602,7 @@ outfit "Ballistic Cannon Turret" "live effect" "ballistic smoke" 36 "hit effect" "ballistic hit" "inaccuracy" 3 - "turret turn" 0.6 + "turret turn" 0.4 "velocity" 8 "lifetime" 100 "reload" 100 @@ -661,7 +661,7 @@ outfit "Astuit Battery" sound "astuit" "hit effect" "astuit hit" "inaccuracy" 5 - "turret turn" 2.2 + "turret turn" 1.5 "velocity" 8 "lifetime" 44 "reload" 6 @@ -700,7 +700,7 @@ outfit "Acuit Artillery" "hit effect" "acuit hit" sound "acuit" "inaccuracy" 3 - "turret turn" 1.3 + "turret turn" 0.7 "velocity" 18 "lifetime" 60 "reload" 60 diff --git a/data/hai/hai outfits.txt b/data/hai/hai outfits.txt index bebe73d131df..00778b9058c1 100644 --- a/data/hai/hai outfits.txt +++ b/data/hai/hai outfits.txt @@ -49,7 +49,7 @@ outfit "Pulse Turret" sound "pulse" "hit effect" "pulse impact" "inaccuracy" 1 - "turret turn" 2.3 + "turret turn" 1.5 "velocity" 15 "lifetime" 30 "reload" 10 @@ -179,7 +179,7 @@ outfit "Ionic Turret Prototype" sound "ion" "hit effect" "ionic impact" 5 "inaccuracy" 2 - "turret turn" 2.4 + "turret turn" 0.9 "velocity" 12 "lifetime" 70 "reload" 70 diff --git a/data/human/weapons.txt b/data/human/weapons.txt index f2b51ff56a27..c3ea421ad0d9 100644 --- a/data/human/weapons.txt +++ b/data/human/weapons.txt @@ -84,7 +84,7 @@ outfit "Blaster Turret" sound "blaster" "hit effect" "blaster impact" "inaccuracy" 3 - "turret turn" 3.7 + "turret turn" 2. "velocity" 10.625 "lifetime" 48 "reload" 6 @@ -110,7 +110,7 @@ outfit "Quad Blaster Turret" sound "blaster" "hit effect" "blaster impact" "inaccuracy" 3 - "turret turn" 3.2 + "turret turn" 1.5 "velocity" 10.625 "lifetime" 48 "reload" 3 @@ -202,7 +202,7 @@ outfit "Modified Blaster Turret" sound "mod blaster" "hit effect" "blaster impact" "inaccuracy" 4 - "turret turn" 3.5 + "turret turn" 2. "velocity" 10 "lifetime" 48 "reload" 6 @@ -253,7 +253,7 @@ outfit "Laser Turret" sound "laser" "hit effect" "beam laser impact" "inaccuracy" .5 - "turret turn" 4.0 + "turret turn" 2.2 "velocity" 300 "lifetime" 1 "reload" 1 @@ -313,7 +313,7 @@ outfit "Heavy Laser Turret" sound "heavy laser" "hit effect" "heavy laser impact" "inaccuracy" .4 - "turret turn" 2.2 + "turret turn" 1.3 "velocity" 400 "lifetime" 1 "reload" 1 @@ -377,7 +377,7 @@ outfit "Mining Laser Turret" sound "mining laser" "hit effect" "beam laser impact" "inaccuracy" .35 - "turret turn" 3.8 + "turret turn" 2.4 "velocity" 200 "lifetime" 1 "reload" 1 @@ -458,7 +458,7 @@ outfit "Electron Turret" sound "electron beam" "hit effect" "electron impact" "inaccuracy" .3 - "turret turn" 1.4 + "turret turn" 0.8 "velocity" 450 "lifetime" 1 "reload" 1 @@ -630,7 +630,7 @@ outfit "Proton Turret" sound "proton" "hit effect" "proton impact" 3 "inaccuracy" 4 - "turret turn" 2.0 + "turret turn" 1.4 "submunition" "Proton Fragment" 3 "velocity" 24 "lifetime" 2 @@ -683,7 +683,7 @@ outfit "Plasma Turret" sound "plasma" "hit effect" "plasma explosion" "inaccuracy" 2 - "turret turn" 1.2 + "turret turn" 1. "velocity" 12 "lifetime" 40 "reload" 9 @@ -1100,7 +1100,7 @@ outfit "Javelin Turret" icon "icon/javelin turret" "hit effect" "tiny explosion" "inaccuracy" 4 - "turret turn" 2 + "turret turn" 2. "velocity" 10 "lifetime" 60 "reload" 7.5 @@ -1561,7 +1561,7 @@ outfit "Gatling Turret" ammo "Gatling Gun Ammo" 2 icon "icon/gat turret" "inaccuracy" 2 - "turret turn" 3.4 + "turret turn" 2. "velocity" 16 "lifetime" 1 "reload" 3 diff --git a/data/kahet/kahet outfits.txt b/data/kahet/kahet outfits.txt index 8efa2720ab7d..3b5ebafc98f0 100644 --- a/data/kahet/kahet outfits.txt +++ b/data/kahet/kahet outfits.txt @@ -149,7 +149,7 @@ outfit "Ka'het Ravager Turret" sound "disruptor" "hit effect" "ravager impact" "inaccuracy" .2 - "turret turn" 1.8 + "turret turn" 2.3 "velocity" 480 "lifetime" 1 "reload" 1 @@ -205,7 +205,7 @@ outfit "Ka'het Annihilator Turret" "hardpoint offset" 15. "hit effect" "bullet impact" "inaccuracy" 1 - "turret turn" 2.3 + "turret turn" 1.8 "range override" 630 "velocity override" 18 "reload" 10 diff --git a/data/korath/korath weapons.txt b/data/korath/korath weapons.txt index 7c35e3bd560d..49cf271ad5b9 100644 --- a/data/korath/korath weapons.txt +++ b/data/korath/korath weapons.txt @@ -32,7 +32,7 @@ outfit "Grab-Strike Turret" "hit effect" "grab-strike impact" "die effect" "grab-strike impact" "inaccuracy" 1 - "turret turn" 1.9 + "turret turn" 1. "velocity" 10 "lifetime" 100 "reload" 20 @@ -78,7 +78,7 @@ outfit "Shunt-Strike Turret" "hit effect" "shunt-strike hit" "die effect" "shunt-strike sparkle" "inaccuracy" 1 - "turret turn" 2.1 + "turret turn" 1.5 "velocity" 10 "lifetime" 81 "reload" 30 @@ -132,7 +132,7 @@ outfit "Banisher Grav-Turret" sound "banisher" "hit effect" "banisher impact" "inaccuracy" .4 - "turret turn" 4.2 + "turret turn" 1.8 "velocity" 590 "lifetime" 1 "reload" 1 @@ -255,7 +255,7 @@ outfit "Blaze-Pike Turret" sound "blaze-pike" "hit effect" "blaze-pike hit" "inaccuracy" 0.45 - "turret turn" 2.1 + "turret turn" 0.8 "velocity" 450 "lifetime" 1 "reload" 1 @@ -293,7 +293,7 @@ outfit "Korath Inferno" sound "korath inferno" "hit effect" "korath inferno hit" "inaccuracy" 0.5 - "turret turn" 1.3 + "turret turn" 1. "velocity" 550 "lifetime" 1 "reload" 1 @@ -372,7 +372,7 @@ outfit "Thermal Repeater Turret" sound "repeater" "hit effect" "repeater impact" "inaccuracy" 3 - "turret turn" 2.6 + "turret turn" 1.5 "velocity" 13 "lifetime" 40 "reload" 5 @@ -718,7 +718,7 @@ outfit "Husk-Slice Turret" sound "slicer" "hit effect" "slicer impact" "inaccuracy" 0 - "turret turn" 2.9 + "turret turn" 1. "velocity" 520 "lifetime" 1 "reload" 1.62 @@ -758,7 +758,7 @@ outfit "Digger Mining Turret" sound "korath digger" "hit effect" "korath digger hit" "inaccuracy" 1.5 - "turret turn" 4.6 + "turret turn" 2.4 "velocity" 480 "lifetime" 1 "reload" 1 @@ -826,7 +826,7 @@ outfit "Langrage Hyper-Heaver" icon "icon/korath heaver" "hit effect" "heaver hyperspace hit" "inaccuracy" 0.5 - "turret turn" 2.2 + "turret turn" 1.3 velocity 30 lifetime 8 "reload" 40 @@ -1083,7 +1083,7 @@ outfit "Firestorm Battery" "hardpoint sprite" "hardpoint/firestorm battery" sound "firestorm" ammo "Firestorm Torpedo" - "turret turn" 2.7 + "turret turn" 1.5 icon "icon/firestorm torpedo" "hit effect" "firestorm ring" 40 "die effect" "small explosion" diff --git a/data/pug/pug outfits.txt b/data/pug/pug outfits.txt index 8a571e363454..192379768912 100644 --- a/data/pug/pug outfits.txt +++ b/data/pug/pug outfits.txt @@ -54,7 +54,7 @@ outfit "Pug Zapper Turret" sound "zapper" "hit effect" "zapper impact" "inaccuracy" .3 - "turret turn" 2.5 + "turret turn" 1. "velocity" 320 "lifetime" 1 "reload" 1 diff --git a/data/remnant/remnant outfits.txt b/data/remnant/remnant outfits.txt index c9a21be151e7..43e11259bf31 100644 --- a/data/remnant/remnant outfits.txt +++ b/data/remnant/remnant outfits.txt @@ -76,7 +76,7 @@ outfit "Inhibitor Turret" sound "inhibitor" "hit effect" "inhibitor impact" 3 "inaccuracy" .5 - "turret turn" 3.5 + "turret turn" 2. "velocity" 36 "random velocity" .5 "lifetime" 24 @@ -152,7 +152,7 @@ outfit "Thrasher Turret" sound "thrasher" "hit effect" "thrasher impact" "inaccuracy" 6 - "turret turn" 2.4 + "turret turn" 1.2 "velocity" 10 "lifetime" 36 "reload" 5 diff --git a/data/sheragi/sheragi outfits.txt b/data/sheragi/sheragi outfits.txt index 7b1297c6656c..45d5c07b4d21 100644 --- a/data/sheragi/sheragi outfits.txt +++ b/data/sheragi/sheragi outfits.txt @@ -263,7 +263,7 @@ outfit "Particle Waveform Turret" "fire effect" "lightning flare" "hit effect" "pwave impact" "inaccuracy" 1.5 - "turret turn" 1.8 + "turret turn" 0.8 "velocity" 50 "lifetime" 18 "reload" 60 diff --git a/data/wanderer/wanderer outfits.txt b/data/wanderer/wanderer outfits.txt index a47729245925..bb93f5e6a5cc 100644 --- a/data/wanderer/wanderer outfits.txt +++ b/data/wanderer/wanderer outfits.txt @@ -66,7 +66,7 @@ outfit "Sunbeam Turret" sound "sunbeam" "hit effect" "sunbeam impact" "inaccuracy" .2 - "turret turn" 1.3 + "turret turn" 1.1 "velocity" 540 "lifetime" 1 "reload" 1 @@ -96,7 +96,7 @@ outfit "Dual Sunbeam Turret" sound "sunbeam" "hit effect" "sunbeam impact" 2 "inaccuracy" .2 - "turret turn" 1.0 + "turret turn" 0.7 "velocity" 540 "lifetime" 1 "reload" 1 @@ -171,7 +171,7 @@ outfit "Moonbeam Turret" "fire effect" "moonbeam fleck" "hit effect" "moonbeam impact" "inaccuracy" 2.0 - "turret turn" 3.6 + "turret turn" 1.3 "velocity" 490 "lifetime" 1 # A full cycle is 36 frames. Beam is active 83% of the time. From 4ab625f980f21ab22411630be880747e88f98d41 Mon Sep 17 00:00:00 2001 From: Hecter94 Date: Sat, 4 May 2024 15:44:13 -0400 Subject: [PATCH 2/4] Remove trailing decimals --- data/bunrodea/bunrodea weapons.txt | 2 +- data/gegno/gegno outfits.txt | 2 +- data/human/weapons.txt | 10 +++++----- data/korath/korath weapons.txt | 6 +++--- data/pug/pug outfits.txt | 2 +- data/quarg/quarg outfits.txt | 2 +- data/remnant/remnant outfits.txt | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/bunrodea/bunrodea weapons.txt b/data/bunrodea/bunrodea weapons.txt index 5effbc573e33..4d750905e725 100644 --- a/data/bunrodea/bunrodea weapons.txt +++ b/data/bunrodea/bunrodea weapons.txt @@ -50,7 +50,7 @@ outfit "Locust Turret" sound "locust blaster" "hit effect" "bullet impact" "inaccuracy" 5 - "turret turn" 2. + "turret turn" 2 "velocity" 10 "random velocity" 2 "lifetime" 40 diff --git a/data/gegno/gegno outfits.txt b/data/gegno/gegno outfits.txt index 6caa771d0d44..ec19d810e33f 100644 --- a/data/gegno/gegno outfits.txt +++ b/data/gegno/gegno outfits.txt @@ -436,7 +436,7 @@ outfit "Irate Cannon Turret" "live effect" "irate smoke" 12 "hit effect" "tiny explosion" "inaccuracy" 2 - "turret turn" 2. + "turret turn" 2 "velocity" 22 "lifetime" 15 "reload" 10 diff --git a/data/human/weapons.txt b/data/human/weapons.txt index c3ea421ad0d9..ffab76470782 100644 --- a/data/human/weapons.txt +++ b/data/human/weapons.txt @@ -84,7 +84,7 @@ outfit "Blaster Turret" sound "blaster" "hit effect" "blaster impact" "inaccuracy" 3 - "turret turn" 2. + "turret turn" 2 "velocity" 10.625 "lifetime" 48 "reload" 6 @@ -202,7 +202,7 @@ outfit "Modified Blaster Turret" sound "mod blaster" "hit effect" "blaster impact" "inaccuracy" 4 - "turret turn" 2. + "turret turn" 2 "velocity" 10 "lifetime" 48 "reload" 6 @@ -683,7 +683,7 @@ outfit "Plasma Turret" sound "plasma" "hit effect" "plasma explosion" "inaccuracy" 2 - "turret turn" 1. + "turret turn" 1 "velocity" 12 "lifetime" 40 "reload" 9 @@ -1100,7 +1100,7 @@ outfit "Javelin Turret" icon "icon/javelin turret" "hit effect" "tiny explosion" "inaccuracy" 4 - "turret turn" 2. + "turret turn" 2 "velocity" 10 "lifetime" 60 "reload" 7.5 @@ -1561,7 +1561,7 @@ outfit "Gatling Turret" ammo "Gatling Gun Ammo" 2 icon "icon/gat turret" "inaccuracy" 2 - "turret turn" 2. + "turret turn" 2 "velocity" 16 "lifetime" 1 "reload" 3 diff --git a/data/korath/korath weapons.txt b/data/korath/korath weapons.txt index 49cf271ad5b9..54ada40ed214 100644 --- a/data/korath/korath weapons.txt +++ b/data/korath/korath weapons.txt @@ -32,7 +32,7 @@ outfit "Grab-Strike Turret" "hit effect" "grab-strike impact" "die effect" "grab-strike impact" "inaccuracy" 1 - "turret turn" 1. + "turret turn" 1 "velocity" 10 "lifetime" 100 "reload" 20 @@ -293,7 +293,7 @@ outfit "Korath Inferno" sound "korath inferno" "hit effect" "korath inferno hit" "inaccuracy" 0.5 - "turret turn" 1. + "turret turn" 1 "velocity" 550 "lifetime" 1 "reload" 1 @@ -718,7 +718,7 @@ outfit "Husk-Slice Turret" sound "slicer" "hit effect" "slicer impact" "inaccuracy" 0 - "turret turn" 1. + "turret turn" 1 "velocity" 520 "lifetime" 1 "reload" 1.62 diff --git a/data/pug/pug outfits.txt b/data/pug/pug outfits.txt index 192379768912..1eac6990b251 100644 --- a/data/pug/pug outfits.txt +++ b/data/pug/pug outfits.txt @@ -54,7 +54,7 @@ outfit "Pug Zapper Turret" sound "zapper" "hit effect" "zapper impact" "inaccuracy" .3 - "turret turn" 1. + "turret turn" 1 "velocity" 320 "lifetime" 1 "reload" 1 diff --git a/data/quarg/quarg outfits.txt b/data/quarg/quarg outfits.txt index 26571d8d84ba..f757814417bb 100644 --- a/data/quarg/quarg outfits.txt +++ b/data/quarg/quarg outfits.txt @@ -50,7 +50,7 @@ outfit "Quarg Skylance" sound "skylance" "hit effect" "skylance impact" "inaccuracy" .4 - "turret turn" 4. + "turret turn" 4 "velocity" 500 "lifetime" 1 "reload" 1 diff --git a/data/remnant/remnant outfits.txt b/data/remnant/remnant outfits.txt index 43e11259bf31..89a654e2d1d8 100644 --- a/data/remnant/remnant outfits.txt +++ b/data/remnant/remnant outfits.txt @@ -76,7 +76,7 @@ outfit "Inhibitor Turret" sound "inhibitor" "hit effect" "inhibitor impact" 3 "inaccuracy" .5 - "turret turn" 2. + "turret turn" 2 "velocity" 36 "random velocity" .5 "lifetime" 24 From 252f118358dcdb4d940dd6499e02a21400542bba Mon Sep 17 00:00:00 2001 From: Hecter94 Date: Sat, 4 May 2024 16:39:15 -0400 Subject: [PATCH 3/4] Swap shield disuptor and husk-slice turning --- data/korath/korath weapons.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/korath/korath weapons.txt b/data/korath/korath weapons.txt index 54ada40ed214..44581bc7e1b7 100644 --- a/data/korath/korath weapons.txt +++ b/data/korath/korath weapons.txt @@ -654,7 +654,7 @@ outfit "Shield Disruptor Turret" sound "disruptor" "hit effect" "disruptor impact" "inaccuracy" 1 - "turret turn" 1.5 + "turret turn" 1 "velocity" 480 "lifetime" 1 "reload" 1 @@ -718,7 +718,7 @@ outfit "Husk-Slice Turret" sound "slicer" "hit effect" "slicer impact" "inaccuracy" 0 - "turret turn" 1 + "turret turn" 1.5 "velocity" 520 "lifetime" 1 "reload" 1.62 From b25288752c138bfb2d074dd6e8ddc07ef2af206a Mon Sep 17 00:00:00 2001 From: Hecter94 Date: Sat, 4 May 2024 20:34:43 -0400 Subject: [PATCH 4/4] Drop Korath inferno turn rate below blaze-pike. --- data/korath/korath weapons.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/korath/korath weapons.txt b/data/korath/korath weapons.txt index 44581bc7e1b7..4b72dfb153b5 100644 --- a/data/korath/korath weapons.txt +++ b/data/korath/korath weapons.txt @@ -293,7 +293,7 @@ outfit "Korath Inferno" sound "korath inferno" "hit effect" "korath inferno hit" "inaccuracy" 0.5 - "turret turn" 1 + "turret turn" 0.6 "velocity" 550 "lifetime" 1 "reload" 1