From e76a96c7166e7200944d660dbfb7b9594c800f11 Mon Sep 17 00:00:00 2001 From: Fryslan Date: Mon, 6 Jun 2016 13:28:46 +0200 Subject: [PATCH 1/8] [CLASS REWRITE] Rewritten Sandwich Lady random. --- .../parabot/randoms/pkhonor/SandwichLady.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java index bcaa9c3..dde3c6b 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java +++ b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java @@ -12,32 +12,37 @@ import org.rev317.min.api.wrappers.Npc; */ public class SandwichLady implements Random { - Npc lady; + private Npc lady; + private final int ID = 3117; @Override public boolean activate() { - for (Npc npc : Npcs.getNearest(3117)) { - if (npc != null && npc.getDef() != null && npc.getInteractingCharacter().equals(Players.getMyPlayer())) { - lady = npc; - return true; - } - } - return false; + this.lady = lady(); + return this.lady != null; } @Override public void execute() { - if (lady != null && lady.getDef() != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) { - lady.interact(0); + if (this.lady != null) { + lady.interact(Npcs.Option.TALK_TO); Time.sleep(new SleepCondition() { @Override public boolean isValid() { - return !lady.getInteractingCharacter().equals(Players.getMyPlayer()); + return lady == null || !lady.getInteractingCharacter().equals(Players.getMyPlayer()); } }, 1500); } } + private Npc lady() { + for (Npc lady : Npcs.getNearest(ID)) { + if (lady != null && lady.getDef() != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) { + return lady; + } + } + return null; + } + @Override public String getName() { return "Sandwich Lady Solver"; From 2b961d94b9497c00c891de6545f09f24f950c1f8 Mon Sep 17 00:00:00 2001 From: Fryslan Date: Mon, 6 Jun 2016 13:35:59 +0200 Subject: [PATCH 2/8] [CLASS REWRITE] Rewritten Mysterious Old Man random. --- .gitignore | 3 ++- .../randoms/pkhonor/MysteriousOldMan.java | 27 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 7e350c0..40d0328 100644 --- a/.gitignore +++ b/.gitignore @@ -68,4 +68,5 @@ fabric.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -*.iml \ No newline at end of file +*.iml +.i€dea \ No newline at end of file diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java index 84624d4..f701540 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java +++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java @@ -12,32 +12,37 @@ import org.rev317.min.api.wrappers.Npc; */ public class MysteriousOldMan implements Random { - Npc man; + private Npc man; + private final int ID = 410; @Override public boolean activate() { - for (Npc npc : Npcs.getNearest(410)) { - if (npc != null && npc.getDef() != null && npc.getInteractingCharacter().equals(Players.getMyPlayer())) { - man = npc; - return true; - } - } - return false; + this.man = man(); + return man != null; } @Override public void execute() { - if (man != null && man.getDef() != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) { - man.interact(0); + if (this.man != null) { + man.interact(Npcs.Option.TALK_TO); Time.sleep(new SleepCondition() { @Override public boolean isValid() { - return !man.getInteractingCharacter().equals(Players.getMyPlayer()); + return man == null || !man.getInteractingCharacter().equals(Players.getMyPlayer()); } }, 1500); } } + private Npc man() { + for (Npc man : Npcs.getNearest(ID)) { + if (man != null && man.getDef() != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) { + return man; + } + } + return null; + } + @Override public String getName() { return "Mysterious Old Man Solver"; From e32c88b82a2e37c3799545a2f9a6e7f887c1b313 Mon Sep 17 00:00:00 2001 From: Fryslan Date: Mon, 6 Jun 2016 22:40:39 +0200 Subject: [PATCH 3/8] [NAMING] Used Correct Naming Convention and Renamed get Methods. --- .../org/parabot/randoms/pkhonor/MysteriousOldMan.java | 10 +++++----- .../java/org/parabot/randoms/pkhonor/SandwichLady.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java index f701540..02f9ca8 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java +++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java @@ -13,11 +13,11 @@ import org.rev317.min.api.wrappers.Npc; public class MysteriousOldMan implements Random { private Npc man; - private final int ID = 410; + private final int id = 410; @Override public boolean activate() { - this.man = man(); + this.man = getMan(); return man != null; } @@ -28,14 +28,14 @@ public class MysteriousOldMan implements Random { Time.sleep(new SleepCondition() { @Override public boolean isValid() { - return man == null || !man.getInteractingCharacter().equals(Players.getMyPlayer()); + return man.distanceTo() < 2 || !man.getInteractingCharacter().equals(Players.getMyPlayer()); } }, 1500); } } - private Npc man() { - for (Npc man : Npcs.getNearest(ID)) { + private Npc getMan() { + for (Npc man : Npcs.getNearest(id)) { if (man != null && man.getDef() != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) { return man; } diff --git a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java index dde3c6b..b187622 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java +++ b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java @@ -13,11 +13,11 @@ import org.rev317.min.api.wrappers.Npc; public class SandwichLady implements Random { private Npc lady; - private final int ID = 3117; + private final int id = 3117; @Override public boolean activate() { - this.lady = lady(); + this.lady = getLady(); return this.lady != null; } @@ -28,14 +28,14 @@ public class SandwichLady implements Random { Time.sleep(new SleepCondition() { @Override public boolean isValid() { - return lady == null || !lady.getInteractingCharacter().equals(Players.getMyPlayer()); + return lady.distanceTo() < 2 || !lady.getInteractingCharacter().equals(Players.getMyPlayer()); } }, 1500); } } - private Npc lady() { - for (Npc lady : Npcs.getNearest(ID)) { + private Npc getLady() { + for (Npc lady : Npcs.getNearest(id)) { if (lady != null && lady.getDef() != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) { return lady; } From 31e732ee42bda21b64875a2ecdf411e169dfe708 Mon Sep 17 00:00:00 2001 From: Fryslan Date: Mon, 6 Jun 2016 23:00:42 +0200 Subject: [PATCH 4/8] [BUG FIX] Using dIstance Check instead of null check. --- src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java | 2 +- src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java index 02f9ca8..89566a3 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java +++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java @@ -28,7 +28,7 @@ public class MysteriousOldMan implements Random { Time.sleep(new SleepCondition() { @Override public boolean isValid() { - return man.distanceTo() < 2 || !man.getInteractingCharacter().equals(Players.getMyPlayer()); + return man.distanceTo() > 0 || !man.getInteractingCharacter().equals(Players.getMyPlayer()); } }, 1500); } diff --git a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java index b187622..33ef95d 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java +++ b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java @@ -28,7 +28,7 @@ public class SandwichLady implements Random { Time.sleep(new SleepCondition() { @Override public boolean isValid() { - return lady.distanceTo() < 2 || !lady.getInteractingCharacter().equals(Players.getMyPlayer()); + return lady.distanceTo() > 0 || !lady.getInteractingCharacter().equals(Players.getMyPlayer()); } }, 1500); } From 191645ca3ac0319641ea0e3e1eb9f42020b85f8c Mon Sep 17 00:00:00 2001 From: Fryslan Date: Fri, 10 Jun 2016 21:51:20 +0200 Subject: [PATCH 5/8] [NAMING] Fixed Naming in BobsRandom and Jail classes. --- .../parabot/randoms/pkhonor/BobsIsland.java | 10 +++++----- .../org/parabot/randoms/pkhonor/Jail.java | 20 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java index dd1bd38..91c878a 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java @@ -19,20 +19,20 @@ import java.util.ArrayList; */ public class BobsIsland implements Random { - private static final Tile CENTER = new Tile(2525,4777); - private static final int PORTAL_ID = 8987; + private static final Tile center = new Tile(2525,4777); + private static final int portal_id = 8987; public BobsIsland() { } @Override public boolean activate() { - return CENTER.distanceTo() < 25; + return center.distanceTo() < 25; } @Override public void execute() { - SceneObject[] portals = SceneObjects.getNearest(PORTAL_ID); + SceneObject[] portals = SceneObjects.getNearest(portal_id); for(final SceneObject portal : portals){ if(portal != null){ @@ -45,7 +45,7 @@ public class BobsIsland implements Random { }, 10000); Time.sleep(1000); - if(CENTER.distanceTo() > 24){ + if(center.distanceTo() > 24){ break; } } diff --git a/src/main/java/org/parabot/randoms/pkhonor/Jail.java b/src/main/java/org/parabot/randoms/pkhonor/Jail.java index c8b6836..17ba13d 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/Jail.java +++ b/src/main/java/org/parabot/randoms/pkhonor/Jail.java @@ -16,14 +16,14 @@ import org.rev317.min.api.wrappers.SceneObject; public class Jail implements Random { private Npc jailer; - private final int[] ROCKS = {2093, 2092}; - private final int[] PICK_AXES = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608}; + private final int[] rocks = {2093, 2092}; + private final int[] pick_axes = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608}; @Override public boolean activate() { try { - if (jailer() != null) { - this.jailer = jailer(); + if (getJailer() != null) { + this.jailer = getJailer(); return true; } return false; @@ -36,10 +36,10 @@ public class Jail implements Random { public void execute() { try { - SceneObject rock = rock(); + SceneObject rock = getRock(); //Check if we got an Pickaxe - if (Inventory.getCount(PICK_AXES) > 0) { + if (Inventory.getCount(pick_axes) > 0) { //Check if we can min the ores if (!Inventory.isFull()) { @@ -84,17 +84,17 @@ public class Jail implements Random { } } - private Npc jailer(){ + private Npc getJailer(){ for(Npc jailer : Npcs.getNearest(201)){ - if(jailer != null){ + if(jailer != null && jailer.getDef() != null){ return jailer; } } return null; } - private SceneObject rock(){ - for(SceneObject rock : SceneObjects.getNearest(ROCKS)){ + private SceneObject getRock(){ + for(SceneObject rock : SceneObjects.getNearest(rocks)){ if(rock != null){ return rock; } From 188a97a010d97ad114a3dca8b4b7922c231e23f7 Mon Sep 17 00:00:00 2001 From: Fryslan Date: Fri, 10 Jun 2016 22:00:41 +0200 Subject: [PATCH 6/8] [NAMING] Fixed Naming in BobsRandom and Jail classes. --- src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java | 4 ++-- src/main/java/org/parabot/randoms/pkhonor/Jail.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java index 91c878a..d8812f2 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java @@ -20,7 +20,7 @@ import java.util.ArrayList; public class BobsIsland implements Random { private static final Tile center = new Tile(2525,4777); - private static final int portal_id = 8987; + private static final int portalId = 8987; public BobsIsland() { } @@ -32,7 +32,7 @@ public class BobsIsland implements Random { @Override public void execute() { - SceneObject[] portals = SceneObjects.getNearest(portal_id); + SceneObject[] portals = SceneObjects.getNearest(portalId); for(final SceneObject portal : portals){ if(portal != null){ diff --git a/src/main/java/org/parabot/randoms/pkhonor/Jail.java b/src/main/java/org/parabot/randoms/pkhonor/Jail.java index 17ba13d..b27ec83 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/Jail.java +++ b/src/main/java/org/parabot/randoms/pkhonor/Jail.java @@ -17,7 +17,7 @@ import org.rev317.min.api.wrappers.SceneObject; public class Jail implements Random { private Npc jailer; private final int[] rocks = {2093, 2092}; - private final int[] pick_axes = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608}; + private final int[] pickAxes = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608}; @Override public boolean activate() { @@ -39,7 +39,7 @@ public class Jail implements Random { SceneObject rock = getRock(); //Check if we got an Pickaxe - if (Inventory.getCount(pick_axes) > 0) { + if (Inventory.getCount(pickAxes) > 0) { //Check if we can min the ores if (!Inventory.isFull()) { From a62e66c059052b84db0319ee39969712a78fe72c Mon Sep 17 00:00:00 2001 From: Fryslan Date: Sat, 8 Oct 2016 18:51:08 +0200 Subject: [PATCH 7/8] [ADDED RANDOM] BanFile Handler --- .../org/parabot/randoms/pkhonor/BanFile.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/main/java/org/parabot/randoms/pkhonor/BanFile.java diff --git a/src/main/java/org/parabot/randoms/pkhonor/BanFile.java b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java new file mode 100644 index 0000000..1b16412 --- /dev/null +++ b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java @@ -0,0 +1,50 @@ +package org.parabot.randoms.pkhonor; + +import org.parabot.environment.scripts.randoms.Random; + +import java.io.File; + +/** + * Created by Fryslan. + */ +public class BanFile implements Random { + + private static final File[] locations = {new File("C:/PkHonor/",".jagex_cache_58993.dat"),new File(System.getProperty("user.home"), ".app_info_3541"),new File(System.getProperty("user.home"), "AppData/Applications")}; + private boolean checked = false; + + @Override + public boolean activate() { + return !checked && filePresent(); + } + + @Override + public void execute() { + for(File banfile : locations){ + if(banfile.exists()){ + banfile.delete(); + } + } + + checked = true; + } + + @Override + public String getName() { + return "BanFile Handler"; + } + + @Override + public String getServer() { + return "pkhonor"; + } + + private boolean filePresent() { + for(File banfile : locations){ + if(banfile.exists()){ + return true; + } + } + checked = true; + return false; + } +} From a8682a5e9843cc5d44c3e5de7fd20c09cd3c1f1d Mon Sep 17 00:00:00 2001 From: Fryslan Date: Sat, 8 Oct 2016 18:56:35 +0200 Subject: [PATCH 8/8] [FIX] Fixed Checked var --- src/main/java/org/parabot/randoms/pkhonor/BanFile.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/BanFile.java b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java index 1b16412..b7c7b2c 100644 --- a/src/main/java/org/parabot/randoms/pkhonor/BanFile.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java @@ -14,6 +14,7 @@ public class BanFile implements Random { @Override public boolean activate() { + checked = true; return !checked && filePresent(); } @@ -25,7 +26,6 @@ public class BanFile implements Random { } } - checked = true; } @Override @@ -44,7 +44,6 @@ public class BanFile implements Random { return true; } } - checked = true; return false; } }