ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

timers: use chat message for sire stun timer

Browse Source 
This makes the timer work more reliably when stuns are stacked
This commit is contained in:
Mrnice98
2020-12-24 00:54:30 -05:00
committed by GitHub
parent a9987a21d2
commit 0c2f93d11c
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -59,7 +59,6 @@ import net.runelite.api.events.GameTick;
import net.runelite.api.events.GraphicChanged; import net.runelite.api.events.GraphicChanged;
import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.ItemContainerChanged;
import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.NpcChanged;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.VarbitChanged;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
@@ -84,6 +83,7 @@ import org.apache.commons.lang3.ArrayUtils;
@Slf4j @Slf4j
public class TimersPlugin extends Plugin public class TimersPlugin extends Plugin
{ {
private static final String ABYSSAL_SIRE_STUN_MESSAGE = "The Sire has been disorientated temporarily.";
private static final String ANTIFIRE_DRINK_MESSAGE = "You drink some of your antifire potion."; private static final String ANTIFIRE_DRINK_MESSAGE = "You drink some of your antifire potion.";
private static final String ANTIFIRE_EXPIRED_MESSAGE = "<col=7f007f>Your antifire potion has expired.</col>"; private static final String ANTIFIRE_EXPIRED_MESSAGE = "<col=7f007f>Your antifire potion has expired.</col>";
private static final String CANNON_FURNACE_MESSAGE = "You add the furnace."; private static final String CANNON_FURNACE_MESSAGE = "You add the furnace.";
@@ -450,6 +450,11 @@ public class TimersPlugin extends Plugin
return; return;
} }
if (message.equals(ABYSSAL_SIRE_STUN_MESSAGE) && config.showAbyssalSireStun())
{
createGameTimer(ABYSSAL_SIRE_STUN);
}
if (message.equals(ENDURANCE_EFFECT_MESSAGE)) if (message.equals(ENDURANCE_EFFECT_MESSAGE))
{ {
wasWearingEndurance = true; wasWearingEndurance = true;
@@ -805,28 +810,6 @@ public class TimersPlugin extends Plugin
} }
} }
@Subscribe
public void onNpcChanged(NpcChanged npcChanged)
{
int id = npcChanged.getNpc().getId();
int oldId = npcChanged.getOld().getId();
if (id == NpcID.ABYSSAL_SIRE_5888)
{
// stunned npc type
log.debug("Sire is stunned");
if (config.showAbyssalSireStun())
{
createGameTimer(ABYSSAL_SIRE_STUN);
}
}
else if (oldId == NpcID.ABYSSAL_SIRE_5888)
{
// change from stunned sire to anything else
log.debug("Sire is unstunned");
removeGameTimer(ABYSSAL_SIRE_STUN);
}
}
@Subscribe @Subscribe
public void onAnimationChanged(AnimationChanged event) public void onAnimationChanged(AnimationChanged event)

14
runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java
View File

@@ -240,6 +240,20 @@ public class TimersPluginTest
assertEquals(Duration.ofMinutes(2), infoBox.getDuration()); assertEquals(Duration.ofMinutes(2), infoBox.getDuration());
} }
@Test
public void testSireStunTimer()
{
when(timersConfig.showAbyssalSireStun()).thenReturn(true);
ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", "The Sire has been disorientated temporarily.", "", 0);
timersPlugin.onChatMessage(chatMessage);
ArgumentCaptor<InfoBox> captor = ArgumentCaptor.forClass(InfoBox.class);
verify(infoBoxManager).addInfoBox(captor.capture());
TimerTimer infoBox = (TimerTimer) captor.getValue();
assertEquals(GameTimer.ABYSSAL_SIRE_STUN, infoBox.getTimer());
assertEquals(Duration.ofSeconds(30), infoBox.getDuration());
}
@Test @Test
public void testEndurance() public void testEndurance()
{ {