Add p5 enrage, tweak LR call

xpdota · Dec 9, 2024 · af7c01a · af7c01a
1 parent 2050ea0
commit af7c01a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/triggers/triggers-dt/src/main/java/gg/xp/xivsupport/triggers/ultimate/FRU.java b/triggers/triggers-dt/src/main/java/gg/xp/xivsupport/triggers/ultimate/FRU.java
@@ -623,7 +623,7 @@ private static ModifiableCallout<FruP1TetherEvent> makeTetherCall(String descPar
 	@NpcCastCallout(0x9D12)
 	private final ModifiableCallout<AbilityCastStart> hallowedRay = ModifiableCallout.durationBasedCall("Hallowed Ray", "Line Stack");
 
-	private final ModifiableCallout<AbilityCastStart> lrInitial = ModifiableCallout.durationBasedCall("Light Rampant: Initial", "Light Rampant Positions");
+	private final ModifiableCallout<AbilityCastStart> lrInitial = ModifiableCallout.durationBasedCall("Light Rampant: Initial", "Raidwide, Light Rampant Positions");
 
 	private final ModifiableCallout<?> lrChainNoStack = new ModifiableCallout<>("Light Rampant: Chain, No Weight Debuff", "Chain").statusIcon(0x103D);
 	private final ModifiableCallout<?> lrChainWithStack = new ModifiableCallout<>("Light Rampant: Chain + Weight Debuff", "Chain and Stack").statusIcon(0x103F);
@@ -1597,7 +1597,7 @@ else if (hit.eighthsTo(nextHit) == -1) {
 			});
 
 	private final ModifiableCallout<AbilityCastStart> polarizingInitial = ModifiableCallout.durationBasedCall("Polarizing Strikes", "Line Stacks");
-	private final ModifiableCallout<?> polarizingHit = new ModifiableCallout<>("Polarizing Strikes Hit", "Move");
+	private final ModifiableCallout<?> polarizingHit = new ModifiableCallout<>("Polarizing Strikes Hit (No Swap)", "Move");
 	private final ModifiableCallout<?> polarizingHitSwap = new ModifiableCallout<>("Polarizing Strikes Swap", "Swap");
 
 	@AutoFeed
@@ -1622,6 +1622,9 @@ else if (hit.eighthsTo(nextHit) == -1) {
 
 			});
 
+	@NpcCastCallout(value = 0x9D88, cancellable = true)
+	private final ModifiableCallout<AbilityCastStart> p5enrage = ModifiableCallout.durationBasedCall("P5 Enrage", "Enrage");
+
 }
 
 

diff --git a/triggers/triggers-dt/src/test/java/gg/xp/xivsupport/triggers/ultimate/FRUTest.java b/triggers/triggers-dt/src/test/java/gg/xp/xivsupport/triggers/ultimate/FRUTest.java
@@ -16,6 +16,7 @@ protected long minimumMsBetweenCalls() {
 		return 250;
 	}
 
+	// TODO: turn this into "configure a call" method and specialized "disable call" etc methods
 //	@Override
 //	protected void configure(MutablePicoContainer pico) {
 //		// Disable this specific callout since it will fail the timing check (and is unnecessary anyway)
@@ -74,7 +75,7 @@ protected List<CalloutInitialValues> getExpectedCalls() {
 				call(256982, "Blue Mirror and Boss, In+Proteans", "Blue Mirror and Boss, In+Proteans (5.7)"),
 				call(263029, "Red Mirrors, In+Proteans", "Red Mirrors, In+Proteans (9.7)"),
 				call(274140, "Spread", "Spread (4.7)"),
-				call(283518, "Light Rampant Positions", "Light Rampant Positions (4.7)"),
+				call(283518, "Raidwide, Light Rampant Positions", "Raidwide, Light Rampant Positions (4.7)"),
 				call(289475, "Chain and Stack", "Chain and Stack"),
 				call(299695, "Stacks", "Stacks"),
 				call(307824, "Avoid Tower", "Avoid Tower"),
@@ -168,7 +169,8 @@ protected List<CalloutInitialValues> getExpectedCalls() {
 				call(1084485, "Stacks", "Stacks (7.7)"),
 				call(1084798, "Move", "Move"),
 				call(1086756, "Move", "Move"),
-				call(1088843, "Move", "Move")
+				call(1088843, "Move", "Move"),
+				call(1100948, "Enrage", "Enrage (21.2)")
 		);
 	}
 }