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 0a352d86ee62..9e59e27f54d1 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 @@ -740,15 +740,17 @@ private static Predicate initDurBetween(int secondsMin, int seconds private final ModifiableCallout relThLongFire = ModifiableCallout.durationBasedCall("Relativity: Support Long Fire", "Long Fire").autoIcon(); private final ModifiableCallout relThIce = ModifiableCallout.durationBasedCall("Relativity: Support Ice", "Ice").autoIcon(); - private final ModifiableCallout relShortFirePop = ModifiableCallout.durationBasedCall("Relativity: DPS Short Fire Popping", "Move Out").autoIcon() + private final ModifiableCallout relShortFirePop = ModifiableCallout.durationBasedCall("Relativity: Short Fire Popping", "Move Out").autoIcon() .extendedDescription("The short fire/stack pop calls happen about 5 seconds in."); - private final ModifiableCallout relShortStackPop = ModifiableCallout.durationBasedCall("Relativity: DPS Short Stack Popping", "Stack").autoIcon(); + private final ModifiableCallout relShortStackPop = ModifiableCallout.durationBasedCall("Relativity: Short Stack Popping", "Stack").autoIcon(); private final ModifiableCallout relLongRewind = new ModifiableCallout<>("Relativity: Long Rewind", "Bait Spinny") .extendedDescription("This call happens after the first fire/stack pop, if you have long rewind."); private final ModifiableCallout relShortRewindEruption = ModifiableCallout.durationBasedCall("Relativity: Short Rewind w/ Eruption", "Stand on Light").autoIcon() .extendedDescription("This call happens after the first fire/stack pop, if you have short rewind and have eruption (no water)."); - private final ModifiableCallout relShortRewindWater = ModifiableCallout.durationBasedCall("Relativity: Short Rewind w/ Water", "Stand on Light").autoIcon() + private final ModifiableCallout relShortRewindEruptionMedFire = ModifiableCallout.durationBasedCall("Relativity: Short Rewind w/ Eruption and Med Fire", "Stand inside Light").autoIcon() + .extendedDescription("This call happens after the first fire/stack pop, if you have short rewind and have eruption (no water) as well as medium fire."); + private final ModifiableCallout relShortRewindWater = ModifiableCallout.durationBasedCall("Relativity: Short Rewind w/ Water", "Stand In").autoIcon() .extendedDescription("This call happens after the first fire/stack pop, if you have short rewind and have water (no eruption)."); private final ModifiableCallout relMedFirePop = ModifiableCallout.durationBasedCall("Relativity: DPS Medium Fire Popping", "Move Out").autoIcon() @@ -888,7 +890,13 @@ private static Predicate initDurBetween(int secondsMin, int seconds s.updateCall(relShortRewindWater, e); } else { - s.updateCall(relShortRewindEruption, e); + // TODO: some people need to bait inside for this? + if (medFireC.anyMatch(isPlayer)) { + s.updateCall(relShortRewindEruptionMedFire, e); + } + else { + s.updateCall(relShortRewindEruption, e); + } } }, () -> s.updateCall(relLongRewind)); diff --git a/xivsupport/src/main/java/gg/xp/xivsupport/callouts/gui/CalloutSettingGui.java b/xivsupport/src/main/java/gg/xp/xivsupport/callouts/gui/CalloutSettingGui.java index fb0c1c521f91..5d83fd7c3ed0 100644 --- a/xivsupport/src/main/java/gg/xp/xivsupport/callouts/gui/CalloutSettingGui.java +++ b/xivsupport/src/main/java/gg/xp/xivsupport/callouts/gui/CalloutSettingGui.java @@ -171,6 +171,7 @@ private void recalcEnabledDisabledStatus() { callCheckbox.repaint(); ttsPanel.updateUI(); textPanel.updateUI(); + soundPanel.updateUI(); } public void setEnabledByParent(boolean enabledByParent) { diff --git a/xivsupport/src/main/java/gg/xp/xivsupport/gui/components/ReadOnlyText.java b/xivsupport/src/main/java/gg/xp/xivsupport/gui/components/ReadOnlyText.java index 3f9b709570ed..7c4da4eca114 100644 --- a/xivsupport/src/main/java/gg/xp/xivsupport/gui/components/ReadOnlyText.java +++ b/xivsupport/src/main/java/gg/xp/xivsupport/gui/components/ReadOnlyText.java @@ -52,7 +52,9 @@ public void setBounds(int x, int y, int width, int height) { Rectangle currentBounds = getBounds(); int currentWidth = currentBounds.width; boolean doResize = width - currentWidth > 3 || width - currentWidth < 0; - super.setBounds(x, y, width, height); + if (doResize) { + super.setBounds(x, y, width, height); + } if (!isPreferredSizeSet()) { fakePreferredSize = super.getPreferredSize(); }