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

mining: Add Daeyalt essence timers

Browse Source
This commit is contained in:
Tim Hinz
2020-06-23 23:27:05 -07:00
committed by Jordan Atwood
parent 573baa40fc
commit f7b49fa4e2
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
View File

@@ -46,6 +46,10 @@ class MiningOverlay extends Overlay
private static final int ORE_VEIN_MIN_RESPAWN_TIME = 150; // Game ticks private static final int ORE_VEIN_MIN_RESPAWN_TIME = 150; // Game ticks
private static final float ORE_VEIN_RANDOM_PERCENT_THRESHOLD = (float) ORE_VEIN_MIN_RESPAWN_TIME / ORE_VEIN_MAX_RESPAWN_TIME; private static final float ORE_VEIN_RANDOM_PERCENT_THRESHOLD = (float) ORE_VEIN_MIN_RESPAWN_TIME / ORE_VEIN_MAX_RESPAWN_TIME;
static final int DAEYALT_MAX_RESPAWN_TIME = 110; // Game ticks
private static final int DAEYALT_MIN_RESPAWN_TIME = 91; // Game ticks
private static final float DAEYALT_RANDOM_PERCENT_THRESHOLD = (float) DAEYALT_MIN_RESPAWN_TIME / DAEYALT_MAX_RESPAWN_TIME;
static final int LOVAKITE_ORE_MAX_RESPAWN_TIME = 65; // Game ticks static final int LOVAKITE_ORE_MAX_RESPAWN_TIME = 65; // Game ticks
private static final int LOVAKITE_ORE_MIN_RESPAWN_TIME = 50; // Game ticks private static final int LOVAKITE_ORE_MIN_RESPAWN_TIME = 50; // Game ticks
private static final float LOVAKITE_ORE_RANDOM_PERCENT_THRESHOLD = (float) LOVAKITE_ORE_MIN_RESPAWN_TIME / LOVAKITE_ORE_MAX_RESPAWN_TIME; private static final float LOVAKITE_ORE_RANDOM_PERCENT_THRESHOLD = (float) LOVAKITE_ORE_MIN_RESPAWN_TIME / LOVAKITE_ORE_MAX_RESPAWN_TIME;
@@ -104,6 +108,7 @@ class MiningOverlay extends Overlay
// Recolour pie on motherlode veins or Lovakite ore during the portion of the timer where they may respawn // Recolour pie on motherlode veins or Lovakite ore during the portion of the timer where they may respawn
if ((rock == Rock.ORE_VEIN && percent > ORE_VEIN_RANDOM_PERCENT_THRESHOLD) if ((rock == Rock.ORE_VEIN && percent > ORE_VEIN_RANDOM_PERCENT_THRESHOLD)
|| (rock == Rock.DAEYALT_ESSENCE && percent > DAEYALT_RANDOM_PERCENT_THRESHOLD)
|| (rock == Rock.LOVAKITE && percent > LOVAKITE_ORE_RANDOM_PERCENT_THRESHOLD)) || (rock == Rock.LOVAKITE && percent > LOVAKITE_ORE_RANDOM_PERCENT_THRESHOLD))
{ {
pieFillColor = Color.GREEN; pieFillColor = Color.GREEN;

24
runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
View File

@@ -128,23 +128,39 @@ public class MiningPlugin extends Plugin
Rock rock = Rock.getRock(object.getId()); Rock rock = Rock.getRock(object.getId());
if (rock != null) if (rock != null)
{ {
RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(region).toMillis(), rock.getZOffset()); if (rock == Rock.DAEYALT_ESSENCE)
respawns.add(rockRespawn); {
final WorldPoint point = object.getWorldLocation();
respawns.removeIf(rockRespawn -> rockRespawn.getWorldPoint().equals(point));
}
else
{
RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(region).toMillis(), rock.getZOffset());
respawns.add(rockRespawn);
}
} }
} }
@Subscribe @Subscribe
public void onGameObjectSpawned(GameObjectSpawned event) public void onGameObjectSpawned(GameObjectSpawned event)
{ {
if (client.getGameState() != GameState.LOGGED_IN) if (client.getGameState() != GameState.LOGGED_IN || recentlyLoggedIn)
{ {
return; return;
} }
GameObject object = event.getGameObject(); GameObject object = event.getGameObject();
Rock rock = Rock.getRock(object.getId());
// Inverse timer to track daeyalt essence active duration
if (rock == Rock.DAEYALT_ESSENCE)
{
final int region = client.getLocalPlayer().getWorldLocation().getRegionID();
RockRespawn rockRespawn = new RockRespawn(rock, object.getWorldLocation(), Instant.now(), (int) rock.getRespawnTime(region).toMillis(), rock.getZOffset());
respawns.add(rockRespawn);
}
// If the Lovakite ore respawns before the timer is up, remove it // If the Lovakite ore respawns before the timer is up, remove it
if (Rock.getRock(object.getId()) == Rock.LOVAKITE) else if (rock == Rock.LOVAKITE)
{ {
final WorldPoint point = object.getWorldLocation(); final WorldPoint point = object.getWorldLocation();
respawns.removeIf(rockRespawn -> rockRespawn.getWorldPoint().equals(point)); respawns.removeIf(rockRespawn -> rockRespawn.getWorldPoint().equals(point));

3
runelite-client/src/main/java/net/runelite/client/plugins/mining/Rock.java
View File

@@ -96,7 +96,8 @@ enum Rock
URT_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33254), URT_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33254),
EFH_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33255), EFH_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33255),
TE_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33256), TE_SALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33256),
BASALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33257); BASALT(Duration.of(9, GAME_TICKS), 0, ROCKS_33257),
DAEYALT_ESSENCE(Duration.of(MiningOverlay.DAEYALT_MAX_RESPAWN_TIME, GAME_TICKS), 0, DAEYALT_ESSENCE_39095);
private static final int WILDERNESS_RESOURCE_AREA = 12605; private static final int WILDERNESS_RESOURCE_AREA = 12605;
private static final int MISCELLANIA = 10044; private static final int MISCELLANIA = 10044;