feat: change player2's control back to '/'

UoB-COMSM0166 · Feb 27, 2025 · 0436c71 · 0436c71
1 parent 05eefd7
commit 0436c71
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/docs/src/classes/Player.js b/docs/src/classes/Player.js
@@ -51,15 +51,13 @@ class Player extends Entity {
     this.isPaused = pauseState;
   }
 
-  keyPressed(event, entities, onDie) {
+  keyPressed(entities, onDie) {
     if (this.status === Constants.EntityStatus.DIED) return;
 
-    const hitControl = this.controls[Constants.Control.HIT];
-
     // when player press 'hit' while alive (not 'hit' or 'cooldown' status)
+    const hitControl = this.controls[Constants.Control.HIT];
     if (
       keyCode === hitControl.value &&
-      (hitControl.side === undefined || hitControl.side === event.location) &&
       this.status === Constants.EntityStatus.ALIVE
     ) {
       this.hit(entities, onDie);

diff --git a/docs/src/config/settings.js b/docs/src/config/settings.js
@@ -34,11 +34,7 @@ const Settings = Object.freeze({
         [Constants.Control.RIGHT]: { value: 39, name: 'Right Arrow' },
         [Constants.Control.UP]: { value: 38, name: 'Up Arrow' },
         [Constants.Control.DOWN]: { value: 40, name: 'Down Arrow' },
-        [Constants.Control.HIT]: {
-          value: 16,
-          name: 'Shift',
-          side: KeyboardEvent.DOM_KEY_LOCATION_RIGHT,
-        },
+        [Constants.Control.HIT]: { value: 191, name: '?' },
       }),
     }),
   ],

diff --git a/docs/src/pages/Welcome.js b/docs/src/pages/Welcome.js
@@ -19,7 +19,7 @@ class Welcome extends BasePage {
     this.introText = null;
     this.checkiconP1 = null;
     this.checkiconP2 = null;
-    this.introBox = { x: 20, y: 350, w: 430, h: 150 };
+    this.introBox = { x: 20, y: 350, w: 400, h: 150 };
     this.delay = 0;
     this.pauseGame = false;
   }
@@ -243,7 +243,7 @@ class Welcome extends BasePage {
     const p2 = new Text({
       x: position.x + 10,
       y: position.y + 80,
-      label: 'Player 2: [↑ ← ↓ →] Attack: [Shift]',
+      label: 'Player 2: [↑ ← ↓ →] Attack: [?]',
       textAlign: [LEFT, CENTER],
       textSize: Theme.text.fontSize.small,
       color: Theme.palette.black,

diff --git a/docs/src/pages/WelcomeIntro.js b/docs/src/pages/WelcomeIntro.js
@@ -55,7 +55,7 @@ class WelcomeIntro extends BasePage {
       text(
         'Welcome to UNSTOPPABLE. \n' +
           'Player 1: move with [W A S D], attack with [Q]\n' +
-          'Player 2: move with [↑ ← ↓ →], attack with [Shift]\n' +
+          'Player 2: move with [↑ ← ↓ →], attack with [?]\n' +
           'to COME HERE area to start! Shall we?',
         10,
         height - 175,

diff --git a/docs/src/pages/maps/BaseMapGame.js b/docs/src/pages/maps/BaseMapGame.js
@@ -116,19 +116,15 @@ class BaseMapGame extends BasePage {
   }
 
   /** @override */
-  keyPressed(event) {
+  keyPressed() {
     super.keyPressed();
     this.players.forEach((player) => {
       if (player.status === Constants.EntityStatus.DIED) return;
-      player.keyPressed(
-        event,
-        [...this.robots, ...this.players],
-        (diedEntity) => {
-          if (diedEntity.type === Constants.EntityType.PLAYER) {
-            this.alivePlayerCtn--;
-          }
-        },
-      );
+      player.keyPressed([...this.robots, ...this.players], (diedEntity) => {
+        if (diedEntity.type === Constants.EntityType.PLAYER) {
+          this.alivePlayerCtn--;
+        }
+      });
     });
   }
 }