idle notifier: Support filling water vessels, Shades of Mort'ton
LOOKING_INTO is a generic animation used for numerous activities, and was previously used as an intermediate animation in a test case. Now that it is used to trigger idle notifications, a dummy animation has been inserted to ensure the affected test case will not be broken in the same way in the future. Co-authored-by: Nick Wolff <nickwolff2@gmail.com> Co-authored-by: Arnaud Peralta <arnaud.peralta@gmail.com>
This commit is contained in:
@@ -179,7 +179,7 @@ public final class AnimationID
|
|||||||
public static final int MAGIC_ENCHANTING_BOLTS = 4462;
|
public static final int MAGIC_ENCHANTING_BOLTS = 4462;
|
||||||
public static final int BURYING_BONES = 827;
|
public static final int BURYING_BONES = 827;
|
||||||
public static final int USING_GILDED_ALTAR = 3705;
|
public static final int USING_GILDED_ALTAR = 3705;
|
||||||
public static final int LOOKING_INTO = 832;
|
public static final int LOOKING_INTO = 832; // Generic animation used for filling water vessels, Shades of Mort'ton, etc.
|
||||||
public static final int DIG = 830;
|
public static final int DIG = 830;
|
||||||
public static final int DEMONIC_GORILLA_MAGIC_ATTACK = 7225;
|
public static final int DEMONIC_GORILLA_MAGIC_ATTACK = 7225;
|
||||||
public static final int DEMONIC_GORILLA_MELEE_ATTACK = 7226;
|
public static final int DEMONIC_GORILLA_MELEE_ATTACK = 7226;
|
||||||
|
|||||||
@@ -292,6 +292,7 @@ public class IdleNotifierPlugin extends Plugin
|
|||||||
case PISCARILIUS_CRANE_REPAIR:
|
case PISCARILIUS_CRANE_REPAIR:
|
||||||
case HOME_MAKE_TABLET:
|
case HOME_MAKE_TABLET:
|
||||||
case SAND_COLLECTION:
|
case SAND_COLLECTION:
|
||||||
|
case LOOKING_INTO:
|
||||||
resetTimers();
|
resetTimers();
|
||||||
lastAnimation = animation;
|
lastAnimation = animation;
|
||||||
lastAnimating = Instant.now();
|
lastAnimating = Instant.now();
|
||||||
|
|||||||
@@ -62,6 +62,8 @@ import org.mockito.junit.MockitoJUnitRunner;
|
|||||||
@RunWith(MockitoJUnitRunner.class)
|
@RunWith(MockitoJUnitRunner.class)
|
||||||
public class IdleNotifierPluginTest
|
public class IdleNotifierPluginTest
|
||||||
{
|
{
|
||||||
|
private static final int UNKNOWN_ANIMATION = -2;
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
@Bind
|
@Bind
|
||||||
private Client client;
|
private Client client;
|
||||||
@@ -153,7 +155,7 @@ public class IdleNotifierPluginTest
|
|||||||
animationChanged.setActor(player);
|
animationChanged.setActor(player);
|
||||||
plugin.onAnimationChanged(animationChanged);
|
plugin.onAnimationChanged(animationChanged);
|
||||||
plugin.onGameTick(new GameTick());
|
plugin.onGameTick(new GameTick());
|
||||||
when(player.getAnimation()).thenReturn(AnimationID.LOOKING_INTO);
|
when(player.getAnimation()).thenReturn(UNKNOWN_ANIMATION);
|
||||||
plugin.onAnimationChanged(animationChanged);
|
plugin.onAnimationChanged(animationChanged);
|
||||||
plugin.onGameTick(new GameTick());
|
plugin.onGameTick(new GameTick());
|
||||||
when(player.getAnimation()).thenReturn(AnimationID.IDLE);
|
when(player.getAnimation()).thenReturn(AnimationID.IDLE);
|
||||||
|
|||||||
Reference in New Issue
Block a user