- Fix shadow animations (strike, hit)

- Take over lifes from level 12 to 13
- Don't show level/time info in level 13 and 14
- Leap of faith is ready directly after shadow merge (no waiting for music end)
- Fix "runturn" sliding glitch, through right side gate (e.g. level 10)
- Jaffar takes a moment longer until engarde (start fight)

Author: oklemenz

README.md

@@ -36,7 +36,7 @@ Prince of Persia reimplementation written in HTML5 / JavaScript (MS-DOS version)
 
 ## Play on Apple Watch
 
-- Mail/Message 
+- Mail/Message
   - Send mail or message to yourself with body: https://princejs.com
   - On Apple Watch open Mail or Message app
   - Click included link to open Browser

assets/anims/shadow.json

@@ -45,7 +45,7 @@
 
     "bump": [
       { "cmd": 249, "p1": 5 },
-      { "cmd": 251, "p1": -4 },
+      { "cmd": 251, "p1": -2 },
       { "cmd": 0, "p1": 50 },
       { "cmd": 0, "p1": 51 },
       { "cmd": 0, "p1": 52 },
@@ -129,22 +129,6 @@
       { "cmd": 255, "p1": "running", "p2": 0 }
     ],
 
-    "runjumpdown": [
-      { "cmd": 249, "p1": 1 },
-      { "cmd": 242, "p1": 1 },
-      { "cmd": 0, "p1": 42 },
-      { "cmd": 251, "p1": 4 },
-      { "cmd": 250, "p1": 11 },
-      { "cmd": 0, "p1": 43 },
-      { "cmd": 251, "p1": 4 },
-      { "cmd": 250, "p1": 3 },
-      { "cmd": 0, "p1": 44 },
-      { "cmd": 251, "p1": 5 },
-      { "cmd": 244 },
-      { "cmd": 242, "p1": 1 },
-      { "cmd": 255, "p1": "running", "p2": 0 }
-    ],
-
     "turn": [
       { "cmd": 249, "p1": 7 },
       { "cmd": 254 },
@@ -597,9 +581,8 @@
       { "cmd": 251, "p1": 3 },
       { "cmd": 249, "p1": 1 },
       { "cmd": 242, "p1": 0 },
-      { "cmd": 0, "p1": 170 },
-      { "cmd": 0, "p1": 171 },
-      { "cmd": 255, "p1": "engarde", "p2": 12 }
+      { "cmd": 0, "p1": 158 },
+      { "cmd": 255, "p1": "engarde", "p2": 11 }
     ],
 
     "advance": [
@@ -632,8 +615,6 @@
     ],
 
     "strike": [
-      { "cmd": 249, "p1": 1 },
-      { "cmd": 0, "p1": 168 },
       { "cmd": 249, "p1": 1 },
       { "cmd": 0, "p1": 151 },
       { "cmd": 0, "p1": 152 },
@@ -692,24 +673,6 @@
       { "cmd": 255, "p1": "dropdead", "p2": 9 }
     ],
 
-    "impale": [
-      { "cmd": 249, "p1": 1 },
-      { "cmd": 244 },
-      { "cmd": 251, "p1": 4 },
-      { "cmd": 0, "p1": 177 },
-      { "cmd": 246 },
-      { "cmd": 0, "p1": 177 },
-      { "cmd": 255, "p1": "impale", "p2": 5 }
-    ],
-
-    "halve": [
-      { "cmd": 249, "p1": 1 },
-      { "cmd": 0, "p1": 178 },
-      { "cmd": 246 },
-      { "cmd": 0, "p1": 178 },
-      { "cmd": 255, "p1": "halve", "p2": 3 }
-    ],
-
     "turnengarde": [
       { "cmd": 249, "p1": 5 },
       { "cmd": 254 },
@@ -739,6 +702,48 @@
       { "cmd": 255, "p1": "strike", "p2": 5 }
     ],
 
