Merge branch 'main' into terrainpulse

.github/workflows/deploy.yml

@@ -28,7 +28,9 @@ jobs:
           ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
       - name: Deploy build on server
         if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
-        run: rsync -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
+        run: | 
+          rsync --del --no-times --checksum -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
+          ssh -t ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "~/prmanifest --inpath ${{ secrets.DESTINATION_DIR }} --outpath ${{ secrets.DESTINATION_DIR }}/manifest.json"
       - name: Purge Cloudflare Cache
         if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
         id: purge-cache
@@ -36,3 +38,7 @@ jobs:
         with:
           cf_auth: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           cf_zone: ${{ secrets.CLOUDFLARE_ZONE_ID }}
+          files: |
+            https://pokerogue.net/
+            https://pokerogue.net/index.html
+            https://pokerogue.net/manifest.json

index.html

@@ -9,27 +9,27 @@
 	<meta property="og:type" content="website" />
 	<meta property="og:description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." />
 	<meta property="og:image" content="https://pokerogue.net/logo512.png" />
-	<link rel="apple-touch-icon" href="/logo512.png" />
+	<link rel="apple-touch-icon" href="./logo512.png" />
-	<link rel="shortcut icon" type="image/png" href="/logo512.png" />
+	<link rel="shortcut icon" type="image/png" href="./logo512.png" />
 	<meta charset="UTF-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
 	<style type="text/css">
 		@font-face {
 			font-family: 'emerald';
-			src: url('/fonts/pokemon-emerald-pro.ttf') format('truetype');
+			src: url('./fonts/pokemon-emerald-pro.ttf') format('truetype');
 		}
 
 		@font-face {
 			font-family: 'pkmnems';
-			src: url('/fonts/pkmnems.ttf') format('truetype');
+			src: url('./fonts/pkmnems.ttf') format('truetype');
 		}
 	</style>
