changes

oldschoolgg · Jun 18, 2024 · 0082080 · 0082080
1 parent f26e505
commit 0082080
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 63 deletions.
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
 		"murmurhash": "^2.0.1",
 		"node-cron": "^3.0.3",
 		"node-fetch": "^2.6.7",
-		"oldschooljs": "^2.5.1",
+		"oldschooljs": "^2.5.4",
 		"p-queue": "^6.6.2",
 		"piscina": "^4.4.0",
 		"random-js": "^2.1.0",
@@ -83,8 +83,8 @@
 		"eslint-plugin-simple-import-sort": "^8.0.0",
 		"eslint-plugin-unicorn": "^44.0.2",
 		"jest-image-snapshot": "^6.2.0",
-		"mitm": "^1.7.2",
 		"madge": "^7.0.0",
+		"mitm": "^1.7.2",
 		"prettier": "^2.7.1",
 		"prisma": "^5.13.0",
 		"rimraf": "^5.0.5",

diff --git a/src/lib/data/buyables/buyables.ts b/src/lib/data/buyables/buyables.ts
@@ -1122,7 +1122,7 @@ for (const cape of allTeamCapes) {
 	Buyables.push({
 		name: cape.name,
 		outputItems: new Bank().add(cape.id),
-		gpCost: 15_000
+		gpCost: 20_000
 	});
 }
 

diff --git a/src/lib/data/itemAliases.ts b/src/lib/data/itemAliases.ts
@@ -174,12 +174,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/mahoji/commands/sacrifice.ts b/src/mahoji/commands/sacrifice.ts
@@ -47,7 +47,8 @@ const noSacPrice = resolveItems([
 	'Bronze pickaxe',
 	'Iron pickaxe',
 	'Red dye',
-	'Cannon furnace'
+	'Cannon furnace',
+	'Feather'
 ]);
 
 export function sacrificePriceOfItem(item: Item, qty: number) {

diff --git 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,

diff --git a/src/mahoji/lib/abstracted_commands/questCommand.ts b/src/mahoji/lib/abstracted_commands/questCommand.ts
@@ -91,7 +91,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) {
@@ -119,8 +119,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