+    "impale": [
+      { "cmd": 249, "p1": 1 },
+      { "cmd": 244 },
+      { "cmd": 251, "p1": 4 },
+      { "cmd": 0, "p1": 177 },
+      { "cmd": 246 },
+      { "cmd": 0, "p1": 177 },
+      { "cmd": 255, "p1": "impale", "p2": 5 }
+    ],
+
+    "halve": [
+      { "cmd": 249, "p1": 1 },
+      { "cmd": 0, "p1": 178 },
+      { "cmd": 246 },
+      { "cmd": 0, "p1": 178 },
+      { "cmd": 255, "p1": "halve", "p2": 3 }
+    ],
+
+    "falldead": [
+      { "cmd": 249, "p1": 5 },
+      { "cmd": 0, "p1": 185 },
+      { "cmd": 246 },
+      { "cmd": 0, "p1": 185 },
+      { "cmd": 255, "p1": "falldead", "p2": 3 }
+    ],
+
+    "runjumpdown": [
+      { "cmd": 249, "p1": 1 },
+      { "cmd": 242, "p1": 1 },
+      { "cmd": 0, "p1": 42 },
+      { "cmd": 251, "p1": 4 },
+      { "cmd": 250, "p1": 11 },
+      { "cmd": 0, "p1": 43 },
+      { "cmd": 251, "p1": 4 },
+      { "cmd": 250, "p1": 3 },
+      { "cmd": 0, "p1": 44 },
+      { "cmd": 251, "p1": 5 },
+      { "cmd": 244 },
+      { "cmd": 242, "p1": 1 },
+      { "cmd": 255, "p1": "running", "p2": 0 }
+    ],
+
     "softlandStandup": [
       { "cmd": 249, "p1": 5 },
       { "cmd": 244 },

package-lock.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/oklemenz/PrinceJS#readme",
   "devDependencies": {
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "eslint-config": "^0.3.0",
     "eslint-config-prettier": "^8.3.0",
     "http-server": "^14.1.0",

package.json

@@ -25,13 +25,15 @@ PrinceJS.SKIP_CUTSCENES = false;
 PrinceJS.Init = function () {
   PrinceJS.currentLevel = 1;
   PrinceJS.maxHealth = 3;
+  PrinceJS.currentHealth = null;
   PrinceJS.minutes = 60;
   PrinceJS.startTime = undefined;
   PrinceJS.endTime = undefined;
   PrinceJS.strength = 100;
   PrinceJS.screenWidth = 0;
   PrinceJS.shortcut = false;
   PrinceJS.danger = null;
+  PrinceJS.skipShowLevel = false;
 };
 
 PrinceJS.Restart = function () {

src/Boot.js

@@ -90,11 +90,14 @@ PrinceJS.Enemy.prototype.updateBehaviour = function () {
     return;
   }
   if (this.willStartFight()) {
-    PrinceJS.Utils.delayed(() => {
-      if (this.willStartFight()) {
-        this.startFight = true;
-      }
-    }, 500);
+    PrinceJS.Utils.delayed(
+      () => {
+        if (this.willStartFight()) {
+          this.startFight = true;
+        }
+      },
+      this.baseCharName === "jaffar" ? 2300 : 500
+    );
   }
 
   if (this.refracTimer > 0) {

src/Enemy.js

@@ -1322,13 +1322,18 @@ PrinceJS.Fighter.prototype.getCharBounds = function () {
   let f = this.game.cache.getFrameData(this.charName).getFrameByName(this.charName + "-" + this.charFrame);
   let x = PrinceJS.Utils.convertX(this.charX + this.charFdx * this.charFace);
   let y = this.charY + this.charFdy - f.height;
+  let w = f.width;
+  let h = f.height;
   if (this.faceR()) {
     x -= f.width - 5;
   }
   if ((this.charFood && this.faceL()) || (!this.charFood && this.faceR())) {
     x += 1;
   }
-  return new Phaser.Rectangle(x, y, f.width, f.height);
+  if (["runturn"].includes(this.action)) {
+    w += 2;
+  }
+  return new Phaser.Rectangle(x, y, w, h);
 };
 
 PrinceJS.Fighter.prototype.alignToTile = function (tile) {