Sneak for all guards, unblock 179

oklemenz · May 10, 2022 · 6c170a5 · 6c170a5
1 parent 17a578a
commit 6c170a5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/assets/maps/custom/level178.json b/assets/maps/custom/level178.json
@@ -1797,8 +1797,7 @@
       "skill": 0,
       "colors": 2,
       "type": "guard",
-      "direction": 1,
-      "sneak": true
+      "direction": 1
     },
     {
       "room": 6,
@@ -1814,8 +1813,7 @@
       "skill": 4,
       "colors": 4,
       "type": "guard",
-      "direction": 1,
-      "sneak": true
+      "direction": 1
     },
     {
       "room": 13,

diff --git a/assets/maps/custom/level179.json b/assets/maps/custom/level179.json
@@ -2281,7 +2281,8 @@
       "skill": 4,
       "colors": 6,
       "type": "guard",
-      "direction": -1
+      "direction": -1,
+      "bias": 1
     },
     {
       "room": 15,

diff --git a/assets/maps/level8.json b/assets/maps/level8.json
@@ -2733,8 +2733,7 @@
       "skill": 3,
       "colors": 4,
       "type": "guard",
-      "direction": -1,
-      "sneak": true
+      "direction": -1
     }
   ],
   "events": [

diff --git a/src/Enemy.js b/src/Enemy.js
@@ -21,7 +21,7 @@ PrinceJS.Enemy = function (game, level, location, direction, room, skill, color,
   this.strikeTimer = 0;
   this.lookBelow = false;
   this.startFight = false;
-  this.sneakUp = false;
+  this.sneakUp = true;
 
   this.health = PrinceJS.Enemy.EXTRA_STRENGTH[skill] + PrinceJS.Enemy.STRENGTH[this.level.number];
 
@@ -388,8 +388,8 @@ PrinceJS.Enemy.prototype.setInactive = function () {
   }
 };
 
-PrinceJS.Enemy.prototype.setSneakUp = function () {
-  this.sneakUp = true;
+PrinceJS.Enemy.prototype.setSneakUp = function (state) {
+  this.sneakUp = state;
 };
 
 PrinceJS.Enemy.prototype.checkBarrier = function () {

diff --git a/src/Fighter.js b/src/Fighter.js
@@ -1321,7 +1321,7 @@ PrinceJS.Fighter.prototype.moveL = function (extended = true) {
 };
 
 PrinceJS.Fighter.prototype.sneaks = function () {
-  return ["stoop", "stand", "standup", "turn", "jumphanglong", "hang", "climbup", "climbdown"].includes(this.action) || this.action.startsWith("step");
+  return ["stoop", "stand", "standup", "turn", "jumphanglong", "hang", "hangdrop", "climbup", "climbdown", "testfoot"].includes(this.action) || this.action.startsWith("step");
 };
 
 PrinceJS.Fighter.prototype.getCharBounds = function () {

diff --git a/src/Game.js b/src/Game.js
@@ -66,8 +66,8 @@ PrinceJS.Game.prototype = {
       if (data.active === false) {
         enemy.setInactive();
       }
-      if (data.sneak === true) {
-        enemy.setSneakUp();
+      if (data.sneak === false) {
+        enemy.setSneakUp(false);
       }
       enemy.onInitLife.add((fighter) => {
         this.ui.setOpponentLive(fighter);