X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=blobdiff_plain;f=rogue_chat.html;h=f4aa6ff522d4ebc6e1f1c0ee49cb99cde4c357e8;hb=279e60e6066ff1f335c50b3355a05d9c1aa1fba6;hp=0a70962a0d72e30218980101b90ecea16736789d;hpb=c0aba691859793c07e9d17c7494af36013f046c0;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 0a70962..f4aa6ff 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -55,6 +55,7 @@ keyboard input/control: <span id="keyboard_control"></span>
       <button id="drop_thing"></button>
       <button id="door"></button>
       <button id="consume"></button>
+      <button id="switch_to_command_thing"></button>
       <button id="teleport"></button>
     </td>
   </tr>
@@ -105,6 +106,7 @@ keyboard input/control: <span id="keyboard_control"></span>
 <li><input id="key_switch_to_edit" type="text" value="E" />
 <li><input id="key_switch_to_write" type="text" value="m" />
 <li><input id="key_switch_to_name_thing" type="text" value="N" />
+<li><input id="key_switch_to_command_thing" type="text" value="O" />
 <li><input id="key_switch_to_password" type="text" value="P" />
 <li><input id="key_switch_to_admin_enter" type="text" value="A" />
 <li><input id="key_switch_to_control_pw_type" type="text" value="C" />
@@ -118,8 +120,8 @@ keyboard input/control: <span id="keyboard_control"></span>
 </div>
 <script>
 "use strict";
