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

ಠ_ಠ

Browse Source
This commit is contained in:
RedSparr0w
2019-10-21 13:44:45 +13:00
parent 16846e62d1
commit c1abc5f312
5 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+13 -7
View File
@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment="" /> <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/BuryBones.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/BuryBones.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/MakeArrowShafts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/MakeArrowShafts.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/PickupItems.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/PickupItems.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="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -47,8 +53,10 @@
<key name="ExtractSuperBase.RECENT_KEYS"> <key name="ExtractSuperBase.RECENT_KEYS">
<recent name="ParaScript" /> <recent name="ParaScript" />
</key> </key>
<key name="CopyFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript" /> <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> </key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="ParaScript.strategies" /> <recent name="ParaScript.strategies" />
@@ -57,10 +65,8 @@
<recent name="ParaScript.ui" /> <recent name="ParaScript.ui" />
<recent name="ParaScript.data" /> <recent name="ParaScript.data" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src\main" /> <recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript" />
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\src" />
<recent name="C:\Users\Dan-j\Documents\GitHub\ParaScript\main\java" />
</key> </key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
src/main/java/ParaScript/strategies/BuryBones.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class BuryBones implements Strategy {
Inventory.getItem(527).interact(Items.Option.SECOND); Inventory.getItem(527).interact(Items.Option.SECOND);
Time.sleep(500); Time.sleep(500);
if (Game.isLoggedIn() && hasBones()) buryBones(); if (Game.isLoggedIn() && hasBones()) buryBones();
} catch (Exception err) { } catch (Exception ಠ_ಠ) {
System.out.println("Bone burying error: ¯\\_(ツ)_/¯"); System.out.println("Bone burying error: ¯\\_(ツ)_/¯");
} }
} }
src/main/java/ParaScript/strategies/MakeArrowShafts.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class MakeArrowShafts implements Strategy {
Time.sleep(3000); Time.sleep(3000);
//Wait for the Player to chop the Tree //Wait for the Player to chop the Tree
Time.sleep(() -> Players.getMyPlayer().getAnimation() == -1, 3000); Time.sleep(() -> Players.getMyPlayer().getAnimation() == -1, 3000);
} catch (Exception err) { } catch (Exception ಠ_ಠ) {
System.out.println("Fletching error: ¯\\_(ツ)_/¯"); System.out.println("Fletching error: ¯\\_(ツ)_/¯");
} }
} }
src/main/java/ParaScript/strategies/PickupItems.java
+6 -2
View File
@@ -40,19 +40,23 @@ public class PickupItems implements Strategy {
break; break;
} }
} }
} catch (Exception err){ } catch (Exception ಠ_ಠ){
System.out.println("Pickup items error: ¯\\_(ツ)_/¯"); System.out.println("Pickup items error: ¯\\_(ツ)_/¯");
} }
Variables.addItemGained(Inventory.getCount(true) - currentItemAmount); Variables.addItemGained(Inventory.getCount(true) - currentItemAmount);
} }
private GroundItem[] getItems(){ private GroundItem[] getItems(){
return GroundItems.getNearest(getItemIDs());
}
private int[] getItemIDs(){
int[] itemIDs = new int[]{}; int[] itemIDs = new int[]{};
if (Variables.skill_to_train == Skill.ATTACK){ if (Variables.skill_to_train == Skill.ATTACK){
if (Variables.fighting_bury_bones) if (Variables.fighting_bury_bones)
itemIDs = new int[]{526}; // TODO: need to add all the other bones itemIDs = new int[]{526}; // TODO: need to add all the other bones
} }
itemIDs = Methods.combineIntArrays(Variables.fighting_item_ids, itemIDs); itemIDs = Methods.combineIntArrays(Variables.fighting_item_ids, itemIDs);
return GroundItems.getNearest(itemIDs); return itemIDs;
} }
} }
src/main/java/ParaScript/ui/UI.java
+3 -3
View File
@@ -327,7 +327,7 @@ public class UI extends JFrame {
for (int i = 0; i < sample.length; i++) for (int i = 0; i < sample.length; i++)
customIDs[i] = Integer.parseInt(sample[i]); customIDs[i] = Integer.parseInt(sample[i]);
Variables.fighting_npc_selected.setIDs(customIDs); Variables.fighting_npc_selected.setIDs(customIDs);
} catch (Exception err) { } catch (Exception ಠ_ಠ) {
FightingNpcs.CUSTOM.setIDs(new int[]{0}); FightingNpcs.CUSTOM.setIDs(new int[]{0});
} }
} }
@@ -371,7 +371,7 @@ public class UI extends JFrame {
for (int i = 0; i < sample.length; i++) for (int i = 0; i < sample.length; i++)
customIDs[i] = Integer.parseInt(sample[i]); customIDs[i] = Integer.parseInt(sample[i]);
Variables.fighting_item_ids = customIDs; Variables.fighting_item_ids = customIDs;
} catch (Exception err) { } catch (Exception ಠ_ಠ) {
Variables.fighting_item_ids = new int[]{}; Variables.fighting_item_ids = new int[]{};
} }
} }
@@ -435,7 +435,7 @@ public class UI extends JFrame {
for (int i = 0; i < sample.length; i++) for (int i = 0; i < sample.length; i++)
customIDs[i] = Integer.parseInt(sample[i]); customIDs[i] = Integer.parseInt(sample[i]);
Variables.thieving_npc_selected.setIDs(customIDs); Variables.thieving_npc_selected.setIDs(customIDs);
} catch (Exception err) { } catch (Exception ಠ_ಠ) {
ThievingNpcs.CUSTOM.setIDs(new int[]{0}); ThievingNpcs.CUSTOM.setIDs(new int[]{0});
} }
} }