Add UI to CAgility

This commit is contained in:
Yuri Moens 2021-10-19 14:10:05 +02:00
parent 9609f2ba3e
commit 6ae9c22cb3
Signed by: ymo
GPG Key ID: F6D51D6FE15BE924
2 changed files with 23 additions and 4 deletions

View File

@ -2,21 +2,28 @@ package io.reisub.dreambot.cagility;
import io.reisub.dreambot.cagility.tasks.HandleObstacle; import io.reisub.dreambot.cagility.tasks.HandleObstacle;
import io.reisub.dreambot.cagility.tasks.PickupMark; import io.reisub.dreambot.cagility.tasks.PickupMark;
import io.reisub.dreambot.util.CTaskScript;
import io.reisub.dreambot.util.Constants; import io.reisub.dreambot.util.Constants;
import io.reisub.dreambot.util.randomevents.GenieSolver; import io.reisub.dreambot.util.randomevents.GenieSolver;
import io.reisub.dreambot.util.tasks.Eat; import io.reisub.dreambot.util.tasks.Eat;
import io.reisub.dreambot.util.tasks.kitten.KittenTask; import io.reisub.dreambot.util.tasks.kitten.KittenTask;
import org.dreambot.api.methods.skills.Skill;
import org.dreambot.api.script.Category; import org.dreambot.api.script.Category;
import org.dreambot.api.script.ScriptManifest; import org.dreambot.api.script.ScriptManifest;
import org.dreambot.api.script.impl.TaskScript; import org.dreambot.api.utilities.Timer;
import java.awt.*;
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ScriptManifest(category = Category.AGILITY, name = "CAgility", description = "Runs laps for days", author = Constants.AUTHOR, version = 1.0) @ScriptManifest(category = Category.AGILITY, name = "CAgility", description = "Runs laps for days", author = Constants.AUTHOR, version = 1.0)
public class CAgility extends TaskScript { public class CAgility extends CTaskScript {
@Override @Override
public void onStart() { public void onStart() {
getRandomManager().registerSolver(new GenieSolver(GenieSolver.Skill.HERBLORE)); getRandomManager().registerSolver(new GenieSolver(GenieSolver.Skill.HERBLORE));
getUI().addSkills(Skill.AGILITY);
getUI().setCustomLines(1);
addNodes( addNodes(
new Eat(), new Eat(),
KittenTask.createKittenTask(), KittenTask.createKittenTask(),
@ -24,4 +31,12 @@ public class CAgility extends TaskScript {
new PickupMark() new PickupMark()
); );
} }
@Override
public void onPaint(Graphics g) {
super.onPaint(g);
int marks = PickupMark.marksPickedUp;
getUI().drawString("Marks picked up: " + marks + " (" + getUI().getHourlyRate(marks) + " per hour)");
}
} }

View File

@ -11,6 +11,8 @@ import org.dreambot.api.wrappers.items.GroundItem;
import org.dreambot.api.wrappers.items.Item; import org.dreambot.api.wrappers.items.Item;
public class PickupMark extends TaskNode { public class PickupMark extends TaskNode {
public static int marksPickedUp = 0;
@Override @Override
public boolean accept() { public boolean accept() {
GroundItem mark = GroundItems.closest(Constants.MARK_OF_GRACE); GroundItem mark = GroundItems.closest(Constants.MARK_OF_GRACE);
@ -29,10 +31,12 @@ public class PickupMark extends TaskNode {
mark.interact(); mark.interact();
MethodContext.sleepUntil(() -> { if (MethodContext.sleepUntil(() -> {
Item currentMarks = Inventory.get(Constants.MARK_OF_GRACE); Item currentMarks = Inventory.get(Constants.MARK_OF_GRACE);
return currentMarks != null && currentMarks.getAmount() > count; return currentMarks != null && currentMarks.getAmount() > count;
}, Calculations.random(5000, 5500)); }, Calculations.random(5000, 5500))) {
marksPickedUp++;
}
return Calculations.random(250, 400); return Calculations.random(250, 400);
} }