Merge branch 'awgil:master' into lab

awgil · Feb 2, 2025 · 68ffd0a · 68ffd0a
2 parents 79de010 + f54bf40
commit 68ffd0a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/BossMod/ActionTweaks/ManualActionQueueTweak.cs b/BossMod/ActionTweaks/ManualActionQueueTweak.cs
@@ -129,6 +129,18 @@ private bool ResolveTarget(ActionDefinition def, Actor player, ulong targetId, F
     {
         target = null;
         targetPos = default;
+
+        // BTL is a ground targeted action with only one valid target position, which is wherever player leylines happen to be
+        if (def.ID.ID == (uint)BLM.AID.BetweenTheLines)
+        {
+            var playerLL = ws.Actors.FirstOrDefault(act => act.OwnerID == player.InstanceID && act.OID == 0x179);
+            if (playerLL == null)
+                return false;
+
+            targetPos = playerLL.PosRot.XYZ();
+            return true;
+        }
+
         if (def.AllowedTargets.HasFlag(ActionTargets.Area))
         {
             // GT actions with range 0 must be cast on player - there are only a few of these (BLM leylines, PCT leylines, PCT PVP limit break)

diff --git a/BossMod/Modules/Dawntrail/Chaotic/Ch01CloudOfDarkness/Ch01CloudOfDarknessEnums.cs b/BossMod/Modules/Dawntrail/Chaotic/Ch01CloudOfDarkness/Ch01CloudOfDarknessEnums.cs
@@ -111,8 +111,8 @@ public enum AID : uint
     DiffusiveForceParticleBeamAOE1 = 40465, // Helper->players, no cast, range 7 circle, first wave (any specific targeting?)
     DiffusiveForceParticleBeamAOE2 = 40466, // Helper->players, no cast, range 5 circle, second wave
 
-    LateralCorePhaser = 40495, // StygianShadow->self, 6.0+2.0s cast, single-target, visual (sides > front)
-    CoreLateralPhaser = 40496, // StygianShadow->self, 6.0+2.0s cast, single-target, visual (front > sides)
+    CoreLateralPhaser = 40495, // StygianShadow->self, 6.0+2.0s cast, single-target, visual (sides > front)
+    LateralCorePhaser = 40496, // StygianShadow->self, 6.0+2.0s cast, single-target, visual (front > sides)
     Phaser = 40497, // Helper->self, 8.0s cast, range 23 ?-degree cone
 
     ActivePivotParticleBeamCW = 40467, // Boss->self, 14.0+0.5s cast, single-target, visual (cw rotation)