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

Add more rocks/ores

Browse Source
This commit is contained in:
RedSparr0w
2019-10-23 14:05:16 +13:00
parent 10b9377b94
commit 44b7d7cc65
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ParaScript/data/variables/Ores.java
+26 -19
View File
@@ -5,26 +5,35 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
public enum Ores { public enum Ores {
COPPER_TIN("Copper & Tin", new int[]{2090, 2094}, 17.5), ESSENCE("Essence", new int[] { 2491 }, 1, 5, 3, 1, new int[] { 1436, 7936 }),
COPPER("Copper", new int[]{2090}, 17.5), CLAY("Clay", new int[] { 2108, 2109, 11189, 11190, 11191, 9713, 9711, 14905, 14904 }, 1, 5, 1, 5, new int[] { 434 }),
TIN("Tin", new int[]{2094}, 17.5), COPPER("Copper", new int[] { 3042, 2091, 2090, 9708, 9709, 9710, 11960, 14906, 14907 }, 1, 18, 1, 8, new int[] { 436 }),
SILVER("Silver", new int[]{2100, 2101, 6945, 6946}, 0), TIN("Tin", new int[] { 2094, 2095, 3043, 9716, 9714, 11958, 11957, 11959, 11933, 11934, 11935, 14903, 14902 }, 1, 18, 1, 8, new int[] { 438 }),
GOLD("Gold", new int[]{2098, 2099, 2609, 2610, 2611, 5768, 5769}, 0), BLURITE("Blurite", new int[] { 10574, 10583, 2110 }, 10, 20, 1, 8, new int[] { 668 }),
IRON ("Iron", new int[]{2092, 2093}, 35), IRON("Iron", new int[] { 2093, 2092, 9717, 9718, 9719, 11962, 11956, 11954, 14856, 14857, 14858, 14914, 14913 }, 15, 35, 2, 5, new int[] { 440 }),
COAL("Coal", new int[]{2096, 2097}, 50), SILVER("Silver", new int[] { 2101, 11186, 11187, 11188, 2100 }, 20, 40, 3, 20, new int[] { 442 }),
MITHRIL("Mithril", new int[]{2102, 2103}, 0), COAL("Coal", new int[] { 2096, 2097, 11963, 11964, 14850, 14851, 14852, 11930, 11931 }, 30, 50, 4, 25, new int[] { 453 }),
ADAMANT("Adamant", new int[]{2104, 2105, 3040, 3273, 5782, 5783}, 0), GOLD("Gold", new int[] { 2099, 2098, 11183, 11184, 11185, 9720, 9722 }, 40, 65, 6, 33, new int[] { 444 }),
RUNITE("Runite", new int[]{14859, 14860}, 0), MITHRIL("Mithril", new int[] { 2103, 2102, 14853, 14854, 14855 }, 55, 80, 8, 50, new int[] { 447 }),
PURE_ESSENCE("Pure Essence", new int[]{2491}, 0); ADAMANT("Adamant", new int[] { 2104, 2105, 14862, 14863, 14864 }, 70, 95, 10, 83, new int[] { 449 }),
RUNE("Rune", new int[] { 14859, 14860, 2106, 2107 }, 85, 125, 20, 166, new int[] { 451 }),
GRANITE("Granite", new int[] { 10947 }, 45, 75, 10, 10, new int[] { 6979, 6981, 6983 }),
SANDSTONE("Sandstone", new int[] { 10946 }, 35, 60, 5, 5, new int[] { 6971, 6973, 6975, 6977 }),
GEM("Gem", new int[] {2111}, 40, 65, 6, 120, new int[] {1});
private String name; private final String name;
private int[] ids; private final int levelReq, mineTimer, respawnTimer, xp;
private double xp; private final int[] oreIds;
private final int[] objectId;
Ores(String name, int[] ids, double xp) { Ores(final String name, final int[] objectId, final int levelReq, final int xp, final int mineTimer, final int respawnTimer, final int... oreIds) {
this.name = name; this.name = name;
this.ids = ids; this.objectId = objectId;
this.levelReq = levelReq;
this.xp = xp; this.xp = xp;
this.mineTimer = mineTimer;
this.respawnTimer = respawnTimer;
this.oreIds = oreIds;
} }
public static String[] toStringArray() { public static String[] toStringArray() {
@@ -41,7 +50,5 @@ public enum Ores {
public String getName() { return this.name; } public String getName() { return this.name; }
public int[] getIDs() { return this.ids; } public int[] getIDs() { return this.objectId; }
public double getXP() { return this.xp; }
} }
src/main/java/ParaScript/strategies/Mine.java
-6
View File
@@ -46,12 +46,6 @@ public class Mine implements Strategy {
private SceneObject ore(){ private SceneObject ore(){
int[] ore_to_mine = Variables.mining_ore_selected.getIDs(); int[] ore_to_mine = Variables.mining_ore_selected.getIDs();
if (ore_to_mine == Ores.COPPER_TIN.getIDs()) {
if (Inventory.getCount(437) >= 14)
ore_to_mine = Ores.TIN.getIDs();
if (Inventory.getCount(439) >= 14)
ore_to_mine = Ores.COPPER.getIDs();
}
for(SceneObject ore : SceneObjects.getNearest(ore_to_mine)){ for(SceneObject ore : SceneObjects.getNearest(ore_to_mine)){
if(Variables.VARROCK_EAST_MINE_ZONE.inTheZoneObject(ore)) { if(Variables.VARROCK_EAST_MINE_ZONE.inTheZoneObject(ore)) {
return ore; return ore;