update timetracking for sailing

src/modules/timetracking/BirdHouse.js

@@ -77,43 +77,43 @@ export class BirdHouse_$WRAPPER {
 }
 BirdHouse['__class'] = 'timetracking.BirdHouse'
 BirdHouse['_$wrappers'] = {
-  0: new BirdHouse_$WRAPPER(0, 'NORMAL', 'Bird House', ItemID.BIRD_HOUSE),
-  1: new BirdHouse_$WRAPPER(1, 'OAK', 'Oak Bird House', ItemID.OAK_BIRD_HOUSE),
+  0: new BirdHouse_$WRAPPER(0, 'NORMAL', 'Bird House', ItemID.BIRDHOUSE_NORMAL),
+  1: new BirdHouse_$WRAPPER(1, 'OAK', 'Oak Bird House', ItemID.BIRDHOUSE_OAK),
   2: new BirdHouse_$WRAPPER(
     2,
     'WILLOW',
     'Willow Bird House',
-    ItemID.WILLOW_BIRD_HOUSE
+    ItemID.BIRDHOUSE_WILLOW
   ),
   3: new BirdHouse_$WRAPPER(
     3,
     'TEAK',
     'Teak Bird House',
-    ItemID.TEAK_BIRD_HOUSE
+    ItemID.BIRDHOUSE_TEAK
   ),
   4: new BirdHouse_$WRAPPER(
     4,
     'MAPLE',
     'Maple Bird House',
-    ItemID.MAPLE_BIRD_HOUSE
+    ItemID.BIRDHOUSE_MAPLE
   ),
   5: new BirdHouse_$WRAPPER(
     5,
     'MAHOGANY',
     'Mahogany Bird House',
-    ItemID.MAHOGANY_BIRD_HOUSE
+    ItemID.BIRDHOUSE_MAHOGANY
   ),
-  6: new BirdHouse_$WRAPPER(6, 'YEW', 'Yew Bird House', ItemID.YEW_BIRD_HOUSE),
+  6: new BirdHouse_$WRAPPER(6, 'YEW', 'Yew Bird House', ItemID.BIRDHOUSE_YEW),
   7: new BirdHouse_$WRAPPER(
     7,
     'MAGIC',
     'Magic Bird House',
-    ItemID.MAGIC_BIRD_HOUSE
+    ItemID.BIRDHOUSE_MAGIC
   ),
   8: new BirdHouse_$WRAPPER(
     8,
     'REDWOOD',
     'Redwood Bird House',
-    ItemID.REDWOOD_BIRD_HOUSE
+    ItemID.BIRDHOUSE_REDWOOD
   )
 }

src/modules/timetracking/FarmingWorld.js

@@ -38,6 +38,18 @@ export class FarmingWorld {
       5677,
       5678
     )
