X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Frogue_chat_nocanvas_monochrome.html;h=a3f81f2a0bf206ee5bdd81e767223d63feda45b5;hb=d111426abddb8b84eb609cfa8916d036b05a5d52;hp=6fee53c50409d878546c56ae256e048f989a191c;hpb=4eee27cda6fbfae7a79709300512b0651f99fcaf;p=plomrogue2-experiments

diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html
index 6fee53c..a3f81f2 100644
--- a/new2/rogue_chat_nocanvas_monochrome.html
+++ b/new2/rogue_chat_nocanvas_monochrome.html
@@ -59,6 +59,7 @@ let terminal = {
 
 let parser = {
   tokenize: function(str) {
+    let token_ends = [];
     let tokens = [];
     let token = ''
     let quoted = false;
@@ -72,7 +73,7 @@ let parser = {
         } else if (c == '\\') {
           escaped = true;
         } else if (c == '"') {
-    	    quoted = false
+          quoted = false
         } else {
           token += c;
         }
@@ -80,6 +81,7 @@ let parser = {
         quoted = true
       } else if (c === ' ') {
         if (token.length > 0) {
+          token_ends.push(i);
           tokens.push(token);
           token = '';
         }
@@ -90,9 +92,13 @@ let parser = {
     if (token.length > 0) {
       tokens.push(token);
     }
-    return tokens;
+    let token_starts = [];
+    for (let i = 0; i < token_ends.length; i++) {
+      token_starts.push(token_ends[i] - tokens[i].length);
+    };
+    return [tokens, token_starts];
   },
-  parse_yx(position_string) {
+  parse_yx: function(position_string) {
     let coordinate_strings = position_string.split(',')
     let position = [0, 0];
     position[0] = parseInt(coordinate_strings[0].slice(2));
@@ -101,24 +107,51 @@ let parser = {
   },
 }
 
-function quote(str) {
-    let quoted = ['"'];
-    for (let i = 0; i < str.length; i++) {
-        let c = str[i];
-        if (c in ['"', '\\']) {
-            quoted.push('\\');
+let server = {
+    init: function(url) {
+        this.websocket = new WebSocket(url);
+        this.websocket.onopen = function(event) {
+            window.setInterval(function() { server.send(['PING']) }, 30000);
+            server.send(['GET_GAMESTATE']);
         };
-        quoted.push(c);
+    },
+    send: function(tokens) {
+        this.websocket.send(unparser.untokenize(tokens));
+    }
+}
+
+let unparser = {
+    quote: function(str) {
+        let quoted = ['"'];
+        for (let i = 0; i < str.length; i++) {
+            let c = str[i];
+            if (c in ['"', '\\']) {
+                quoted.push('\\');
+            };
+            quoted.push(c);
+        }
+        quoted.push('"');
+        return quoted.join('');
+    },
+    to_yx: function(yx_coordinate) {
+        return "Y:" + yx_coordinate[0] + ",X:" + yx_coordinate[1];
+    },
+    untokenize: function(tokens) {
+        let quoted_tokens = [];
+        for (let token of tokens) {
+            quoted_tokens.push(this.quote(token));
+        }
+        return quoted_tokens.join(" ");
     }
-    quoted.push('"');
-    return quoted.join('');
 }
 
 let tui = {
   mode: 'chat',
-  switch_mode: function(mode_name) {
-    if (mode_name == 'explore') {
-        explorer.position = game.things[game.player_id];
+  log: [],
+  input_line: '',
+  switch_mode: function(mode_name, keep_pos=false) {
+    if (mode_name == 'study' && !keep_pos) {
+      explorer.position = game.things[game.player_id];
     }
     this.mode = mode_name;
     this.full_refresh();
@@ -126,7 +159,7 @@ let tui = {
   draw_history: function() {
     terminal.drawBox(1, terminal.cols / 2, terminal.rows - 2, terminal.cols / 2);
     let i = 0;
-    for (let line of chat.history) {
+    for (let line of this.log) {
       terminal.write(terminal.rows - 2 - i, terminal.cols / 2, line);
       i += 1;
     }
@@ -145,15 +178,16 @@ let tui = {
     };
     map_lines.push(line);
     let player_position = [0,0];
+    let center_pos = [Math.floor(game.map_size[0] / 2),
+		      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]] = '@';
         if (game.player_id == thing_id) {
-            player_position = t;
+            center_pos = t;
         }
     };
-    let center_pos = player_position;
-    if (tui.mode == 'explore') {
+    if (tui.mode == 'study' || tui.mode == 'annotate') {
         map_lines[explorer.position[0]][explorer.position[1]] = '?';
         center_pos = explorer.position;
     }
@@ -174,22 +208,30 @@ let tui = {
   },
   draw_input_line: function() {
     terminal.drawBox(terminal.rows - 1, terminal.cols / 2, 1, terminal.cols / 2);
-    terminal.write(terminal.rows - 1, terminal.cols / 2, chat.input_line);
+    if (this.mode == 'chat' || this.mode == 'annotate') {
+      terminal.write(terminal.rows - 1, terminal.cols / 2, '> ' + this.input_line);
+    }
   },
-  log_msg: function(msg, indent=0) {
-    let line_length = (terminal.cols / 2) - indent;
+  msg_into_lines_of_width: function(msg, width) {
     let chunk = "";
+    let lines = [];
     for (let i = 0, x = 0; i < msg.length; i++, x++) {
-      if (x >= line_length) {
-        chat.history.unshift(' '.repeat(indent) + chunk);
+      if (x >= width) {
+        lines.unshift(chunk);
         chunk = "";
         x = 0;
       };
       chunk += msg[i];
     }
-    chat.history.unshift(' '.repeat(indent) + chunk);
-    while (chat.history.length > terminal.rows - 2) {
-      chat.history.pop();
+    lines.unshift(chunk);
+    return lines;
+  },
+  log_msg: function(msg) {
+    let line_length = (terminal.cols / 2);
+    let chunk = "";
+    this.log = this.msg_into_lines_of_width(msg, terminal.cols / 2).concat(this.log);
+    while (this.log.length > terminal.rows - 2) {
+      this.log.pop();
     };
     this.draw_history();
   },
@@ -198,38 +240,45 @@ let tui = {
   },
   log_help: function() {
     tui.log_msg("");
-    tui.log_msg("HELP", 1);
-    tui.log_msg("chat mode commands:", 1);
+    tui.log_msg("HELP");
     tui.log_msg("");
-    tui.log_msg("/login USER - register as USER", 3);
-    tui.log_msg("/msg USER TEXT - send TEXT to USER", 3);
-    tui.log_msg("/help - show this help", 3);
-    tui.log_msg("/play - switch to play mode", 3);
+    tui.log_msg("chat mode commands:");
+    tui.log_msg(":login USER - register as USER");
+    tui.log_msg(":msg USER TEXT - send TEXT to USER");
+    tui.log_msg(":help - show this help");
+    tui.log_msg(":play or :p - switch to play mode");
+    tui.log_msg(":study or :s - switch to study mode");
     tui.log_msg("");
-    tui.log_msg("play mode commands:", 1);
-    tui.log_msg("w, a, s, d - move avatar", 3);
-    tui.log_msg("f - flatten surroundings", 3);
-    tui.log_msg("e - write following ASCII character", 3);
-    tui.log_msg("c - switch to chat mode", 3);
-    tui.log_msg("? - switch to explore mode", 3);
+    tui.log_msg("play mode commands:");
+    tui.log_msg("w, a, s, d - move avatar");
+    tui.log_msg("f - flatten surroundings");
+    tui.log_msg("e - write following ASCII character");
+    tui.log_msg("c - switch to chat mode");
+    tui.log_msg("? - switch to study mode");
     tui.log_msg("");
-    tui.log_msg("explore mode commands:", 1);
-    tui.log_msg("w, a, s, d - move question mark", 3);
-    tui.log_msg("c - switch to chat mode", 3);
-    tui.log_msg("p - switch to play mode", 3);
+    tui.log_msg("study mode commands:");
+    tui.log_msg("w, a, s, d - move question mark");
+    tui.log_msg("A - annotate terrain");
+    tui.log_msg("c - switch to chat mode");
+    tui.log_msg("p - switch to play mode");
     tui.log_msg("");
   },
   draw_info: function() {
-    terminal.drawBox(0, terminal.cols / 2, terminal.rows, terminal.cols / 2);
-    let lines = ['unfinished info screen'];
-    for (let y = 0, i = 0; y < terminal.rows && i < lines.length; y++, i++) {
+    terminal.drawBox(1, terminal.cols / 2, terminal.rows - 2, terminal.cols / 2);
+    let lines = this.msg_into_lines_of_width(explorer.get_info(), terminal.cols / 2);
+    lines.reverse();
+    for (let y = 1, i = 0; y < terminal.rows && i < lines.length; y++, i++) {
       terminal.write(y, terminal.cols / 2, lines[i]);
     }
   },
   full_refresh: function() {
     this.draw_map();
     this.draw_turn_line();
-    this.draw_history();
+    if (this.mode == 'study' || this.mode == 'annotate') {
+      this.draw_info();
+    } else {
+      this.draw_history();
+    }
     this.draw_input_line();
     this.refresh();
   }
@@ -243,18 +292,13 @@ let game = {
   player_id: 0
 }
 
-let chat = {
-  input_line: "",
-  history: [],
-}
-
 terminal.initialize();
 tui.log_help();
 tui.full_refresh();
 
-let websocket = new WebSocket(websocket_location);
-websocket.onmessage = function (event) {
-  let tokens = parser.tokenize(event.data);
+server.init(websocket_location);
+server.websocket.onmessage = function (event) {
+  let tokens = parser.tokenize(event.data)[0];
   if (tokens[0] === 'TURN') {
     game.things = {}
     game.turn = parseInt(tokens[1]);
@@ -264,36 +308,44 @@ websocket.onmessage = function (event) {
     game.map_size = parser.parse_yx(tokens[1]);
     game.map = tokens[2]
   } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
+    explorer.empty_info_db();
+    if (tui.mode == 'study') {
+      explorer.query_info();
+    }
     tui.draw_turn_line();
     tui.draw_map();
     tui.refresh();
-  } else if (tokens[0] === 'LOG') {
-     tui.log_msg(tokens[1], 1);
+  } else if (tokens[0] === 'CHAT') {
+     tui.log_msg('# ' + tokens[1], 1);
      tui.refresh();
   } else if (tokens[0] === 'PLAYER_ID') {
       game.player_id = parseInt(tokens[1]);
   } else if (tokens[0] === 'META') {
-     tui.log_msg(tokens[1]);
+     tui.log_msg('@ ' + tokens[1]);
      tui.refresh();
+  } else if (tokens[0] === 'ANNOTATION') {
+     let position = parser.parse_yx(tokens[1]);
+     explorer.update_info_db(position, tokens[2]);
   } else if (tokens[0] === 'UNHANDLED_INPUT') {
-     tui.log_msg('unknown command');
+     tui.log_msg('? unknown command');
      tui.refresh();
   } else if (tokens[0] === 'ARGUMENT_ERROR') {
-     tui.log_msg('syntax error: ' + tokens[1]);
+     tui.log_msg('? syntax error: ' + tokens[1]);
      tui.refresh();
   } else if (tokens[0] === 'GAME_ERROR') {
-     tui.log_msg('game error: ' + tokens[1]);
+     tui.log_msg('? game error: ' + tokens[1]);
      tui.refresh();
   } else if (tokens[0] === 'PONG') {
     console.log('PONG');
   } else {
-     tui.log_msg('unhandled input: ' + event.data);
+     tui.log_msg('? unhandled input: ' + event.data);
      tui.refresh();
   }
 }
 
 let explorer = {
     position: [0,0],
+    info_db: {},
     move: function(direction) {
         let try_pos = [0,0];
         try_pos[0] = this.position[0];
@@ -312,82 +364,116 @@ let explorer = {
             !(try_pos[0] >= game.map_size[0])
             && !(try_pos[1] >= game.map_size[1])) {
             this.position = try_pos;
+            this.query_info();
             tui.draw_map();
             tui.draw_info();
             tui.refresh();
         }
+    },
+    update_info_db: function(yx, str) {
+        this.info_db[yx] = str;
+        if (tui.mode == 'study') {
+            tui.draw_info();
+            tui.refresh();
+        }
+    },
+    empty_info_db: function() {
+        this.info_db = {};
+        if (tui.mode == 'study') {
+            tui.draw_info();
+            tui.refresh();
+        }
+    },
+    query_info: function() {
+        server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
+    },
+    get_info: function() {
+        if (this.position in this.info_db) {
+            return this.info_db[this.position];
+        } else {
+            return 'waiting …';
+        }
+    },
+    annotate: function(msg) {
+        if (msg.length == 0) {
+            msg = " ";  // triggers annotation deletion
+        }
+        server.send(["ANNOTATE", unparser.to_yx(explorer.position), msg]);
     }
 }
 
 document.addEventListener('keydown', (event) => {
     if (tui.mode == 'chat') {
         if (event.key.length === 1) {
-            chat.input_line += event.key;
+            tui.input_line += event.key;
             tui.draw_input_line();
             tui.refresh();
         } else if (event.key == 'Backspace') {
-            chat.input_line = chat.input_line.slice(0, -1);
+            tui.input_line = tui.input_line.slice(0, -1);
             tui.draw_input_line();
             tui.refresh();
         } else if (event.key == 'Enter') {
-            let tokens = parser.tokenize(chat.input_line);
+            let [tokens, token_starts] = parser.tokenize(tui.input_line);
             if (tokens.length > 0 && tokens[0].length > 0) {
-                if (tokens[0][0] == '/') {
-                    if (tokens[0] == '/play') {
+                if (tokens[0][0] == ':') {
+                    if (tokens[0] == ':play' || tokens[0] == ':p') {
                         tui.switch_mode('play');
-                    } else if (tokens[0] == '/?') {
+                    } else if (tokens[0] == ':study' || tokens[0] == ':s') {
+                        tui.switch_mode('study');
+                    } else if (tokens[0] == ':help') {
                         tui.log_help();
                         tui.refresh();
-                    } else if (tokens[0] == '/login') {
+                    } else if (tokens[0] == ':login') {
                         if (tokens.length > 1) {
-                            websocket.send('LOGIN ' + quote(tokens[1]));
+                            server.send(['LOGIN', tokens[1]]);
                         } else {
-                            tui.log_msg('need login name');
+                            tui.log_msg('? need login name');
                         }
-                    } else if (tokens[0] == '/msg') {
+                    } else if (tokens[0] == ':msg') {
                         if (tokens.length > 2) {
-                            websocket.send('QUERY ' + quote(tokens[1]) + ' ' + quote(tokens[2]));
+                            let msg = tui.input_line.slice(token_starts[2]);
+                            server.send(['QUERY', tokens[1], msg]);
                         } else {
-                            tui.log_msg('need message target and message');
+                            tui.log_msg('? need message target and message');
                         }
                     } else {
-                        tui.log_msg('unknown command');
+                        tui.log_msg('? unknown command');
                     }
                 } else {
-                    websocket.send('ALL ' + quote(chat.input_line));
+                    server.send(['ALL', tui.input_line]);
                 }
             }
-            chat.input_line = '';
+            tui.input_line = '';
             tui.draw_input_line();
             tui.refresh();
         }
-    } else if (tui.mode == 'play') {
+      } else if (tui.mode == 'play') {
           if (event.key === 'c') {
               tui.switch_mode('chat');
           } else if (event.key === 'e') {
               tui.switch_mode('edit');
           } else if (event.key === '?') {
-              tui.switch_mode('explore');
+              tui.switch_mode('study');
           } else if (event.key === 'F1') {
               tui.log_help();
               tui.refresh();
           } else if (event.key === 'f') {
-              websocket.send("TASK:FLATTEN_SURROUNDINGS");
+              server.send(["TASK:FLATTEN_SURROUNDINGS"]);
           } else if (event.key === 'a') {
-              websocket.send('TASK:MOVE LEFT');
+              server.send(['TASK:MOVE', 'LEFT']);
           } else if (event.key === 'd') {
-              websocket.send('TASK:MOVE RIGHT');
+              server.send(['TASK:MOVE', 'RIGHT']);
           } else if (event.key === 'w') {
-              websocket.send('TASK:MOVE UP');
+              server.send(['TASK:MOVE', 'UP']);
           } else if (event.key === 's') {
-              websocket.send('TASK:MOVE DOWN');
+              server.send(['TASK:MOVE', 'DOWN']);
           };
     } else if (tui.mode == 'edit') {
-        if (event.key.length === 1) {
-            websocket.send("TASK:WRITE " + quote(event.key));
+        if (event.key != "Shift" && event.key.length == 1) {
+            server.send(["TASK:WRITE", event.key]);
+            tui.switch_mode('play');
         }
-        tui.switch_mode('play');
-    } else if (tui.mode == 'explore') {
+    } else if (tui.mode == 'study') {
         if (event.key === 'c') {
             tui.switch_mode('chat');
         } else if (event.key == 'p') {
@@ -400,10 +486,26 @@ document.addEventListener('keydown', (event) => {
 	      explorer.move('up');
         } else if (event.key === 's') {
 	      explorer.move('down');
-	};
+        } else if (event.key === 'A') {
+          tui.switch_mode('annotate');
+          tui.draw_info();
+          tui.refresh();
+        };
+    } else if (tui.mode == 'annotate') {
+        if (event.key.length === 1) {
+            tui.input_line += event.key;
+            tui.draw_input_line();
+            tui.refresh();
+        } else if (event.key == 'Backspace') {
+            tui.input_line = tui.input_line.slice(0, -1);
+            tui.draw_input_line();
+            tui.refresh();
+        } else if (event.key == 'Enter') {
+            explorer.annotate(tui.input_line);
+            tui.input_line = '';
+            tui.switch_mode('study', true);
+        }
     }
 }, false);
-
-window.setInterval(function() { websocket.send('PING') }, 30000);
 </script>
 </body></html>