Fix testss

xpdota · Dec 31, 2024 · cbfa3e4 · cbfa3e4
1 parent 34d92b5
commit cbfa3e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/triggers/triggers-dt/pom.xml b/triggers/triggers-dt/pom.xml
@@ -17,4 +17,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>
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
@@ -772,7 +772,7 @@ private static Predicate<HasDuration> initDurBetween(int secondsMin, int seconds
 	// TODO icons
 	private final ModifiableCallout<?> relShortRewindMedFire = new ModifiableCallout<>("Relativity: Short Rewind Part 2 (Med Fire)", "AFK")
 			.extendedDescription("This call happens after the second fire/stack pop, if you have short rewind and had medium fire.");
-	private final ModifiableCallout<?> relLongRewind2 = new ModifiableCallout<>("Relativity: Long Rewind Part 2", "Drop Rewind Middle")
+	private final ModifiableCallout<BuffApplied> relLongRewind2 = ModifiableCallout.<BuffApplied>durationBasedCall("Relativity: Long Rewind Part 2", "Drop Rewind Middle")
 			.statusIcon(0x9A0)
 			.extendedDescription("This call happens after the first fire/stack pop, if you have long rewind.");
 
@@ -930,7 +930,7 @@ private static Predicate<HasDuration> initDurBetween(int secondsMin, int seconds
 								ignored -> s.updateCall(relShortRewindMedFire),
 								() -> s.updateCall(relShortRewindBait)),
 						() -> {
-							s.updateCall(relLongRewind2);
+							s.updateCall(relLongRewind2, longRewindC.findAny(r -> true).orElse(null));
 						}
 				);
 				s.waitMs(5_000); // T=26

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
@@ -91,7 +91,7 @@ protected List<CalloutInitialValues> getExpectedCalls() {
 				call(462111, "Stack", "Stack (5.6)"),
 				call(468120, "Bait Spinny", "Bait Spinny"),
 				call(473149, "Stack", "Stack (4.6)"),
-				call(478175, "Stand Middle", "Stand Middle"),
+				call(478175, "Drop Rewind Middle", "Drop Rewind Middle (4.6)"),
 				call(483195, "Move Out", "Move Out (4.5)"),
 				call(488217, "Look Outside", "Look Outside (8.5)"),
 				call(500670, "Stack", "Stack (2.7)"),