+    this.add(
+      new FarmingRegion(
+        "Anglers' Retreat",
+        9770,
+        false,
+        new FarmingPatch(
+          '',
+          VarbitID.FARMING_TRANSMIT_A,
+          PatchImplementation.HARDWOOD_TREE
+        )
+      )
+    )
     this.add(
       new FarmingRegion(
         'Ardougne',
@@ -383,6 +395,42 @@ export class FarmingWorld {
       9526,
       9525
     )
+    this.add(
+      new FarmingRegion(
+        'Great Conch',
+        12581,
+        true,
+        new FarmingPatch(
+          'East',
+          VarbitID.FARMING_TRANSMIT_A,
+          PatchImplementation.CORAL
+        ),
+        new FarmingPatch(
+          'West',
+          VarbitID.FARMING_TRANSMIT_B,
+          PatchImplementation.CORAL
+        ),
+        new FarmingPatch(
+          '',
+          VarbitID.FARMING_TRANSMIT_C,
+          PatchImplementation.CALQUAT
+        )
+      ),
+      12325,
+      12326,
+      12327,
+      12580,
+      12581,
+      12582,
+      12583,
+      12836,
+      12837,
+      12838,
+      12839,
+      13092,
+      13093,
+      13194
+    )
     this.add(
       new FarmingRegion(
         'Harmony',
@@ -403,7 +451,7 @@ export class FarmingWorld {
     this.add(
       new FarmingRegion(
         'Kastori',
-        5243,
+        5423,
         false,
         new FarmingPatch(
           '',

src/modules/timetracking/ItemID.js

@@ -1,13 +1,13 @@
 // @ts-nocheck
 /* eslint-disable */
 export class ItemID {}
-ItemID.GRIMY_RANARR_WEED = 207
+ItemID.UNIDENTIFIED_RANARR = 207
 ItemID.LIMPWURT_ROOT = 225
 ItemID.SNAPE_GRASS = 231
 ItemID.WHITE_BERRIES = 239
 ItemID.JANGERBERRIES = 247
 ItemID.GUAM_LEAF = 249
-ItemID.MARRENTILL = 251
+ItemID.MARENTILL = 251
 ItemID.TARROMIN = 253
 ItemID.HARRALANDER = 255
 ItemID.RANARR_WEED = 257
@@ -17,14 +17,15 @@ ItemID.KWUARM = 263
 ItemID.CADANTINE = 265
 ItemID.DWARF_WEED = 267
 ItemID.TORSTOL = 269
-ItemID.CADAVA_BERRIES = 753
+ItemID.CADAVABERRIES = 753
 ItemID.BATTLESTAFF = 1391
 ItemID.MAGIC_LOGS = 1513
 ItemID.YEW_LOGS = 1515
 ItemID.MAPLE_LOGS = 1517
 ItemID.WILLOW_LOGS = 1519
 ItemID.OAK_LOGS = 1521
-ItemID.WOAD_LEAF = 1793
+ItemID.FLAX = 1779
+ItemID.WOADLEAF = 1793
 ItemID.POTATO = 1942
 ItemID.REDBERRIES = 1951
 ItemID.COOKING_APPLE = 1955
@@ -36,18 +37,20 @@ ItemID.GRAPES = 1987
 ItemID.ORANGE = 2108
 ItemID.PINEAPPLE = 2114
 ItemID.DWELLBERRIES = 2126
-ItemID.CAVE_NIGHTSHADE = 2398
-ItemID.RED_FLOWERS = 2462
+ItemID.NIGHTSHADE = 2398
+ItemID.FLOWERS_WATERFALL_QUEST_RED = 2462
 ItemID.LANTADYME = 2481
-ItemID.WATCH = 2575
+ItemID.ROTTEN_TOMATO = 2518
+ItemID.TRAIL_WATCH = 2575
 ItemID.TOADFLAX = 2998
 ItemID.SNAPDRAGON = 3000
-ItemID.POTATO_CACTUS = 3138
-ItemID.GOUTWEED = 3261
+ItemID.CACTUS_POTATO = 3138
+ItemID.EADGAR_GOUTWEED_HERB = 3261
+ItemID.EADGAR_FADE_TO_BLACK_INV = 3271
 ItemID.STRAWBERRY = 5504
 ItemID.JUTE_FIBRE = 5931
 ItemID.CURRY_LEAF = 5970
-ItemID.PAPAYA_FRUIT = 5972
+ItemID.PAPAYA = 5972
 ItemID.COCONUT = 5974
 ItemID.CALQUAT_FRUIT = 5980
 ItemID.WATERMELON = 5982
@@ -57,37 +60,47 @@ ItemID.ASGARNIAN_HOPS = 5996
 ItemID.YANILLIAN_HOPS = 5998
 ItemID.KRANDORIAN_HOPS = 6000
 ItemID.WILDBLOOD_HOPS = 6002
-ItemID.MUSHROOM = 6004
+ItemID.BITTERCAP_MUSHROOM = 6004
 ItemID.BARLEY = 6006
-ItemID.MARIGOLDS = 6010
-ItemID.NASTURTIUMS = 6012
+ItemID.MARIGOLD = 6010
+ItemID.NASTURTIUM = 6012
 ItemID.ROSEMARY = 6014
 ItemID.CACTUS_SPINE = 6016
-ItemID.POISON_IVY_BERRIES = 6018
+ItemID.POISONIVY_BERRIES = 6018
+ItemID.BUCKET_COMPOST = 6032
+ItemID.BUCKET_SUPERCOMPOST = 6034
 ItemID.WEEDS = 6055
-ItemID.SCARECROW = 6059
-ItemID.SPIRIT_TREE = 6063
+ItemID.SCARECROW_COMPLETE = 6059
+ItemID.SPIRIT_TREE_DUMMY = 6063
 ItemID.MAHOGANY_LOGS = 6332
 ItemID.TEAK_LOGS = 6333
 ItemID.REDWOOD_LOGS = 19669
+ItemID.BUCKET_ULTRACOMPOST = 21483
 ItemID.GIANT_SEAWEED = 21504
-ItemID.OLD_NOTES = 22051
+ItemID.BIRDHOUSE_NORMAL = 21512
+ItemID.BIRDHOUSE_OAK = 21515
+ItemID.BIRDHOUSE_WILLOW = 21518
+ItemID.BIRDHOUSE_TEAK = 21521
+ItemID.DS2_CRANDOR_NOTES = 22051
+ItemID.BIRDHOUSE_MAPLE = 22192
+ItemID.BIRDHOUSE_MAHOGANY = 22195
+ItemID.BIRDHOUSE_YEW = 22198
+ItemID.BIRDHOUSE_MAGIC = 22201
+ItemID.BIRDHOUSE_REDWOOD = 22204
 ItemID.DRAGONFRUIT = 22929
-ItemID.WHITE_LILY = 22932
-ItemID.CRYSTAL_SHARDS = 23866
-ItemID.BIRD_HOUSE = 21512
-ItemID.OAK_BIRD_HOUSE = 21515
-ItemID.WILLOW_BIRD_HOUSE = 21518
-ItemID.TEAK_BIRD_HOUSE = 21521
-ItemID.MAPLE_BIRD_HOUSE = 22192
-ItemID.MAHOGANY_BIRD_HOUSE = 22195
-ItemID.YEW_BIRD_HOUSE = 22198
-ItemID.MAGIC_BIRD_HOUSE = 22201
-ItemID.REDWOOD_BIRD_HOUSE = 22204
-ItemID.FEATHER = 314
-ItemID.COMPOST_BIN = 3271
-ItemID.COMPOST = 6032
-ItemID.SUPERCOMPOST = 6034
-ItemID.ULTRACOMPOST = 21483
-ItemID.ROTTEN_TOMATO = 2518
+ItemID.WHITELILLY = 22932
+ItemID.ANIMA_KRONOS = 22938
+ItemID.ANIMA_IASOR = 22939
+ItemID.ANIMA_ATTAS = 22940
+ItemID.HESPORI = 23044
+ItemID.GAUNTLET_CRYSTAL_SHARD = 23866
+ItemID.HUASCA = 30097
+ItemID.HEMP = 31457
+ItemID.COTTON_BOLL = 31460
+ItemID.CORAL_ELKHORN = 31481
+ItemID.CORAL_PILLAR = 31484
+ItemID.CORAL_UMBRAL = 31487
+ItemID.CAMPHOR_LOGS = 32904
+ItemID.IRONWOOD_LOGS = 32907
+ItemID.ROSEWOOD_LOGS = 32910
 ItemID['__class'] = 'timetracking.ItemID'