Use EMonster enum for monsterScores record

Author: gc

src/lib/diaries.ts

@@ -1,5 +1,5 @@
 import { objectEntries } from '@oldschoolgg/toolkit';
-import { Items, Monsters, resolveItems } from 'oldschooljs';
+import { EMonster, Items, Monsters, resolveItems } from 'oldschooljs';
 
 import type { Minigame } from '@/prisma/main.js';
 import { MAX_QP } from '@/lib/minions/data/quests.js';
@@ -104,10 +104,9 @@ export function userhasDiaryTierSync(
 	}
 
 	if (tier.monsterScores) {
-		const entries = Object.entries(tier.monsterScores);
-		for (const [name, score] of entries) {
-			const mon = Monsters.find(mon => mon.name === name)!;
-			if (!monsterScores[mon.id] || monsterScores[mon.id] < score) {
+		for (const [id, score] of objectEntries(tier.monsterScores)) {
+			const mon = Monsters.get(Number(id))!;
+			if (!monsterScores[mon.id] || monsterScores[mon.id] < score!) {
 				canDo = false;
 				reasons.push(
 					`You don't have **${score} ${mon.name}** KC, you have **${monsterScores[mon.id] ?? 0}** KC`
@@ -213,7 +212,7 @@ export const WesternProv: Diary = {
 		},
 		qp: 92,
 		monsterScores: {
-			Zulrah: 1
+			[EMonster.ZULRAH]: 1
 		}
 	},
 	elite: {
@@ -235,7 +234,7 @@ export const WesternProv: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Magic longbow', 'Void knight top', 'Void knight robe', 'Void knight gloves']),
 		monsterScores: {
-			'Thermonuclear smoke devil': 1
+			[EMonster.THERMONUCLEAR_SMOKE_DEVIL]: 1
 		},
 		minigameReqs: {
 			big_chompy_bird_hunting: 1000
@@ -394,7 +393,7 @@ const DesertDiary: Diary = {
 			'Pollnivneach Rooftop Course': 1
 		},
 		monsterScores: {
-			'Dust Devil': 1
+			[EMonster.DUST_DEVIL]: 1
 		},
 		collectionLogReqs: resolveItems(['Mithril platebody'])
 	},
@@ -478,8 +477,8 @@ export const FaladorDiary: Diary = {
 		qp: 32,
 		collectionLogReqs: resolveItems(['Mind rune', 'Prospector helmet']),
 		monsterScores: {
-			'Skeletal Wyvern': 1,
-			'Blue Dragon': 1
+			[EMonster.SKELETAL_WYVERN]: 1,
+			[EMonster.BLUE_DRAGON]: 1
 		},
 		lapsReqs: {
 			'Falador Rooftop Course': 1
@@ -580,14 +579,14 @@ const FremennikDiary: Diary = {
 			strength: 70
 		},
 		monsterScores: {
-			'Dagannoth Rex': 1,
-			'Dagannoth Prime': 1,
-			'Dagannoth Supreme': 1,
-			'General Graardor': 1,
-			"Kree'arra": 1,
-			'Commander Zilyana': 1,
-			"K'ril Tsutsaroth": 1,
-			'Spiritual Mage': 1
+			[EMonster.DAGANNOTH_REX]: 1,
+			[EMonster.DAGANNOTH_PRIME]: 1,
+			[EMonster.DAGANNOTH_SUPREME]: 1,
+			[EMonster.GENERAL_GRAARDOR]: 1,
+			[EMonster.KREEARRA]: 1,
+			[EMonster.COMMANDER_ZILYANA]: 1,
+			[EMonster.KRIL_TSUTSAROTH]: 1,
+			[EMonster.SPIRITUAL_MAGE]: 1
 		},
 		collectionLogReqs: resolveItems(['Astral rune', 'Dragonstone amulet']),
 		qp: 50
@@ -626,7 +625,7 @@ export const KandarinDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Bass', 'Maple shortbow', 'Limpwurt root', 'Coal']),
 		monsterScores: {
-			'Fire Giant': 1
+			[EMonster.FIRE_GIANT]: 1
 		},
 		minigameReqs: {
 			barb_assault: 1
@@ -655,7 +654,7 @@ export const KandarinDiary: Diary = {
 			"Seers' Village Rooftop Course": 1
 		},
 		monsterScores: {
-			'Mithril Dragon': 1
+			[EMonster.MITHRIL_DRAGON]: 1
 		}
 	},
 	elite: {
@@ -697,7 +696,7 @@ export const KaramjaDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Gold ore']),
 		monsterScores: {
-			Jogre: 1
+			[EMonster.JOGRE]: 1
 		}
 	},
 	medium: {
@@ -732,7 +731,7 @@ export const KaramjaDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Nature rune', 'Cooked karambwan']),
 		monsterScores: {
-			'Steel Dragon': 1
+			[EMonster.STEEL_DRAGON]: 1
 		}
 	},
 	elite: {
@@ -795,8 +794,8 @@ export const KourendKebosDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Adamantite bar']),
 		monsterScores: {
-			Wyrm: 1,
-			'Lizardman Shaman': 1
+			[EMonster.WYRM]: 1,
+			[EMonster.LIZARDMAN_SHAMAN]: 1
 		}
 	},
 	elite: {
@@ -816,7 +815,7 @@ export const KourendKebosDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Blood rune', 'Redwood logs', 'Dark totem', 'Raw anglerfish']),
 		monsterScores: {
-			Hydra: 1
+			[EMonster.HYDRA]: 1
 		},
 		minigameReqs: {
 			raids: 1
@@ -910,9 +909,9 @@ export const MorytaniaDiary: Diary = {
 			slayer: 15
 		},
 		monsterScores: {
-			Banshee: 1,
-			Ghoul: 1,
-			Werewolf: 1
+			[EMonster.BANSHEE]: 1,
+			[EMonster.GHOUL]: 1,
+			[EMonster.WEREWOLF]: 1
 		}
 	},
 	medium: {
@@ -952,7 +951,7 @@ export const MorytaniaDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Watermelon', 'Mahogany logs', 'Mithril ore', 'Mushroom']),
 		monsterScores: {
-			'Cave Horror': 1
+			[EMonster.CAVE_HORROR]: 1
 		}
 	},
 	elite: {
@@ -971,7 +970,7 @@ export const MorytaniaDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Raw shark', "Black d'hide body"]),
 		monsterScores: {
-			'Abyssal Demon': 1
+			[EMonster.ABYSSAL_DEMON]: 1
 		}
 	}
 };
@@ -1058,8 +1057,8 @@ export const WildernessDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(["Red spiders' eggs", 'Iron ore']),
 		monsterScores: {
-			Mammoth: 1,
-			'Earth Warrior': 1
+			[EMonster.MAMMOTH]: 1,
+			[EMonster.EARTH_WARRIOR]: 1
 		}
 	},
 	medium: {
@@ -1076,9 +1075,9 @@ export const WildernessDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Mithril ore', 'Yew logs']),
 		monsterScores: {
-			'Green dragon': 1,
-			Ankou: 1,
-			Bloodveld: 1
+			[EMonster.GREEN_DRAGON]: 1,
+			[EMonster.ANKOU]: 1,
+			[EMonster.BLOODVELD]: 1
 		}
 	},
 	hard: {
@@ -1094,11 +1093,11 @@ export const WildernessDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Black salamander', 'Adamant scimitar']),
 		monsterScores: {
-			'Chaos Elemental': 1,
-			'Crazy Archaeologist': 1,
-			'Chaos Fanatic': 1,
-			Scorpia: 1,
-			'Spiritual Warrior': 1
+			[EMonster.CHAOS_ELEMENTAL]: 1,
+			[EMonster.CRAZY_ARCHAEOLOGIST]: 1,
+			[EMonster.CHAOS_FANATIC]: 1,
+			[EMonster.SCORPIA]: 1,
+			[EMonster.SPIRITUAL_WARRIOR]: 1
 		}
 	},
 	elite: {
@@ -1119,9 +1118,9 @@ export const WildernessDiary: Diary = {
 		},
 		collectionLogReqs: resolveItems(['Rune scimitar', 'Raw dark crab', 'Dark crab', 'Magic logs']),
 		monsterScores: {
-			Callisto: 1,
-			Venenatis: 1,
-			"Vet'ion": 1
+			[EMonster.CALLISTO]: 1,
+			[EMonster.VENENATIS]: 1,
+			[EMonster.VETION]: 1
 		}
 	}
 };

src/lib/minions/types.ts

@@ -1,4 +1,12 @@
-import type { ArrayItemsResolved, Bank, Item, ItemBank, MonsterKillOptions, SimpleMonster } from 'oldschooljs';
+import type {
+	ArrayItemsResolved,
+	Bank,
+	EMonster,
+	Item,
+	ItemBank,
+	MonsterKillOptions,
+	SimpleMonster
+} from 'oldschooljs';
 import type { OffenceGearStat } from 'oldschooljs/gear';
 
 import type { GearSetupType, XpGainSource } from '@/prisma/main.js';
@@ -170,7 +178,7 @@ export interface DiaryTier {
 	minigameReqs?: Partial<Record<MinigameName, number>>;
 	lapsReqs?: Record<string, number>;
 	qp?: number;
-	monsterScores?: Record<string, number>;
+	monsterScores?: Partial<Record<EMonster, number>>;
 	customReq?: (user: MUser, summary: boolean, stats: MUserStats) => [true] | [false, string];
 }
 export enum DiaryID {