Merge branch 'main' of https://gitea.nolanhellyer.com/nolan/blackjack

client/public/assets/cards.json

@@ -935,13 +935,31 @@
 				"x": 0,
 				"y": 0
 			}
+		},
+		"unknown": {
+			"frame": {
+				"w": 144,
+				"h": 224,
+				"x": 1872,
+				"y": 0
+			},
+			"sourceSize": {
+				"w": 144,
+				"h": 224
+			},
+			"spriteSourceSize": {
+				"w": 144,
+				"h": 224,
+				"x": 0,
+				"y": 0
+			}
 		}
 	},
 	"meta": {
 		"image": "cards.png",
 		"format": "RGBA8888",
 		"size": {
-			"w": 1872,
+			"w": 2016,
 			"h": 896
 		},
 		"scale": 1

client/src/Card.ts

@@ -50,4 +50,5 @@ export type Card =
 	| "jackOfDiamonds"
 	| "queenOfDiamonds"
 	| "kingOfDiamonds"
-	| "aceOfDiamonds";
+	| "aceOfDiamonds"
+	| "unknown";

client/src/spritesheets/spritesheet.ts

@@ -26,7 +26,7 @@ function getCardSpritesheet() {
 		meta: {
 			image: "/public/assets/cards.png",
 			format: "RGBA8888",
-			size: { w: 1872, h: 896 },
+			size: { w: 2016, h: 896 },
 			scale: 1,
 		},
 	};
@@ -48,10 +48,10 @@ function getCardSpritesheet() {
 		"ace",
 	];
 
+	const size = { w: 144, h: 224 };
 	for (let i = 0; i < 4; i++) {
 		for (let j = 0; j < 13; j++) {
 			const cardName = `${values[j]}Of${suits[i]}`;
-			const size = { w: 144, h: 224 };
 			const position = { x: j * size.w, y: i * size.h };
 
 			spriteSheet.frames[cardName] = {
@@ -62,5 +62,11 @@ function getCardSpritesheet() {
 		}
 	}
 
+	spriteSheet.frames["unknown"] = {
+		frame: { ...size, x: size.w * 13, y: 0 },
+		sourceSize: size,
+		spriteSourceSize: { ...size, x: 0, y: 0 },
+	};
+
 	return spriteSheet;
 }