From cbfa3e42124025e4cf94ada952816f12b431b22d Mon Sep 17 00:00:00 2001 From: XP Date: Mon, 30 Dec 2024 22:26:54 -0800 Subject: [PATCH] Fix testss --- triggers/triggers-dt/pom.xml | 7 +++++++ .../main/java/gg/xp/xivsupport/triggers/ultimate/FRU.java | 4 ++-- .../java/gg/xp/xivsupport/triggers/ultimate/FRUTest.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/triggers/triggers-dt/pom.xml b/triggers/triggers-dt/pom.xml index 5a4825847cad..b3e573f55acd 100644 --- a/triggers/triggers-dt/pom.xml +++ b/triggers/triggers-dt/pom.xml @@ -17,4 +17,11 @@ UTF-8 + + + org.apache.commons + commons-lang3 + + + \ No newline at end of file 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 index 7eee08fbad3f..c6de3d30d0d3 100644 --- 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 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 relLongRewind2 = ModifiableCallout.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 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 index 8b47ab04f0e8..69fa4428d0a6 100644 --- 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 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)"),