Non-working changes for switching between rooms.

Cars-n · Feb 20, 2024 · ac01d85 · ac01d85
1 parent 5efd289
commit ac01d85
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 16 deletions.
diff --git a/sketch.js b/sketch.js
@@ -47,6 +47,8 @@ function draw() {
 	movementSounds(player,footsteps);
 	playerMovement.handleInput();
 	enemyHandler();
+
+
 	//FPS counter, needs to be in draw to
 	//render properly
 	//Create a new room

diff --git a/src/js/Camera.js b/src/js/Camera.js
@@ -39,6 +39,7 @@ function fadeIn(object){
     return false;
     }
     else {
+        console.log('Hello');
         object.opacity = 1;
         return true;
     }
@@ -61,19 +62,22 @@ function fadeOut(object){
 
 //Moves the camera in the direction specified. takes "up", "down", "left", "right" as arguments.
 function moveCamera(direction){
-    if (direction == "up") camera.y -= windowHeight;
-    else if (direction == "down") camera.y += windowHeight;
-    else if (direction == "left") camera.x -= windowWidth;
-    else if (direction == "right") camera.x += windowWidth;
+   if(!HASMOVEDCAMERA){
+    if (direction == "up") camera.y -= 1080;
+    else if (direction == "down") camera.y += 1080;
+    else if (direction == "left") camera.x -= 1920;
+    else if (direction == "right") camera.x += 1920;
+   }
+   HASMOVEDCAMERA = true;
 }
 
 
 //Moves the player in the direction specified. takes "up", "down", "left", "right" as arguments. Used to teleport to the next room. 
-function movePlayer(){
-    if (direction == "up") player.y -= 20;
-    else if (direction == "down") player.y += 20;
-    else if (direction == "left") player.x -= 20;
-    else if (direction == "right") player.x += 20;
+function movePlayer(direction){
+    if (direction == "up") player.y -= 80;
+    else if (direction == "down") player.y += 80;
+    else if (direction == "left") player.x -= 80;
+    else if (direction == "right") player.x += 80;
 }
 
 

diff --git a/src/js/Rooms.js b/src/js/Rooms.js
@@ -5,13 +5,33 @@ let roomControl;
 // Callback function, simply determines whether it is the player ob colliding with door tile or not
 function doorCallback(a, b) {
     if (b?.tag === "player") {
-        console.log("player at door");
+
     } else {
         console.log("not player: ", b.tag);
     }
 
 }
 
+function upwardDoorCallback(a, b) {
+        fadeScreenNow();
+        if(HASFADEDIN === true){
+        moveCamera("up");
+        movePlayer("up");
+        }
+    }
+function rightDoorCallback(a, b) {
+        fadeScreenNow();
+        if(HASFADEDIN === true){
+        moveCamera("right");
+        movePlayer("right");
+        }
+}
+function leftDoorCallback(a, b) {
+    fadeScreenNow();
+    moveCamera("left");
+    movePlayer("left");
+}
+
 // Class for managing the room layout
 class RoomController {
     static TILE_HEIGHT = 120;
@@ -20,7 +40,8 @@ class RoomController {
 	//Defining our tiles that we want to use, keeps them in memory. Not meant to be written to outside of class
     static wallTile; 
     static floor;
-    static door;
+    static upDoor;
+    static rightDoor;
 
     constructor() {
         // If it's the first load, initialize the tiles
@@ -30,7 +51,9 @@ class RoomController {
             RoomController.wallTile = new ImageTile(brickImage, '=', RoomController.TILE_WIDTH, RoomController.TILE_HEIGHT, 'static');
             RoomController.floor = new ImageTile(floorBoardImage, 'o', RoomController.TILE_WIDTH, RoomController.TILE_HEIGHT, 'none',doorCallback);
             RoomController.door = new ImageTile(doorImage, 'D', RoomController.TILE_WIDTH, RoomController.TILE_HEIGHT, 'static', doorCallback);
-
+			RoomController.upDoor = new ImageTile(doorImage, '^', RoomController.TILE_WIDTH, RoomController.TILE_HEIGHT, 'static', upwardDoorCallback);
+            RoomController.rightDoor = new ImageTile(doorImage, '>', RoomController.TILE_WIDTH, RoomController.TILE_HEIGHT, 'static', rightDoorCallback);
+            RoomController.leftDoor = new ImageTile(doorImage, '<', RoomController.TILE_WIDTH, RoomController.TILE_HEIGHT, 'static', leftDoorCallback);
 		}
 
         this.map = [];
@@ -56,8 +79,8 @@ class RoomController {
                 '.'.repeat(10),
                 '.'.repeat(10),
                 '='.repeat(10),
-                'o'.repeat(10),
-                'o'.repeat(10),
+                'o'.repeat(2)+ '><' + 'o'.repeat(6),
+                'o'.repeat(2)+ '><' + 'o'.repeat(6),
                 '='.repeat(10),
                 '.'.repeat(10),
                 '.'.repeat(10),

diff --git a/src/js/sound.js b/src/js/sound.js
@@ -1,12 +1,10 @@
 function movementSounds(sprite,sound){
     if(sprite.velocity.x!=0||sprite.velocity.y!=0){
-        console.log("starting sound");
         if(!sound.isPlaying()){
             sound.play();
         }
     }
     else{
-        console.log("stopping sound");
        sound.pause();
     }
 }