Remove unnecessary condition.

[plomrogue2-experiments] / new2 / rogue_chat_nocanvas_monochrome.html

diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html
index 578e971912e29ad52991b76d627afdd93da18eaa..d06eb30e6d44a90a929f22f6b8ea21c9f446059c 100644 (file)
--- a/new2/rogue_chat_nocanvas_monochrome.html
+++ b/new2/rogue_chat_nocanvas_monochrome.html
@@ -133,6 +133,12 @@ let parser = {
   },
 }
 
+class Thing {
+    constructor(yx) {
+        this.position = yx;
+    }
+}
+
 let server = {
     init: function(url) {
         this.url = url;
@@ -165,7 +171,9 @@ let server = {
             game.portals = {};
             game.turn = parseInt(tokens[1]);
         } else if (tokens[0] === 'THING_POS') {
-            game.things[tokens[1]] = parser.parse_yx(tokens[2]);
+            game.get_thing(tokens[1], true).position = parser.parse_yx(tokens[2]);
+        } else if (tokens[0] === 'THING_NAME') {
+            game.get_thing(tokens[1], true).name_ = tokens[2];
         } else if (tokens[0] === 'MAP') {
             game.map_size = parser.parse_yx(tokens[1]);
             game.map = tokens[2]
@@ -174,15 +182,9 @@ let server = {
             if (tui.mode == mode_study) {
                 explorer.query_info();
             }
-            let player_position = [0,0];
-            for (const thing_id in game.things) {
-                if (game.player_id == thing_id) {
-                    let t = game.things[thing_id];
-                    player_position = t;
-                }
-            }
-            if (player_position in game.portals) {
-                tui.teleport_target = game.portals[player_position];
+            let t = game.get_thing(game.player_id);
+            if (t.position in game.portals) {
+                tui.teleport_target = game.portals[t.position];
                 tui.switch_mode(mode_teleport);
                 return;
             }
@@ -243,10 +245,10 @@ let unparser = {
 }
 
 class Mode {
-    constructor(name, has_input_prompt=false, shows_annotations=false, is_intro=false) {
+    constructor(name, has_input_prompt=false, shows_info=false, is_intro=false) {
         this.name = name;
         this.has_input_prompt = has_input_prompt;
-        this.shows_annotations = shows_annotations;
+        this.shows_info= shows_info;
         this.is_intro = is_intro;
     }
 }
@@ -258,6 +260,7 @@ let mode_play = new Mode('play / move around', false, false);
 let mode_study = new Mode('check map tiles for messages', false, true);
 let mode_edit = new Mode('write ASCII char to map tile', false, false);
 let mode_teleport = new Mode('teleport away?');
+let mode_portal = new Mode('add portal to map tile', true, true);
 
 let tui = {
   mode: mode_waiting_for_server,
@@ -296,19 +299,24 @@ let tui = {
   },
   switch_mode: function(mode, keep_pos=false) {
     if (mode == mode_study && !keep_pos) {
-      explorer.position = game.things[game.player_id];
+      explorer.position = game.things[game.player_id].position;
     }
     this.mode = mode;
     this.empty_input();
     if (mode == mode_annotate && explorer.position in explorer.info_db) {
         let info = explorer.info_db[explorer.position];
         if (info != "(none)") {
-           this.inputEl.value = explorer.info_db[explorer.position];
+           this.inputEl.value = info;
            this.recalc_input_lines();
         }
+    }
+    if (mode == mode_portal && explorer.position in game.portals) {
+        let portal = game.portals[explorer.position]
+       this.inputEl.value = portal;
+       this.recalc_input_lines();
     } else if (mode == mode_teleport) {
-        tui.log_msg("Type Y or y to affirm teleportation, any other key to abort.");
-        tui.log_msg("target: " + tui.teleport_target);
+        tui.log_msg("@ May teleport to: " + tui.teleport_target);
+        tui.log_msg("@ Type Y or y to affirm, other keys to abort.");
     }
     this.full_refresh();
   },
@@ -342,7 +350,7 @@ let tui = {
   },
   log_msg: function(msg) {
       this.log.push(msg);
-      while (this.log.length > terminal.rows * 4) {
+      while (this.log.length > 100) {
         this.log.shift();
       };
       this.full_refresh();
@@ -382,12 +390,12 @@ let tui = {
                      Math.floor(game.map_size[1] / 2)];
     for (const thing_id in game.things) {
         let t = game.things[thing_id];
-        map_lines[t[0]][t[1]] = '@';
+        map_lines[t.position[0]][t.position[1]] = '@';
         if (game.player_id == thing_id) {
-            center_pos = t;
+            center_pos = t.position;
         }
     };
-    if (tui.mode.shows_annotations) {
+    if (tui.mode.shows_info) {
         map_lines[explorer.position[0]][explorer.position[1]] = '?';
         center_pos = explorer.position;
     }
@@ -428,7 +436,7 @@ let tui = {
   },
   draw_input: function() {
     if (this.mode.has_input_prompt) {
-        for (let y = terminal.rows - this.height_input, i = 0; y < terminal.rows && i < this.input_lines.length; y++, i++) {
+        for (let y = terminal.rows - this.height_input, i = 0; i < this.input_lines.length; y++, i++) {
             terminal.write(y, this.window_width, this.input_lines[i]);
         }
     }
@@ -442,7 +450,7 @@ let tui = {
         this.draw_map();
         this.draw_turn_line();
         this.draw_mode_line();
-        if (this.mode.shows_annotations) {
+        if (this.mode.shows_info) {
           this.draw_info();
         } else {
           this.draw_history();
@@ -462,6 +470,15 @@ let game = {
         this.player_id = -1;
         this.portals = {};
     },
+    get_thing: function(id_, create_if_not_found=false) {
+        if (id_ in game.things) {
+            return game.things[id_];
+        } else if (create_if_not_found) {
+            let t = new Thing([0,0]);
+            game.things[id_] = t;
+            return t;
+        };
+    }
 }
 
 game.init();
@@ -511,6 +528,18 @@ let explorer = {
     },
     get_info: function() {
         let info = "";
+        let position_i = this.position[0] * game.map_size[1] + this.position[1];
+        info += "TERRAIN: " + game.map[position_i] + "\n";
+        for (let t_id in game.things) {
+             let t = game.things[t_id];
+             if (t.position[0] == this.position[0] && t.position[1] == this.position[1]) {
+                 info += "PLAYER @";
+                 if (t.name_) {
+                     info += ": " + t.name_;
+                 }
+                 info += "\n";
+             }
+        }
         if (this.position in game.portals) {
             info += "PORTAL: " + game.portals[this.position] + "\n";
         }
@@ -526,12 +555,18 @@ let explorer = {
             msg = " ";  // triggers annotation deletion
         }
         server.send(["ANNOTATE", unparser.to_yx(explorer.position), msg]);
+    },
+    set_portal: function(msg) {
+        if (msg.length == 0) {
+            msg = " ";  // triggers portal deletion
+        }
+        server.send(["PORTAL", unparser.to_yx(explorer.position), msg]);
     }
 }
 
 tui.inputEl.addEventListener('input', (event) => {
     if (tui.mode.has_input_prompt) {
-       let max_length = tui.window_width * terminal.rows - tui.input_prompt.length;
+        let max_length = tui.window_width * terminal.rows - tui.input_prompt.length;
         if (tui.inputEl.value.length > max_length) {
             tui.inputEl.value = tui.inputEl.value.slice(0, max_length);
         };
@@ -544,6 +579,7 @@ tui.inputEl.addEventListener('input', (event) => {
         if (['Y', 'y'].includes(tui.inputEl.value[0])) {
             server.reconnect_to(tui.teleport_target);
        } else {
+            tui.log_msg("@ teleportation aborted");
             tui.switch_mode(mode_play);
        }
     }
@@ -555,6 +591,9 @@ tui.inputEl.addEventListener('keydown', (event) => {
     if (tui.mode == mode_login && event.key == 'Enter') {
         server.send(['LOGIN', tui.inputEl.value]);
         tui.switch_mode(mode_login);
+    } else if (tui.mode == mode_portal && event.key == 'Enter') {
+        explorer.set_portal(tui.inputEl.value);
+        tui.switch_mode(mode_study, true);
     } else if (tui.mode == mode_annotate && event.key == 'Enter') {
         explorer.annotate(tui.inputEl.value);
         tui.switch_mode(mode_study, true);
@@ -625,6 +664,9 @@ tui.inputEl.addEventListener('keydown', (event) => {
             tui.switch_mode(mode_chat);
         } else if (event.key == 'p') {
             tui.switch_mode(mode_play);
+        } else if (event.key === 'P') {
+            event.preventDefault();
+            tui.switch_mode(mode_portal);
         } else if (event.key === tui.key_left) {
              explorer.move('left');
         } else if (event.key === tui.key_right) {