From 75ce98f9474e51a342c96b78e2e155c64ba94269 Mon Sep 17 00:00:00 2001
From: Renge <renge@marmot.website>
Date: Wed, 13 Apr 2022 19:37:26 -0400
Subject: [PATCH] fix: bug in getEnemies

---
 dist/shattered_sword_assets/jsons/forest_template.json | 6 ++++++
 src/shattered_sword/Scenes/Tutorial.ts                 | 2 +-
 src/shattered_sword/Tools/RandomMapGenerator.ts        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dist/shattered_sword_assets/jsons/forest_template.json b/dist/shattered_sword_assets/jsons/forest_template.json
index a919c2c..df0bffc 100644
--- a/dist/shattered_sword_assets/jsons/forest_template.json
+++ b/dist/shattered_sword_assets/jsons/forest_template.json
@@ -28,6 +28,12 @@
             "type": "player",
             "x": 5,
             "y": 19
+         },
+         {
+            "type": "test_dummy",
+            "x": 7,
+            "y": 19,
+            "possibility": 1
          }
       ]
    },
diff --git a/src/shattered_sword/Scenes/Tutorial.ts b/src/shattered_sword/Scenes/Tutorial.ts
index 16e35bb..421efb1 100644
--- a/src/shattered_sword/Scenes/Tutorial.ts
+++ b/src/shattered_sword/Scenes/Tutorial.ts
@@ -40,7 +40,7 @@ export default class Tutorial extends GameLevel{
         this.viewport.setBounds(0, 0, this.map.width*32, this.map.height*32);
         this.viewport.follow(this.player);
 
-        console.log(this.rmg.getPlayer().toString());
+        console.log(this.rmg.getEnemies());
         this.playerSpawn = this.rmg.getPlayer().scale(32);
 
         // Do generic setup for a GameLevel
diff --git a/src/shattered_sword/Tools/RandomMapGenerator.ts b/src/shattered_sword/Tools/RandomMapGenerator.ts
index 40e9c29..391c969 100644
--- a/src/shattered_sword/Tools/RandomMapGenerator.ts
+++ b/src/shattered_sword/Tools/RandomMapGenerator.ts
@@ -258,7 +258,7 @@ export default class RandomMapGenerator {
                     this.map.layers[1].data[(room.topLeft.y + i) * width + room.topLeft.x + j] = room.topLayer[i * roomWidth + j];
                 }
             if (room.enemies)
-                for (let enemy of this.enemies) {
+                for (let enemy of room.enemies) {
                     enemy.position.x += room.topLeft.x;
                     enemy.position.y += room.topLeft.y;
                     this.enemies.push(enemy);