From 42deab4eaa64dcc460dd066264e2486660bc20fc Mon Sep 17 00:00:00 2001
From: Basilisk3 <126026384+Basilisk3@users.noreply.github.com>
Date: Sat, 8 Feb 2025 17:25:08 +0100
Subject: [PATCH] Improvements to the functionality of a number of anti-torpedo
 weapons (#6607)

---
 changelog/snippets/balance.6607.md | 23 +++++++++++++++++++++++
 units/UAS0305/UAS0305_unit.bp      |  4 +++-
 units/XRL0403/XRL0403_unit.bp      |  1 +
 units/XRS0204/XRS0204_unit.bp      |  1 +
 units/XSS0203/XSS0203_unit.bp      |  7 ++++++-
 units/XSS0304/XSS0304_unit.bp      |  5 +++++
 6 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 changelog/snippets/balance.6607.md

diff --git a/changelog/snippets/balance.6607.md b/changelog/snippets/balance.6607.md
new file mode 100644
index 00000000000..905f148d065
--- /dev/null
+++ b/changelog/snippets/balance.6607.md
@@ -0,0 +1,23 @@
+- (#6607) Improve the functionality of a number of anti-torpedo weapons by giving them a minimum range and altering their targeting. The addition of a `MinRadius` prevents the weapon from locking onto projectiles it cannot reasonably intercept anymore. In particular, the torpedo defense of the Aeon T3 Sonar should perform noticeably better with these changes. Additionally, audio queues are added to the torpedo defenses of the Seraphim Tech 1 and Tech 3 submarines.
+
+  - **Aeon T3 Sonar Platform (UAS0305):**
+    - Quasar Anti Torpedo
+      - FiringTolerance: 2 --> 180
+      - MinRadius: 0 --> 5
+      - `UseFiringSolutionInsteadOfAimBone`: `false` --> `true`
+
+  - **Sou-istle: T1 Attack Submarine (XSS0203):**
+    - Ajellu Anti-Torpedo Defense
+      - FiringTolerance: 0 --> 180
+      - MinRadius: 0 --> 5
+      - `UseFiringSolutionInsteadOfAimBone`: `false` --> `true`
+      - Audio queue added
+
+  - **Yathsou: T3 Submarine Hunter (XSS0304):**
+    - Ajellu Anti-Torpedo Defense (x2)
+      - MinRadius: 0 --> 10
+      - Audio queue added
+
+  - **Barracuda (XRS0204) and Megalith (XRL0403):**
+    - Anti-Torpedo Flare
+      - MinRadius: 0 --> 5
diff --git a/units/UAS0305/UAS0305_unit.bp b/units/UAS0305/UAS0305_unit.bp
index 50f9d6f9335..0cc2651b083 100644
--- a/units/UAS0305/UAS0305_unit.bp
+++ b/units/UAS0305/UAS0305_unit.bp
@@ -165,9 +165,10 @@ UnitBlueprint{
             DisableWhileReloading = true,
             DisplayName = "Quasar Anti Torpedo",
             FireTargetLayerCapsTable = { Water = "Water" },
-            FiringTolerance = 2,
+            FiringTolerance = 180,
             Label = "AntiTorpedo01",
             MaxRadius = 32,
+            MinRadius = 5,
             MuzzleSalvoDelay = 0,
             MuzzleSalvoSize = 1,
             MuzzleVelocity = 30,
@@ -204,6 +205,7 @@ UnitBlueprint{
             TurretYawRange = 180,
             TurretYawSpeed = 360,
             Turreted = true,
+            UseFiringSolutionInsteadOfAimBone = true,
             WeaponCategory = "Defense",
         },
     },
diff --git a/units/XRL0403/XRL0403_unit.bp b/units/XRL0403/XRL0403_unit.bp
index 6d699d69909..6cb5f215e2c 100644
--- a/units/XRL0403/XRL0403_unit.bp
+++ b/units/XRL0403/XRL0403_unit.bp
@@ -483,6 +483,7 @@ UnitBlueprint{
             FiringTolerance = 2,
             Label = "AntiTorpedo",
             MaxRadius = 25,
+            MinRadius = 5,
             MuzzleSalvoDelay = 0,
             MuzzleSalvoSize = 1,
             MuzzleVelocity = 5,
diff --git a/units/XRS0204/XRS0204_unit.bp b/units/XRS0204/XRS0204_unit.bp
index f54f20787a3..cba31a1ed8f 100644
--- a/units/XRS0204/XRS0204_unit.bp
+++ b/units/XRS0204/XRS0204_unit.bp
@@ -296,6 +296,7 @@ UnitBlueprint{
             FiringTolerance = 2,
             Label = "AntiTorpedo01",
             MaxRadius = 25,
+            MinRadius = 5,
             MuzzleSalvoDelay = 0,
             MuzzleSalvoSize = 1,
             MuzzleVelocity = 5,
diff --git a/units/XSS0203/XSS0203_unit.bp b/units/XSS0203/XSS0203_unit.bp
index 4f013fb9ce1..26cb1348543 100644
--- a/units/XSS0203/XSS0203_unit.bp
+++ b/units/XSS0203/XSS0203_unit.bp
@@ -269,6 +269,9 @@ UnitBlueprint{
         },
         {
             AlwaysRecheckTarget = false,
+            Audio = {
+                Fire = Sound { Bank = 'XSS_Weapon', Cue = 'XSS0201_Ajellu_Torpedo', LodCutoff = 'Weapon_LodCutoff' },
+            },
             BallisticArc = "RULEUBA_None",
             CollideFriendly = false,
             Damage = 2,
@@ -280,10 +283,11 @@ UnitBlueprint{
                 Sub = "Water",
                 Water = "Water",
             },
-            FiringTolerance = 0,
+            FiringTolerance = 180,
             Label = "AntiTorpedo",
             LeadTarget = false,
             MaxRadius = 32,
+            MinRadius = 5,
             MuzzleSalvoDelay = 0,
             MuzzleSalvoSize = 1,
             MuzzleVelocity = 80,
@@ -320,6 +324,7 @@ UnitBlueprint{
             TurretYawRange = 180,
             TurretYawSpeed = 180,
             Turreted = true,
+            UseFiringSolutionInsteadOfAimBone = true,
             WeaponCategory = "Defense",
             WeaponRepackTimeout = 0,
             WeaponUnpacks = false,
diff --git a/units/XSS0304/XSS0304_unit.bp b/units/XSS0304/XSS0304_unit.bp
index 1993b166b1e..c9e1e2b3f5d 100644
--- a/units/XSS0304/XSS0304_unit.bp
+++ b/units/XSS0304/XSS0304_unit.bp
@@ -281,6 +281,7 @@ UnitBlueprint{
             Label = "AntiTorpedoLeft",
             LeadTarget = false,
             MaxRadius = 32,
+            MinRadius = 10,
             MuzzleSalvoDelay = 0,
             MuzzleSalvoSize = 1,
             MuzzleVelocity = 80,
@@ -322,6 +323,9 @@ UnitBlueprint{
         },
         {
             AlwaysRecheckTarget = false,
+            Audio = {
+                Fire = Sound { Bank = 'XSS_Weapon', Cue = 'XSS0304_Ajellu_Torpedo', LodCutoff = 'Weapon_LodCutoff' },
+            },
             BallisticArc = "RULEUBA_None",
             CollideFriendly = false,
             Damage = 2,
@@ -336,6 +340,7 @@ UnitBlueprint{
             Label = "AntiTorpedoRight",
             LeadTarget = false,
             MaxRadius = 32,
+            MinRadius = 10,
             MuzzleSalvoDelay = 0,
             MuzzleSalvoSize = 1,
             MuzzleVelocity = 80,