farming: Support Kebos Lowlands update

This commit is contained in:
Max Weber
2019-01-15 22:19:33 -07:00
parent c017bd4a36
commit 72ca27edca
4 changed files with 885 additions and 558 deletions

View File

@@ -390,6 +390,15 @@ public enum Varbits
FARMING_4772(4772),
FARMING_4773(4773),
FARMING_4774(4774),
FARMING_4775(4775),
FARMING_7904(7904),
FARMING_7905(7905),
FARMING_7906(7906),
FARMING_7907(7907),
FARMING_7908(7908),
FARMING_7909(7909),
FARMING_7910(7910),
FARMING_7911(7911),
/**
* Transmog controllers for grapes

View File

@@ -57,7 +57,7 @@ class FarmingWorld
// Some of these patches get updated in multiple regions.
// It may be worth it to add a specialization for these patches
add(new FarmingRegion("Al Kharid", 13106,
new FarmingPatch("Cactus", Varbits.FARMING_4771, PatchImplementation.CACTUS)
new FarmingPatch("", Varbits.FARMING_4771, PatchImplementation.CACTUS)
));
add(new FarmingRegion("Ardougne", 10290,
@@ -225,6 +225,25 @@ class FarmingWorld
new FarmingPatch("", Varbits.FARMING_4771, PatchImplementation.HERB)
));
add(new FarmingRegion("Farming Guild", 5021,
new FarmingPatch("Hespori", Varbits.FARMING_7908, PatchImplementation.HESPORI)
));
add(new FarmingRegion("Farming Guild", 4922,
new FarmingPatch("", Varbits.FARMING_7905, PatchImplementation.TREE),
new FarmingPatch("", Varbits.FARMING_4775, PatchImplementation.HERB),
new FarmingPatch("", Varbits.FARMING_4772, PatchImplementation.BUSH),
new FarmingPatch("", Varbits.FARMING_7906, PatchImplementation.FLOWER),
new FarmingPatch("North", Varbits.FARMING_4773, PatchImplementation.ALLOTMENT),
new FarmingPatch("South", Varbits.FARMING_4774, PatchImplementation.ALLOTMENT),
new FarmingPatch("", Varbits.FARMING_7904, PatchImplementation.CACTUS),
new FarmingPatch("", Varbits.FARMING_4771, PatchImplementation.SPIRIT_TREE),
new FarmingPatch("", Varbits.FARMING_7909, PatchImplementation.FRUIT_TREE),
new FarmingPatch("Anima", Varbits.FARMING_7911, PatchImplementation.ANIMA),
new FarmingPatch("", Varbits.FARMING_7910, PatchImplementation.CELASTRUS),
new FarmingPatch("", Varbits.FARMING_7907, PatchImplementation.REDWOOD)
));
// Finalize
this.regions = Collections.unmodifiableMap(regions);
Map<Tab, Set<FarmingPatch>> umtabs = new TreeMap<>();

View File

@@ -28,6 +28,7 @@ package net.runelite.client.plugins.timetracking.farming;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.runelite.api.ItemID;
import net.runelite.api.NullItemID;
@RequiredArgsConstructor
@Getter
@@ -44,6 +45,7 @@ public enum Produce
SWEETCORN("Sweetcorn", ItemID.SWEETCORN, 10, 6, 0, 3),
STRAWBERRY("Strawberry", ItemID.STRAWBERRY, 10, 7, 0, 3),
WATERMELON("Watermelon", ItemID.WATERMELON, 10, 8, 0, 3),
SNAPE_GRASS("Snape grass", ItemID.SNAPE_GRASS, 10, 8, 0, 3),
// Flower crops
MARIGOLD("Marigold", ItemID.MARIGOLDS, 5, 5),
@@ -51,6 +53,7 @@ public enum Produce
NASTURTIUM("Nasturtium", ItemID.NASTURTIUMS, 5, 5),
WOAD("Woad", ItemID.WOAD_LEAF, 5, 5),
LIMPWURT("Limpwurt", ItemID.LIMPWURT_ROOT, 5, 5),
WHITE_LILY("While lily", ItemID.WHITE_LILY, 5, 5),
// Bush crops
REDBERRIES("Redberry", ItemID.REDBERRIES, 20, 6, 20, 5),
@@ -85,7 +88,7 @@ public enum Produce
DWARF_WEED("Dwarf Weed", ItemID.DWARF_WEED, 20, 5, 0, 3),
TORSTOL("Torstol", ItemID.TORSTOL, 20, 5, 0, 3),
GOUTWEED("Goutweed", ItemID.GOUTWEED, 20, 5, 0, 2),
ANYHERB("Any Herb", ItemID.GUAM_LEAF, 20, 5, 0, 3),
ANYHERB("Any herb", ItemID.GUAM_LEAF, 20, 5, 0, 3),
// Tree crops
OAK("Oak", ItemID.OAK_LOGS, 40, 5),
@@ -102,17 +105,31 @@ public enum Produce
PINEAPPLE("Pineapple", ItemID.PINEAPPLE, 160, 7, 45, 7),
PAPAYA("Papaya", ItemID.PAPAYA_FRUIT, 160, 7, 45, 7),
PALM("Palm", ItemID.COCONUT, 160, 7, 45, 7),
DRAGONFRUIT("Dragonfruit", ItemID.DRAGONFRUIT, 160, 7, 45, 7),
// Cactus
CACTUS("Cactus", ItemID.CACTUS_SPINE, 80, 8, 20, 4),
POTATO_CACTUS("Potato cactus", ItemID.POTATO_CACTUS, 10, 8, 5, 7),
// Hardwood
TEAK("Teak", ItemID.TEAK_LOGS, 560, 8),
MAHOGANY("Mahogany", ItemID.MAHOGANY_LOGS, 640, 9),
// Anima
ATTAS("Attas", NullItemID.NULL_22940, 640, 9),
IASOR("Iasro", NullItemID.NULL_22939, 640, 9),
KRONOS("Kronos", NullItemID.NULL_22938, 640, 9),
// Special crops
SEAWEED("Seaweed", ItemID.GIANT_SEAWEED, 10, 5, 0, 4),
TEAK("Teak", ItemID.TEAK_LOGS, 560, 8),
GRAPE("Grape", ItemID.GRAPES, 5, 8, 0, 5),
MUSHROOM("Mushroom", ItemID.MUSHROOM, 40, 7, 0, 7),
MAHOGANY("Mahogany", ItemID.MAHOGANY_LOGS, 640, 9),
CACTUS("Cactus", ItemID.POTATO_CACTUS, 80, 8, 20, 4),
BELLADONNA("Belladonna", ItemID.CAVE_NIGHTSHADE, 80, 5),
CALQUAT("Calquat", ItemID.CALQUAT_FRUIT, 160, 9, 0, 7),
SPIRIT_TREE("Spirit Tree", ItemID.SPIRIT_TREE, 320, 13);
SPIRIT_TREE("Spirit tree", ItemID.SPIRIT_TREE, 320, 13),
CELASTRUS("Celastrus", ItemID.BATTLESTAFF, 160, 6, 0, 4),
REDWOOD("Redwood", ItemID.REDWOOD_LOGS, 640, 11),
HESPORI("Hespori", NullItemID.NULL_23044, 640, 4, 0, 2);
/**
* User-visible name