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

timetracking: add support for botanist relic

Browse Source
This commit is contained in:
Hydrox6
2020-11-18 08:21:05 +00:00
committed by Adam
parent 23b7a65c29
commit 374cf05c6d
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingConfig.java
View File

@@ -35,6 +35,7 @@ public interface TimeTrackingConfig extends Config
String CONFIG_GROUP = "timetracking"; String CONFIG_GROUP = "timetracking";
String AUTOWEED = "autoweed"; String AUTOWEED = "autoweed";
String BIRD_HOUSE = "birdhouse"; String BIRD_HOUSE = "birdhouse";
String BOTANIST = "botanist";
String TIMERS = "timers"; String TIMERS = "timers";
String STOPWATCHES = "stopwatches"; String STOPWATCHES = "stopwatches";

25
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
View File

@@ -91,6 +91,15 @@ public class FarmingTracker
} }
} }
{
boolean botanist = client.getVar(Varbits.LEAGUE_RELIC_5) == 1;
if (!Boolean.valueOf(botanist).equals(configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.BOTANIST, Boolean.class)))
{
configManager.setRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.BOTANIST, botanist);
changed = true;
}
}
for (FarmingRegion region : farmingWorld.getRegions().get(location.getRegionID())) for (FarmingRegion region : farmingWorld.getRegions().get(location.getRegionID()))
{ {
if (!region.isInBounds(location)) if (!region.isInBounds(location))
@@ -152,6 +161,9 @@ public class FarmingTracker
boolean autoweed = Integer.toString(Autoweed.ON.ordinal()) boolean autoweed = Integer.toString(Autoweed.ON.ordinal())
.equals(configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.AUTOWEED)); .equals(configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.AUTOWEED));
boolean botanist = Boolean.TRUE
.equals(configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.BOTANIST, Boolean.class));
String key = patch.getRegion().getRegionID() + "." + patch.getVarbit().getId(); String key = patch.getRegion().getRegionID() + "." + patch.getVarbit().getId();
String storedValue = configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, key); String storedValue = configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, key);
@@ -192,6 +204,7 @@ public class FarmingTracker
int stage = state.getStage(); int stage = state.getStage();
int stages = state.getStages(); int stages = state.getStages();
int tickrate = state.getTickRate() * 60; int tickrate = state.getTickRate() * 60;
int farmingTickLength = 5 * 60;
if (autoweed && state.getProduce() == Produce.WEEDS) if (autoweed && state.getProduce() == Produce.WEEDS)
{ {
@@ -200,14 +213,20 @@ public class FarmingTracker
tickrate = 0; tickrate = 0;
} }
if (botanist)
{
tickrate /= 5;
farmingTickLength /= 5;
}
long doneEstimate = 0; long doneEstimate = 0;
if (tickrate > 0) if (tickrate > 0)
{ {
long tickNow = (unixNow + (5 * 60)) / tickrate; long tickNow = (unixNow + farmingTickLength) / tickrate;
long tickTime = (unixTime + (5 * 60)) / tickrate; long tickTime = (unixTime + farmingTickLength) / tickrate;
int delta = (int) (tickNow - tickTime); int delta = (int) (tickNow - tickTime);
doneEstimate = ((stages - 1 - stage) + tickTime) * tickrate + (5 * 60); doneEstimate = ((stages - 1 - stage) + tickTime) * tickrate + farmingTickLength;
stage += delta; stage += delta;
if (stage >= stages) if (stage >= stages)