From bdc6f788205c59a273686cfbf954662f872bbdca Mon Sep 17 00:00:00 2001
From: nwjgit <69014816+nwjgit@users.noreply.github.com>
Date: Tue, 6 Aug 2024 07:22:46 -0500
Subject: [PATCH] quest/lamp fixes (#5949)

---
 src/lib/data/itemAliases.ts                       |  5 ++++-
 src/lib/minions/data/quests.ts                    |  5 ++---
 src/mahoji/lib/abstracted_commands/lampCommand.ts | 10 ++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/lib/data/itemAliases.ts b/src/lib/data/itemAliases.ts
index ec44fda255..557bd0b85f 100644
--- a/src/lib/data/itemAliases.ts
+++ b/src/lib/data/itemAliases.ts
@@ -178,12 +178,15 @@ setItemAlias(2993, 'Chompy bird hat (dragon archer)');
 setItemAlias(2994, 'Chompy bird hat (expert ogre dragon archer)');
 setItemAlias(2995, 'Chompy bird hat (expert dragon archer)');
 
-// Item aliases
+// Achievement diary lamps
 setItemAlias(11_137, 'Antique lamp 1');
 setItemAlias(11_139, 'Antique lamp 2');
 setItemAlias(11_141, 'Antique lamp 3');
 setItemAlias(11_185, 'Antique lamp 4');
 
+// Defender of varrock quest lamp
+setItemAlias(28_820, 'Antique lamp (defender of varrock)');
+
 // Dragonfire shields
 setItemAlias(11_284, 'Uncharged dragonfire shield');
 setItemAlias(11_283, 'Dragonfire shield');
diff --git a/src/lib/minions/data/quests.ts b/src/lib/minions/data/quests.ts
index 70451b6ac9..91a92ec0cb 100644
--- a/src/lib/minions/data/quests.ts
+++ b/src/lib/minions/data/quests.ts
@@ -84,7 +84,7 @@ export const quests: Quest[] = [
 		},
 		combatLevelReq: 50,
 		qpReq: 10,
-		rewards: new Bank().add(28_587).add(28_587).add(28_588).add(28_589).add(28_590).freeze(),
+		rewards: new Bank().add(28_587).add(28_588).add(28_589).add(28_590).freeze(),
 		calcTime: (user: MUser) => {
 			let duration = Time.Minute * 10;
 			if (user.combatLevel < 90) {
@@ -112,8 +112,7 @@ export const quests: Quest[] = [
 		},
 		combatLevelReq: 65,
 		qpReq: 20,
-		// Awaiting item update for the lamp to be added
-		// rewards: new Bank().add(28_820).freeze(),
+		rewards: new Bank().add(28_820).freeze(),
 		skillsRewards: {
 			smithing: 15_000,
 			hunter: 15_000
diff --git a/src/mahoji/lib/abstracted_commands/lampCommand.ts b/src/mahoji/lib/abstracted_commands/lampCommand.ts
index 2a5d9bb0b3..db678e76fb 100644
--- a/src/mahoji/lib/abstracted_commands/lampCommand.ts
+++ b/src/mahoji/lib/abstracted_commands/lampCommand.ts
@@ -84,13 +84,12 @@ export const XPLamps: IXPLamp[] = [
 		minimumLevel: 1,
 		allowedSkills: [SkillsEnum.Magic]
 	},
-	/*	Needs OSJS Update
 	{
 		itemID: 28_820,
 		amount: 5000,
 		name: 'Antique lamp (defender of varrock)',
 		minimumLevel: 1
-	},*/
+	},
 	{
 		itemID: itemID('Antique lamp (easy ca)'),
 		amount: 5000,
@@ -149,6 +148,13 @@ export const Lampables: IXPObject[] = [
 				skills[skill] =
 					data.user.skillLevel(skill) *
 					([
+						SkillsEnum.Attack,
+						SkillsEnum.Strength,
+						SkillsEnum.Defence,
+						SkillsEnum.Magic,
+						SkillsEnum.Ranged,
+						SkillsEnum.Hitpoints,
+						SkillsEnum.Prayer,
 						SkillsEnum.Mining,
 						SkillsEnum.Woodcutting,
 						SkillsEnum.Herblore,