-let websocket_location = "wss://plomlompom.com/rogue_chat/";
-//let websocket_location = "ws://localhost:8000/";
+//let websocket_location = "wss://plomlompom.com/rogue_chat/";
+let websocket_location = "ws://localhost:8001/";
 
 let mode_helps = {
     'play': {
@@ -137,6 +139,10 @@ let mode_helps = {
         'short': 'name thing',
         'long': 'Give name to/change name of thing here.'
     },
+    'command_thing': {
+        'short': 'command thing',
+        'long': 'Enter a command to the thing you carry.  Enter nothing to return to play mode.'
+    },
     'admin_thing_protect': {
         'short': 'change thing protection',
         'long': 'Change protection character for thing here.'
@@ -431,9 +437,10 @@ let server = {
         let tokens = parser.tokenize(event.data);
         if (tokens[0] === 'TURN') {
             game.turn_complete = false;
-            explorer.empty_info_db();
+            explorer.empty_annotations();
             game.things = {};
             game.portals = {};
+            game.fov = '';
             game.turn = parseInt(tokens[1]);
         } else if (tokens[0] === 'THING') {
             let t = game.get_thing(tokens[4], true);
@@ -453,6 +460,7 @@ let server = {
         } else if (tokens[0] === 'TASKS') {
             game.tasks = tokens[1].split(',');
             tui.mode_write.legal = game.tasks.includes('WRITE');
+            tui.mode_command_thing.legal = game.tasks.includes('WRITE');
         } else if (tokens[0] === 'THING_TYPE') {
             game.thing_types[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'TERRAIN') {
@@ -470,12 +478,13 @@ let server = {
             game.turn_complete = true;
             if (tui.mode.name == 'post_login_wait') {
                 tui.switch_mode('play');
-            } else if (tui.mode.name == 'study') {
-                explorer.query_info();
             }
+            explorer.info_cached = false;
             tui.full_refresh();
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);
+        } else if (tokens[0] === 'REPLY') {
+             tui.log_msg('#MUSICPLAYER: ' + tokens[1], 1);
         } else if (tokens[0] === 'PLAYER_ID') {
             game.player_id = parseInt(tokens[1]);
         } else if (tokens[0] === 'LOGIN_OK') {
@@ -492,12 +501,9 @@ let server = {
         } else if (tokens[0] === 'PORTAL') {
             let position = parser.parse_yx(tokens[1]);
             game.portals[position] = tokens[2];
-        } else if (tokens[0] === 'ANNOTATION_HINT') {
-            let position = parser.parse_yx(tokens[1]);
-            explorer.info_hints = explorer.info_hints.concat([position]);
         } else if (tokens[0] === 'ANNOTATION') {
             let position = parser.parse_yx(tokens[1]);
-            explorer.update_info_db(position, tokens[2]);
+            explorer.update_annotations(position, tokens[2]);
             tui.full_refresh();
         } else if (tokens[0] === 'UNHANDLED_INPUT') {
             tui.log_msg('? unknown command');
@@ -614,6 +620,7 @@ let tui = {
   mode_portal: new Mode('portal', true, true),
   mode_password: new Mode('password', true),
   mode_name_thing: new Mode('name_thing', true, true),
+  mode_command_thing: new Mode('command_thing', true),
   mode_admin_enter: new Mode('admin_enter', true),
   mode_admin: new Mode('admin'),
   mode_control_pw_pw: new Mode('control_pw_pw', true),
@@ -625,11 +632,15 @@ let tui = {
       'drop_thing': 'DROP',
       'move': 'MOVE',
       'door': 'DOOR',
+      'command': 'COMMAND',
       'consume': 'INTOXICATE',
   },
+  offset: [0,0],
+  map_lines: [],
   init: function() {
       this.mode_chat.available_modes = ["play", "study", "edit", "admin_enter"]
-      this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+      this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
+                                        "command_thing"]
       this.mode_play.available_actions = ["move", "take_thing", "drop_thing",
                                           "teleport", "door", "consume"];
       this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
@@ -728,9 +739,6 @@ let tui = {
     }
     if (game.player_id in game.things && (this.mode.shows_info || this.mode.name == 'control_tile_draw')) {
         explorer.position = game.things[game.player_id].position;
-        if (this.mode.shows_info) {
-            explorer.query_info();
-        }
     }
     this.inputEl.value = "";
     this.restore_input_values();
@@ -762,6 +770,8 @@ let tui = {
         }
     } else if (this.mode.is_single_char_entry) {
         this.show_help = true;
+    } else if (this.mode.name == 'command_thing') {
+        server.send(['TASK:COMMAND', 'HELP']);
     } else if (this.mode.name == 'admin_enter') {
         this.log_msg('@ enter admin password:')
     } else if (this.mode.name == 'control_pw_type') {
@@ -790,8 +800,8 @@ let tui = {
       }
   },
   restore_input_values: function() {
-      if (this.mode.name == 'annotate' && explorer.position in explorer.info_db) {
-          let info = explorer.info_db[explorer.position];
+      if (this.mode.name == 'annotate' && explorer.position in explorer.annotations) {
+          let info = explorer.annotations[explorer.position];
           if (info != "(none)") {
               this.inputEl.value = info;
           }
@@ -889,85 +899,90 @@ let tui = {
       this.full_refresh();
   },
   draw_map: function() {
-    let map_lines_split = [];
-    let line = [];
-    for (let i = 0, j = 0; i < game.map.length; i++, j++) {
-        if (j == game.map_size[1]) {
-            map_lines_split.push(line);
-            line = [];
-            j = 0;
+    if (!game.turn_complete && this.map_lines.length == 0) {
+        return;
+    }
+    if (game.turn_complete) {
+        let map_lines_split = [];
+        let line = [];
+        for (let i = 0, j = 0; i < game.map.length; i++, j++) {
+            if (j == game.map_size[1]) {
+                map_lines_split.push(line);
+                line = [];
+                j = 0;
+            };
+            if (this.map_mode == 'protections') {
+                line.push(game.map_control[i] + ' ');
+            } else {
+                line.push(game.map[i] + ' ');
+            }
         };
-        if (this.map_mode == 'protections') {
-            line.push(game.map_control[i] + ' ');
-        } else {
-            line.push(game.map[i] + ' ');
-        }
-    };
-    map_lines_split.push(line);
-    if (this.map_mode == 'terrain + annotations') {
-        for (const coordinate of explorer.info_hints) {
-            map_lines_split[coordinate[0]][coordinate[1]] = 'A ';
+        map_lines_split.push(line);
+        if (this.map_mode == 'terrain + annotations') {
+            for (const coordinate of explorer.info_hints) {
+                map_lines_split[coordinate[0]][coordinate[1]] = 'A ';
+            }
+        } else if (this.map_mode == 'terrain + things') {
+            for (const p in game.portals) {
+                let coordinate = p.split(',')
+                let original = map_lines_split[coordinate[0]][coordinate[1]];
+                map_lines_split[coordinate[0]][coordinate[1]] = original[0] + 'P';
+            }
+            let used_positions = [];
+            for (const thing_id in game.things) {
+                let t = game.things[thing_id];
+                let symbol = game.thing_types[t.type_];
+                let meta_char = ' ';
+                if (t.thing_char) {
+                    meta_char = t.thing_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());
+            };
         }
-    } else if (this.map_mode == 'terrain + things') {
-        for (const p in game.portals) {
-            let coordinate = p.split(',')
-            let original = map_lines_split[coordinate[0]][coordinate[1]];
-            map_lines_split[coordinate[0]][coordinate[1]] = original[0] + 'P';
+        let player = game.things[game.player_id];
+        if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
+            map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
+        } else if (tui.map_mode != 'terrain + things') {
+            map_lines_split[player.position[0]][player.position[1]] = '??';
         }
-        let used_positions = [];
-        for (const thing_id in game.things) {
-            let t = game.things[thing_id];
-            let symbol = game.thing_types[t.type_];
-            let meta_char = ' ';
-            if (t.thing_char) {
-                meta_char = t.thing_char;
-            }
-            if (used_positions.includes(t.position.toString())) {
-                meta_char = '+';
+        this.map_lines = []
+        if (game.map_geometry == 'Square') {
+            for (let line_split of map_lines_split) {
+                this.map_lines.push(line_split.join(''));
             };
-            map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
-            used_positions.push(t.position.toString());
-        };
-    }
-    let player = game.things[game.player_id];
-    if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
-        map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
-    } else if (tui.map_mode != 'terrain + things') {
-        map_lines_split[player.position[0]][player.position[1]] = '??';
-    }
-    let map_lines = []
-    if (game.map_geometry == 'Square') {
-        for (let line_split of map_lines_split) {
-            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(''));
-            if (indent == 0) {
-                indent = 1;
-            } else {
-                indent = 0;
+        } else if (game.map_geometry == 'Hex') {
+            let indent = 0
+            for (let line_split of map_lines_split) {
+                this.map_lines.push(' '.repeat(indent) + line_split.join(''));
+                if (indent == 0) {
+                    indent = 1;
+                } else {
+                    indent = 0;
+                };
             };
+        }
+        let window_center = [terminal.rows / 2, this.window_width / 2];
+        let center_position = [player.position[0], player.position[1]];
+        if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
+            center_position = [explorer.position[0], explorer.position[1]];
+        }
+        center_position[1] = center_position[1] * 2;
+        this.offset = [center_position[0] - window_center[0],
+                       center_position[1] - window_center[1]]
+        if (game.map_geometry == 'Hex' && this.offset[0] % 2) {
+            this.offset[1] += 1;
         };
-    }
-    let window_center = [terminal.rows / 2, this.window_width / 2];
-    let center_position = [player.position[0], player.position[1]];
-    if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
-        center_position = [explorer.position[0], explorer.position[1]];
-    }
-    center_position[1] = center_position[1] * 2;
-    let offset = [center_position[0] - window_center[0],
-                  center_position[1] - window_center[1]]
-    if (game.map_geometry == 'Hex' && offset[0] % 2) {
-        offset[1] += 1;
     };
-    let term_y = Math.max(0, -offset[0]);
-    let term_x = Math.max(0, -offset[1]);
-    let map_y = Math.max(0, offset[0]);
-    let map_x = Math.max(0, offset[1]);
+    let term_y = Math.max(0, -this.offset[0]);
+    let term_x = Math.max(0, -this.offset[1]);
+    let map_y = Math.max(0, this.offset[0]);
+    let map_x = Math.max(0, this.offset[1]);
     for (; term_y < terminal.rows && map_y < game.map_size[0]; term_y++, map_y++) {
-        let to_draw = map_lines[map_y].slice(map_x, this.window_width + offset[1]);
+        let to_draw = this.map_lines[map_y].slice(map_x, this.window_width + this.offset[1]);
         terminal.write(term_y, term_x, to_draw);
     }
   },
@@ -979,7 +994,9 @@ let tui = {
       terminal.write(0, this.window_width, 'MODE: ' + this.mode.short_desc + ' – ' + help);
   },
   draw_turn_line: function(n) {
-    terminal.write(1, this.window_width, 'TURN: ' + game.turn);
+      if (game.turn_complete) {
+          terminal.write(1, this.window_width, 'TURN: ' + game.turn);
+      }
   },
   draw_history: function() {
       let log_display_lines = [];
@@ -1014,8 +1031,8 @@ let tui = {
       this.offset_links(offset, log_links);
   },
   draw_info: function() {
-      let [lines, link_data] = this.msg_into_lines_of_width(explorer.get_info(),
-                                                            this.window_width);
+      const info = "MAP VIEW: " + tui.map_mode + "\n" + explorer.get_info();
+      let [lines, link_data] = this.msg_into_lines_of_width(info, this.window_width);
       let offset = [this.height_header, this.window_width];
       for (let y = offset[0], i = 0; y < terminal.rows && i < lines.length; y++, i++) {
         terminal.write(y, offset[1], lines[i]);
@@ -1097,10 +1114,8 @@ let tui = {
         this.draw_history();
         this.draw_input();
     } else {
-        if (game.turn_complete) {
-            this.draw_map();
-            this.draw_turn_line();
-        }
+        this.draw_map();
+        this.draw_turn_line();
         this.draw_mode_line();
         if (this.mode.shows_info) {
           this.draw_info();
@@ -1196,81 +1211,79 @@ server.init(websocket_location);
 
 let explorer = {
     position: [0,0],
-    info_db: {},
-    info_hints: [],
+    annotations: {},
+    info_cached: false,
     move: function(direction) {
         let target = game.move(this.position, direction);
         if (target) {
             this.position = target
-            if (tui.mode.shows_info) {
-                this.query_info();
-            } else if (tui.tile_draw) {
+            this.info_cached = false;
+            if (tui.tile_draw) {
                 this.send_tile_control_command();
             }
         } else {
             terminal.blink_screen();
         };
     },
-    update_info_db: function(yx, str) {
-        this.info_db[yx] = str;
+    update_annotations: function(yx, str) {
+        this.annotations[yx] = str;
         if (tui.mode.name == 'study') {
             tui.full_refresh();
         }
     },
-    empty_info_db: function() {
-        this.info_db = {};
-        this.info_hints = [];
+    empty_annotations: function() {
+        this.annotations = {};
         if (tui.mode.name == 'study') {
             tui.full_refresh();
         }
     },
-    query_info: function() {
-        server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
-    },
     get_info: function() {
-        let info = "MAP VIEW: " + tui.map_mode + "\n";
+        if (this.info_cached) {
+            return this.info_cached;
+        }
+        let info_to_cache = '';
         let position_i = this.position[0] * game.map_size[1] + this.position[1];
         if (game.fov[position_i] != '.') {
-            return info + 'outside field of view';
-        };
-        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";
-        let protection = game.map_control[position_i];
-        if (protection == '.') {
-            protection = 'unprotected';
-        };
-        info += 'PROTECTION: ' + protection + '\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]) {
-                 let symbol = game.thing_types[t.type_];
-                 let protection = t.protection;
-                 if (protection == '.') {
-                     protection = 'none';
-                 }
-                 info += "THING: " + t.type_ + " / " + symbol;
-                 if (t.thing_char) {
-                     info += t.thing_char;
-                 };
-                 if (t.name_) {
-                     info += " (" + t.name_ + ")";
-                 }
-                 info += " / protection: " + protection + "\n";
-             }
-        }
-        if (this.position in game.portals) {
-            info += "PORTAL: " + game.portals[this.position] + "\n";
-        }
-        if (this.position in this.info_db) {
-            info += "ANNOTATIONS: " + this.info_db[this.position];
+            info_to_cache += 'outside field of view';
         } else {
-            info += 'waiting …';
+            let terrain_char = game.map[position_i]
+            let terrain_desc = '?'
+            if (game.terrains[terrain_char]) {
+                terrain_desc = game.terrains[terrain_char];
+            };
+            info_to_cache += 'TERRAIN: "' + terrain_char + '" / ' + terrain_desc + "\n";
+            let protection = game.map_control[position_i];
+            if (protection == '.') {
+                protection = 'unprotected';
+            };
+            info_to_cache += 'PROTECTION: ' + protection + '\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]) {
+                     let symbol = game.thing_types[t.type_];
+                     let protection = t.protection;
+                     if (protection == '.') {
+                         protection = 'none';
+                     }
+                     info_to_cache += "THING: " + t.type_ + " / " + symbol;
+                     if (t.thing_char) {
+                         info_to_cache += t.thing_char;
+                     };
+                     if (t.name_) {
+                         info_to_cache += " (" + t.name_ + ")";
+                     }
+                     info_to_cache += " / protection: " + protection + "\n";
+                 }
+            }
+            if (this.position in game.portals) {
+                info_to_cache += "PORTAL: " + game.portals[this.position] + "\n";
+            }
+            if (this.position in this.annotations) {
+                info_to_cache += "ANNOTATION: " + this.annotations[this.position];
+            }
         }
-        return info;
+        this.info_cached = info_to_cache;
+        return this.info_cached;
     },
     annotate: function(msg) {
         if (msg.length == 0) {
@@ -1320,6 +1333,14 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.login_name = tui.inputEl.value;
         server.send(['LOGIN', tui.inputEl.value]);
         tui.inputEl.value = "";
+    } else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
+        if (tui.inputEl.value.length == 0) {
+            tui.log_msg('@ aborted');
+            tui.switch_mode('play');
+        } else if (tui.task_action_on('command')) {
+            server.send(['TASK:COMMAND', tui.inputEl.value]);
+            tui.inputEl.value = "";
+        }
     } else if (tui.mode.name == 'control_pw_pw' && event.key == 'Enter') {
         if (tui.inputEl.value.length == 0) {
             tui.log_msg('@ aborted');