Merge pull request #18 from Parabot/feature/issue-17

[FEATURE] New randoms system

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.parabot</groupId>
     <artifactId>randoms</artifactId>
-    <version>0.2</version>
+    <version>0.21</version>
 
     <properties>
         <jdk.version>1.7</jdk.version>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.parabot</groupId>
             <artifactId>client</artifactId>
-            <version>2.6</version>
+            <version>2.6.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>*</artifactId>

src/main/java/org/parabot/randoms/Core.java

@@ -1,7 +1,7 @@
 package org.parabot.randoms;
 
 import org.parabot.core.Context;
-import org.parabot.environment.scripts.randoms.Random;
+import org.parabot.environment.randoms.Random;
 import org.parabot.randoms.dreamscape.SerialBanAvoider;
 import org.parabot.randoms.pkhonor.*;
 

src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java

@@ -1,10 +1,8 @@
 package org.parabot.randoms.dreamscape;
 
 import org.parabot.core.Context;
-import org.parabot.core.Core;
+import org.parabot.environment.randoms.Random;
-import org.parabot.core.reflect.RefClass;
+import org.parabot.environment.randoms.RandomType;
-import org.parabot.core.reflect.RefField;
-import org.parabot.environment.scripts.randoms.Random;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -53,4 +51,9 @@ public class SerialBanAvoider implements Random {
     public String getServer() {
         return "dreamscape";
     }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.ON_SERVER_START;
+    }
 }

src/main/java/org/parabot/randoms/pkhonor/BanFile.java

@@ -1,11 +1,12 @@
 package org.parabot.randoms.pkhonor;
 
