Merge branch 'main' into implements-cursed-body

.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

README.md

@@ -7,8 +7,11 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite
 If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#vote** channel in the discord. 
 
 ### 💻 Environment Setup
-node: 18.3.0
+#### Prerequisites
+- node: 18.3.0
+- npm: [how to install](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
 
+#### Running Locally
 1. Clone the repo and in the root directory run `npm install`
     - *if you run into any errors, reach out in the **#dev-corner** channel in discord*
 2. Run `npm run start:dev` to locally run the project in `localhost:8000`

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/1024-stellar.json

@@ -4,30 +4,30 @@
 			"image": "1024-stellar.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 96,
+				"w": 119,
-				"h": 96
+				"h": 119
 			},
-			"scale": 0.5,
+			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 96,
+						"w": 119,
-						"h": 96
+						"h": 119
 					},
 					"spriteSourceSize": {
-						"x": 9,
+						"x": 0,
 						"y": 0,
-						"w": 78,
+						"w": 115,
-						"h": 96
+						"h": 119
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 78,
+						"w": 115,
-						"h": 96
+						"h": 119
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c9ee64bda72f2dadb06109338796ccac:1313f1218b7da2c57ad9f290d1323840:c1508f3b01ae78a28a1267fd6caa4f7b$"
+		"smartupdate": "$TexturePacker:SmartUpdate:bc663acf2e62803fce6c3a525dc8dd98:ccd7d0de8a487235cfbd6f372afa931f:c1508f3b01ae78a28a1267fd6caa4f7b$"
 	}
 }

public/images/pokemon/back/1024-stellar.json

@@ -4,30 +4,30 @@
 			"image": "1024-stellar.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 96,
+				"w": 119,
-				"h": 96
+				"h": 119
 			},
-			"scale": 0.333,
+			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 96,
+						"w": 119,
-						"h": 96
+						"h": 119
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 86,
+						"w": 115,
-						"h": 96
+						"h": 119
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 86,
+						"w": 115,
-						"h": 96
+						"h": 119
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ac5e775f77477eeabd029932804747c4:f7a112a87c35dc81cb0da88b7cbb39e8:c1508f3b01ae78a28a1267fd6caa4f7b$"
+		"smartupdate": "$TexturePacker:SmartUpdate:210ba1c2e6e58501571ae226d073a3c5:f12bdf191842f7ec3a4be98a43fb8121:c1508f3b01ae78a28a1267fd6caa4f7b$"
 	}
 }

public/images/pokemon/back/shiny/1024-stellar.json

@@ -4,30 +4,30 @@
 			"image": "1024-stellar.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 96,
+				"w": 119,
-				"h": 96
+				"h": 119
 			},
-			"scale": 0.333,
+			"scale": 1,
 			"frames": [
 				{
 					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 96,
+						"w": 119,
-						"h": 96
+						"h": 119
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 0,
 						"y": 0,
-						"w": 86,
+						"w": 115,
-						"h": 96
+						"h": 119
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 86,
+						"w": 115,
-						"h": 96
+						"h": 119
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:2bd25bae0fabcfbc35e24bd578a7b4b5:aec60788a0d77f38fb599d721e41a0d6:c1508f3b01ae78a28a1267fd6caa4f7b$"
+		"smartupdate": "$TexturePacker:SmartUpdate:210ba1c2e6e58501571ae226d073a3c5:f12bdf191842f7ec3a4be98a43fb8121:c1508f3b01ae78a28a1267fd6caa4f7b$"
 	}
 }