diff --git a/src/modules/timetracking/FarmingWorld.js b/src/modules/timetracking/FarmingWorld.js index bcb5eefa7..31b4c3ef1 100644 --- a/src/modules/timetracking/FarmingWorld.js +++ b/src/modules/timetracking/FarmingWorld.js @@ -12,17 +12,42 @@ export class FarmingWorld { 'Al Kharid', 13106, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.CACTUS) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.CACTUS + ) ), 13362, 13105 ) + this.add( + new FarmingRegion( + 'Aldarin', + 5421, + false, + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.HOPS + ) + ), + 5165, + 5166, + 5422, + 5677, + 5678 + ) this.add( new FarmingRegion( 'Ardougne', 10290, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.BUSH) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.BUSH + ) ), 10546 ) @@ -33,19 +58,50 @@ export class FarmingWorld { false, new FarmingPatch( 'North', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4773, PatchImplementation.FLOWER), - new FarmingPatch('', Varbits.FARMING_4774, PatchImplementation.HERB), - new FarmingPatch('', Varbits.FARMING_4775, PatchImplementation.COMPOST) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_D, + PatchImplementation.HERB + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, + PatchImplementation.COMPOST + ) ) ) + this.add( + new FarmingRegion( + 'Auburnvale', + 5427, + false, + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.TREE + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_B, + PatchImplementation.BELLADONNA + ) + ), + 5428, + 5684 + ) this.add( new FarmingRegion( 'Avium Savannah', @@ -53,7 +109,7 @@ export class FarmingWorld { true, new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.HARDWOOD_TREE ) ), @@ -66,12 +122,12 @@ export class FarmingWorld { false, new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.FRUIT_TREE ), new FarmingPatch( '', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.SPIRIT_TREE ) ), @@ -84,17 +140,29 @@ export class FarmingWorld { false, new FarmingPatch( 'North', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4773, PatchImplementation.FLOWER), - new FarmingPatch('', Varbits.FARMING_4774, PatchImplementation.HERB), - new FarmingPatch('', Varbits.FARMING_4775, PatchImplementation.COMPOST) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_D, + PatchImplementation.HERB + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, + PatchImplementation.COMPOST + ) ), 11061, 11318, @@ -107,7 +175,7 @@ export class FarmingWorld { false, new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.FRUIT_TREE ) ) @@ -119,26 +187,46 @@ export class FarmingWorld { false, new FarmingPatch( 'North', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4773, PatchImplementation.FLOWER), - new FarmingPatch('', Varbits.FARMING_4774, PatchImplementation.HERB), - new FarmingPatch('', Varbits.FARMING_4775, PatchImplementation.COMPOST) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_D, + PatchImplementation.HERB + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, + PatchImplementation.COMPOST + ) ), - 6448 + 6447, + 6448, + 6449, + 6191, + 6193 ) this.add( new FarmingRegion( "Champions' Guild", 12596, true, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.BUSH) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.BUSH + ) ) ) this.add( @@ -147,8 +235,8 @@ export class FarmingWorld { 12340, false, new FarmingPatch( - 'Belladonna', - Varbits.FARMING_4771, + '', + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.BELLADONNA ) ) @@ -158,7 +246,11 @@ export class FarmingWorld { 'Entrana', 11060, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.HOPS) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.HOPS + ) ), 11316 ) @@ -167,10 +259,14 @@ export class FarmingWorld { 'Etceteria', 10300, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.BUSH), new FarmingPatch( '', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.BUSH + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.SPIRIT_TREE ) ) @@ -180,7 +276,11 @@ export class FarmingWorld { 'Falador', 11828, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.TREE) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.TREE + ) ), 12084 ) @@ -191,17 +291,29 @@ export class FarmingWorld { false, new FarmingPatch( 'North West', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South East', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4773, PatchImplementation.FLOWER), - new FarmingPatch('', Varbits.FARMING_4774, PatchImplementation.HERB), - new FarmingPatch('', Varbits.FARMING_4775, PatchImplementation.COMPOST) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_D, + PatchImplementation.HERB + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, + PatchImplementation.COMPOST + ) ) ) this.add( @@ -211,17 +323,17 @@ export class FarmingWorld { false, new FarmingPatch( 'East', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.HARDWOOD_TREE ), new FarmingPatch( 'Middle', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.HARDWOOD_TREE ), new FarmingPatch( 'West', - Varbits.FARMING_4773, + VarbitID.FARMING_TRANSMIT_C, PatchImplementation.HARDWOOD_TREE ) ), @@ -241,12 +353,12 @@ export class FarmingWorld { false, new FarmingPatch( 'North', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.SEAWEED ), new FarmingPatch( 'South', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.SEAWEED ) ) @@ -256,10 +368,14 @@ export class FarmingWorld { 'Gnome Stronghold', 9781, true, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.TREE), new FarmingPatch( '', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.TREE + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.FRUIT_TREE ) ), @@ -274,12 +390,40 @@ export class FarmingWorld { false, new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4772, PatchImplementation.HERB) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_B, + PatchImplementation.HERB + ) ) ) + this.add( + new FarmingRegion( + 'Kastori', + 5243, + false, + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.CALQUAT + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_B, + PatchImplementation.FRUIT_TREE + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ) + ), + 5167, + 5424 + ) this.add( new FarmingRegion( 'Kourend', @@ -287,20 +431,32 @@ export class FarmingWorld { false, new FarmingPatch( 'North East', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South West', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4773, PatchImplementation.FLOWER), - new FarmingPatch('', Varbits.FARMING_4774, PatchImplementation.HERB), - new FarmingPatch('', Varbits.FARMING_4775, PatchImplementation.COMPOST), new FarmingPatch( '', - Varbits.FARMING_7904, + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_D, + PatchImplementation.HERB + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, + PatchImplementation.COMPOST + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_F, PatchImplementation.SPIRIT_TREE ) ), @@ -313,62 +469,62 @@ export class FarmingWorld { false, new FarmingPatch( 'East 1', - Varbits.GRAPES_4953, + VarbitID.FARMING_TRANSMIT_A1, PatchImplementation.GRAPES ), new FarmingPatch( 'East 2', - Varbits.GRAPES_4954, + VarbitID.FARMING_TRANSMIT_A2, PatchImplementation.GRAPES ), new FarmingPatch( 'East 3', - Varbits.GRAPES_4955, + VarbitID.FARMING_TRANSMIT_B1, PatchImplementation.GRAPES ), new FarmingPatch( 'East 4', - Varbits.GRAPES_4956, + VarbitID.FARMING_TRANSMIT_B2, PatchImplementation.GRAPES ), new FarmingPatch( 'East 5', - Varbits.GRAPES_4957, + VarbitID.FARMING_TRANSMIT_C1, PatchImplementation.GRAPES ), new FarmingPatch( 'East 6', - Varbits.GRAPES_4958, + VarbitID.FARMING_TRANSMIT_C2, PatchImplementation.GRAPES ), new FarmingPatch( 'West 1', - Varbits.GRAPES_4959, + VarbitID.FARMING_TRANSMIT_D1, PatchImplementation.GRAPES ), new FarmingPatch( 'West 2', - Varbits.GRAPES_4960, + VarbitID.FARMING_TRANSMIT_D2, PatchImplementation.GRAPES ), new FarmingPatch( 'West 3', - Varbits.GRAPES_4961, + VarbitID.FARMING_TRANSMIT_E1, PatchImplementation.GRAPES ), new FarmingPatch( 'West 4', - Varbits.GRAPES_4962, + VarbitID.FARMING_TRANSMIT_E2, PatchImplementation.GRAPES ), new FarmingPatch( 'West 5', - Varbits.GRAPES_4963, + VarbitID.FARMING_TRANSMIT_F1, PatchImplementation.GRAPES ), new FarmingPatch( 'West 6', - Varbits.GRAPES_4964, + VarbitID.FARMING_TRANSMIT_F2, PatchImplementation.GRAPES ) ) @@ -380,7 +536,7 @@ export class FarmingWorld { false, new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.FRUIT_TREE ) ), @@ -391,7 +547,11 @@ export class FarmingWorld { 'Lumbridge', 12851, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.HOPS) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.HOPS + ) ) ) this.add( @@ -399,7 +559,11 @@ export class FarmingWorld { 'Lumbridge', 12594, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.TREE) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.TREE + ) ), 12850 ) @@ -410,7 +574,7 @@ export class FarmingWorld { false, new FarmingPatch( 'Mushroom', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.MUSHROOM ) ), @@ -423,17 +587,29 @@ export class FarmingWorld { false, new FarmingPatch( 'North West', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South East', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4773, PatchImplementation.FLOWER), - new FarmingPatch('', Varbits.FARMING_4774, PatchImplementation.HERB), - new FarmingPatch('', Varbits.FARMING_4775, PatchImplementation.COMPOST) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_D, + PatchImplementation.HERB + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, + PatchImplementation.COMPOST + ) ), 14390 ) @@ -444,7 +620,7 @@ export class FarmingWorld { false, new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.SPIRIT_TREE ) ), @@ -455,7 +631,11 @@ export class FarmingWorld { 'Rimmington', 11570, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.BUSH) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.BUSH + ) ), 11826 ) @@ -464,7 +644,11 @@ export class FarmingWorld { "Seers' Village", 10551, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.HOPS) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.HOPS + ) ), 10550 ) @@ -473,7 +657,11 @@ export class FarmingWorld { 'Tai Bwo Wannai', 11056, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.CALQUAT) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.CALQUAT + ) ) ) this.add( @@ -481,7 +669,11 @@ export class FarmingWorld { 'Taverley', 11573, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.TREE) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.TREE + ) ), 11829 ) @@ -492,7 +684,7 @@ export class FarmingWorld { true, new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.FRUIT_TREE ) ), @@ -503,7 +695,11 @@ export class FarmingWorld { 'Troll Stronghold', 11321, true, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.HERB) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.HERB + ) ) ) this.add( @@ -511,7 +707,11 @@ export class FarmingWorld { 'Varrock', 12854, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.TREE) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.TREE + ) ), 12853 ) @@ -520,7 +720,11 @@ export class FarmingWorld { 'Yanille', 10288, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.HOPS) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.HOPS + ) ) ) this.add( @@ -528,7 +732,11 @@ export class FarmingWorld { 'Weiss', 11325, false, - new FarmingPatch('', Varbits.FARMING_4771, PatchImplementation.HERB) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, + PatchImplementation.HERB + ) ) ) this.add( @@ -538,7 +746,7 @@ export class FarmingWorld { true, new FarmingPatch( 'Hespori', - Varbits.FARMING_7908, + VarbitID.FARMING_TRANSMIT_J, PatchImplementation.HESPORI ) ) @@ -548,47 +756,71 @@ export class FarmingWorld { 'Farming Guild', 4922, true, - 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( + '', + VarbitID.FARMING_TRANSMIT_G, + PatchImplementation.TREE + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, + PatchImplementation.HERB + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_B, + PatchImplementation.BUSH + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_H, + PatchImplementation.FLOWER + ), new FarmingPatch( 'North', - Varbits.FARMING_4773, + VarbitID.FARMING_TRANSMIT_C, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South', - Varbits.FARMING_4774, + VarbitID.FARMING_TRANSMIT_D, PatchImplementation.ALLOTMENT ), new FarmingPatch( '', - Varbits.FARMING_7912, + VarbitID.FARMING_TRANSMIT_N, PatchImplementation.BIG_COMPOST ), - new FarmingPatch('', Varbits.FARMING_7904, PatchImplementation.CACTUS), new FarmingPatch( '', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_F, + PatchImplementation.CACTUS + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.SPIRIT_TREE ), new FarmingPatch( '', - Varbits.FARMING_7909, + VarbitID.FARMING_TRANSMIT_K, PatchImplementation.FRUIT_TREE ), new FarmingPatch( 'Anima', - Varbits.FARMING_7911, + VarbitID.FARMING_TRANSMIT_M, PatchImplementation.ANIMA ), new FarmingPatch( '', - Varbits.FARMING_7910, + VarbitID.FARMING_TRANSMIT_L, PatchImplementation.CELASTRUS ), - new FarmingPatch('', Varbits.FARMING_7907, PatchImplementation.REDWOOD) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_I, + PatchImplementation.REDWOOD + ) )), 5177, 5178, @@ -606,21 +838,29 @@ export class FarmingWorld { false, new FarmingPatch( 'North', - Varbits.FARMING_4771, + VarbitID.FARMING_TRANSMIT_A, PatchImplementation.ALLOTMENT ), new FarmingPatch( 'South', - Varbits.FARMING_4772, + VarbitID.FARMING_TRANSMIT_B, PatchImplementation.ALLOTMENT ), - new FarmingPatch('', Varbits.FARMING_4773, PatchImplementation.FLOWER), new FarmingPatch( '', - Varbits.FARMING_4775, + VarbitID.FARMING_TRANSMIT_C, + PatchImplementation.FLOWER + ), + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_E, PatchImplementation.CRYSTAL_TREE ), - new FarmingPatch('', Varbits.FARMING_4774, PatchImplementation.COMPOST) + new FarmingPatch( + '', + VarbitID.FARMING_TRANSMIT_D, + PatchImplementation.COMPOST + ) ), 12895, 12894, @@ -667,6 +907,6 @@ export class FarmingWorld { } FarmingWorld['__class'] = 'timetracking.FarmingWorld' import { PatchImplementation } from './PatchImplementation' -import { Varbits } from './Varbits' +import { VarbitID } from './VarbitID' import { FarmingPatch } from './FarmingPatch' import { FarmingRegion } from './FarmingRegion' diff --git a/src/modules/timetracking/PatchImplementation.js b/src/modules/timetracking/PatchImplementation.js index 0ccaa2752..40e0bbce8 100644 --- a/src/modules/timetracking/PatchImplementation.js +++ b/src/modules/timetracking/PatchImplementation.js @@ -7,21 +7,21 @@ import { ItemID } from './ItemID' import { NullItemID } from './NullItemID' export var PatchImplementation ;(function (PatchImplementation) { - PatchImplementation[(PatchImplementation['BELLADONNA'] = 0)] = 'BELLADONNA' - PatchImplementation[(PatchImplementation['MUSHROOM'] = 1)] = 'MUSHROOM' - PatchImplementation[(PatchImplementation['HESPORI'] = 2)] = 'HESPORI' - PatchImplementation[(PatchImplementation['ALLOTMENT'] = 3)] = 'ALLOTMENT' - PatchImplementation[(PatchImplementation['HERB'] = 4)] = 'HERB' - PatchImplementation[(PatchImplementation['FLOWER'] = 5)] = 'FLOWER' - PatchImplementation[(PatchImplementation['BUSH'] = 6)] = 'BUSH' - PatchImplementation[(PatchImplementation['FRUIT_TREE'] = 7)] = 'FRUIT_TREE' - PatchImplementation[(PatchImplementation['HOPS'] = 8)] = 'HOPS' - PatchImplementation[(PatchImplementation['TREE'] = 9)] = 'TREE' - PatchImplementation[(PatchImplementation['HARDWOOD_TREE'] = 10)] = + PatchImplementation[(PatchImplementation['MUSHROOM'] = 0)] = 'MUSHROOM' + PatchImplementation[(PatchImplementation['HESPORI'] = 1)] = 'HESPORI' + PatchImplementation[(PatchImplementation['ALLOTMENT'] = 2)] = 'ALLOTMENT' + PatchImplementation[(PatchImplementation['HERB'] = 3)] = 'HERB' + PatchImplementation[(PatchImplementation['FLOWER'] = 4)] = 'FLOWER' + PatchImplementation[(PatchImplementation['BUSH'] = 5)] = 'BUSH' + PatchImplementation[(PatchImplementation['FRUIT_TREE'] = 6)] = 'FRUIT_TREE' + PatchImplementation[(PatchImplementation['HOPS'] = 7)] = 'HOPS' + PatchImplementation[(PatchImplementation['TREE'] = 8)] = 'TREE' + PatchImplementation[(PatchImplementation['HARDWOOD_TREE'] = 9)] = 'HARDWOOD_TREE' - PatchImplementation[(PatchImplementation['REDWOOD'] = 11)] = 'REDWOOD' - PatchImplementation[(PatchImplementation['SPIRIT_TREE'] = 12)] = 'SPIRIT_TREE' - PatchImplementation[(PatchImplementation['ANIMA'] = 13)] = 'ANIMA' + PatchImplementation[(PatchImplementation['REDWOOD'] = 10)] = 'REDWOOD' + PatchImplementation[(PatchImplementation['SPIRIT_TREE'] = 11)] = 'SPIRIT_TREE' + PatchImplementation[(PatchImplementation['ANIMA'] = 12)] = 'ANIMA' + PatchImplementation[(PatchImplementation['BELLADONNA'] = 13)] = 'BELLADONNA' PatchImplementation[(PatchImplementation['CACTUS'] = 14)] = 'CACTUS' PatchImplementation[(PatchImplementation['SEAWEED'] = 15)] = 'SEAWEED' PatchImplementation[(PatchImplementation['CALQUAT'] = 16)] = 'CALQUAT' @@ -1353,63 +1353,6 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' 'timetracking.PatchImplementation.Produce' /** @ignore */ class PatchImplementation$0_$WRAPPER extends PatchImplementation_$WRAPPER { - constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { - super(_$ordinal, _$name, tab, name, healthCheckRequired) - } - /** - * - * @param {number} value - * @return {PatchState} - */ - forVarbitValue(value) { - if (value >= 0 && value <= 3) { - return new PatchState( - PatchImplementation.Produce.WEEDS, - CropState.GROWING, - 3 - value - ) - } - if (value >= 4 && value <= 7) { - return new PatchState( - PatchImplementation.Produce.BELLADONNA, - CropState.GROWING, - value - 4 - ) - } - if (value === 8) { - return new PatchState( - PatchImplementation.Produce.BELLADONNA, - CropState.HARVESTABLE, - 0 - ) - } - if (value >= 9 && value <= 11) { - return new PatchState( - PatchImplementation.Produce.BELLADONNA, - CropState.DISEASED, - value - 8 - ) - } - if (value >= 12 && value <= 14) { - return new PatchState( - PatchImplementation.Produce.BELLADONNA, - CropState.DEAD, - value - 11 - ) - } - if (value >= 15 && value <= 255) { - return new PatchState( - PatchImplementation.Produce.WEEDS, - CropState.GROWING, - 3 - ) - } - return null - } - } - PatchImplementation.PatchImplementation$0_$WRAPPER = PatchImplementation$0_$WRAPPER - /** @ignore */ - class PatchImplementation$1_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -1464,9 +1407,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$1_$WRAPPER = PatchImplementation$1_$WRAPPER + PatchImplementation.PatchImplementation$0_$WRAPPER = PatchImplementation$0_$WRAPPER /** @ignore */ - class PatchImplementation$2_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$1_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -1507,9 +1450,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$2_$WRAPPER = PatchImplementation$2_$WRAPPER + PatchImplementation.PatchImplementation$1_$WRAPPER = PatchImplementation$1_$WRAPPER /** @ignore */ - class PatchImplementation$3_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$2_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -1977,9 +1920,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$3_$WRAPPER = PatchImplementation$3_$WRAPPER + PatchImplementation.PatchImplementation$2_$WRAPPER = PatchImplementation$2_$WRAPPER /** @ignore */ - class PatchImplementation$4_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$3_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -2356,9 +2299,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$4_$WRAPPER = PatchImplementation$4_$WRAPPER + PatchImplementation.PatchImplementation$3_$WRAPPER = PatchImplementation$3_$WRAPPER /** @ignore */ - class PatchImplementation$5_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$4_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -2742,9 +2685,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$5_$WRAPPER = PatchImplementation$5_$WRAPPER + PatchImplementation.PatchImplementation$4_$WRAPPER = PatchImplementation$4_$WRAPPER /** @ignore */ - class PatchImplementation$6_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$5_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -3084,9 +3027,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$6_$WRAPPER = PatchImplementation$6_$WRAPPER + PatchImplementation.PatchImplementation$5_$WRAPPER = PatchImplementation$5_$WRAPPER /** @ignore */ - class PatchImplementation$7_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$6_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -3500,9 +3443,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$7_$WRAPPER = PatchImplementation$7_$WRAPPER + PatchImplementation.PatchImplementation$6_$WRAPPER = PatchImplementation$6_$WRAPPER /** @ignore */ - class PatchImplementation$8_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$7_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -3928,9 +3871,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$8_$WRAPPER = PatchImplementation$8_$WRAPPER + PatchImplementation.PatchImplementation$7_$WRAPPER = PatchImplementation$7_$WRAPPER /** @ignore */ - class PatchImplementation$9_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$8_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -4338,9 +4281,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$9_$WRAPPER = PatchImplementation$9_$WRAPPER + PatchImplementation.PatchImplementation$8_$WRAPPER = PatchImplementation$8_$WRAPPER /** @ignore */ - class PatchImplementation$10_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$9_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -4462,9 +4405,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$10_$WRAPPER = PatchImplementation$10_$WRAPPER + PatchImplementation.PatchImplementation$9_$WRAPPER = PatchImplementation$9_$WRAPPER /** @ignore */ - class PatchImplementation$11_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$10_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -4535,9 +4478,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$11_$WRAPPER = PatchImplementation$11_$WRAPPER + PatchImplementation.PatchImplementation$10_$WRAPPER = PatchImplementation$10_$WRAPPER /** @ignore */ - class PatchImplementation$12_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$11_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -4608,9 +4551,9 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } - PatchImplementation.PatchImplementation$12_$WRAPPER = PatchImplementation$12_$WRAPPER + PatchImplementation.PatchImplementation$11_$WRAPPER = PatchImplementation$11_$WRAPPER /** @ignore */ - class PatchImplementation$13_$WRAPPER extends PatchImplementation_$WRAPPER { + class PatchImplementation$12_$WRAPPER extends PatchImplementation_$WRAPPER { constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { super(_$ordinal, _$name, tab, name, healthCheckRequired) } @@ -4665,6 +4608,63 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' return null } } + PatchImplementation.PatchImplementation$12_$WRAPPER = PatchImplementation$12_$WRAPPER + /** @ignore */ + class PatchImplementation$13_$WRAPPER extends PatchImplementation_$WRAPPER { + constructor(_$ordinal, _$name, tab, name, healthCheckRequired) { + super(_$ordinal, _$name, tab, name, healthCheckRequired) + } + /** + * + * @param {number} value + * @return {PatchState} + */ + forVarbitValue(value) { + if (value >= 0 && value <= 3) { + return new PatchState( + PatchImplementation.Produce.WEEDS, + CropState.GROWING, + 3 - value + ) + } + if (value >= 4 && value <= 7) { + return new PatchState( + PatchImplementation.Produce.BELLADONNA, + CropState.GROWING, + value - 4 + ) + } + if (value === 8) { + return new PatchState( + PatchImplementation.Produce.BELLADONNA, + CropState.HARVESTABLE, + 0 + ) + } + if (value >= 9 && value <= 11) { + return new PatchState( + PatchImplementation.Produce.BELLADONNA, + CropState.DISEASED, + value - 8 + ) + } + if (value >= 12 && value <= 14) { + return new PatchState( + PatchImplementation.Produce.BELLADONNA, + CropState.DEAD, + value - 11 + ) + } + if (value >= 15 && value <= 255) { + return new PatchState( + PatchImplementation.Produce.WEEDS, + CropState.GROWING, + 3 + ) + } + return null + } + } PatchImplementation.PatchImplementation$13_$WRAPPER = PatchImplementation$13_$WRAPPER /** @ignore */ class PatchImplementation$14_$WRAPPER extends PatchImplementation_$WRAPPER { @@ -5340,98 +5340,98 @@ PatchImplementation['__class'] = 'timetracking.PatchImplementation' PatchImplementation['_$wrappers'] = { 0: new PatchImplementation.PatchImplementation$0_$WRAPPER( 0, - 'BELLADONNA', + 'MUSHROOM', Tab.SPECIAL, '', false ), 1: new PatchImplementation.PatchImplementation$1_$WRAPPER( 1, - 'MUSHROOM', - Tab.SPECIAL, - '', - false - ), - 2: new PatchImplementation.PatchImplementation$2_$WRAPPER( - 2, 'HESPORI', Tab.SPECIAL, '', true ), - 3: new PatchImplementation.PatchImplementation$3_$WRAPPER( - 3, + 2: new PatchImplementation.PatchImplementation$2_$WRAPPER( + 2, 'ALLOTMENT', Tab.ALLOTMENT, '', false ), - 4: new PatchImplementation.PatchImplementation$4_$WRAPPER( - 4, + 3: new PatchImplementation.PatchImplementation$3_$WRAPPER( + 3, 'HERB', Tab.HERB, '', false ), - 5: new PatchImplementation.PatchImplementation$5_$WRAPPER( - 5, + 4: new PatchImplementation.PatchImplementation$4_$WRAPPER( + 4, 'FLOWER', Tab.FLOWER, '', false ), - 6: new PatchImplementation.PatchImplementation$6_$WRAPPER( - 6, + 5: new PatchImplementation.PatchImplementation$5_$WRAPPER( + 5, 'BUSH', Tab.BUSH, '', true ), - 7: new PatchImplementation.PatchImplementation$7_$WRAPPER( - 7, + 6: new PatchImplementation.PatchImplementation$6_$WRAPPER( + 6, 'FRUIT_TREE', Tab.FRUIT_TREE, '', true ), - 8: new PatchImplementation.PatchImplementation$8_$WRAPPER( - 8, + 7: new PatchImplementation.PatchImplementation$7_$WRAPPER( + 7, 'HOPS', Tab.HOPS, '', false ), - 9: new PatchImplementation.PatchImplementation$9_$WRAPPER( - 9, + 8: new PatchImplementation.PatchImplementation$8_$WRAPPER( + 8, 'TREE', Tab.TREE, '', true ), - 10: new PatchImplementation.PatchImplementation$10_$WRAPPER( - 10, + 9: new PatchImplementation.PatchImplementation$9_$WRAPPER( + 9, 'HARDWOOD_TREE', Tab.TREE, 'Hardwood Trees', true ), - 11: new PatchImplementation.PatchImplementation$11_$WRAPPER( - 11, + 10: new PatchImplementation.PatchImplementation$10_$WRAPPER( + 10, 'REDWOOD', Tab.TREE, 'Redwood Trees', true ), - 12: new PatchImplementation.PatchImplementation$12_$WRAPPER( - 12, + 11: new PatchImplementation.PatchImplementation$11_$WRAPPER( + 11, 'SPIRIT_TREE', Tab.TREE, 'Spirit Trees', true ), + 12: new PatchImplementation.PatchImplementation$12_$WRAPPER( + 12, + 'ANIMA', + Tab.SPECIAL, + '', + false + ), 13: new PatchImplementation.PatchImplementation$13_$WRAPPER( 13, - 'ANIMA', + 'BELLADONNA', Tab.SPECIAL, '', false diff --git a/src/modules/timetracking/VarbitID.js b/src/modules/timetracking/VarbitID.js new file mode 100644 index 000000000..cefe31caf --- /dev/null +++ b/src/modules/timetracking/VarbitID.js @@ -0,0 +1,32 @@ +// @ts-nocheck +/* eslint-disable */ +export class VarbitID {} +VarbitID.FARMING_TRANSMIT_A = 4771 +VarbitID.FARMING_TRANSMIT_B = 4772 +VarbitID.FARMING_TRANSMIT_C = 4773 +VarbitID.FARMING_TRANSMIT_D = 4774 +VarbitID.FARMING_TRANSMIT_E = 4775 +VarbitID.FARMING_TRANSMIT_F = 7904 +VarbitID.FARMING_TRANSMIT_G = 7905 +VarbitID.FARMING_TRANSMIT_H = 7906 +VarbitID.FARMING_TRANSMIT_I = 7907 +VarbitID.FARMING_TRANSMIT_J = 7908 +VarbitID.FARMING_TRANSMIT_K = 7909 +VarbitID.FARMING_TRANSMIT_L = 7910 +VarbitID.FARMING_TRANSMIT_M = 7911 +VarbitID.FARMING_TRANSMIT_N = 7912 +VarbitID.FARMING_TRANSMIT_O = 7913 +VarbitID.FARMING_TRANSMIT_P = 7914 +VarbitID.FARMING_TRANSMIT_A1 = 4953 +VarbitID.FARMING_TRANSMIT_A2 = 4954 +VarbitID.FARMING_TRANSMIT_B1 = 4955 +VarbitID.FARMING_TRANSMIT_B2 = 4956 +VarbitID.FARMING_TRANSMIT_C1 = 4957 +VarbitID.FARMING_TRANSMIT_C2 = 4958 +VarbitID.FARMING_TRANSMIT_D1 = 4959 +VarbitID.FARMING_TRANSMIT_D2 = 4960 +VarbitID.FARMING_TRANSMIT_E1 = 4961 +VarbitID.FARMING_TRANSMIT_E2 = 4962 +VarbitID.FARMING_TRANSMIT_F1 = 4963 +VarbitID.FARMING_TRANSMIT_F2 = 4964 +VarbitID['__class'] = 'timetracking.VarbitID' diff --git a/src/modules/timetracking/Varbits.js b/src/modules/timetracking/Varbits.js deleted file mode 100644 index d2c0a2711..000000000 --- a/src/modules/timetracking/Varbits.js +++ /dev/null @@ -1,40 +0,0 @@ -// @ts-nocheck -/* eslint-disable */ -export class Varbits {} -/** - * Transmog controllers for farming - */ -Varbits.FARMING_4771 = 4771 -Varbits.FARMING_4772 = 4772 -Varbits.FARMING_4773 = 4773 -Varbits.FARMING_4774 = 4774 -Varbits.FARMING_4775 = 4775 -Varbits.FARMING_7904 = 7904 -Varbits.FARMING_7905 = 7905 -Varbits.FARMING_7906 = 7906 -Varbits.FARMING_7907 = 7907 -Varbits.FARMING_7908 = 7908 -Varbits.FARMING_7909 = 7909 -Varbits.FARMING_7910 = 7910 -Varbits.FARMING_7911 = 7911 -Varbits.FARMING_7912 = 7912 -/** - * Transmog controllers for grapes - */ -Varbits.GRAPES_4953 = 4953 -Varbits.GRAPES_4954 = 4954 -Varbits.GRAPES_4955 = 4955 -Varbits.GRAPES_4956 = 4956 -Varbits.GRAPES_4957 = 4957 -Varbits.GRAPES_4958 = 4958 -Varbits.GRAPES_4959 = 4959 -Varbits.GRAPES_4960 = 4960 -Varbits.GRAPES_4961 = 4961 -Varbits.GRAPES_4962 = 4962 -Varbits.GRAPES_4963 = 4963 -Varbits.GRAPES_4964 = 4964 -/** - * Automatically weed farming patches - */ -Varbits.AUTOWEED = 5557 -Varbits['__class'] = 'timetracking.Varbits'