Forestry update

prisma/schema.prisma

@@ -491,6 +491,7 @@ enum XpGainSource {
   CamdozaalMining
   CamdozaalSmithing
   CamdozaalFishing
+  ForestryEvents
 }
 
 model XPGain {
@@ -758,6 +759,8 @@ model UserStats {
 
   herbs_cleaned_while_farming_bank Json @default("{}") @db.Json
 
+  forestry_event_completions_bank Json @default("{}") @db.Json
+
   @@map("user_stats")
 }
 

src/lib/constants.ts

@@ -69,7 +69,7 @@
 };
 
 export const enum Emoji {
 	MoneyBag = '<:MoneyBag:493286312854683654>',
 	OSBot = '<:OSBot:601768469905801226>',
 	Joy = '😂',
 	Bpaptu = '<:bpaptu:660333438292983818>',
@@ -171,14 +171,14 @@
 }
 
 export enum ActivityGroup {
 	Skilling = 'Skilling',
 	Clue = 'Clue',
 	Monster = 'Monster',
 	Minigame = 'Minigame'
 }
 
 export const enum Events {
 	Error = 'error',
 	Log = 'log',
 	Verbose = 'verbose',
 	Warn = 'warn',
@@ -191,7 +191,7 @@
 export const COINS_ID = 995;
 
 export const enum PerkTier {
 	/**
 	 * Boosters
 	 */
 	One = 1,
@@ -222,7 +222,7 @@
 }
 
 export enum BitField {
 	IsPatronTier1 = 2,
 	IsPatronTier2 = 3,
 	IsPatronTier3 = 4,
 	IsPatronTier4 = 5,
@@ -360,7 +360,7 @@
 } as const;
 
 export const enum PatronTierID {
 	One = '4608201',
 	Two = '4608226',
 	Three = '4720356',
 	Four = '5262065',
@@ -509,6 +509,9 @@
 export const UNDERWATER_AGILITY_THIEVING_TRAINING_SKILL = ['agility', 'thieving', 'agility+thieving'] as const;
 export type UnderwaterAgilityThievingTrainingSkill = (typeof UNDERWATER_AGILITY_THIEVING_TRAINING_SKILL)[number];
 
+export const TWITCHERS_GLOVES = ['egg', 'ring', 'seed', 'clue'] as const;
+export type TwitcherGloves = (typeof TWITCHERS_GLOVES)[number];
+
 export const busyImmuneCommands = ['admin', 'rp'];
 export const usernameCache = new Map<string, string>();
 export const badgesCache = new Map<string, string>();
@@ -551,7 +554,7 @@
 ]);
 
 export enum PeakTier {
 	High = 'high',
 	Medium = 'medium',
 	Low = 'low'
 }

src/lib/data/Collections.ts

@@ -894,7 +894,7 @@
 				items: cyclopsCL
 			},
 			Forestry: {
-				alias: ['forestry'],
+				alias: ['forestry', 'forest', 'for'],
 				fmtProg: skillProg(SkillsEnum.Woodcutting),
 				allItems: forestryCL,
 				items: forestryCL
@@ -912,7 +912,7 @@
 			'Monkey Backpacks': {
 				alias: ['monkey', 'monkey bps', 'backpacks'],
 				kcActivity: {
 					Default: async (_, __, u) => u.lapsScores[6] || 0
 				},
 				items: monkeyBackpacksCL,
 				isActivity: true
@@ -1085,7 +1085,7 @@
 			Creatables: {
 				counts: false,
 				items: Createables.filter(i => i.noCl !== true)
 					.map(i => new Bank(i.outputItems).items().map(i => i[0].id))
 					.flat()
 			},
 			Leagues: {
@@ -1151,7 +1151,7 @@
 		)
 		.flat(100),
 	...Object.values(Monsters)
 		.map(m => (m && m.allItems ? m.allItems : []))
 		.flat(100)
 ]);
 

src/lib/data/CollectionsExport.ts

