From eb6a59a0d0e32519ab3b49b40d5f89c342085c26 Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Tue, 15 Oct 2019 13:04:52 +1300
Subject: [PATCH] Use Skill from the api

---
 .idea/workspace.xml                          |  7 +++---
 src/main/java/ParaScript/Main.java           | 18 ++++++++++-----
 src/main/java/ParaScript/data/Variables.java | 23 ++++++++++----------
 src/main/java/ParaScript/ui/UI.java          | 13 ++++++++---
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b998ef6..8379cad 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Bank.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Bank.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Walk.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Walk.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/data/Variables.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/data/Variables.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/ui/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/ui/UI.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -56,8 +57,8 @@
       <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\main\java" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="ParaScript" />
       <recent name="ParaScript.strategies" />
+      <recent name="ParaScript" />
       <recent name="ParaScript.data.variables" />
       <recent name="ParaScript.ui" />
       <recent name="ParaScript.data" />
diff --git a/src/main/java/ParaScript/Main.java b/src/main/java/ParaScript/Main.java
index 291fa23..5d1e52c 100644
--- a/src/main/java/ParaScript/Main.java
+++ b/src/main/java/ParaScript/Main.java
@@ -11,6 +11,7 @@ import org.parabot.environment.scripts.Category;
 import org.parabot.environment.scripts.ScriptManifest;
 import org.rev317.min.api.events.MessageEvent;
 import org.rev317.min.api.events.listeners.MessageListener;
+import org.rev317.min.api.methods.Skill;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -28,17 +29,19 @@ public class Main extends Script implements MessageListener, Paintable {
             Time.sleep(300);
         }
 
+        Variables.setBaseExp();
+
         strategies.add(new ScriptState());
-        if(Variables.skill_to_train.equalsIgnoreCase("Woodcutting")) {
+        if(Variables.skill_to_train == Skill.WOODCUTTING) {
             strategies.add(new MakeArrowShafts());
             strategies.add(new WoodcutTree());
         }
-        if(Variables.skill_to_train.equalsIgnoreCase("Mining")) {
+        if(Variables.skill_to_train == Skill.MINING) {
             strategies.add(new Mine());
             strategies.add(new Bank());
             strategies.add(new Walk());
         }
-        if(Variables.skill_to_train.equalsIgnoreCase("Bank Runner")) {
+        if(Variables.skill_to_train == null) {
             strategies.add(new Bank());
             strategies.add(new Walk());
         }
@@ -83,16 +86,19 @@ public class Main extends Script implements MessageListener, Paintable {
             case 0:
                 if (message.getMessage().startsWith("You manage to ")) {
                     Variables.addItemGained(1);
-                    Variables.addExpGained();
+                    Variables.updateExpGained();
                 }
                 if (message.getMessage().contains("Congratulations, you advanced a woodcutting level.")) {
                     // add in level up to paint
                 }
                 break;
             case 4:
-                if(Variables.skill_to_train.equalsIgnoreCase("Bank Runner")) {
+                if(Variables.skill_to_train == null) {
                     if (message.getMessage().startsWith(Variables.slaveMaster.toLowerCase() + " wishes to trade with you")) {
-                        // add in level up to paint
+                        // accept trade
+                        // take items, give items if smithing or similar
+                        // goto bank, deposit/withdraw items
+                        // go back to user
                     }
                 }
                 break;
diff --git a/src/main/java/ParaScript/data/Variables.java b/src/main/java/ParaScript/data/Variables.java
index 399f322..5e62fb6 100644
--- a/src/main/java/ParaScript/data/Variables.java
+++ b/src/main/java/ParaScript/data/Variables.java
@@ -4,6 +4,7 @@ import ParaScript.data.variables.Ores;
 import ParaScript.data.variables.Trees;
 import ParaScript.data.variables.Zone;
 import org.parabot.environment.api.utils.Timer;
+import org.rev317.min.api.methods.Skill;
 import org.rev317.min.api.wrappers.Tile;
 import org.rev317.min.api.wrappers.TilePath;
 
@@ -15,6 +16,7 @@ public class Variables {
     public static boolean running = false;
     private static String currentStatus = "none";
     public static int itemsGained = 0;
+    public static double baseExperience = 0;
     public static double expGained = 0;
 
     // Login Panel
@@ -22,7 +24,7 @@ public class Variables {
     private static String password = "";
 
     // Settings Panel
-    public static String skill_to_train = "Woodcutting";
+    public static Skill skill_to_train = Skill.WOODCUTTING;
 
     // Woodcutting
     public static Trees woodcutting_tree_selected = Trees.NORMAL;
@@ -89,16 +91,13 @@ public class Variables {
         itemsGained += amount;
     }
 
-    public static void addExpGained(){
-        double xp_to_add = 0;
-        switch(skill_to_train){
-            case "Woodcutting":
-                xp_to_add = woodcutting_tree_selected.getXP();
-                break;
-            case "Mining":
-                xp_to_add = mining_ore_selected.getXP();
-                break;
-        }
-        expGained += xp_to_add;
+    public static void setBaseExp(){
+        if (skill_to_train == null) return;
+        baseExperience = skill_to_train.getExperience();
+    }
+
+    public static void updateExpGained(){
+        if (skill_to_train == null) return;
+        expGained = skill_to_train.getExperience() - baseExperience;
     }
 }
diff --git a/src/main/java/ParaScript/ui/UI.java b/src/main/java/ParaScript/ui/UI.java
index 5264a69..84fe12b 100644
--- a/src/main/java/ParaScript/ui/UI.java
+++ b/src/main/java/ParaScript/ui/UI.java
@@ -5,6 +5,7 @@ import ParaScript.data.variables.Trees;
 import ParaScript.data.Variables;
 import org.rev317.min.api.methods.Game;
 import org.rev317.min.api.methods.Players;
+import org.rev317.min.api.methods.Skill;
 import org.rev317.min.api.wrappers.Player;
 
 import javax.swing.*;
@@ -106,14 +107,20 @@ public class UI extends JFrame {
         lblSkillToTrain.setBounds(20, 20, 73, 20);
         settingsPanel.add(lblSkillToTrain);
         skillSelect.setModel(new DefaultComboBoxModel(new String[]{
-                "Woodcutting",
-                "Mining",
+                Skill.WOODCUTTING.getName(),
+                Skill.MINING.getName(),
                 "Bank Runner",
         }));
         skillSelect.setBounds(20, 40, 150, 20);
         skillSelect.addActionListener (new ActionListener () {
             public void actionPerformed(ActionEvent e) {
-                Variables.skill_to_train = skillSelect.getSelectedItem().toString();
+                for (Skill skill : Skill.values()) {
+                    if (skill.getName().equalsIgnoreCase(skillSelect.getSelectedItem().toString())) {
+                        Variables.skill_to_train = skill;
+                        return;
+                    }
+                    Variables.skill_to_train = null;
+                }
             }
         });
         settingsPanel.add(skillSelect);