Merge branch 'beta' into rogue-ball-balance-fix

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.1.0",
+	"version": "1.1.6",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.1.0",
+			"version": "1.1.6",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.1.0",
+	"version": "1.1.6",
 	"type": "module",
 	"scripts": {
 		"start": "vite",

public/images/items.json

@@ -3353,12 +3353,12 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 24,
+						"w": 32,
-						"h": 23
+						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 1,
+						"x": 5,
-						"y": 1,
+						"y": 5,
 						"w": 22,
 						"h": 21
 					},
@@ -8436,6 +8436,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:875c6d67e72590dfc6d319101aa31cfa:dd2bb865ecbc5ac7b975ddf70b993334:110e074689c9edd2c54833ce2e4d9270$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d91a46c431ace3f09f5ca68916a2171e:1e84369d9a13e1416fa58028d629d116:110e074689c9edd2c54833ce2e4d9270$"
 	}
 }

public/images/pokemon/658-ash.json

@@ -1,41 +1,19 @@
-{
+{ "frames": [
-	"textures": [
+   {
-		{
+    "filename": "0001.png",
-			"image": "658-ash.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
-			"format": "RGBA8888",
+    "rotated": false,
-			"size": {
+    "trimmed": false,
-				"w": 79,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
-				"h": 79
+    "sourceSize": { "w": 79, "h": 74 },
-			},
+    "duration": 100
-			"scale": 1,
+   }
-			"frames": [
+ ],
-				{
+ "meta": {
-					"filename": "0001.png",
+  "app": "https://www.aseprite.org/",
-					"rotated": false,
+  "version": "1.3.7-x64",
-					"trimmed": false,
+  "format": "I8",
-					"sourceSize": {
+  "size": { "w": 79, "h": 74 },
-						"w": 79,
+  "scale": "1"
-						"h": 74
+ }
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 79,
-						"h": 74
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:936f62fa49ba4d6e402bb2e2eaf2afd0:ed00ba047a44b4bf1309bc147dd000e3:bfbf521a5c7bd80bcd95a96d9789c0dd$"
-	}
 }

public/images/pokemon/658.json

@@ -1,41 +1,19 @@
-{
+{ "frames": [
-	"textures": [
+   {
-		{
+    "filename": "0001.png",
-			"image": "658.png",
+    "frame": { "x": 0, "y": 0, "w": 85, "h": 67 },
-			"format": "RGBA8888",
+    "rotated": false,
-			"size": {
+    "trimmed": false,
-				"w": 75,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 85, "h": 67 },
-				"h": 75
+    "sourceSize": { "w": 85, "h": 67 },
-			},
+    "duration": 100
-			"scale": 1,
+   }
-			"frames": [
+ ],
-				{
+ "meta": {
-					"filename": "0001.png",
+  "app": "https://www.aseprite.org/",
-					"rotated": false,
+  "version": "1.3.7-x64",
-					"trimmed": false,
+  "format": "I8",
-					"sourceSize": {
+  "size": { "w": 85, "h": 67 },
-						"w": 75,
+  "scale": "1"
-						"h": 65
+ }
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:e0b10df331bd4ce6760edab61dee144b:061561c45beff89a92bf0158d065204f:5affcab976148657d36bf4ff3410f92d$"
-	}
 }

public/images/pokemon/688.json

@@ -1,41 +1,18 @@
-{
+{ "frames": [
-	"textures": [
+   {
-		{
+    "filename": "0001.png",
-			"image": "688.png",
+    "frame": { "x": 0, "y": 0, "w": 64, "h": 63 },
-			"format": "RGBA8888",
+    "rotated": false,
-			"size": {
+    "trimmed": false,
-				"w": 52,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 63 },
-				"h": 52
+    "sourceSize": { "w": 64, "h": 63 }
-			},
+   }
-			"scale": 1,
+ ],
-			"frames": [
+ "meta": {
-				{
+  "app": "https://www.aseprite.org/",
-					"filename": "0001.png",
+  "version": "1.3.7-x64",
-					"rotated": false,
+  "format": "I8",
-					"trimmed": false,
+  "size": { "w": 64, "h": 63 },
-					"sourceSize": {
+  "scale": "1"
-						"w": 41,
+ }
-						"h": 52
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 52
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 52
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f328f72c414efc6cf463a1254afa75ac:50168e1a7077626f41bdaf5d0b35af74:176060351d0044923af938ba7932a6ef$"
-	}
 }

public/images/pokemon/689.json

@@ -1,41 +1,19 @@
-{
+{ "frames": [
-	"textures": [
+   {
-		{
+    "filename": "0001.png",
-			"image": "689.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 82 },
-			"format": "RGBA8888",
+    "rotated": false,
-			"size": {
+    "trimmed": false,
-				"w": 86,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 82 },
-				"h": 86
+    "sourceSize": { "w": 79, "h": 82 },
-			},
+    "duration": 100
-			"scale": 1,
+   }
-			"frames": [
+ ],
-				{
+ "meta": {
-					"filename": "0001.png",
+  "app": "https://www.aseprite.org/",
-					"rotated": false,
+  "version": "1.3.7-x64",
-					"trimmed": false,
+  "format": "I8",
-					"sourceSize": {
+  "size": { "w": 79, "h": 82 },
-						"w": 86,
+  "scale": "1"
-						"h": 79
+ }
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 86,
-						"h": 79
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:1825183d2cc847c000400501e055918b:af535bb92b1490f3ab69be674b3b6fe0:bd0c58ecddcb4af9a0c6e7b39821d971$"
-	}
 }