Merge pull request #623 from Abextm/imp-box-hunter

Add imp boxes to the hunter plugin
This commit is contained in:
Adam
2018-02-21 15:33:06 -05:00
committed by GitHub
2 changed files with 8 additions and 1 deletions

View File

@@ -124,6 +124,7 @@ public class HunterPlugin extends Plugin
lastActionTime = Instant.now(); lastActionTime = Instant.now();
} }
break; break;
case ObjectID.MAGIC_BOX: // Imp box placed
case ObjectID.BOX_TRAP_9380: //Box trap placed case ObjectID.BOX_TRAP_9380: //Box trap placed
case ObjectID.BIRD_SNARE_9345: //Bird snare placed case ObjectID.BIRD_SNARE_9345: //Bird snare placed
case ObjectID.NET_TRAP_9343: //Net trap placed at green sallys case ObjectID.NET_TRAP_9343: //Net trap placed at green sallys
@@ -154,6 +155,7 @@ public class HunterPlugin extends Plugin
} }
break; break;
case ObjectID.MAGIC_BOX_19226: // Imp caught
case ObjectID.SHAKING_BOX: //Black chinchompa caught case ObjectID.SHAKING_BOX: //Black chinchompa caught
case ObjectID.SHAKING_BOX_9382: // Grey chinchompa caught case ObjectID.SHAKING_BOX_9382: // Grey chinchompa caught
case ObjectID.SHAKING_BOX_9383: //Red chinchompa caught case ObjectID.SHAKING_BOX_9383: //Red chinchompa caught
@@ -180,6 +182,7 @@ public class HunterPlugin extends Plugin
lastActionTime = Instant.now(); lastActionTime = Instant.now();
} }
break; break;
case ObjectID.MAGIC_BOX_FAILED: //Empty imp box
case ObjectID.BOX_TRAP_9385: //Empty box trap case ObjectID.BOX_TRAP_9385: //Empty box trap
case ObjectID.BIRD_SNARE: //Empty box trap case ObjectID.BIRD_SNARE: //Empty box trap
if (myTrap != null) if (myTrap != null)
@@ -192,6 +195,9 @@ public class HunterPlugin extends Plugin
lastActionTime = Instant.now(); lastActionTime = Instant.now();
} }
break; break;
// Imp entering box
case ObjectID.MAGIC_BOX_19225:
//Black chin shaking box //Black chin shaking box
case ObjectID.BOX_TRAP: case ObjectID.BOX_TRAP:
case ObjectID.BOX_TRAP_2026: case ObjectID.BOX_TRAP_2026:

View File

@@ -110,7 +110,8 @@ public class TrapOverlay extends Overlay
Widget viewport = client.getViewportWidget(); Widget viewport = client.getViewportWidget();
for (HunterTrap trap : plugin.getTraps()) for (HunterTrap trap : plugin.getTraps())
{ {
if (viewport != null && viewport.contains(trap.getGameObject().getCanvasLocation())) net.runelite.api.Point trapLoc = trap.getGameObject().getCanvasLocation();
if (viewport != null && trapLoc != null && viewport.contains(trapLoc))
{ {
switch (trap.getState()) switch (trap.getState())
{ {