-	<link rel="stylesheet" type="text/css" href="index.css" />
+	<link rel="stylesheet" type="text/css" href="./index.css" />
-	<link rel="manifest" href="/manifest.webmanifest">
+	<link rel="manifest" href="./manifest.webmanifest">
   <script>
     if ("serviceWorker" in navigator) {
       window.addEventListener("load", function () {
-        navigator.serviceWorker.register("/service-worker.js").then(
+        navigator.serviceWorker.register("./service-worker.js").then(
           function (registration) {
             console.log("ServiceWorker registration successful");
           },
@@ -94,9 +94,9 @@
 			</div>
 		</div>
 	</div>
-	<script type="module" src="src/main.ts"></script>
+	<script type="module" src="./src/main.ts"></script>
-	<script src="src/touch-controls.js" type="module"></script>
+	<script src="./src/touch-controls.js" type="module"></script>
-	<script src="src/debug.js" type="module"></script>
+	<script src="./src/debug.js" type="module"></script>
 </body>
 
 </html>

package.json

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

public/exp-sprites.json

@@ -4535,5 +4535,184 @@
     "999s-roaming",
     "999s-roaming",
     "999s",
-    "999s"
+    "999s",
+    "1000",
+    "1001",
+    "1004",
+    "181-mega",
+    "212-mega",
+    "282-mega_2",
+    "282-mega_2",
+    "282-mega_3",
+    "282-mega_3",
+    "303-mega",
+    "334-mega",
+    "334-mega_2",
+    "334-mega_2",
+    "376-mega",
+    "384-mega",
+    "384-mega_2",
+    "384-mega_2",
+    "4263",
+    "4264",
+    "428-mega",
+    "445-mega",
+    "448-mega",
+    "475-mega_2",
+    "475-mega_2",
+    "475-mega_3",
+    "475-mega_3",
+    "6549",
+    "6570",
+    "6571",
+    "6705",
+    "6706_2",
+    "6706_2",
+    "6706_3",
+    "6706_3",
+    "700",
+    "704",
+    "705_2",
+    "705_2",
+    "705_3",
+    "705_3",
+    "706",
+    "708",
+    "709",
+    "710",
+    "711",
+    "720-unbound",
+    "720",
+    "755",
+    "756",
+    "789",
+    "791_1",
+    "791_1",
+    "802",
+    "856",
+    "857_2",
+    "857_2",
+    "857_3",
+    "857_3",
+    "858",
+    "872",
+    "873",
+    "877-hangry",
+    "877",
+    "885",
+    "886",
+    "887",
+    "890_2",
+    "890_2",
+    "890_3",
+    "890_3",
+    "900",
+    "919",
+    "920",
+    "924",
+    "925-four",
+    "925-four_2",
+    "925-four_2",
+    "925-four_3",
+    "925-four_3",
+    "925-three",
+    "925-three_2",
+    "925-three_2",
+    "925-three_3",
+    "925-three_3",
+    "94-mega_1",
+    "94-mega_1",
+    "94-mega_2",
+    "94-mega_2",
+    "94-mega_3",
+    "94-mega_3",
+    "962",
+    "967",
+    "973",
+    "987",
+    "988",
+    "988_3",
+    "988_3",
+    "999",
+    "999_1",
+    "999_1",
+    "1000b",
+    "1001b",
+    "1004b",
+    "181b-mega",
+    "212b-mega",
+    "282b-mega",
+    "303b-mega",
+    "334b-mega",
+    "376b-mega",
+    "384b-mega",
+    "4263b",
+    "4264b",
+    "428b-mega",
+    "445b-mega",
+    "448b-mega",
+    "475b-mega_2",
+    "475b-mega_2",
+    "475b-mega_3",
+    "475b-mega_3",
+    "6549b",
+    "6570b",
+    "6571b",
+    "6705b",
+    "6706_2b",
+    "6706_2b",
+    "6706_3b",
+    "6706_3b",
+    "700b",
+    "704b",
+    "705b",
+    "706b",
+    "708b",
+    "709b",
+    "710b",
+    "711b",
+    "720b-unbound",
+    "720b",
+    "755b",
+    "756b",
+    "789b",
+    "791b",
+    "802b",
+    "856b",
+    "857_2b",
+    "857_2b",
+    "857_3b",
+    "857_3b",
+    "858b",
+    "872b",
+    "873b",
+    "877b-hangry",
+    "877b",
+    "885b",
+    "886b",
+    "887b",
+    "890b",
+    "900b",
+    "919b",
+    "920b",
+    "924b",
+    "925b-four",
+    "925b-four_2",
+    "925b-four_2",
+    "925b-four_3",
+    "925b-four_3",
+    "925b-three",
+    "925b-three_2",
+    "925b-three_2",
+    "925b-three_3",
+    "925b-three_3",
+    "94b-mega",
+    "962b",
+    "962_3b",
+    "962_3b",
+    "967b",
+    "973b",
+    "987b",
+    "988b",
+    "999b"
 ]

public/images/pokemon/890-eternamax.json

@@ -4,30 +4,744 @@
 			"image": "890-eternamax.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 96,
+				"w": 579,
-				"h": 96
+				"h": 579
 			},
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "0001.png",
+					"filename": "0035.png",
 					"rotated": false,
-					"trimmed": false,
+					"trimmed": true,
 					"sourceSize": {
-						"w": 96,
+						"w": 112,
-						"h": 96
+						"h": 112
 					},
 					"spriteSourceSize": {
-						"x": 0,
+						"x": 8,
-						"y": 0,
+						"y": 9,
-						"w": 96,
+						"w": 100,
-						"h": 96
+						"h": 98
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
+						"w": 100,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 95,
+						"h": 100
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 95,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 8,
+						"w": 91,
+						"h": 100
+					},
+					"frame": {
+						"x": 0,
+						"y": 98,
+						"w": 91,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
 						"w": 96,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 100,
+						"w": 96,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 95,
+						"h": 99
+					},
+					"frame": {
+						"x": 187,
+						"y": 100,
+						"w": 95,
+						"h": 99
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 91,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 198,
+						"w": 91,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 10,
+						"w": 88,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 198,
+						"w": 88,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 10,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 195,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 179,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 274,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 290,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 94,
 						"h": 96
+					},
+					"frame": {
+						"x": 282,
+						"y": 97,
+						"w": 94,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 90,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 193,
+						"w": 90,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 13,
+						"w": 93,
+						"h": 95
+					},
+					"frame": {
+						"x": 385,
+						"y": 0,
+						"w": 93,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 9,
+						"w": 91,
+						"h": 96
+					},
+					"frame": {
+						"x": 385,
+						"y": 95,
+						"w": 91,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 290,
+						"w": 87,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 290,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 459,
+						"y": 191,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 90,
+						"h": 95
+					},
+					"frame": {
+						"x": 476,
+						"y": 95,
+						"w": 90,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 478,
+						"y": 0,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 386,
+						"w": 89,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 0,
+						"y": 296,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 14,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 89,
+						"y": 296,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 88,
+						"h": 95
+					},
+					"frame": {
+						"x": 178,
+						"y": 296,
+						"w": 88,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 95
+					},
+					"frame": {
+						"x": 89,
+						"y": 390,
+						"w": 87,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 391,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 266,
+						"y": 387,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 13,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 266,
+						"y": 296,
+						"w": 85,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 13,
+						"w": 88,
+						"h": 94
+					},
+					"frame": {
+						"x": 176,
+						"y": 391,
+						"w": 88,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 13,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 355,
+						"y": 387,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 11,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 264,
+						"y": 480,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 351,
+						"y": 481,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 93
+					},
+					"frame": {
+						"x": 440,
+						"y": 482,
+						"w": 87,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 10,
+						"w": 86,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 485,
+						"w": 86,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 14,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 86,
+						"y": 485,
+						"w": 85,
+						"h": 91
 					}
 				}
 			]
@@ -36,6 +750,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2f58479d6e423d47c2e020de79121c9e:2b0d210cee7325446481599b7b95c52b:4db8b375066b8984bad6ce8eed9a5f6f$"
+		"smartupdate": "$TexturePacker:SmartUpdate:8fd9e1830200ec8e4aac8571cc2d27a6:c966e3efce03c7bae43d7bca6d6dfa62:cedd2711a12bbacba5623505fe88bd92$"
 	}
 }