@@ -1630,6 +1630,8 @@ export const cyclopsCL = resolveItems([
 	'Dragon defender'
 ]);
 export const forestryCL = resolveItems([
+	'Fox whistle',
+	'Golden pheasant egg',
 	'Lumberjack hat',
 	'Lumberjack top',
 	'Lumberjack legs',
@@ -1638,10 +1640,19 @@ export const forestryCL = resolveItems([
 	'Forestry top',
 	'Forestry legs',
 	'Forestry boots',
+	"Twitcher's gloves",
 	'Funky shaped log',
 	'Log basket',
 	'Log brace',
-	'Clothes pouch blueprint'
+	'Clothes pouch blueprint',
+	'Cape pouch',
+	'Felling axe handle',
+	'Pheasant hat',
+	'Pheasant legs',
+	'Pheasant boots',
+	'Pheasant cape',
+	'Petal garland',
+	'Sturdy beehive parts'
 ]);
 
 export const fossilIslandNotesCL = resolveItems([

src/lib/data/buyables/forestryBuyables.ts

@@ -21,14 +21,6 @@ export const forestryBuyables: Buyable[] = [
 		name: 'Ritual mulch',
 		itemCost: new Bank().add('Anima-infused bark', 150).add('Maple logs', 10)
 	},
-	{
-		name: 'Clover insignia',
-		itemCost: new Bank().add('Anima-infused bark', 200).add('Oak logs', 15)
-	},
-	{
-		name: 'Powdered pollen',
-		itemCost: new Bank().add('Anima-infused bark', 300).add('Willow logs', 15)
-	},
 	{
 		name: 'Log brace',
 		itemCost: new Bank().add('Anima-infused bark', 3000).add('Maple logs', 300).add('Yew logs', 300)
@@ -37,10 +29,22 @@ export const forestryBuyables: Buyable[] = [
 		name: 'Clothes pouch blueprint',
 		itemCost: new Bank().add('Anima-infused bark', 10_000).add('Willow logs', 300).add('Maple logs', 300)
 	},
+	{
+		name: 'Cape pouch',
+		itemCost: new Bank().add('Anima-infused bark', 2500)
+	},
 	{
 		name: 'Log basket',
 		itemCost: new Bank().add('Anima-infused bark', 5000).add('Oak logs', 300).add('Willow logs', 300)
 	},
+	{
+		name: 'Felling axe handle',
+		itemCost: new Bank().add('Anima-infused bark', 10_000).add('Oak logs', 500)
+	},
+	{
+		name: "Twitcher's gloves",
+		itemCost: new Bank().add('Anima-infused bark', 5000).add('Willow logs', 500)
+	},
 	{
 		name: 'Funky shaped log',
 		itemCost: new Bank()
@@ -55,6 +59,11 @@ export const forestryBuyables: Buyable[] = [
 			.add('Magic logs', 500)
 			.add('Redwood logs', 500)
 	},
+	{
+		name: 'Sawmill voucher',
+		itemCost: new Bank().add('Anima-infused bark', 150),
+		outputItems: new Bank({ 'Sawmill voucher': 10 })
+	},
 	{
 		name: 'Lumberjack boots',
 		itemCost: new Bank().add('Anima-infused bark', 1000).add('Maple logs', 100).add('Yew logs', 200)

src/lib/data/creatables/forestryCreatables.ts

@@ -14,28 +14,18 @@ export const forestryCreatables: Createable[] = [
 		outputItems: new Bank().add('Nature offerings', 40)
 	},
 	{
-		name: 'Leprechaun charm',
-		inputItems: new Bank().add('Clover insignia').add('Emerald').add('Ball of wool'),
-		outputItems: new Bank().add('Leprechaun charm', 10),
-		requiredSkills: {
-			crafting: 70,
-			woodcutting: 70,
-			farming: 35
-		}
-	},
-	{
-		name: 'Bee on a stick',
-		inputItems: new Bank().add('Powdered pollen').add('Logs').add('Ball of wool'),
-		outputItems: new Bank().add('Bee on a stick', 10),
+		name: 'Sturdy harness',
+		inputItems: new Bank().add('Log brace').add('Steel nails', 45).add('Rope', 2).add('Adamantite bar', 3),
+		outputItems: new Bank().add('Sturdy harness'),
 		requiredSkills: {
-			hunter: 50,
-			woodcutting: 35
+			smithing: 75,
+			woodcutting: 75
 		}
 	},
 	{
-		name: 'Sturdy harness',
-		inputItems: new Bank().add('Log brace').add('Steel nails', 45).add('Rope', 2).add('Adamantite bar', 3),
-		outputItems: new Bank().add('Sturdy harness'),
+		name: 'Forestry basket',
+		inputItems: new Bank().add('Forestry kit').add('Log basket').add('Sturdy harness'),
+		outputItems: new Bank().add('Forestry basket'),
 		requiredSkills: {
 			smithing: 75,
 			woodcutting: 75
@@ -49,5 +39,110 @@ export const forestryCreatables: Createable[] = [
 			crafting: 50,
 			woodcutting: 50
 		}
+	},
+	{
+		name: 'Pheasant hat',
+		inputItems: new Bank().add('Pheasant tail feathers', 15).add('Thread'),
+		outputItems: new Bank().add('Pheasant hat'),
+		requiredSkills: {
+			crafting: 2
+		}
+	},
+	{
+		name: 'Pheasant legs',
+		inputItems: new Bank().add('Pheasant tail feathers', 15).add('Thread'),
+		outputItems: new Bank().add('Pheasant legs'),
+		requiredSkills: {
+			crafting: 2
+		}
+	},
+	{
+		name: 'Pheasant boots',
+		inputItems: new Bank().add('Pheasant tail feathers', 15).add('Thread'),
+		outputItems: new Bank().add('Pheasant boots'),
+		requiredSkills: {
+			crafting: 2
+		}
+	},
+	{
+		name: 'Pheasant cape',
+		inputItems: new Bank().add('Pheasant tail feathers', 15).add('Thread'),
+		outputItems: new Bank().add('Pheasant cape'),
+		requiredSkills: {
+			crafting: 2
+		}
+	},
+	{
+		name: 'Bronze felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Bronze axe'),
+		outputItems: new Bank().add('Bronze felling axe')
+	},
+	{
+		name: 'Iron felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Iron axe'),
+		outputItems: new Bank().add('Iron felling axe')
+	},
+	{
+		name: 'Steel felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Steel axe'),
+		outputItems: new Bank().add('Steel felling axe')
+	},
+	{
+		name: 'Black felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Black axe'),
+		outputItems: new Bank().add('Black felling axe')
+	},
+	{
+		name: 'Mithril felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Mithril axe'),
+		outputItems: new Bank().add('Mithril felling axe')
+	},
+	{
+		name: 'Adamant felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Adamant axe'),
+		outputItems: new Bank().add('Adamant felling axe')
+	},
+	{
+		name: 'Rune felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Rune axe'),
+		outputItems: new Bank().add('Rune felling axe')
+	},
+	{
+		name: 'Dragon felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Dragon axe'),
+		outputItems: new Bank().add('Dragon felling axe')
+	},
+	{
+		name: 'Crystal felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('Crystal axe'),
+		outputItems: new Bank().add('Crystal felling axe')
+	},
+	{
+		name: '3rd age felling axe',
+		inputItems: new Bank().add('Felling axe handle').add('3rd age axe'),
+		outputItems: new Bank().add('3rd age felling axe')
+	},
+	{
+		name: 'Pheasant',
+		inputItems: new Bank().add('Beaver').add('Golden pheasant egg'),
+		outputItems: new Bank().add('Pheasant')
+	},
+	{
+		name: 'Revert Pheasant',
+		inputItems: new Bank().add('Pheasant'),
+		outputItems: new Bank().add('Beaver').add('Golden pheasant egg'),
+		noCl: true
+	},
+	{
+		// use id to not get mixed up with the "Fox" quest item
+		name: 'Fox',
+		inputItems: new Bank().add('Beaver').add('Fox whistle'),
+		outputItems: new Bank().add(28_670)
+	},
+	{
+		name: 'Revert Fox',
+		inputItems: new Bank().add(28_670),
+		outputItems: new Bank().add('Beaver').add('Fox whistle'),
+		noCl: true
 	}
 ];