Fix hiscores

oldschoolgg · Feb 21, 2024 · 4fc6bd4 · 4fc6bd4
1 parent f49a098
commit 4fc6bd4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/scripts/prepareItems.ts b/scripts/prepareItems.ts
@@ -237,7 +237,7 @@ export default async function prepareItems(): Promise<void> {
 
 	const allPrices = await fetch('https://prices.runescape.wiki/api/v1/osrs/latest', {
 		headers: {
-			'User-Agent': 'oldschooljs - @Magnaboy#7556'
+			'User-Agent': 'oldschooljs - @magnaboy'
 		}
 	})
 		.then((res): Promise<any> => res.json())
@@ -358,7 +358,6 @@ export default async function prepareItems(): Promise<void> {
 			if (item.name !== previousItem.name) {
 				messages.push(`WARNING: name changed from ${previousItem.name} to ${item.name}`);
 			}
-			item.price = previousItem.price;
 			if (item.equipment?.slot !== previousItem.equipment?.slot) {
 				messages.push(`WARNING: ${previousItem.name} slot changed`);
 			}
@@ -372,12 +371,18 @@ export default async function prepareItems(): Promise<void> {
 			item.equipable = copyItem.equipable;
 		}
 		if (previousItem) {
-			item.price = previousItem.price;
 			item.cost = previousItem.cost;
 			item.lowalch = previousItem.lowalch;
 			item.highalch = previousItem.highalch;
 			item.wiki_url = previousItem.wiki_url;
 			item.wiki_name = previousItem.wiki_name;
+			item.release_date = previousItem.release_date;
+			if (previousItem.equipment?.requirements) {
+				item.equipment = {
+					...item.equipment,
+					requirements: previousItem.equipment.requirements
+				};
+			}
 		}
 		if (previousItem) {
 			if (item.equipment?.requirements === null && previousItem.equipment?.requirements !== null) {

diff --git a/src/constants.ts b/src/constants.ts
@@ -80,6 +80,7 @@ export const mappedBossNames: [keyof BossRecords, string][] = [
 	['phantomMuspah', 'Phantom Muspah'],
 	['sarachnis', 'Sarachnis'],
 	['scorpia', 'Scorpia'],
+	['scurrius', 'Scurrius'],
 	['skotizo', 'Skotizo'],
 	['spindel', 'Spindel'],
 	['tempoross', 'Tempoross'],

diff --git a/src/meta/types.ts b/src/meta/types.ts
@@ -96,6 +96,7 @@ export interface BossRecords {
 	phantomMuspah: MinigameScore;
 	sarachnis: MinigameScore;
 	scorpia: MinigameScore;
+	scurrius: MinigameScore;
 	skotizo: MinigameScore;
 	spindel: MinigameScore;
 	tempoross: MinigameScore;

diff --git a/test/Hiscores.test.ts b/test/Hiscores.test.ts
@@ -71,11 +71,10 @@ test('Hiscores', async () => {
 	expect(dmmTournyFaux.skills.agility.level).toBeGreaterThan(49);
 
 	const leagues = await Hiscores.fetch('Magnaboy', { type: 'seasonal' });
-	expect(leagues.leaguePoints?.points).toBeGreaterThan(6300);
-	expect(leagues.leaguePoints?.points).toBeLessThan(50_000);
+	expect(leagues.leaguePoints?.points).toBeGreaterThan(1);
 
 	const leagues2 = await Hiscores.fetch('fk ezscape', { type: 'seasonal' });
-	expect(leagues2.leaguePoints?.points).toBeGreaterThan(20_000);
+	expect(leagues2.leaguePoints?.points).toBeGreaterThan(1);
 
 	// Skillers
 	const skiller = await Hiscores.fetch('Jcw', { type: 'skiller' });

diff --git a/test/Items.test.ts b/test/Items.test.ts
@@ -152,7 +152,6 @@ describe('Items', () => {
 			expect(scep2.equipable_weapon).toEqual(true);
 			expect(scep2.equipable).toEqual(true);
 			expect(scep2.equipment?.slot).toEqual(EquipmentSlot.Weapon);
-			expect(scep2.price > 4_000_000).toEqual(true);
 
 			expect(Items.filter(i => i.name === "Pharaoh's sceptre").size).toEqual(1);
 		},

diff --git a/test/items.sanity.test.ts b/test/items.sanity.test.ts
@@ -71,7 +71,6 @@ test('Items Sanity Test', async () => {
 	expect(itemWebweaverBowU.cost).toEqual(175_000);
 	expect(itemWebweaverBowU.lowalch).toEqual(70_000);
 	expect(itemWebweaverBowU.highalch).toEqual(105_000);
-	expect(itemWebweaverBowU.buy_limit).toBeUndefined();
 
 	const item27655 = Items.get(27_655)!;
 	expect(item27655.id).toEqual(27_655);
@@ -95,7 +94,6 @@ test('Items Sanity Test', async () => {
 	expect(item27657.cost).toEqual(175_000);
 	expect(item27657.lowalch).toEqual(70_000);
 	expect(item27657.highalch).toEqual(105_000);
-	expect(item27657.buy_limit).toBeUndefined();
 
 	const item27660 = Items.get(27_660)!;
 	expect(item27660.id).toEqual(27_660);