ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

woodcutting: add Isle Of Souls trees

Browse Source
This commit is contained in:
Daniel Bolink
2022-02-01 17:20:17 -08:00
committed by GitHub
parent f283871f50
commit 03f0df17b6
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
View File

@@ -34,18 +34,23 @@ import static net.runelite.api.ObjectID.MAGIC_TREE_10834;
import static net.runelite.api.NullObjectID.NULL_10835; import static net.runelite.api.NullObjectID.NULL_10835;
import static net.runelite.api.ObjectID.MAHOGANY; import static net.runelite.api.ObjectID.MAHOGANY;
import static net.runelite.api.ObjectID.MAHOGANY_36688; import static net.runelite.api.ObjectID.MAHOGANY_36688;
import static net.runelite.api.ObjectID.MAHOGANY_40760;
import static net.runelite.api.ObjectID.MAPLE_TREE_10832; import static net.runelite.api.ObjectID.MAPLE_TREE_10832;
import static net.runelite.api.ObjectID.MAPLE_TREE_36681; import static net.runelite.api.ObjectID.MAPLE_TREE_36681;
import static net.runelite.api.ObjectID.MAPLE_TREE_40754;
import static net.runelite.api.ObjectID.OAK_10820; import static net.runelite.api.ObjectID.OAK_10820;
import static net.runelite.api.ObjectID.OAK_TREE_4540; import static net.runelite.api.ObjectID.OAK_TREE_4540;
import static net.runelite.api.ObjectID.REDWOOD_29670; import static net.runelite.api.ObjectID.REDWOOD_29670;
import static net.runelite.api.ObjectID.TEAK; import static net.runelite.api.ObjectID.TEAK;
import static net.runelite.api.ObjectID.TEAK_36686; import static net.runelite.api.ObjectID.TEAK_36686;
import static net.runelite.api.ObjectID.TEAK_40758;
import static net.runelite.api.ObjectID.TREE; import static net.runelite.api.ObjectID.TREE;
import static net.runelite.api.ObjectID.TREE_1277; import static net.runelite.api.ObjectID.TREE_1277;
import static net.runelite.api.ObjectID.TREE_1278; import static net.runelite.api.ObjectID.TREE_1278;
import static net.runelite.api.ObjectID.TREE_1279; import static net.runelite.api.ObjectID.TREE_1279;
import static net.runelite.api.ObjectID.TREE_1280; import static net.runelite.api.ObjectID.TREE_1280;
import static net.runelite.api.ObjectID.TREE_40750;
import static net.runelite.api.ObjectID.TREE_40752;
import static net.runelite.api.ObjectID.WILLOW; import static net.runelite.api.ObjectID.WILLOW;
import static net.runelite.api.ObjectID.WILLOW_10829; import static net.runelite.api.ObjectID.WILLOW_10829;
import static net.runelite.api.ObjectID.WILLOW_10831; import static net.runelite.api.ObjectID.WILLOW_10831;
@@ -53,15 +58,16 @@ import static net.runelite.api.ObjectID.WILLOW_10833;
import static net.runelite.api.ObjectID.YEW; import static net.runelite.api.ObjectID.YEW;
import static net.runelite.api.NullObjectID.NULL_10823; import static net.runelite.api.NullObjectID.NULL_10823;
import static net.runelite.api.ObjectID.YEW_36683; import static net.runelite.api.ObjectID.YEW_36683;
import static net.runelite.api.ObjectID.YEW_40756;
import static net.runelite.client.util.RSTimeUnit.GAME_TICKS; import static net.runelite.client.util.RSTimeUnit.GAME_TICKS;
@Getter @Getter
enum Tree enum Tree
{ {
REGULAR_TREE(null, TREE, TREE_1277, TREE_1278, TREE_1279, TREE_1280), REGULAR_TREE(null, TREE, TREE_1277, TREE_1278, TREE_1279, TREE_1280, TREE_40750, TREE_40752),
OAK_TREE(Duration.of(14, GAME_TICKS), OAK_TREE_4540, OAK_10820), OAK_TREE(Duration.of(14, GAME_TICKS), OAK_TREE_4540, OAK_10820),
WILLOW_TREE(Duration.of(14, GAME_TICKS), WILLOW, WILLOW_10829, WILLOW_10831, WILLOW_10833), WILLOW_TREE(Duration.of(14, GAME_TICKS), WILLOW, WILLOW_10829, WILLOW_10831, WILLOW_10833),
MAPLE_TREE(Duration.of(59, GAME_TICKS), MAPLE_TREE_10832, MAPLE_TREE_36681) MAPLE_TREE(Duration.of(59, GAME_TICKS), MAPLE_TREE_10832, MAPLE_TREE_36681, MAPLE_TREE_40754)
{ {
@Override @Override
Duration getRespawnTime(int region) Duration getRespawnTime(int region)
@@ -69,9 +75,9 @@ enum Tree
return region == MISCELLANIA_REGION ? Duration.of(14, GAME_TICKS) : super.respawnTime; return region == MISCELLANIA_REGION ? Duration.of(14, GAME_TICKS) : super.respawnTime;
} }
}, },
TEAK_TREE(Duration.of(15, GAME_TICKS), TEAK, TEAK_36686), TEAK_TREE(Duration.of(15, GAME_TICKS), TEAK, TEAK_36686, TEAK_40758),
MAHOGANY_TREE(Duration.of(14, GAME_TICKS), MAHOGANY, MAHOGANY_36688), MAHOGANY_TREE(Duration.of(14, GAME_TICKS), MAHOGANY, MAHOGANY_36688, MAHOGANY_40760),
YEW_TREE(Duration.of(99, GAME_TICKS), YEW, NULL_10823, YEW_36683), YEW_TREE(Duration.of(99, GAME_TICKS), YEW, NULL_10823, YEW_36683, YEW_40756),
MAGIC_TREE(Duration.of(199, GAME_TICKS), MAGIC_TREE_10834, NULL_10835), MAGIC_TREE(Duration.of(199, GAME_TICKS), MAGIC_TREE_10834, NULL_10835),
REDWOOD(Duration.of(199, GAME_TICKS), ObjectID.REDWOOD, REDWOOD_29670); REDWOOD(Duration.of(199, GAME_TICKS), ObjectID.REDWOOD, REDWOOD_29670);