Improve Look mode flow and allow items to be visible

Author: mattlink

src/Items/Sword.ts

@@ -43,13 +43,9 @@ class SwordAction extends Action {
                 world.appendMessage("You kill the " + target.name + ".");
 
                 (<Floor>obj).removeOccupation();
-                console.log("room actors pre: ", room.actors);
-                console.log("activeRoom actors pre: ", world.getActiveRoom().actors);
                 room.actors = room.actors.filter(a => {
                     return a != target;
                 });
-                console.log("room actors post: ", room.actors);
-                console.log("activeRoom actors post: ", world.getActiveRoom().actors);
             } 
 
             return true;

src/Rooms/Room.ts

@@ -145,7 +145,7 @@ export class Room {
             }
 
             default: {
-                console.log("DoorType:", type, " not supported by ", this.name);
+                console.log("DoorType:", type, " not supported by room:", this.name);
                 break;
             }
         }
@@ -164,6 +164,8 @@ export class Room {
 
     addActor(actor: Actor) {
         this.actors.push(actor);
+        this.objects[actor.x][actor.y] = new Floor(actor.x, actor.y, this.floorTile);
+        (<Floor>this.objects[actor.x][actor.y]).setOccupation(actor);
     }
 
     getActors() {

src/Systems/renderer.ts

@@ -256,7 +256,7 @@ export class Renderer {
         }
     }
 
-    public addWindow(name: string, width: number, height: number, isTiled?: boolean) {
+    public addWindow(name: string, width: number, height?: number, isTiled?: boolean) {
         this.windows[name] = new Window(-1, -1, width, height, isTiled);
         this.windows[name].initContext();
         this.bind(this.windows[name].getContext());

src/importer.ts

@@ -37,7 +37,12 @@ export class Importer {
                 let option = new MenuOption(o.name, o.letter);
                 if (o.toMenu != null) option.toMenu = o.toMenu;
                 if (o.toState != null) option.toState = o.toState;
-                menu.addElement(option);
+
+                if (o.hidden) {
+                    menu.options[o.letter] = option;
+                } else {
+                    menu.addElement(option);
+                }
             });
 
             menus[m.name] = menu;

src/main.ts

@@ -61,10 +61,10 @@ class game extends Game {
         this.renderer.addWindow('create_game', Menu.width, Menu.height);
         this.renderer.addWindow('about_game', Menu.width, Menu.height);
 
-        this.renderer.addWindow('messagebox', Menu.width, 2);
+        this.renderer.addWindow('messagebox', Menu.width, 1);
         this.renderer.addWindow('game', Menu.width, Menu.height, true);
         this.renderer.addWindow('inventory', Menu.width, Menu.height);
-        this.renderer.addWindow('status_info', Menu.width, 3);
+        this.renderer.addWindow('status_info', Menu.width);
 
         this.renderer.hideAllWindows();
         this.renderer.windows['start'].show();
@@ -166,6 +166,7 @@ class game extends Game {
             }
 
             if (key == 'Escape') {
+                this.renderer.renderGameObject(this.world.getActiveRoom().objects[this.lookCursor.x][this.lookCursor.y], this.renderer.windows['game'].getContext());
                 this.state = GameState.Play;
             }
 
@@ -174,6 +175,11 @@ class game extends Game {
             if (obj instanceof Floor && (<Floor>obj).getOccupation() != null) {
                 name = (<Floor>obj).getOccupation().name;
             }
+
+            if (obj instanceof Floor && (<Floor>obj).getObjects().length > 0) {
+                name = (<Floor>obj).getObjects()[0].name;
+            }
+
             (<MenuInfo>this.menus['messagebox'].elements[0]).content = name;
 
         }
@@ -197,9 +203,7 @@ class game extends Game {
                 this.state = GameState.Look;
                 this.lookCursor.x = this.world.getPlayer().x;
                 this.lookCursor.y = this.world.getPlayer().y;
-
-                // this.renderer.renderLookCursor(this.lookCursor, this.renderer.windows['game'].getContext());
-
+                return;
             }
 
             this.world.getPlayer().receiveKeyInput(key);

src/menus.json

@@ -39,13 +39,26 @@
                     "letter": "s",
                     "name": "Enter Seed",
                     "onSelect": "seed_entry"
+                },
+                {
+                    "letter": "Escape",
+                    "name": "",
+                    "toMenu": "start",
+                    "hidden": "true"
                 }
             ]
         },
         {
             "name": "about_game",
             "title": "About Game",
-            "options": []
+            "options": [
+                {
+                    "letter": "Escape",
+                    "name": "",
+                    "toMenu": "start",
+                    "hidden": "true"
+                }
+            ]
         }
     ],
     "menuActions": [