X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=blobdiff_plain;f=rogue_chat_nocanvas_monochrome.html;h=7c24a43a3e36ff2e2c95d2fb128f559492a54c39;hb=acdf162669be2293919fe536275b28703489881f;hp=8ceb72870f5c1c6efd9230d9338f7ac4789b133b;hpb=764287037ec8cca02ca59316a473217ac270e085;p=plomrogue2

diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index 8ceb728..7c24a43 100644
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -23,13 +23,15 @@ move down-left (hex grid): <input id="key_hex_move_downleft" type="text" value="
 move left (hex grid): <input id="key_hex_move_left" type="text" value="a" /><br />
 help: <input id="key_help" type="text" value="h" /><br />
 flatten surroundings: <input id="key_flatten" type="text" value="F" /><br />
+take thing under player: <input id="key_take_thing" type="text" value="z" /><br />
+drop carried thing: <input id="key_drop_thing" type="text" value="u" /><br />
 switch to chat mode: <input id="key_switch_to_chat" type="text" value="t" /><br />
 switch to play mode: <input id="key_switch_to_play" type="text" value="p" /><br />
 switch to study mode: <input id="key_switch_to_study" type="text" value="?" /><br />
-edit terrain (from play mode): <input id="key_switch_to_edit" type="text" value="m" /><br />
-enter terrain password (from play mode): <input id="key_switch_to_password" type="text" value="P" /><br />
-annotate terrain (from study mode): <input id="key_switch_to_annotate" type="text" value="m" /><br />
-annotate portal (from study mode): <input id="key_switch_to_portal" type="text" value="P" /><br />
+edit tile (from play mode): <input id="key_switch_to_edit" type="text" value="m" /><br />
+enter tile password (from play mode): <input id="key_switch_to_password" type="text" value="P" /><br />
+annotate tile (from play mode): <input id="key_switch_to_annotate" type="text" value="M" /><br />
+annotate portal (from play mode): <input id="key_switch_to_portal" type="text" value="T" /><br />
 toggle terrain/control view (from study mode): <input id="key_toggle_map_mode" type="text" value="M" /><br />
 </div>
 <script>
@@ -175,20 +177,22 @@ let server = {
         this.url = url;
         this.websocket = new WebSocket(this.url);
         this.websocket.onopen = function(event) {
-            window.setInterval(function() { server.send(['PING']) }, 30000);
-            this.send('TASKS');
+            server.connected = true;
+            game.thing_types = {};
+            game.terrains = {};
+            server.send(['TASKS']);
+            server.send(['TERRAINS']);
+            server.send(['THING_TYPES']);
             tui.log_msg("@ server connected! :)");
             tui.switch_mode(mode_login);
         };
         this.websocket.onclose = function(event) {
+            server.connected = false;
+            tui.switch_mode(mode_waiting_for_server);
             tui.log_msg("@ server disconnected :(");
-            tui.log_msg("@ hint: try the '/reconnect' command");
         };
 	    this.websocket.onmessage = this.handle_event;
         },
