Implement parts of the door logics

UoB-COMSM0166 · Feb 28, 2025 · bddedb6 · bddedb6
1 parent c1f4abb
commit bddedb6
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 16 deletions.
diff --git a/docs/public/assets/background/room_tutorial.png b/docs/public/assets/background/room_tutorial.png
diff --git a/docs/src/controllers/InputHandler.js b/docs/src/controllers/InputHandler.js
@@ -7,6 +7,7 @@ class InputHandler {
   }
 
   update() {
+    this.currentRoom.update();
     player.updateVelocity();
     player.updatePosition();
     const collideWithEnemies = this.collisionDetector.detectPlayerCollision(player, this.currentRoom.enemies);
@@ -28,6 +29,7 @@ class InputHandler {
     this.updateBullets();
     this.collisionDetector.detectBulletEnemyCollision(player.bullets, this.currentRoom.enemies);
     this.removeEnemies(this.currentRoom.enemies);
+    this.moveToNextRoom();
   }
 
   handlePlayerShooting() {
@@ -53,7 +55,6 @@ class InputHandler {
     });
   }
 
-
   decreasePlayerHp() {
     // The player will not receive any damage in the future 2 seconds.
     if (millis() - this.lastCollisionTime < this.collisionCoolDownTime) {
@@ -65,4 +66,18 @@ class InputHandler {
     hurtSound.currentTime = 0;
     hurtSound.play();
   }
+
+  moveToNextRoom(tolerance=player.size.x) {
+    if (!this.currentRoom.checkClearCondition()) return;
+
+    const playerMidX = player.position.x + player.size.x / 2;
+    const playerMidY = player.position.y + player.size.y / 2;
+    const doorX = this.currentRoom.door.position.x;
+    const doorY = this.currentRoom.door.position.y + this.currentRoom.door.size.y / 2;
+
+    if (dist(playerMidX, playerMidY, doorX, doorY) < tolerance) {
+      console.log("Move to the next room!");
+      loadRoom();
+    }
+  }
 }
diff --git a/docs/src/core/controller.js b/docs/src/core/controller.js
@@ -108,3 +108,7 @@ function isGameOver() {
   return player.hp <= 0;
 }
 
+function loadRoom() {
+
+}
+
diff --git a/docs/src/core/main.js b/docs/src/core/main.js
@@ -14,7 +14,7 @@ function preload() {
   startMenuImg = loadImage('assets/background/menu_start.png');
   closedDoorImg = loadImage('assets/door/door_close.png');
   openDoorImg = loadImage('assets/door/door_open.png');
-  officeRoomImg = loadImage('assets/background/room_office.jpg');
+  officeRoomImg = loadImage('assets/background/room_tutorial.png');
 }
 
 function setup() {
@@ -41,7 +41,7 @@ function draw() {
   }
   else {
     displayTutorial();
-    room.update();
+    // room.update();
     inputHandler.update();
     player.display();
     drawUiHub();

diff --git a/docs/src/entities/Room.js b/docs/src/entities/Room.js
@@ -27,8 +27,8 @@ class Room {
     this.obstacles = [];
     const maxEntitySize = heightInPixel / 8;
     for (let i = 0; i < obstacleCount; i++) {
-      let x = random(boundaryInPixel.w, widthInPixel - boundaryInPixel.w - maxEntitySize);
-      let y = random(boundaryInPixel.h, heightInPixel - boundaryInPixel.h - maxEntitySize);
+      let x = random(leftBoundary, rightBoundary - maxEntitySize);
+      let y = random(topBoundary, bottomBoundary - maxEntitySize);
       this.obstacles.push(new Obstacle(x, y));
     }
   }
@@ -37,8 +37,8 @@ class Room {
     this.enemies = [];
     const maxEntitySize = heightInPixel / 8;
     for (let i = 0; i < enemyCount; i++) {
-      let x = random(boundaryInPixel.w, widthInPixel - boundaryInPixel.w - maxEntitySize);
-      let y = random(boundaryInPixel.h, heightInPixel - boundaryInPixel.h - maxEntitySize);
+      let x = random(leftBoundary, rightBoundary - maxEntitySize);
+      let y = random(topBoundary, bottomBoundary - maxEntitySize);
       let hp = random([smallEnemyHp, largeEnemyHp]);
       this.enemies.push(new Enemy(x, y, hp));
     }
@@ -63,5 +63,4 @@ class Room {
   checkClearCondition() {
     return (this.enemies.length === 0 && player.hp > 0);
   }
-
 }
diff --git a/docs/src/utils.js b/docs/src/utils.js
@@ -16,6 +16,10 @@ let timeSpent = 0;
 let currentLevel = 1;
 let currentStage = 1;
 
+const uiTextSize = 20;
+const hPadding = 50;
+const vPadding = 20;
+
 let nearSavedPosition = false;
 let lastSavedPosition = { xPos: null, yPos: null };
 let minDistanceToSave = 50;
@@ -28,7 +32,7 @@ const largeEnemyHp = 100;
 const largeEnemySize = { w: 50, h: 60 };
 
 let player;
-let enemyCount = 5;
+let enemyCount = 1;
 let obstacleCount = 5;
 
 // Add variables and functions from feature_enemies_lyz_before0225
@@ -66,11 +70,6 @@ const leftBoundary = boundaryInPixel.w;
 const rightBoundary = widthInPixel - boundaryInPixel.w;
 const topBoundary = boundaryInPixel.h;
 const bottomBoundary = heightInPixel - boundaryInPixel.h;
-const smallEntitySize = heightInPixel / 12;
 
-const playerX = 100;
-const playerY = 100;
-
-const uiTextSize = 20;
-const hPadding = 50;
-const vPadding = 20;
+const playerX = leftBoundary;
+const playerY = heightInPixel / 2;
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,3 +108,7 @@ function isGameOver() { @@
       return player.hp <= 0;
     }
+    function loadRoom() {
+    }