Lariat fix

xpdota · Aug 9, 2024 · 7b3a3bb · 7b3a3bb
1 parent 2ad0b63
commit 7b3a3bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/triggers/triggers-dt/src/main/java/gg/xp/xivsupport/triggers/Arcadion/M3S.java b/triggers/triggers-dt/src/main/java/gg/xp/xivsupport/triggers/Arcadion/M3S.java
@@ -118,34 +118,26 @@ public boolean enabled(EventContext context) {
 				s.waitMs(100);
 				s.waitEvent(AbilityUsedEvent.class, aue -> aue.abilityIdMatches(0x968E, 0x93FC));
 				s.waitThenRefreshCombatants(100);
-				// TODO: IDs for this
-				// West safe, boss from south, then east safe (boss from north)
-				// 9AE8 Boss
-				// 9AF0 actual aoe
-				// Then,
-				// 9AEC Boss
-				// 9AF2 actual aoe
-				// The possibilities for the boss aoe are:
-
-
-				// West safe, boss from south, then west safe again (boss from north)
-				// 9AE9 boss
-				// 9AF0 actual aoe
-				// Then,
-				// 9AED boss
-				// 9AF3 actual aoe
+
 				/*
-				9ADC - 9ADF
-				9AE8 - 9AEB
-				9B2C - 9B2F
+				Initial casts:
+				9AE8 - left safe then left safe
+				9AE9 - left safe then right safe
+				9AEA - right safe then right safe
+				9AEB - right safe then left safe
 				 */
-				var lariatCast = s.findOrWaitForCast(casts, acs -> acs.abilityIdMatches(0x9AF0, 0x9AF1), false);
-				var safe = lariatCast.abilityIdMatches(0x9AF0) ? ArenaSector.WEST : ArenaSector.EAST;
-				s.setParam("safe", safe);
+
+				// TODO: boss can come from either direction
+				var lariatCast = s.findOrWaitForCast(casts, acs -> acs.abilityIdMatches(0x9AE8, 0x9AE9, 0x9AEA, 0x9AEB), false);
+				ArenaSector bossAt = ap.forCombatant(lariatCast.getSource());
+
+				var firstSafe = bossAt.plusQuads(lariatCast.abilityIdMatches(0x9AE8, 0x9AE9) ? 1 : -1);
+				var secondSafe = bossAt.opposite().plusQuads(lariatCast.abilityIdMatches(0x9AE8, 0x9AEB) ? 1 : -1);
+
+				s.setParam("safe", firstSafe);
 				s.updateCall(barbarous2ThirdTower);
-				var lariatCast2 = s.findOrWaitForCast(casts, acs -> acs.abilityIdMatches(0x9AF2, 0x9AF3), false);
-				var safe2 = lariatCast2.abilityIdMatches(0x9AF3) ? ArenaSector.WEST : ArenaSector.EAST;
-				s.setParam("safe", safe2);
+				s.waitMs(5_000);
+				s.setParam("safe", secondSafe);
 				s.updateCall(barbarous2SecondLariat);
 			});
 

diff --git a/triggers/triggers-dt/src/test/java/gg/xp/xivsupport/triggers/Arcadion/M3sTest.java b/triggers/triggers-dt/src/test/java/gg/xp/xivsupport/triggers/Arcadion/M3sTest.java
@@ -62,7 +62,7 @@ protected List<CalloutInitialValues> getExpectedCalls() {
 				call(575085, "Side Towers to Corners", "Side Towers to Corners"),
 				call(586220, "Corner Towers to Center", "Corner Towers to Center"),
 				call(589604, "Center Tower to West", "Center Tower to West"),
-				call(596734, "East Safe", "East Safe"),
+				call(594641, "East Safe", "East Safe"),
 				call(610060, "Tank Buster - Multi Hit", "Tank Buster - Multi Hit (4.7)"),
 				call(651098, "Multiple Raidwides", "Multiple Raidwides (5.7)")
 		);

diff --git a/xivsupport/src/main/resources/te_changelog.html b/xivsupport/src/main/resources/te_changelog.html
@@ -1,5 +1,9 @@
 <html lang="en">
     <body style="margin: 5px 20px 5px 20px">
+        <h2>August 9, 2024</h2>
+        <ul>
+            <li>Bugfix for M3s Lariat Combo.</li>
+        </ul>
         <h2>August 7, 2024</h2>
         <ul>
             <li>Bugfixes for M1S, M2S.</li>