-    reconnect: function() {
-	   this.reconnect_to(this.url);
-    },
     reconnect_to: function(url) {
         this.websocket.close();
         this.init(url);
@@ -203,17 +207,33 @@ let server = {
             game.things = {};
             game.portals = {};
             game.turn = parseInt(tokens[1]);
-        } else if (tokens[0] === 'THING_POS') {
-            game.get_thing(tokens[1], true).position = parser.parse_yx(tokens[2]);
+        } else if (tokens[0] === 'THING') {
+            let t = game.get_thing(tokens[3], true);
+            t.position = parser.parse_yx(tokens[1]);
+            t.type_ = tokens[2];
         } else if (tokens[0] === 'THING_NAME') {
-            game.get_thing(tokens[1], true).name_ = tokens[2];
+            let t = game.get_thing(tokens[1], false);
+            if (t) {
+                t.name_ = tokens[2];
+            };
+        } else if (tokens[0] === 'THING_CHAR') {
+            let t = game.get_thing(tokens[1], false);
+            if (t) {
+                t.player_char = tokens[2];
+            };
         } else if (tokens[0] === 'TASKS') {
             game.tasks = tokens[1].split(',')
+        } else if (tokens[0] === 'THING_TYPE') {
+            game.thing_types[tokens[1]] = tokens[2]
+        } else if (tokens[0] === 'TERRAIN') {
+            game.terrains[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'MAP') {
             game.map_geometry = tokens[1];
             tui.init_keys();
             game.map_size = parser.parse_yx(tokens[2]);
             game.map = tokens[3]
+        } else if (tokens[0] === 'FOV') {
+            game.fov = tokens[1]
         } else if (tokens[0] === 'MAP_CONTROL') {
             game.map_control = tokens[1]
         } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
@@ -253,7 +273,7 @@ let server = {
         } else if (tokens[0] === 'GAME_ERROR') {
             tui.log_msg('? game error: ' + tokens[1]);
         } else if (tokens[0] === 'PONG') {
-            console.log('PONG');
+            ;
         } else {
             tui.log_msg('? unhandled input: ' + event.data);
         }
@@ -297,14 +317,14 @@ class Mode {
 let mode_waiting_for_server = new Mode('waiting_for_server', 'Waiting for a server response.', false, false, true);
 let mode_login = new Mode('login', 'Pick your player name.', true, false, true);
 let mode_post_login_wait = new Mode('waiting for game world', 'Waiting for a server response.', false, false, true);
-let mode_chat = new Mode('chat', 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent to all users.  Lines that start with a "/" are used for commands like:', true, false);
-let mode_annotate = new Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on.  Hit Return to leave.', true, true);
+let mode_chat = new Mode('chat', 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:', true, false);
+  let mode_annotate = new Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.', true, true);
 let mode_play = new Mode('play', 'This mode allows you to interact with the map.', false, false);
 let mode_study = new Mode('study', 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it.', false, true);
-let mode_edit = new Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your terrain editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.', false, false);
+let mode_edit = new Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.', false, false);
 let mode_teleport = new Mode('teleport', 'Follow the instructions to re-connect and log-in to another server, or enter anything else to abort.', true);
-let mode_portal = new Mode('portal', 'This mode imprints/edits/removes a teleportation target on the ground you are currently standing on.  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.', true, true);
-let mode_password = new Mode('password', 'This mode allows you to change the password that you send to authorize yourself for editing password-protected tiles.  Hit return to confirm and leave.', true, false, false);
+let mode_portal = new Mode('portal', 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.', true, true);
+let mode_password = new Mode('password', 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles.  Hit return to confirm and leave.', true, false, false);
 
 let tui = {
   mode: mode_waiting_for_server,
@@ -347,10 +367,10 @@ let tui = {
         };
     };
   },
-  switch_mode: function(mode, keep_pos=false) {
+  switch_mode: function(mode) {
     this.show_help = false;
     this.map_mode = 'terrain';
-    if (mode == mode_study && !keep_pos && game.player_id in game.things) {
+    if (mode.shows_info && game.player_id in game.things) {
       explorer.position = game.things[game.player_id].position;
     }
     this.mode = mode;
@@ -434,27 +454,37 @@ let tui = {
             line = [];
             j = 0;
         };
-        line.push(map_content[i]);
+        line.push(map_content[i] + ' ');
     };
     map_lines_split.push(line);
     if (this.map_mode == 'terrain') {
+        let used_positions = [];
         for (const thing_id in game.things) {
             let t = game.things[thing_id];
-            map_lines_split[t.position[0]][t.position[1]] = '@';
+            let symbol = game.thing_types[t.type_];
+            let meta_char = ' ';
+            if (t.player_char) {
+                meta_char = t.player_char;
+            }
+            if (used_positions.includes(t.position.toString())) {
+                meta_char = '+';
+            };
+            map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
+            used_positions.push(t.position.toString());
         };
     }
     if (tui.mode.shows_info) {
-        map_lines_split[explorer.position[0]][explorer.position[1]] = '?';
+        map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
     }
     let map_lines = []
     if (game.map_geometry == 'Square') {
         for (let line_split of map_lines_split) {
-            map_lines.push(line_split.join(' '));
+            map_lines.push(line_split.join(''));
         };
     } else if (game.map_geometry == 'Hex') {
         let indent = 0
         for (let line_split of map_lines_split) {
-            map_lines.push(' '.repeat(indent) + line_split.join(' '));
+            map_lines.push(' '.repeat(indent) + line_split.join(''));
             if (indent == 0) {
                 indent = 1;
             } else {
@@ -520,20 +550,28 @@ let tui = {
   },
   draw_help: function() {
       let movement_keys_desc = Object.keys(this.movement_keys).join(',');
-      let content = this.mode.name + " mode help (hit any key to disappear)\n\n" + this.mode.help_intro + "\n\n";
+      let content = this.mode.name + " mode help\n\n" + this.mode.help_intro + "\n\n";
       if (this.mode == mode_play) {
           content += "Available actions:\n";
           if (game.tasks.includes('MOVE')) {
               content += "[" + movement_keys_desc + "] – move player\n";
           }
+          if (game.tasks.includes('PICK_UP')) {
+              content += "[" + this.keys.take_thing + "] – take thing under player\n";
+          }
+          if (game.tasks.includes('DROP')) {
+              content += "[" + this.keys.drop_thing + "] – drop carried thing\n";
+          }
           if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
               content += "[" + tui.keys.flatten + "] – flatten player's surroundings\n";
           }
           content += '\nOther modes available from here:\n';
-          content += '[' + this.keys.switch_to_edit + '] – terrain edit mode\n';
-          content += '[' + this.keys.switch_to_password + '] – terrain password edit mode\n';
           content += '[' + this.keys.switch_to_chat + '] – chat mode\n';
           content += '[' + this.keys.switch_to_study + '] – study mode\n';
+          content += '[' + this.keys.switch_to_edit + '] – terrain edit mode\n';
+          content += '[' + this.keys.switch_to_portal + '] – portal edit mode\n';
+          content += '[' + this.keys.switch_to_annotate + '] – annotation mode\n';
+          content += '[' + this.keys.switch_to_password + '] – password input mode\n';
       } else if (this.mode == mode_study) {
           content += "Available actions:\n";
           content += '[' + movement_keys_desc + '] – move question mark\n';
@@ -541,11 +579,9 @@ let tui = {
           content += '\nOther modes available from here:\n';
           content += '[' + this.keys.switch_to_chat + '] – chat mode\n';
           content += '[' + this.keys.switch_to_play + '] – play mode\n';
-          content += '[' + this.keys.switch_to_portal + '] – portal mode\n';
-          content += '[' + this.keys.switch_to_annotate + '] – annotation mode\n';
       } else if (this.mode == mode_chat) {
           content += '/nick NAME – re-name yourself to NAME\n';
-          content += '/msg USER TEXT – send TEXT to USER\n';
+          //content += '/msg USER TEXT – send TEXT to USER\n';
           content += '/' + this.keys.switch_to_play + ' or /play – switch to play mode\n';
           content += '/' + this.keys.switch_to_study + ' or /study – switch to study mode\n';
       }
@@ -661,7 +697,6 @@ let explorer = {
         if (target) {
             this.position = target
             this.query_info();
-            tui.full_refresh();
         } else {
             terminal.blink_screen();
         };
@@ -682,15 +717,27 @@ let explorer = {
         server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
     },
     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";
+        if (game.fov[position_i] != '.') {
+            return 'outside field of view';
+        };
+        let info = "";
+        let terrain_char = game.map[position_i]
+        let terrain_desc = '?'
+        if (game.terrains[terrain_char]) {
+            terrain_desc = game.terrains[terrain_char];
+        };
+        info += 'TERRAIN: "' + terrain_char + '" / ' + terrain_desc + "\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 @";
+                 let symbol = game.thing_types[t.type_];
+                 info += "THING: " + t.type_ + " / " + symbol;
+                 if (t.player_char) {
+                     info += t.player_char;
+                 };
                  if (t.name_) {
-                     info += ": " + t.name_;
+                     info += " (" + t.name_ + ")";
                  }
                  info += "\n";
              }
@@ -709,13 +756,13 @@ let explorer = {
         if (msg.length == 0) {
             msg = " ";  // triggers annotation deletion
         }
-        server.send(["ANNOTATE", unparser.to_yx(explorer.position), msg]);
+        server.send(["ANNOTATE", unparser.to_yx(explorer.position), msg, tui.password]);
     },
     set_portal: function(msg) {
         if (msg.length == 0) {
             msg = " ";  // triggers portal deletion
         }
-        server.send(["PORTAL", unparser.to_yx(explorer.position), msg]);
+        server.send(["PORTAL", unparser.to_yx(explorer.position), msg, tui.password]);
     }
 }
 
@@ -726,18 +773,11 @@ tui.inputEl.addEventListener('input', (event) => {
             tui.inputEl.value = tui.inputEl.value.slice(0, max_length);
         };
         tui.recalc_input_lines();
-        tui.full_refresh();
     } else if (tui.mode == mode_edit && tui.inputEl.value.length > 0) {
         server.send(["TASK:WRITE", tui.inputEl.value[0], tui.password]);
         tui.switch_mode(mode_play);
-    } else if (tui.mode == mode_teleport) {
-        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);
-	}
     }
+    tui.full_refresh();
 }, false);
 tui.inputEl.addEventListener('keydown', (event) => {
     tui.show_help = false;
@@ -748,20 +788,18 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.show_help = true;
         tui.empty_input();
         tui.restore_input_values();
-        tui.full_refresh();
     } else if (!tui.mode.has_input_prompt && event.key == tui.keys.help) {
         tui.show_help = true;
-        tui.full_refresh();
     } else if (tui.mode == mode_login && event.key == 'Enter') {
         tui.login_name = tui.inputEl.value;
         server.send(['LOGIN', tui.inputEl.value]);
         tui.empty_input();
     } else if (tui.mode == mode_portal && event.key == 'Enter') {
         explorer.set_portal(tui.inputEl.value);
-        tui.switch_mode(mode_study, true);
+        tui.switch_mode(mode_play);
     } else if (tui.mode == mode_annotate && event.key == 'Enter') {
         explorer.annotate(tui.inputEl.value);
-        tui.switch_mode(mode_study, true);
+        tui.switch_mode(mode_play);
     } else if (tui.mode == mode_password && event.key == 'Enter') {
         if (tui.inputEl.value.length == 0) {
             tui.inputEl.value = " ";
@@ -789,31 +827,24 @@ tui.inputEl.addEventListener('keydown', (event) => {
                     } else {
                         tui.log_msg('? need new name');
                     }
-                } else if (tokens[0].slice(1) == 'msg') {
-                    if (tokens.length > 2) {
-                        let msg = tui.inputEl.value.slice(token_starts[2]);
-                        server.send(['QUERY', tokens[1], msg]);
-                    } else {
-                        tui.log_msg('? need message target and message');
-                    }
-                } else if (tokens[0].slice(1) == 'reconnect') {
-		    if (tokens.length > 1) {
-                        server.reconnect_to(tokens[1]);
-		    } else {
-                        server.reconnect();
-		    }
+                //} else if (tokens[0].slice(1) == 'msg') {
+                //    if (tokens.length > 2) {
+                //        let msg = tui.inputEl.value.slice(token_starts[2]);
+                //        server.send(['QUERY', tokens[1], msg]);
+                //    } else {
+                //        tui.log_msg('? need message target and message');
+                //    }
                 } else {
                     tui.log_msg('? unknown command');
                 }
-	    } else {
-	        server.send(['ALL', tui.inputEl.value]);
+            } else {
+	            server.send(['ALL', tui.inputEl.value]);
             }
-	} else if (tui.inputEl.valuelength > 0) {
-	    server.send(['ALL', tui.inputEl.value]);
+        } else if (tui.inputEl.valuelength > 0) {
+	        server.send(['ALL', tui.inputEl.value]);
         }
         tui.empty_input();
-        tui.full_refresh();
-      } else if (tui.mode == mode_play) {
+    } else if (tui.mode == mode_play) {
           if (event.key === tui.keys.switch_to_chat) {
               event.preventDefault();
               tui.switch_mode(mode_chat);
@@ -829,9 +860,21 @@ tui.inputEl.addEventListener('keydown', (event) => {
           } else if (event.key === tui.keys.flatten
                      && game.tasks.includes('FLATTEN_SURROUNDINGS')) {
               server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
+          } else if (event.key === tui.keys.take_thing
+                     && game.tasks.includes('PICK_UP')) {
+              server.send(["TASK:PICK_UP"]);
+          } else if (event.key === tui.keys.drop_thing
+                     && game.tasks.includes('DROP')) {
+              server.send(["TASK:DROP"]);
           } else if (event.key in tui.movement_keys
                      && game.tasks.includes('MOVE')) {
               server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
+          } else if (event.key === tui.keys.switch_to_portal) {
+              event.preventDefault();
+              tui.switch_mode(mode_portal);
+          } else if (event.key === tui.keys.switch_to_annotate) {
+              event.preventDefault();
+              tui.switch_mode(mode_annotate);
           };
     } else if (tui.mode == mode_study) {
         if (event.key === tui.keys.switch_to_chat) {
@@ -839,9 +882,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
             tui.switch_mode(mode_chat);
         } else if (event.key == tui.keys.switch_to_play) {
             tui.switch_mode(mode_play);
-        } else if (event.key === tui.keys.switch_to_portal) {
-            event.preventDefault();
-            tui.switch_mode(mode_portal);
         } else if (event.key in tui.movement_keys) {
             explorer.move(tui.movement_keys[event.key]);
         } else if (event.key == tui.keys.toggle_map_mode) {
@@ -850,12 +890,9 @@ tui.inputEl.addEventListener('keydown', (event) => {
             } else {
                 tui.map_mode = 'terrain';
             }
-            tui.full_refresh();
-        } else if (event.key === tui.keys.switch_to_annotate) {
-            event.preventDefault();
-            tui.switch_mode(mode_annotate);
         };
     }
+    tui.full_refresh();
 }, false);
 
 rows_selector.addEventListener('input', function() {
@@ -887,5 +924,13 @@ window.setInterval(function() {
         tui.inputEl.focus();
     }
 }, 100);
+window.setInterval(function() {
+    if (server.connected) {
+        server.send(['PING']);
+    } else {
+        server.reconnect_to(server.url);
+        tui.log_msg('@ attempting reconnect …')
+    }
+}, 5000);
 </script>
 </body></html>