Update OSJS/Spritesheet (oldschoolgg#6018)

nwjgit · Aug 26, 2024 · fd5e5fb · fd5e5fb
1 parent 1f9c657
commit fd5e5fb
Show file tree

Hide file tree

Showing 7 changed files with 4,580 additions and 4,426 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
 		"murmurhash": "^2.0.1",
 		"node-cron": "^3.0.3",
 		"node-fetch": "^2.6.7",
-		"oldschooljs": "^2.5.10",
+		"oldschooljs": "^2.5.11",
 		"p-queue": "^6.6.2",
 		"piscina": "^4.6.1",
 		"random-js": "^2.1.0",

diff --git a/scripts/spritesheet.ts b/scripts/spritesheet.ts
@@ -31,7 +31,15 @@ const manualIDs = [
 	21844, 11772, 12887, 25606, 24304, 24374, 19691, 11863, 25840, 28134, 3450, 27580, 3458, 24384, 12896, 25541, 24977,
 	22719, 3454, 6722, 20773, 25432, 27477, 25314, 1037, 6858, 25684, 25926, 8950, 25052, 12894, 28409, 10508, 23083,
 	6861, 25664, 27481, 25282, 7927, 13571, 24378, 1, 24430, 25609, 19695, 11847, 20747, 21752, 24431, 20832, 27610,
-	21214, 25922, 27473, 9923, 28184, 24535, 3456, 25928, 24525, 21843, 12845, 11026, 3457, 25050, 19693, 6857, 12958
+	21214, 25922, 27473, 9923, 28184, 24535, 3456, 25928, 24525, 21843, 12845, 11026, 3457, 25050, 19693, 6857, 12958,
+	29489, 29491, 29493, 29495, 29497, 29499, 29501, 29503, 29505, 29507, 29509, 29510, 29511, 29512, 29513, 29514,
+	29515, 29516, 29517, 29518, 29519, 29521, 29522, 29523, 29524, 29525, 29526, 29527, 29528, 29529, 29530, 29531,
+	29532, 29533, 29534, 29535, 29536, 29537, 29538, 29539, 29540, 29541, 29542, 29543, 29544, 29545, 29546, 29547,
+	29548, 29549, 29550, 29551, 29552, 29553, 29554, 29555, 29556, 29558, 29560, 29562, 29564, 29566, 29568, 29570,
+	29572, 29573, 29574, 29577, 29580, 29583, 29585, 29587, 29589, 29591, 29594, 29596, 29598, 29599, 29602, 29605,
+	29607, 29609, 29611, 29613, 29615, 29617, 29619, 29622, 29625, 29628, 29631, 29634, 29637, 29640, 29643, 29648,
+	29649, 29651, 29652, 29654, 29655, 29657, 29658, 29660, 29661, 29663, 29664, 29666, 29667, 29669, 29670, 29672,
+	29673, 29675, 29676, 29678, 29679, 29684
 ];
 const trades = Items.filter(i => Boolean(i.tradeable_on_ge)).map(i => i.id);
 const itemsMustBeInSpritesheet: number[] = uniqueArr([
@@ -107,6 +115,7 @@ const main = async () => {
 		const jsonData = generateJsonData(result);
 		await fs.writeFile(outputJsonFilePath, JSON.stringify(jsonData, null, 2));
 		console.log('Spritesheet and JSON created successfully!');
+		process.exit(0);
 	} catch (error) {
 		console.error('Error creating spritesheet:', error);
 	}

diff --git a/src/lib/data/buyables/buyables.ts b/src/lib/data/buyables/buyables.ts
@@ -49,8 +49,8 @@ const randomEventBuyables: Buyable[] = [
 			'Frog token': 1
 		}),
 		outputItems: new Bank({
-			'Prince tunic': 1,
-			'Prince leggings': 1
+			'Royal frog tunic': 1,
+			'Royal frog leggings': 1
 		})
 	},
 	{
@@ -59,8 +59,8 @@ const randomEventBuyables: Buyable[] = [
 			'Frog token': 1
 		}),
 		outputItems: new Bank({
-			'Princess blouse': 1,
-			'Princess skirt': 1
+			'Royal frog blouse': 1,
+			'Royal frog skirt': 1
 		})
 	},
 	{