2006Scape-Scripts/ParaScript
1
0
Fork 0
mirror of https://github.com/2006Scape-Scripts/ParaScript.git synced 2026-07-02 16:49:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix banking, add user feedback (#4)

Browse Source 
* fix banking

* Remove debug
This commit is contained in:
Daniel Ginovker
2019-12-09 16:08:29 -05:00
committed by Danial
parent bee16c1f72
commit f2deddbe33
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ParaScript/Main.java
+7 -1
View File
@@ -3,13 +3,16 @@ package ParaScript;
import ParaScript.data.Variables;
import ParaScript.strategies.*;
import ParaScript.ui.UI;
import org.parabot.core.ui.Logger;
import org.parabot.environment.api.interfaces.Paintable;
import org.parabot.environment.api.utils.Time;
import org.parabot.environment.api.utils.Timer;
import org.parabot.environment.input.Keyboard;
import org.parabot.environment.scripts.Script;
import org.parabot.environment.scripts.framework.Strategy;
import org.parabot.environment.scripts.Category;
import org.parabot.environment.scripts.ScriptManifest;
import org.rev317.min.accessors.Client;
import org.rev317.min.api.events.MessageEvent;
import org.rev317.min.api.events.listeners.MessageListener;
import org.rev317.min.api.methods.Skill;
@@ -17,7 +20,7 @@ import org.rev317.min.api.methods.Skill;
import java.awt.*;
import java.util.ArrayList;
@ScriptManifest(author = "RedSparr0w & Dark98", category = Category.OTHER, description = "2006 AIO Script", name = "2006 AIO", servers = { "2006rebotted" }, version = 1)
@ScriptManifest(author = "RedSparr0w & Dark98", category = Category.OTHER, description = "2006 AIO Script", name = "2006 AIO", servers = { "2006rebotted" }, version = 1.2)
public class Main extends Script implements MessageListener, Paintable {
private final ArrayList<Strategy> strategies = new ArrayList<Strategy>();
@@ -66,6 +69,9 @@ public class Main extends Script implements MessageListener, Paintable {
}
strategies.add(new HandleLogin());
provide(strategies);
Keyboard.getInstance().sendKeys("Training " + Variables.skill_to_train.getName() + ". Drop items? " + !Variables.shouldBankItems());
return true;
}
src/main/java/ParaScript/strategies/Bank.java
+8 -2
View File
@@ -15,7 +15,7 @@ public class Bank implements Strategy {
return Variables.running
&& Game.isLoggedIn()
&& Variables.shouldBankItems()
&& (Variables.getStatus() == "none" || Variables.getStatus() == "banking items")
&& (Variables.getStatus().equals("none") || Variables.getStatus().equals("banking items"))
&& Inventory.isFull();
}
@@ -32,7 +32,13 @@ public class Bank implements Strategy {
}
public void depositItems() {
Keyboard.getInstance().sendKeys("::bank", true);
Npc banker = Npcs.getClosest(494);
if (banker != null)
{
banker.interact(Npcs.Option.BANK);
} else {
Keyboard.getInstance().sendKeys("I can't find the banker!");
}
Time.sleep(3000);
if (Game.getOpenInterfaceId() == 5292) {
if (Variables.skill_to_train == Skill.MINING)
src/main/java/ParaScript/strategies/Mine.java
+3 -1
View File
@@ -3,6 +3,7 @@ package ParaScript.strategies;
import ParaScript.data.Variables;
import ParaScript.data.variables.Ores;
import org.parabot.environment.api.utils.Time;
import org.parabot.environment.input.Keyboard;
import org.parabot.environment.scripts.framework.Strategy;
import org.rev317.min.api.methods.Inventory;
import org.rev317.min.api.methods.Items;
@@ -18,7 +19,7 @@ public class Mine implements Strategy {
ore = ore(); // set the local Variable
if (Variables.running
&& ore != null
&& (Variables.getStatus() == "none" || Variables.getStatus() == "mining")
&& (Variables.getStatus().equals("none") || Variables.getStatus().equals("mining"))
&& Variables.VARROCK_EAST_MINE_ZONE.inTheZone()
&& !Players.getMyPlayer().isInCombat()
&& Players.getMyPlayer().getAnimation() == -1
@@ -42,6 +43,7 @@ public class Mine implements Strategy {
} catch (Exception ಠ_ಠ){
System.out.println("Mining error: ¯\\_(ツ)_/¯");
}
Time.sleep(1000);
}
private SceneObject ore(){