add initial drop stuff

This commit is contained in:
RedSparr0w
2019-10-16 12:26:18 +13:00
parent c4914511eb
commit 9843975106
3 changed files with 57 additions and 11 deletions
+8 -8
View File
@@ -3,7 +3,7 @@
<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/data/Variables.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/data/Variables.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -40,7 +40,7 @@
<property name="GenerateAntBuildDialog.generateSingleFile" value="true" />
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="parascript" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
@@ -49,10 +49,8 @@
<key name="ExtractSuperBase.RECENT_KEYS">
<recent name="ParaScript" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src\main" />
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src" />
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\main\java" />
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="ParaScript.strategies" />
@@ -61,8 +59,10 @@
<recent name="ParaScript.ui" />
<recent name="ParaScript.data" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript" />
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src\main" />
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src" />
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\main\java" />
</key>
</component>
<component name="RunDashboard">
+13 -3
View File
@@ -1,8 +1,6 @@
package ParaScript.data;
import ParaScript.data.variables.Ores;
import ParaScript.data.variables.Trees;
import ParaScript.data.variables.Zone;
import ParaScript.data.variables.*;
import org.parabot.environment.api.utils.Timer;
import org.rev317.min.api.methods.Skill;
import org.rev317.min.api.wrappers.Tile;
@@ -103,6 +101,18 @@ public class Variables {
expGained = skill_to_train.getExperience() - baseExperience;
}
public static int[] getItemIDs(){
if (skill_to_train == null) return new int[]{-1};
switch (skill_to_train.getName()){
case "Woodcutting":
return woodcutting_tree_selected.getIDs();
case "Mining":
return mining_ore_selected.getIDs();
default:
return new int[]{-1};
}
}
public static boolean shouldBankItems(){
if (skill_to_train == null) return true;
switch (skill_to_train.getName()){
@@ -0,0 +1,36 @@
package ParaScript.strategies;
import ParaScript.data.Variables;
import org.parabot.environment.api.utils.Time;
import org.parabot.environment.scripts.framework.Strategy;
import org.rev317.min.api.methods.Game;
import org.rev317.min.api.methods.Inventory;
import org.rev317.min.api.methods.Npcs;
import org.rev317.min.api.methods.Skill;
import org.rev317.min.api.wrappers.Item;
import org.rev317.min.api.wrappers.Npc;
import org.rev317.min.api.wrappers.TilePath;
public class Drop implements Strategy {
private Item[] items;
@Override
public boolean activate() {
items = Inventory.getItems(Variables.getItemIDs());
return Variables.running
&& Game.isLoggedIn()
&& Variables.shouldDropItems()
&& items != null
&& items.length > 0;
}
@Override
public void execute() {
for(Item item : items){
if(item != null){
item.drop();
Time.sleep(1000);
}
}
}
}