Merge branch 'main' into main

.github/workflows/deploy.yml

@@ -28,11 +28,6 @@ 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: | 
-      - name: Purge Cloudflare Cache
+          rsync --del --no-times --checksum -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+          ssh -t ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "~/prmanifest --inpath ${{ secrets.DESTINATION_DIR }} --outpath ${{ secrets.DESTINATION_DIR }}/manifest.json"
-        id: purge-cache
-        uses: NathanVaughn/actions-cloudflare-purge@v3.1.0
-        with:
-          cf_auth: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          cf_zone: ${{ secrets.CLOUDFLARE_ZONE_ID }}

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>

public/exp-sprites.json

@@ -1069,8 +1069,6 @@
     "971",
     "972",
     "972",
-    "973",
-    "973",
     "974",
     "974",
     "975",
@@ -2203,8 +2201,6 @@
     "971b",
     "972b",
     "972b",
-    "973b",
-    "973b",
     "974b",
     "974b",
     "975b",
@@ -3335,8 +3331,6 @@
     "971sb",
     "972sb",
     "972sb",
-    "973sb",
-    "973sb",
     "974sb",
     "974sb",
     "975sb",
@@ -4474,8 +4468,6 @@
     "971s",
     "972s",
     "972s",
-    "973s",
-    "973s",
     "974s",
     "974s",
     "975s",