X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=rogue_chat_nocanvas_monochrome.html;h=d9732dad32cb3d9e28e97fc8036bdcef3f39c335;hb=6cc83951670f2022bd22cbf0728ebb4c25479c4d;hp=66cb79584160760e95a2c4158503fbb53df8abc8;hpb=0a25fa6dadb1560ed64c22fe12a6c3d8de567b84;p=plomrogue2

diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index 66cb795..d9732da 100644
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -34,7 +34,8 @@ toggle terrain/control view (from study mode): <input id="key_toggle_map_mode" t
 </div>
 <script>
 "use strict";
-let websocket_location = "wss://plomlompom.com/rogue_chat/";
+//let websocket_location = "wss://plomlompom.com/rogue_chat/";
+let websocket_location = "ws://localhost:8000/";
 
 let rows_selector = document.getElementById("n_rows");
 let cols_selector = document.getElementById("n_cols");
@@ -176,7 +177,9 @@ let server = {
         this.websocket = new WebSocket(this.url);
         this.websocket.onopen = function(event) {
             server.connected = true;
+            game.thing_types = {};
             server.send(['TASKS']);
+            server.send(['THING_TYPES']);
             tui.log_msg("@ server connected! :)");
             tui.switch_mode(mode_login);
         };
@@ -201,12 +204,19 @@ 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] === 'TASKS') {
             game.tasks = tokens[1].split(',')
+        } else if (tokens[0] === 'THING_TYPE') {
+            game.thing_types[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'MAP') {
             game.map_geometry = tokens[1];
             tui.init_keys();
@@ -297,7 +307,7 @@ 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_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);
@@ -440,7 +450,8 @@ let tui = {
     if (this.map_mode == 'terrain') {
         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_];
+            map_lines_split[t.position[0]][t.position[1]] = symbol;
         };
     }
     if (tui.mode.shows_info) {
@@ -545,7 +556,7 @@ let tui = {
           content += '[' + this.keys.switch_to_play + '] – play 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';
       }
@@ -690,9 +701,9 @@ let explorer = {
         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 @";
+                 info += "THING: " + t.type_;
                  if (t.name_) {
-                     info += ": " + t.name_;
+                     info += " (name: " + t.name_ + ")";
                  }
                  info += "\n";
              }
@@ -782,13 +793,13 @@ 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) == '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');
                 }