From f0c1ca778d097e4ed8cb7225a2a2fc507640dded Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:36:38 -1000
Subject: [PATCH 01/12] blaster rework

---
 data/human/weapons.txt | 220 ++++++++++++++++++++++++-----------------
 1 file changed, 130 insertions(+), 90 deletions(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index 4d7a54212af6..41785f63dbf5 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -24,49 +24,51 @@ outfit "Energy Blaster"
 		sound "blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 3
-		"velocity" 10.625
-		"lifetime" 48
-		"reload" 12
-		"firing energy" 5.8
-		"firing heat" 18
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"velocity" 21.25
+		"lifetime" 24
+		"reload" 24
+		"firing energy" 11.6
+		"firing heat" 36
+		"shield damage" 23.6
+		"hull damage" 10.8
+		"hit force" 2
 	description "Although not the most accurate or damaging of weapons, the Energy Blaster is popular because it is small enough to be installed on even the tiniest of ships. One blaster is not enough to do appreciable damage to anything larger than a fighter, but a ship equipped with several of them becomes a force to be reckoned with."
 
 outfit "Twin Blaster"
 	category "Guns"
 	cost 40000
 	thumbnail "outfit/twin blaster"
-	"mass" 12
-	"outfit space" -12
-	"weapon capacity" -12
+	"mass" 11
+	"outfit space" -11
+	"weapon capacity" -11
 	"gun ports" -1
 	weapon
 		sound "blaster"
 		"submunition" "Blaster Submunition"
-			"offset" 1 0
+			"offset" 0.5 0
 			"facing" 0.3
 		"submunition" "Blaster Submunition"
-			"offset" -1 0
+			"offset" -0.5 0
 			"facing" -0.3
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
-		"lifetime" 1
-		"velocity override" 10.625
+		"lifetime" 0
+		"velocity override" 21.25
 		"range override" 510
-		"reload" 12
-		"firing energy" 11.6
-		"firing heat" 36
+		"reload" 24
+		"firing energy" 23.2
+		"firing heat" 72
 	description "The Energy Blaster's ubiquity, low price, and stable performance have made it irresistible to tinkerers from the day it was first introduced. These blasters have been bolted together to fit within a single gun port, offering twice the damage of a single blaster at the cost of twice the heat and power consumption, along with some additional mass."
 
 outfit "Blaster Submunition"
 	weapon
 		sprite "projectile/blaster"
 		"hit effect" "blaster impact"
-		"velocity" 10.625
-		"lifetime" 48
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"velocity" 21.25
+		"lifetime" 24
+		"shield damage" 23.6
+		"hull damage" 10.8
+		"hit force" 2
 
 outfit "Blaster Turret"
 	category "Turrets"
@@ -82,16 +84,21 @@ outfit "Blaster Turret"
 		"hardpoint sprite" "hardpoint/blaster turret"
 		"hardpoint offset" 9.
 		sound "blaster"
-		"hit effect" "blaster impact"
+		"submunition" "Blaster Submunition"
+			"offset" 0.5 0
+			"facing" 0.3
+		"submunition" "Blaster Submunition"
+			"offset" -0.5 0
+			"facing" -0.3
+		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
-		"turret turn" 2
-		"velocity" 10.625
-		"lifetime" 48
-		"reload" 6
-		"firing energy" 5.8
-		"firing heat" 18
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"lifetime" 0
+		"velocity override" 21.25
+		"range override" 510
+		"reload" 24
+		"firing energy" 23.2
+		"firing heat" 72
+
 	description "A Blaster Turret is a pair of Energy Blasters mounted on a rotating platform, allowing it to fire in any direction. Sophisticated software algorithms allow the turret to correct for a target's motion, making the Blaster Turret effective even against small, quickly moving fighters. Because it needs a special mounting point with a 360 degree field of view, not all ships are capable of being equipped with a turret."
 
 outfit "Quad Blaster Turret"
@@ -110,14 +117,27 @@ outfit "Quad Blaster Turret"
 		sound "blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 3
-		"turret turn" 1.5
-		"velocity" 10.625
-		"lifetime" 48
-		"reload" 3
-		"firing energy" 5.8
-		"firing heat" 18
-		"shield damage" 10.6
-		"hull damage" 6.6
+		"submunition" "Blaster Submunition"
+			"offset" 2 0
+			"facing" 0.3
+		"submunition" "Blaster Submunition"
+			"offset" 1 0
+			"facing" -0.3
+		"submunition" "Blaster Submunition"
+			"offset" -1 0
+			"facing" 0.3
+		"submunition" "Blaster Submunition"
+			"offset" -2 0
+			"facing" -0.3
+		"hit effect" "blaster impact" 2
+		"inaccuracy" 3
+		"lifetime" 0
+		"velocity override" 21.25
+		"range override" 510
+		"reload" 24
+		"firing energy" 46.4
+		"firing heat" 144
+
 	description "A Quad Blaster Turret carries four guns on a single turret mount, doubling the firepower of an ordinary Blaster Turret for ships with enough space to install one and energy to drive it."
 
 effect "blaster impact"
@@ -142,49 +162,51 @@ outfit "Modified Blaster"
 		sound "mod blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 4
-		"velocity" 10
-		"lifetime" 48
-		"reload" 12
-		"firing energy" 6.5
-		"firing heat" 25.2
-		"shield damage" 13.2
-		"hull damage" 8.8
+		"velocity" 21.82
+		"lifetime" 22
+		"reload" 24
+		"firing energy" 13
+		"firing heat" 50.4
+		"shield damage" 33.2
+		"hull damage" 10.8
+		"hit force" 3
 	description "This is an Energy Blaster that has been tampered with to increase its power slightly, at the cost of reduced range and higher energy consumption. Modified Blasters also produce an extreme amount of heat when firing, increasing the risk that your ship will overheat."
 
 outfit "Twin Modified Blaster"
 	category "Guns"
 	cost 84000
 	thumbnail "outfit/twin mod blaster"
-	"mass" 14
-	"outfit space" -14
-	"weapon capacity" -14
+	"mass" 13
+	"outfit space" -13
+	"weapon capacity" -13
 	"gun ports" -1
 	weapon
 		sound "mod blaster"
 		"submunition" "Modified Blaster Submunition"
-			"offset" 1 0
+			"offset" 0.5 0
 			"facing" 0.45
 		"submunition" "Modified Blaster Submunition"
-			"offset" -1 0
+			"offset" -0.5 0
 			"facing" -0.45
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
 		"lifetime" 0
-		"velocity override" 10
+		"velocity override" 21.82
 		"range override" 480
-		"reload" 12
-		"firing energy" 13
-		"firing heat" 50.4
+		"reload" 24
+		"firing energy" 26
+		"firing heat" 100.8
 	description "An enterprising engineer, presumably having decided that the Modified Blaster's already-frightening lack of safety control was insufficient, has taken two of the weapons and shoved them together in the same gun port, crudely welded together with fervid enthusiasm. Whether or not this weapon will destroy the target before it melts its own components is anyone's guess; perhaps the intent was that the twin barrels would intimidate enemies into submission before the weapon would have to be fired."
 
 outfit "Modified Blaster Submunition"
 	weapon
 		sprite "projectile/mod blaster"
 		"hit effect" "blaster impact"
-		"velocity" 10
-		"lifetime" 48
-		"shield damage" 13.2
-		"hull damage" 8.8
+		"velocity" 21.82
+		"lifetime" 22
+		"shield damage" 33.2
+		"hull damage" 10.8
+		"hit force" 3
 
 outfit "Modified Blaster Turret"
 	category "Turrets"
@@ -200,16 +222,20 @@ outfit "Modified Blaster Turret"
 		"hardpoint sprite" "hardpoint/mod blaster turret"
 		"hardpoint offset" 9.
 		sound "mod blaster"
-		"hit effect" "blaster impact"
+		"submunition" "Modified Blaster Submunition"
+			"offset" 1.5 0
+			"facing" 0.45
+		"submunition" "Modified Blaster Submunition"
+			"offset" -1.5 0
+			"facing" -0.45
+		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
-		"turret turn" 2
-		"velocity" 10
-		"lifetime" 48
-		"reload" 6
-		"firing energy" 6.5
-		"firing heat" 25.2
-		"shield damage" 13.2
-		"hull damage" 8.8
+		"lifetime" 0
+		"velocity override" 21.82
+		"range override" 480
+		"reload" 24
+		"firing energy" 26
+		"firing heat" 100.8
 	description "This is a turreted version of the Modified Blaster, which is an Energy Blaster modified for greater power at the cost of higher energy consumption and heat. These turrets are popular with pirates and others who are trying to cram as much firepower into their ships as possible."
 
 
@@ -337,9 +363,9 @@ outfit "Mining Laser"
 	category "Guns"
 	cost 38000
 	thumbnail "outfit/mining laser"
-	"mass" 12
-	"outfit space" -12
-	"weapon capacity" -12
+	"mass" 7
+	"outfit space" -7
+	"weapon capacity" -7
 	"gun ports" -1
 	weapon
 		sprite "projectile/mining laser"
@@ -364,9 +390,9 @@ outfit "Mining Laser Turret"
 	category "Turrets"
 	cost 66000
 	thumbnail "outfit/mining laser turret"
-	"mass" 18
-	"outfit space" -18
-	"weapon capacity" -18
+	"mass" 13
+	"outfit space" -13
+	"weapon capacity" -13
 	"turret mounts" -1
 	"required crew" 1
 	weapon
@@ -549,8 +575,8 @@ outfit "Particle Cannon"
 		sound "particle"
 		"hit effect" "particle impact"
 		"inaccuracy" .5
-		"velocity" 30
-		"lifetime" 25
+		"velocity" 62.5
+		"lifetime" 12
 		"reload" 20
 		"firing energy" 35
 		"firing force" 15
@@ -585,8 +611,8 @@ outfit "Proton Gun"
 		"hit effect" "proton impact" 3
 		"inaccuracy" 4
 		"submunition" "Proton Fragment" 3
-		"velocity" 24
-		"lifetime" 2
+		"velocity" 48
+		"lifetime" 1
 		"reload" 8
 		"firing energy" 15
 		"firing force" 3
@@ -600,7 +626,7 @@ outfit "Proton Fragment"
 			"frame rate" 2
 		"hit effect" "proton impact"
 		"inaccuracy" 2
-		"lifetime" 24
+		"lifetime" 12
 		"hit force" 9
 		"shield damage" 10.1
 		"hull damage" 8.4
@@ -632,8 +658,8 @@ outfit "Proton Turret"
 		"inaccuracy" 4
 		"turret turn" 1.4
 		"submunition" "Proton Fragment" 3
-		"velocity" 24
-		"lifetime" 2
+		"velocity" 48
+		"lifetime" 1
 		"reload" 8
 		"firing energy" 15
 		"firing force" 3
@@ -655,8 +681,8 @@ outfit "Plasma Cannon"
 		sound "plasma"
 		"hit effect" "plasma explosion"
 		"inaccuracy" 2
-		"velocity" 12
-		"lifetime" 40
+		"velocity" 24
+		"lifetime" 20
 		"reload" 18
 		"firing energy" 30
 		"firing heat" 180
@@ -684,16 +710,30 @@ outfit "Plasma Turret"
 		"hit effect" "plasma explosion"
 		"inaccuracy" 2
 		"turret turn" 1
-		"velocity" 12
-		"lifetime" 40
-		"reload" 9
-		"firing energy" 30
-		"firing heat" 180
+		"submunition" "Plasma Submunition"
+			"offset" 1.5 0
+			"facing" 0.3
+		"submunition" "Plasma Submunition"
+			"offset" -1.5 0
+			"facing" -0.3
+		"velocity override" 24
+		"range override" 480
+		"lifetime" 0
+		"reload" 18
+		"firing energy" 60
+		"firing heat" 360
+	description "The Plasma Turret is a pair of Plasma Cannons mounted on a turret so that they can fire in any direction. It is a fearsome weapon, but only the largest of ships have the space and the energy that it requires."
+
+outfit "Plasma Submunition"
+	weapon
+		sprite "projectile/mod blaster"
+		"hit effect" "blaster impact"
+		"velocity" 24
+		"lifetime" 20
 		"hit force" 45
 		"shield damage" 63
 		"hull damage" 25
 		"heat damage" 340
-	description "The Plasma Turret is a pair of Plasma Cannons mounted on a turret so that they can fire in any direction. It is a fearsome weapon, but only the largest of ships have the space and the energy that it requires."
 
 outfit "Plasma Repeater"
 	category "Guns"
@@ -708,8 +748,8 @@ outfit "Plasma Repeater"
 			"frame rate" 3
 		sound "plasma"
 		"hit effect" "plasma explosion"
-		"lifetime" 38
-		"velocity" 12
+		"lifetime" 13
+		"velocity" 34.3
 		"inaccuracy" 5
 		"reload" 7
 		"firing energy" 13

From c90f9f1f65467b96546c7cbcc06c87c511aa3642 Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:56:35 -1000
Subject: [PATCH 02/12] cleanup

---
 data/human/weapons.txt | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index 41785f63dbf5..5f3e081c6be0 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -92,6 +92,7 @@ outfit "Blaster Turret"
 			"facing" -0.3
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
+		"turret turn" 2
 		"lifetime" 0
 		"velocity override" 21.25
 		"range override" 510
@@ -129,8 +130,9 @@ outfit "Quad Blaster Turret"
 		"submunition" "Blaster Submunition"
 			"offset" -2 0
 			"facing" -0.3
-		"hit effect" "blaster impact" 2
+		"hit effect" "blaster impact" 4
 		"inaccuracy" 3
+		"turret turn" 1.5
 		"lifetime" 0
 		"velocity override" 21.25
 		"range override" 510
@@ -230,6 +232,7 @@ outfit "Modified Blaster Turret"
 			"facing" -0.45
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
+		"turret turn" 2
 		"lifetime" 0
 		"velocity override" 21.82
 		"range override" 480
@@ -363,9 +366,9 @@ outfit "Mining Laser"
 	category "Guns"
 	cost 38000
 	thumbnail "outfit/mining laser"
-	"mass" 7
-	"outfit space" -7
-	"weapon capacity" -7
+	"mass" 12
+	"outfit space" -12
+	"weapon capacity" -12
 	"gun ports" -1
 	weapon
 		sprite "projectile/mining laser"
@@ -390,9 +393,9 @@ outfit "Mining Laser Turret"
 	category "Turrets"
 	cost 66000
 	thumbnail "outfit/mining laser turret"
-	"mass" 13
-	"outfit space" -13
-	"weapon capacity" -13
+	"mass" 18
+	"outfit space" -18
+	"weapon capacity" -18
 	"turret mounts" -1
 	"required crew" 1
 	weapon
@@ -707,7 +710,7 @@ outfit "Plasma Turret"
 		"hardpoint sprite" "hardpoint/plasma turret"
 		"hardpoint offset" 15.
 		sound "plasma"
-		"hit effect" "plasma explosion"
+		"hit effect" "plasma explosion" 2
 		"inaccuracy" 2
 		"turret turn" 1
 		"submunition" "Plasma Submunition"
@@ -727,7 +730,7 @@ outfit "Plasma Turret"
 outfit "Plasma Submunition"
 	weapon
 		sprite "projectile/mod blaster"
-		"hit effect" "blaster impact"
+		"hit effect" "plasma explosion"
 		"velocity" 24
 		"lifetime" 20
 		"hit force" 45
@@ -748,8 +751,8 @@ outfit "Plasma Repeater"
 			"frame rate" 3
 		sound "plasma"
 		"hit effect" "plasma explosion"
-		"lifetime" 13
-		"velocity" 34.3
+		"lifetime" 19
+		"velocity" 24
 		"inaccuracy" 5
 		"reload" 7
 		"firing energy" 13

From 614551177f6e45869271568ff69bd356a59d4e10 Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Sat, 23 Nov 2024 10:40:53 -1000
Subject: [PATCH 03/12] Slow protons and particles back down a bit

---
 data/human/weapons.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index 5f3e081c6be0..3f5ac1ea6908 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -578,8 +578,8 @@ outfit "Particle Cannon"
 		sound "particle"
 		"hit effect" "particle impact"
 		"inaccuracy" .5
-		"velocity" 62.5
-		"lifetime" 12
+		"velocity" 50
+		"lifetime" 15
 		"reload" 20
 		"firing energy" 35
 		"firing force" 15
@@ -614,7 +614,7 @@ outfit "Proton Gun"
 		"hit effect" "proton impact" 3
 		"inaccuracy" 4
 		"submunition" "Proton Fragment" 3
-		"velocity" 48
+		"velocity" 39
 		"lifetime" 1
 		"reload" 8
 		"firing energy" 15
@@ -629,7 +629,7 @@ outfit "Proton Fragment"
 			"frame rate" 2
 		"hit effect" "proton impact"
 		"inaccuracy" 2
-		"lifetime" 12
+		"lifetime" 15
 		"hit force" 9
 		"shield damage" 10.1
 		"hull damage" 8.4
@@ -661,7 +661,7 @@ outfit "Proton Turret"
 		"inaccuracy" 4
 		"turret turn" 1.4
 		"submunition" "Proton Fragment" 3
-		"velocity" 48
+		"velocity" 39
 		"lifetime" 1
 		"reload" 8
 		"firing energy" 15

From 95819104f55d1ac18de3a055aa6957903713e445 Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Wed, 27 Nov 2024 23:09:33 -1000
Subject: [PATCH 04/12] Adujust Hai to match

---
 data/hai/hai outfits.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/hai/hai outfits.txt b/data/hai/hai outfits.txt
index e66fe1f63568..d15bfc00bf1d 100644
--- a/data/hai/hai outfits.txt	
+++ b/data/hai/hai outfits.txt	
@@ -53,8 +53,8 @@ outfit "Pulse Cannon"
 		sound "pulse"
 		"hit effect" "pulse impact"
 		"inaccuracy" 1
-		"velocity" 15
-		"lifetime" 30
+		"velocity" 30
+		"lifetime" 15
 		"reload" 20
 		"firing energy" 24
 		"firing heat" 70
@@ -79,8 +79,8 @@ outfit "Pulse Turret"
 		"hit effect" "pulse impact"
 		"inaccuracy" 1
 		"turret turn" 1.5
-		"velocity" 15
-		"lifetime" 30
+		"velocity" 30
+		"lifetime" 15
 		"reload" 10
 		"firing energy" 24
 		"firing heat" 70
@@ -101,8 +101,8 @@ outfit "Tripulse Shredder"
 		sound "pulse"
 		"hit effect" "pulse impact"
 		"inaccuracy" 5
-		"velocity" 15
-		"lifetime" 30
+		"velocity" 30
+		"lifetime" 15
 		"reload" 6
 		"burst count" 36
 		"burst reload" 4
@@ -273,7 +273,7 @@ outfit "Railgun"
 		"fire effect" "rail sparks"
 		"hit effect" "bullet impact"
 		"inaccuracy" 3
-		"velocity" 44
+		"velocity" 55
 		"lifetime" 1
 		"range override" 2100
 		"reload" 12
@@ -290,8 +290,8 @@ outfit "rslug"
 		sprite "projectile/rail slug"
 			"frame rate" 30
 		"hit effect" "bullet impact"
-		"lifetime" 49
-		"acceleration" 2.2
+		"lifetime" 42
+		"acceleration" 2.8
 		"drag" .05
 		"turn" .6
 		"homing" 1

From 9d8661541ab66a0675798bb0aebc1a9cd95f2624 Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Wed, 27 Nov 2024 23:14:59 -1000
Subject: [PATCH 05/12] Update gatlings

---
 data/human/weapons.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index 3f5ac1ea6908..255da9f239f6 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -1568,7 +1568,7 @@ outfit "Gatling Gun"
 		ammo "Gatling Gun Ammo"
 		icon "icon/gat"
 		"inaccuracy" 2
-		"velocity" 16
+		"velocity" 32
 		"lifetime" 1
 		"reload" 3
 		"burst count" 180
@@ -1605,7 +1605,7 @@ outfit "Gatling Turret"
 		icon "icon/gat turret"
 		"inaccuracy" 2
 		"turret turn" 2
-		"velocity" 16
+		"velocity" 32
 		"lifetime" 1
 		"reload" 3
 		"burst count" 180
@@ -1623,7 +1623,7 @@ outfit "gbullet"
 			"random start frame"
 			"frame rate" 0
 		"random velocity" 8
-		"lifetime" 20
+		"lifetime" 10
 		"random lifetime" 5
 		"shield damage" 3
 		"hull damage" 6

From 00e81a59c659d8014d7aaaad20459cfdc6a8ff0a Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Wed, 25 Dec 2024 04:38:43 -1000
Subject: [PATCH 06/12] remove facing inaccuracy

---
 data/human/weapons.txt | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index 255da9f239f6..b9539c208dbb 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -46,10 +46,8 @@ outfit "Twin Blaster"
 		sound "blaster"
 		"submunition" "Blaster Submunition"
 			"offset" 0.5 0
-			"facing" 0.3
 		"submunition" "Blaster Submunition"
 			"offset" -0.5 0
-			"facing" -0.3
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
 		"lifetime" 0
@@ -86,10 +84,8 @@ outfit "Blaster Turret"
 		sound "blaster"
 		"submunition" "Blaster Submunition"
 			"offset" 0.5 0
-			"facing" 0.3
 		"submunition" "Blaster Submunition"
 			"offset" -0.5 0
-			"facing" -0.3
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
 		"turret turn" 2
@@ -120,16 +116,12 @@ outfit "Quad Blaster Turret"
 		"inaccuracy" 3
 		"submunition" "Blaster Submunition"
 			"offset" 2 0
-			"facing" 0.3
 		"submunition" "Blaster Submunition"
 			"offset" 1 0
-			"facing" -0.3
 		"submunition" "Blaster Submunition"
 			"offset" -1 0
-			"facing" 0.3
 		"submunition" "Blaster Submunition"
 			"offset" -2 0
-			"facing" -0.3
 		"hit effect" "blaster impact" 4
 		"inaccuracy" 3
 		"turret turn" 1.5
@@ -186,10 +178,8 @@ outfit "Twin Modified Blaster"
 		sound "mod blaster"
 		"submunition" "Modified Blaster Submunition"
 			"offset" 0.5 0
-			"facing" 0.45
 		"submunition" "Modified Blaster Submunition"
 			"offset" -0.5 0
-			"facing" -0.45
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
 		"lifetime" 0
@@ -226,10 +216,8 @@ outfit "Modified Blaster Turret"
 		sound "mod blaster"
 		"submunition" "Modified Blaster Submunition"
 			"offset" 1.5 0
-			"facing" 0.45
 		"submunition" "Modified Blaster Submunition"
 			"offset" -1.5 0
-			"facing" -0.45
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
 		"turret turn" 2
@@ -715,10 +703,8 @@ outfit "Plasma Turret"
 		"turret turn" 1
 		"submunition" "Plasma Submunition"
 			"offset" 1.5 0
-			"facing" 0.3
 		"submunition" "Plasma Submunition"
 			"offset" -1.5 0
-			"facing" -0.3
 		"velocity override" 24
 		"range override" 480
 		"lifetime" 0

From bc29dbf2d242dd3140f59fc77dde5c94d08b946b Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Wed, 25 Dec 2024 04:40:20 -1000
Subject: [PATCH 07/12] fix plasma turret

---
 data/human/weapons.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index b9539c208dbb..de4ce784c86b 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -715,7 +715,7 @@ outfit "Plasma Turret"
 
 outfit "Plasma Submunition"
 	weapon
-		sprite "projectile/mod blaster"
+		sprite "projectile/plasma"
 		"hit effect" "plasma explosion"
 		"velocity" 24
 		"lifetime" 20

From e9646e34316a03b8b72f49f825f638ec45321f87 Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Fri, 10 Jan 2025 23:45:39 -1000
Subject: [PATCH 08/12] update hai outfits.txt

---
 data/hai/hai outfits.txt | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/hai/hai outfits.txt b/data/hai/hai outfits.txt
index d15bfc00bf1d..6a3e0aadd036 100644
--- a/data/hai/hai outfits.txt	
+++ b/data/hai/hai outfits.txt	
@@ -53,8 +53,8 @@ outfit "Pulse Cannon"
 		sound "pulse"
 		"hit effect" "pulse impact"
 		"inaccuracy" 1
-		"velocity" 30
-		"lifetime" 15
+		"velocity" 19
+		"lifetime" 24
 		"reload" 20
 		"firing energy" 24
 		"firing heat" 70
@@ -79,8 +79,8 @@ outfit "Pulse Turret"
 		"hit effect" "pulse impact"
 		"inaccuracy" 1
 		"turret turn" 1.5
-		"velocity" 30
-		"lifetime" 15
+		"velocity" 19
+		"lifetime" 24
 		"reload" 10
 		"firing energy" 24
 		"firing heat" 70
@@ -101,8 +101,8 @@ outfit "Tripulse Shredder"
 		sound "pulse"
 		"hit effect" "pulse impact"
 		"inaccuracy" 5
-		"velocity" 30
-		"lifetime" 15
+		"velocity" 19
+		"lifetime" 24
 		"reload" 6
 		"burst count" 36
 		"burst reload" 4
@@ -138,8 +138,8 @@ outfit "Ion Cannon"
 		sound "ion"
 		"hit effect" "ion impact" 2
 		"inaccuracy" 1
-		"velocity" 16
-		"lifetime" 50
+		"velocity" 19
+		"lifetime" 42
 		"reload" 60
 		"firing energy" 120
 		"firing force" 15
@@ -177,8 +177,8 @@ outfit "Ionic Blaster Prototype"
 		sound "ionic blast"
 		"hit effect" "ion impact"
 		"inaccuracy" 4
-		"velocity" 18
-		"lifetime" 30
+		"velocity" 21
+		"lifetime" 26
 		"reload" 30
 		"firing energy" 72
 		"firing force" 18
@@ -209,8 +209,8 @@ outfit "Ionic Turret Prototype"
 		"hit effect" "ionic impact" 5
 		"inaccuracy" 2
 		"turret turn" 0.9
-		"velocity" 12
-		"lifetime" 70
+		"velocity" 16
+		"lifetime" 53
 		"reload" 70
 		"firing energy" 371
 		"firing force" 12
@@ -273,7 +273,7 @@ outfit "Railgun"
 		"fire effect" "rail sparks"
 		"hit effect" "bullet impact"
 		"inaccuracy" 3
-		"velocity" 55
+		"velocity" 44
 		"lifetime" 1
 		"range override" 2100
 		"reload" 12
@@ -290,7 +290,7 @@ outfit "rslug"
 		sprite "projectile/rail slug"
 			"frame rate" 30
 		"hit effect" "bullet impact"
-		"lifetime" 42
+		"lifetime" 49
 		"acceleration" 2.8
 		"drag" .05
 		"turn" .6

From 1effceefe36b99eda794f4fe97efaa4ee5d67312 Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Sat, 11 Jan 2025 00:03:43 -1000
Subject: [PATCH 09/12] Update weapons.txt

---
 data/human/weapons.txt | 88 +++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index de4ce784c86b..c063e33af674 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -24,14 +24,14 @@ outfit "Energy Blaster"
 		sound "blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 3
-		"velocity" 21.25
-		"lifetime" 24
+		"velocity" 16
+		"lifetime" 32
 		"reload" 24
 		"firing energy" 11.6
 		"firing heat" 36
-		"shield damage" 23.6
-		"hull damage" 10.8
-		"hit force" 2
+		"shield damage" 21.2
+		"hull damage" 13.2
+		"hit force" 1
 	description "Although not the most accurate or damaging of weapons, the Energy Blaster is popular because it is small enough to be installed on even the tiniest of ships. One blaster is not enough to do appreciable damage to anything larger than a fighter, but a ship equipped with several of them becomes a force to be reckoned with."
 
 outfit "Twin Blaster"
@@ -51,8 +51,8 @@ outfit "Twin Blaster"
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 3
 		"lifetime" 0
-		"velocity override" 21.25
-		"range override" 510
+		"velocity override" 16
+		"range override" 512
 		"reload" 24
 		"firing energy" 23.2
 		"firing heat" 72
@@ -62,11 +62,11 @@ outfit "Blaster Submunition"
 	weapon
 		sprite "projectile/blaster"
 		"hit effect" "blaster impact"
-		"velocity" 21.25
-		"lifetime" 24
-		"shield damage" 23.6
-		"hull damage" 10.8
-		"hit force" 2
+		"velocity" 16
+		"lifetime" 32
+		"shield damage" 21.2
+		"hull damage" 13.2
+		"hit force" 1
 
 outfit "Blaster Turret"
 	category "Turrets"
@@ -90,8 +90,8 @@ outfit "Blaster Turret"
 		"inaccuracy" 3
 		"turret turn" 2
 		"lifetime" 0
-		"velocity override" 21.25
-		"range override" 510
+		"velocity override" 16
+		"range override" 512
 		"reload" 24
 		"firing energy" 23.2
 		"firing heat" 72
@@ -126,8 +126,8 @@ outfit "Quad Blaster Turret"
 		"inaccuracy" 3
 		"turret turn" 1.5
 		"lifetime" 0
-		"velocity override" 21.25
-		"range override" 510
+		"velocity override" 16
+		"range override" 512
 		"reload" 24
 		"firing energy" 46.4
 		"firing heat" 144
@@ -156,14 +156,14 @@ outfit "Modified Blaster"
 		sound "mod blaster"
 		"hit effect" "blaster impact"
 		"inaccuracy" 4
-		"velocity" 21.82
-		"lifetime" 22
+		"velocity" 15
+		"lifetime" 32
 		"reload" 24
 		"firing energy" 13
 		"firing heat" 50.4
-		"shield damage" 33.2
-		"hull damage" 10.8
-		"hit force" 3
+		"shield damage" 30.8
+		"hull damage" 13.2
+		"hit force" 1
 	description "This is an Energy Blaster that has been tampered with to increase its power slightly, at the cost of reduced range and higher energy consumption. Modified Blasters also produce an extreme amount of heat when firing, increasing the risk that your ship will overheat."
 
 outfit "Twin Modified Blaster"
@@ -183,7 +183,7 @@ outfit "Twin Modified Blaster"
 		"hit effect" "blaster impact" 2
 		"inaccuracy" 4
 		"lifetime" 0
-		"velocity override" 21.82
+		"velocity override" 15
 		"range override" 480
 		"reload" 24
 		"firing energy" 26
@@ -194,11 +194,11 @@ outfit "Modified Blaster Submunition"
 	weapon
 		sprite "projectile/mod blaster"
 		"hit effect" "blaster impact"
-		"velocity" 21.82
-		"lifetime" 22
-		"shield damage" 33.2
-		"hull damage" 10.8
-		"hit force" 3
+		"velocity" 15
+		"lifetime" 32
+		"shield damage" 30.8
+		"hull damage" 13.2
+		"hit force" 1
 
 outfit "Modified Blaster Turret"
 	category "Turrets"
@@ -222,7 +222,7 @@ outfit "Modified Blaster Turret"
 		"inaccuracy" 4
 		"turret turn" 2
 		"lifetime" 0
-		"velocity override" 21.82
+		"velocity override" 15
 		"range override" 480
 		"reload" 24
 		"firing energy" 26
@@ -566,8 +566,8 @@ outfit "Particle Cannon"
 		sound "particle"
 		"hit effect" "particle impact"
 		"inaccuracy" .5
-		"velocity" 50
-		"lifetime" 15
+		"velocity" 30
+		"lifetime" 25
 		"reload" 20
 		"firing energy" 35
 		"firing force" 15
@@ -602,7 +602,7 @@ outfit "Proton Gun"
 		"hit effect" "proton impact" 3
 		"inaccuracy" 4
 		"submunition" "Proton Fragment" 3
-		"velocity" 39
+		"velocity" 24
 		"lifetime" 1
 		"reload" 8
 		"firing energy" 15
@@ -617,7 +617,7 @@ outfit "Proton Fragment"
 			"frame rate" 2
 		"hit effect" "proton impact"
 		"inaccuracy" 2
-		"lifetime" 15
+		"lifetime" 25
 		"hit force" 9
 		"shield damage" 10.1
 		"hull damage" 8.4
@@ -649,7 +649,7 @@ outfit "Proton Turret"
 		"inaccuracy" 4
 		"turret turn" 1.4
 		"submunition" "Proton Fragment" 3
-		"velocity" 39
+		"velocity" 24
 		"lifetime" 1
 		"reload" 8
 		"firing energy" 15
@@ -672,8 +672,8 @@ outfit "Plasma Cannon"
 		sound "plasma"
 		"hit effect" "plasma explosion"
 		"inaccuracy" 2
-		"velocity" 24
-		"lifetime" 20
+		"velocity" 17
+		"lifetime" 28
 		"reload" 18
 		"firing energy" 30
 		"firing heat" 180
@@ -705,8 +705,8 @@ outfit "Plasma Turret"
 			"offset" 1.5 0
 		"submunition" "Plasma Submunition"
 			"offset" -1.5 0
-		"velocity override" 24
-		"range override" 480
+		"velocity override" 17
+		"range override" 476
 		"lifetime" 0
 		"reload" 18
 		"firing energy" 60
@@ -717,8 +717,8 @@ outfit "Plasma Submunition"
 	weapon
 		sprite "projectile/plasma"
 		"hit effect" "plasma explosion"
-		"velocity" 24
-		"lifetime" 20
+		"velocity" 17
+		"lifetime" 28
 		"hit force" 45
 		"shield damage" 63
 		"hull damage" 25
@@ -737,8 +737,8 @@ outfit "Plasma Repeater"
 			"frame rate" 3
 		sound "plasma"
 		"hit effect" "plasma explosion"
-		"lifetime" 19
-		"velocity" 24
+		"lifetime" 27
+		"velocity" 17
 		"inaccuracy" 5
 		"reload" 7
 		"firing energy" 13
@@ -1554,7 +1554,7 @@ outfit "Gatling Gun"
 		ammo "Gatling Gun Ammo"
 		icon "icon/gat"
 		"inaccuracy" 2
-		"velocity" 32
+		"velocity" 20
 		"lifetime" 1
 		"reload" 3
 		"burst count" 180
@@ -1591,7 +1591,7 @@ outfit "Gatling Turret"
 		icon "icon/gat turret"
 		"inaccuracy" 2
 		"turret turn" 2
-		"velocity" 32
+		"velocity" 20
 		"lifetime" 1
 		"reload" 3
 		"burst count" 180
@@ -1609,7 +1609,7 @@ outfit "gbullet"
 			"random start frame"
 			"frame rate" 0
 		"random velocity" 8
-		"lifetime" 10
+		"lifetime" 11
 		"random lifetime" 5
 		"shield damage" 3
 		"hull damage" 6

From 26cdea4514893bdf026576f75cd815ae6f29b43b Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Sat, 11 Jan 2025 00:11:02 -1000
Subject: [PATCH 10/12] fix weapons.txt

---
 data/human/weapons.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/human/weapons.txt b/data/human/weapons.txt
index c063e33af674..0ad9eb50c854 100644
--- a/data/human/weapons.txt
+++ b/data/human/weapons.txt
@@ -603,7 +603,7 @@ outfit "Proton Gun"
 		"inaccuracy" 4
 		"submunition" "Proton Fragment" 3
 		"velocity" 24
-		"lifetime" 1
+		"lifetime" 2
 		"reload" 8
 		"firing energy" 15
 		"firing force" 3
@@ -617,7 +617,7 @@ outfit "Proton Fragment"
 			"frame rate" 2
 		"hit effect" "proton impact"
 		"inaccuracy" 2
-		"lifetime" 25
+		"lifetime" 24
 		"hit force" 9
 		"shield damage" 10.1
 		"hull damage" 8.4
@@ -650,7 +650,7 @@ outfit "Proton Turret"
 		"turret turn" 1.4
 		"submunition" "Proton Fragment" 3
 		"velocity" 24
-		"lifetime" 1
+		"lifetime" 2
 		"reload" 8
 		"firing energy" 15
 		"firing force" 3
@@ -1609,7 +1609,7 @@ outfit "gbullet"
 			"random start frame"
 			"frame rate" 0
 		"random velocity" 8
-		"lifetime" 11
+		"lifetime" 20
 		"random lifetime" 5
 		"shield damage" 3
 		"hull damage" 6

From 17898de97557d690c33974996a327aadbb721b26 Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Sat, 11 Jan 2025 00:12:37 -1000
Subject: [PATCH 11/12] fix hai outfits.txt

---
 data/hai/hai outfits.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/hai/hai outfits.txt b/data/hai/hai outfits.txt
index 6a3e0aadd036..ba60b1a904a4 100644
--- a/data/hai/hai outfits.txt	
+++ b/data/hai/hai outfits.txt	
@@ -291,7 +291,7 @@ outfit "rslug"
 			"frame rate" 30
 		"hit effect" "bullet impact"
 		"lifetime" 49
-		"acceleration" 2.8
+		"acceleration" 2.2
 		"drag" .05
 		"turn" .6
 		"homing" 1

From 9f0de786d9f6e3f490abf12846682a20b6f9e60e Mon Sep 17 00:00:00 2001
From: Lia <31712538+ravenshining@users.noreply.github.com>
Date: Sat, 11 Jan 2025 02:48:08 -1000
Subject: [PATCH 12/12] group pulse cannon shots

---
 data/hai/hai outfits.txt | 46 ++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/data/hai/hai outfits.txt b/data/hai/hai outfits.txt
index ba60b1a904a4..b15c905ddd94 100644
--- a/data/hai/hai outfits.txt	
+++ b/data/hai/hai outfits.txt	
@@ -60,6 +60,7 @@ outfit "Pulse Cannon"
 		"firing heat" 70
 		"shield damage" 45
 		"hull damage" 34
+		"hit force" 1
 	description "Like most examples of Hai engineering that you have seen, the Pulse Cannon does not stand out as a particularly advanced or elegant technology, but it has a reputation for being efficient, reliable, and well-balanced."
 
 outfit "Pulse Turret"
@@ -76,17 +77,30 @@ outfit "Pulse Turret"
 		"hardpoint sprite" "hardpoint/pulse turret"
 		"hardpoint offset" 7.
 		sound "pulse"
-		"hit effect" "pulse impact"
+		"submunition" "Pulse Submunition"
+			"offset" 1 0
+		"submunition" "Pulse Submunition"
+			"offset" -1 0
+		"hit effect" "pulse impact" 2
 		"inaccuracy" 1
 		"turret turn" 1.5
+		"velocity override" 19
+		"range override" 456
+		"lifetime" 0
+		"reload" 20
+		"firing energy" 28
+		"firing heat" 140
+	description "Pulse Cannons are the primary offensive weapon used by Hai ships. This turret mounts two Pulse Cannons side by side and allows them to track even the fastest-moving of targets."
+
+outfit "Pulse Submunition"
+	weapon
+		sprite "projectile/pulse"
+		"hit effect" "pulse impact"
 		"velocity" 19
 		"lifetime" 24
-		"reload" 10
-		"firing energy" 24
-		"firing heat" 70
 		"shield damage" 45
 		"hull damage" 34
-	description "Pulse Cannons are the primary offensive weapon used by Hai ships. This turret mounts two Pulse Cannons side by side and allows them to track even the fastest-moving of targets."
+		"hit force" 1
 
 outfit "Tripulse Shredder"
 	category "Guns"
@@ -99,18 +113,22 @@ outfit "Tripulse Shredder"
 	weapon
 		sprite "projectile/pulse"
 		sound "pulse"
-		"hit effect" "pulse impact"
+		"submunition" "Pulse Submunition"
+		"submunition" "Pulse Submunition"
+			"offset" 1.33 0
+		"submunition" "Pulse Submunition"
+			"offset" -1.33 0
+		"hit effect" "pulse impact" 3
 		"inaccuracy" 5
-		"velocity" 19
-		"lifetime" 24
-		"reload" 6
-		"burst count" 36
+		"velocity override" 19
+		"range override" 456
+		"lifetime" 0
+		"reload" 18
+		"burst count" 12
 		"burst reload" 4
 		"cluster"
-		"firing energy" 25
-		"firing heat" 60
-		"shield damage" 45
-		"hull damage" 34
+		"firing energy" 75
+		"firing heat" 180
 	description "An early stage in the development of better and faster weaponry to rival that of the Wanderers, the Tripulse Shredder consists of three Pulse Cannons in a single housing. Advancements in cooling capabilities have reduced the heat generated by each shot at the cost of drawing slightly more power. Additionally, the single shared housing results in a less consistent firing pattern, limiting it to bursts. These factors have made the Tripulse Shredder a popular hit-and-run weapon among the Unfettered."
 
 effect "pulse impact"