Merge branch 'master' of https://github.com/yoy333/clocktower-games

Author: yoy333

public/assets/tilemaps/world.json

@@ -127,6 +127,7 @@ class Door extends Phaser.GameObjects.Sprite implements Interactable {
         this.id = id;
         this.position = { x, y };
         this.state = open ? 1 : 0;
+        this.isActive = open;
         this.gameScene = scene as Game;
         this.doorId = doorId;
         scene.add.existing(this);

public/assets/tilemaps/world.tmx

@@ -44,7 +44,7 @@ const config: Phaser.Types.Core.GameConfig = {
         default: 'arcade',
         arcade: {
             gravity: {x: 0, y: 0},
-            debug: true
+            debug: false
         }
     }
 };

src/game/interactables.ts

@@ -116,8 +116,8 @@ class Game extends Scene
         this.createDecor()
 
         // this.showPopup("Welcome brave adventurer!", 10, 10, 300, 100, 3000, 30, "test name")
-        this.showPopup("Crackpot alchemy balls", 
-            10, this.camera.height - 210, this.camera.width - 20, 200, 3000, 30, "name2")
+        //this.showPopup("Crackpot alchemy balls", 
+        //    10, this.camera.height - 210, this.camera.width - 20, 200, 3000, 30, "name2")
 
         this.createMagicBeams()
         this.createRestartB();

src/game/main.ts

@@ -214,12 +214,18 @@ function addControllables(){
             trashCanLayer.objects.forEach((obj, idx) => {
                 const x = (obj.x ?? 0) + 30;
                 const y = (obj.y ?? 0) + 30 - (obj.height ?? 0);
-                const trashCan = new TrashCan(this, idx, x, y);
-                (trashCan.body as Phaser.Physics.Arcade.Body).setSize(trashCan.width/2, 20);
-                this.trashCans.add(trashCan);
-                trashCan.setDepth(2);
-                // console.log(`Created trash can at (${x}, ${y})`);
-                
+                if(obj.properties && obj.properties[0]) {
+                    const heldItems = obj.properties[0].value.split(",").map((item: string) => item.trim() as itemKeys);
+                    const trashCan = new TrashCan(this, idx, x, y, heldItems);
+                    (trashCan.body as Phaser.Physics.Arcade.Body).setSize(trashCan.width/2, 20);
+                    this.trashCans.add(trashCan);
+                    trashCan.setDepth(2);
+                } else {
+                    const trashCan = new TrashCan(this, idx, x, y);
+                    (trashCan.body as Phaser.Physics.Arcade.Body).setSize(trashCan.width/2, 20);
+                    this.trashCans.add(trashCan);
+                    trashCan.setDepth(2);
+                }
             });
         }   
         this.physics.add.collider(this.trashCans, this.player);
@@ -231,8 +237,7 @@ function addControllables(){
             doorLayer.objects.forEach((obj,idx) => {
                 const x = (obj.x ?? 0)+(obj.width ?? 0)/2;
                 const y = (obj.y ?? 0)-(obj.height ?? 0)/2;
-                const door = new Door(this, idx, x, y, obj.id, obj.name.slice(0,4), obj.properties.open);
-                // const door = new Door(this, idx, x, y, obj.id, obj.properties.open);
+                const door = new Door(this, idx, x, y, obj.id, obj.name.slice(0,4), obj.properties[0].value);
                 this.doors.add(door);
                 door.setDepth(2);
                 // console.log(`Created door at (${x}, ${y})`);
@@ -276,7 +281,6 @@ function addControllables(){
             decorLayer.objects.forEach((obj) => {
                 const x = (obj.x ?? 0) + (obj.width ?? 0)/2;
                 const y = (obj.y ?? 0) - (obj.height ?? 0)/2;
-                console.log(obj.name);
                 const decor = this.add.image(x, y, obj.name ?? 'glass_shards');
                 decor.setDisplaySize((obj.width ?? decor.width), (obj.height ?? decor.height))
                     decor.setFlipX(obj.flippedHorizontal ?? false);