-import org.parabot.environment.scripts.randoms.Random;
+import org.parabot.environment.randoms.Random;
+import org.parabot.environment.randoms.RandomType;
 
 import java.io.File;
 
 /**
- * Created by Fryslan.
+ * @author Fryslan
  */
 public class BanFile implements Random {
 
@@ -14,8 +15,12 @@ public class BanFile implements Random {
 
     @Override
     public boolean activate() {
-        checked = true;
+        if (!checked) {
-        return !checked && filePresent();
+            if (filePresent()) {
+                return true;
+            }
+        }
+        return false;
     }
 
     @Override
@@ -38,7 +43,13 @@ public class BanFile implements Random {
         return "pkhonor";
     }
 
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.ON_SERVER_START;
+    }
+
     private boolean filePresent() {
+        checked = true;
         for (File banfile : locations) {
             if (banfile.exists()) {
                 return true;

src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java

@@ -1,21 +1,15 @@
 package org.parabot.randoms.pkhonor;
 
 import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.randoms.Random;
+import org.parabot.environment.randoms.RandomType;
 import org.parabot.environment.scripts.framework.SleepCondition;
-import org.parabot.environment.scripts.randoms.Random;
-import org.rev317.min.api.methods.Players;
 import org.rev317.min.api.methods.SceneObjects;
-import org.rev317.min.api.wrappers.Area;
 import org.rev317.min.api.wrappers.SceneObject;
 import org.rev317.min.api.wrappers.Tile;
 
-import java.util.ArrayList;
-
 /**
- * Created with IntelliJ IDEA.
+ * @author Fryslan
- * User: Piet Jetse
- * Date: 2-1-2015
- * Time: 13:19
  */
 public class BobsIsland implements Random {
 
@@ -61,4 +55,9 @@ public class BobsIsland implements Random {
     public String getServer() {
         return "pkhonor";
     }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.SCRIPT;
+    }
 }

src/main/java/org/parabot/randoms/pkhonor/Jail.java

@@ -1,8 +1,9 @@
 package org.parabot.randoms.pkhonor;
 
 import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.randoms.Random;
+import org.parabot.environment.randoms.RandomType;
 import org.parabot.environment.scripts.framework.SleepCondition;
-import org.parabot.environment.scripts.randoms.Random;
 import org.rev317.min.api.methods.Inventory;
 import org.rev317.min.api.methods.Npcs;
 import org.rev317.min.api.methods.Players;
@@ -11,7 +12,7 @@ import org.rev317.min.api.wrappers.Npc;
 import org.rev317.min.api.wrappers.SceneObject;
 
 /**
- * Created with IntelliJ IDEA. User: Piet Jetse Date: 11-9-2014 Time: 22:22
+ * @author Fryslan
  */
 
 public class Jail implements Random {
@@ -45,7 +46,7 @@ public class Jail implements Random {
                 if (!Inventory.isFull()) {
                     if (rock != null) {
                         if (Players.getMyPlayer().getAnimation() == -1) {
-                            rock.interact(0);
+                            rock.interact(SceneObjects.Option.MINE);
                             Time.sleep(new SleepCondition() {
                                 @Override
                                 public boolean isValid() {
@@ -57,7 +58,7 @@ public class Jail implements Random {
 
                     //Inventory is full depositting ores
                 } else {
-                    jailer.interact(0);
+                    jailer.interact(Npcs.Option.TALK_TO);
 
                     Time.sleep(new SleepCondition() {
                         @Override
@@ -70,7 +71,7 @@ public class Jail implements Random {
 
                 //getting Pickaxe
             } else {
-                jailer.interact(0);
+                jailer.interact(Npcs.Option.TALK_TO);
                 Time.sleep(new SleepCondition() {
                     @Override
                     public boolean isValid() {
@@ -111,4 +112,9 @@ public class Jail implements Random {
     public String getServer() {
         return "pkhonor";
     }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.SCRIPT;
+    }
 }

src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java

@@ -1,14 +1,15 @@
 package org.parabot.randoms.pkhonor;
 
 import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.randoms.Random;
+import org.parabot.environment.randoms.RandomType;
 import org.parabot.environment.scripts.framework.SleepCondition;
-import org.parabot.environment.scripts.randoms.Random;
 import org.rev317.min.api.methods.Npcs;
 import org.rev317.min.api.methods.Players;
 import org.rev317.min.api.wrappers.Npc;
 
 /**
- * Created with IntelliJ IDEA. User: Piet Jetse Date: 12-9-2014 Time: 17:19
+ * @author Fryslan
  */
 public class MysteriousOldMan implements Random {
 
@@ -52,4 +53,9 @@ public class MysteriousOldMan implements Random {
     public String getServer() {
         return "pkhonor";
     }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.SCRIPT;
+    }
 }

src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java

@@ -1,14 +1,15 @@
 package org.parabot.randoms.pkhonor;
 
 import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.randoms.Random;
+import org.parabot.environment.randoms.RandomType;
 import org.parabot.environment.scripts.framework.SleepCondition;
-import org.parabot.environment.scripts.randoms.Random;
 import org.rev317.min.api.methods.Npcs;
 import org.rev317.min.api.methods.Players;
 import org.rev317.min.api.wrappers.Npc;
 
 /**
- * Created with IntelliJ IDEA. User: Piet Jetse Date: 12-9-2014 Time: 16:13
+ * @author Fryslan
  */
 public class SandwichLady implements Random {
 
@@ -52,4 +53,9 @@ public class SandwichLady implements Random {
     public String getServer() {
         return "pkhonor";
     }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.SCRIPT;
+    }
 }

src/main/java/org/parabot/randoms/pkhonor/TriangleSandwich.java

@@ -1,21 +1,23 @@
 package org.parabot.randoms.pkhonor;
 
 import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.randoms.Random;
+import org.parabot.environment.randoms.RandomType;
 import org.parabot.environment.scripts.framework.SleepCondition;
-import org.parabot.environment.scripts.randoms.Random;
 import org.rev317.min.api.methods.Inventory;
 import org.rev317.min.api.wrappers.Item;
 
 /**
- * Created with IntelliJ IDEA. User: Piet Jetse Date: 11-9-2014 Time: 22:29
+ * @author Fryslan
  */
 public class TriangleSandwich implements Random {
 
-    Item item;
+    private Item item;
+    private final int id = 6963;
 
     @Override
     public boolean activate() {
-        for (Item i : Inventory.getItems(6963)) {
+        for (Item i : Inventory.getItems(id)) {
             if (i != null) {
                 this.item = i;
                 return true;
@@ -31,7 +33,7 @@ public class TriangleSandwich implements Random {
             Time.sleep(new SleepCondition() {
                 @Override
                 public boolean isValid() {
-                    return Inventory.getCount(6963) == 0;
+                    return Inventory.getCount(id) == 0;
                 }
             }, 1500);
         }
@@ -46,4 +48,9 @@ public class TriangleSandwich implements Random {
     public String getServer() {
         return "pkhonor";
     }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.SCRIPT;
+    }
 }