Merge branch 'master' into bso

oldschoolgg · Dec 21, 2024 · b882617 · b882617
2 parents 0f10920 + a2672a1
commit b882617
Show file tree

Hide file tree

Showing 28 changed files with 1,703 additions and 13,998 deletions.
diff --git a/data/bso_items.json b/data/bso_items.json
@@ -1671,6 +1671,24 @@
 	"73301": "Spookling token",
 	"73302": "Miniature pumpkin head",
 	"73303": "Snow leopard plushie",
+	"73304": "Snowdream logs",
+	"73305": "Snowdream staff",
+	"73306": "Snowdream rune",
+	"73307": "Snowdream robe legs",
+	"73308": "Snowdream wizard hat",
+	"73309": "Snowdream robe top",
+	"73310": "Snowdream wizard socks",
+	"73311": "Snowdream pillow",
+	"73312": "Black santa top",
+	"73313": "Black santa legs",
+	"73314": "Black santa gloves",
+	"73315": "Black santa boots",
+	"73316": "Chef-touched heart (choc)",
+	"73317": "Icey santa hat",
+	"73318": "Sungod slippers",
+	"73319": "Axe of the high sungod (xmas)",
+	"73320": "Grinchling",
+	"73321": "Snowflake amulet",
 	"88888": "Bucket of dung",
 	"88889": "Polterpup",
 	"121234": "Burnt celebratory cake",

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
 		"start": "pnpm watch",
 		"lint": "tsx scripts/lint.ts",
 		"============SCRIPTS": "============",
-		"spritesheet": "tsx ./scripts/spritesheet.ts && pnpm lint:biome",
+		"spritesheet": "tsx ./scripts/spritesheet.ts && pnpm lint",
 		"data": "concurrently \"tsx ./scripts/monster_table.ts\" && pnpm lint",
 		"wiki": "tsx ./scripts/wiki.ts",
 		"commands": "tsx ./scripts/renderCommandsFile.ts",

diff --git a/packages/oldschooljs/scripts/prepareItems.ts b/packages/oldschooljs/scripts/prepareItems.ts
@@ -105,9 +105,6 @@ const manualItems: Item[] = [
 		cost: 75_000,
 		lowalch: 30_000,
 		highalch: 45_000,
-		weight: 0.004,
-		wiki_name: 'Ring of shadows (uncharged)',
-		wiki_url: 'https://oldschool.runescape.wiki/w/Ring_of_shadows#Uncharged',
 		equipment: {
 			attack_stab: 4,
 			attack_slash: 4,
@@ -133,7 +130,6 @@ const manualItems: Item[] = [
 		name: 'Ancient lamp',
 		cost: 1,
 		wiki_name: 'Ancient lamp',
-		wiki_url: 'https://oldschool.runescape.wiki/w/Ancient_lamp',
 		price: 0
 	},
 	{
@@ -147,7 +143,6 @@ const manualItems: Item[] = [
 		lowalch: 40,
 		highalch: 60,
 		wiki_name: 'Scaly blue dragonhide',
-		wiki_url: 'https://oldschool.runescape.wiki/w/Scaly_blue_dragonhide',
 		price: 2011
 	},
 	{
@@ -161,7 +156,6 @@ const manualItems: Item[] = [
 		lowalch: 1,
 		highalch: 1,
 		wiki_name: "Butler's tray",
-		wiki_url: 'https://oldschool.runescape.wiki/w/Butler%27s_tray',
 		price: 1,
 		equipment: {
 			attack_stab: 0,
@@ -193,7 +187,6 @@ const manualItems: Item[] = [
 		lowalch: 1,
 		highalch: 1,
 		wiki_name: 'Costume needle',
-		wiki_url: 'https://oldschool.runescape.wiki/w/Costume_needle',
 		price: 1
 	}
 ];
@@ -355,7 +348,8 @@ export default async function prepareItems(): Promise<void> {
 			'release_date',
 			'quest_item',
 			'weight',
-			'examine'
+			'examine',
+			'wiki_url'
 		]) {
 			// @ts-ignore
 			delete item[delKey];
@@ -373,8 +367,6 @@ export default async function prepareItems(): Promise<void> {
 			'equipable_weapon',
 			'weight',
 			'buy_limit',
-			'wiki_name',
-			'wiki_url',
 			'equipment',
 			'weapon'
 		] as const) {
@@ -470,7 +462,6 @@ export default async function prepareItems(): Promise<void> {
 			item.cost = previousItem.cost;
 			item.lowalch = previousItem.lowalch;
 			item.highalch = previousItem.highalch;
-			item.wiki_url = previousItem.wiki_url;
 			item.wiki_name = previousItem.wiki_name;
 			if (previousItem.equipment?.requirements) {
 				// @ts-ignore ignore
@@ -553,22 +544,11 @@ GROUP BY id
 `);
 	}
 
-	const date = new Date();
-	const formattedDate = formatDateForTimezones(date);
-
 	const diffOutput: any = diff(previousItems, newItemJSON);
 	for (const [key, val] of objectEntries(diffOutput as any)) {
 		if (!val || Object.values(val).every(t => !t)) {
 			delete diffOutput[key];
 		}
 	}
-	const baseFilename = `item-update-${date.getUTCFullYear()}-${date.getUTCMonth() + 1}-${date.getUTCDay() + 1}`;
-	writeFileSync(
-		`./update-history/${baseFilename}.txt`,
-		`Updated on ${formattedDate.sydney} Sydney / ${formattedDate.cali} California
-
-${messages.join('\n')}`
-	);
-	writeFileSync(`./update-history/${baseFilename}.json`, `${JSON.stringify(diffOutput, null, '	')}`);
 	writeFileSync('./src/data/items/item_data.json', `${JSON.stringify(newItemJSON, null, '	')}\n`);
 }
diff --git a/packages/oldschooljs/src/EMonster.ts b/packages/oldschooljs/src/EMonster.ts
@@ -28,6 +28,7 @@ export enum EMonster {
 	VARDORVIS_AWAKENED = 12224,
 	SCURRIUS = 7222,
 	THE_HUEYCOATL = 14009,
+	AMOXLIATL = 13685,
 	CALLISTO = 6503,
 	CHAOS_ELEMENTAL = 2054,
 	CRAZY_ARCHAEOLOGIST = 6618,
@@ -315,6 +316,10 @@ export enum EMonster {
 	CRAB = 4819,
 	CHILLED_JELLY = 13799,
 	WEALTHY_CITIZEN = 13302,
+	FROST_NAGUA = 13728,
+	SULPHUR_NAGUA = 13033,
+	WARPED_TERRORBIRD = 12491,
+	WARPED_TORTOISE = 12490,
 	BARROWS = 1673,
 	TZTOKJAD = 3127,
 	HESPORI = 8583,