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

idlenotifier: allow animations fallback for interacting checks

Browse Source
This commit is contained in:
Owain van Brakel
2019-07-12 02:06:54 +02:00
parent 2e0af6122c
commit 3897c7e744
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
View File

@@ -127,6 +127,7 @@ public class IdleNotifierPlugin extends Plugin
private List<Integer> itemQuantitiesPrevious = new ArrayList<>(); private List<Integer> itemQuantitiesPrevious = new ArrayList<>();
private final List<Integer> itemQuantitiesChange = new ArrayList<>(); private final List<Integer> itemQuantitiesChange = new ArrayList<>();
private boolean lastInteractWasCombat; private boolean lastInteractWasCombat;
private boolean interactingNotified;
private SkullIcon lastTickSkull = null; private SkullIcon lastTickSkull = null;
private boolean isFirstTick = true; private boolean isFirstTick = true;
@@ -232,6 +233,17 @@ public class IdleNotifierPlugin extends Plugin
/* Fishing */ /* Fishing */
case FISHING_CRUSHING_INFERNAL_EELS: case FISHING_CRUSHING_INFERNAL_EELS:
case FISHING_CUTTING_SACRED_EELS: case FISHING_CUTTING_SACRED_EELS:
case FISHING_BIG_NET:
case FISHING_NET:
case FISHING_POLE_CAST:
case FISHING_CAGE:
case FISHING_HARPOON:
case FISHING_BARBTAIL_HARPOON:
case FISHING_DRAGON_HARPOON:
case FISHING_INFERNAL_HARPOON:
case FISHING_OILY_ROD:
case FISHING_KARAMBWAN:
case FISHING_BAREHAND:
/* Mining(Normal) */ /* Mining(Normal) */
case MINING_BRONZE_PICKAXE: case MINING_BRONZE_PICKAXE:
case MINING_IRON_PICKAXE: case MINING_IRON_PICKAXE:
@@ -275,6 +287,7 @@ public class IdleNotifierPlugin extends Plugin
resetTimers(); resetTimers();
lastAnimation = animation; lastAnimation = animation;
lastAnimating = Instant.now(); lastAnimating = Instant.now();
interactingNotified = false;
break; break;
case MAGIC_LUNAR_SHARED: case MAGIC_LUNAR_SHARED:
if (graphic == GraphicID.BAKE_PIE) if (graphic == GraphicID.BAKE_PIE)
@@ -282,10 +295,12 @@ public class IdleNotifierPlugin extends Plugin
resetTimers(); resetTimers();
lastAnimation = animation; lastAnimation = animation;
lastAnimating = Instant.now(); lastAnimating = Instant.now();
interactingNotified = false;
break; break;
} }
case IDLE: case IDLE:
lastAnimating = Instant.now(); lastAnimating = Instant.now();
interactingNotified = false;
break; break;
default: default:
// On unknown animation simply assume the animation is invalid and dont throw notification // On unknown animation simply assume the animation is invalid and dont throw notification
@@ -541,14 +556,6 @@ public class IdleNotifierPlugin extends Plugin
lastAnimation = IDLE; lastAnimation = IDLE;
} }
if (this.animationIdle && checkAnimationIdle(waitDuration, local))
{
notifier.notify("[" + local.getName() + "] is now idle!");
if (this.animationIdleSound)
{
soundManager.playSound(Sound.IDLE);
}
}
if (this.interactionIdle && checkInteractionIdle(waitDuration, local)) if (this.interactionIdle && checkInteractionIdle(waitDuration, local))
{ {
if (lastInteractWasCombat) if (lastInteractWasCombat)
@@ -567,6 +574,16 @@ public class IdleNotifierPlugin extends Plugin
soundManager.playSound(Sound.IDLE); soundManager.playSound(Sound.IDLE);
} }
} }
interactingNotified = true;
}
if (this.animationIdle && checkAnimationIdle(waitDuration, local))
{
notifier.notify("[" + local.getName() + "] is now idle!");
if (this.animationIdleSound)
{
soundManager.playSound(Sound.IDLE);
}
} }
if (checkLowHitpoints()) if (checkLowHitpoints())
@@ -785,7 +802,7 @@ public class IdleNotifierPlugin extends Plugin
private boolean checkAnimationIdle(Duration waitDuration, Player local) private boolean checkAnimationIdle(Duration waitDuration, Player local)
{ {
if (lastAnimation == IDLE) if (lastAnimation == IDLE || interactingNotified)
{ {
return false; return false;
} }