X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=rogue_chat.html;h=16a27ba68a4b6739615a506b4497088598d80d44;hb=79fb5ce7f20c880164d98fd47640e742041e2fd9;hp=7d2747e75be9fa5478aca4ff461b1c2993efff7e;hpb=88c8acab582aeb25735d86b78defe28441439cba;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 7d2747e..16a27ba 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -19,7 +19,7 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
 <div>
 keyboard input/control: <span id="keyboard_control"></span>
 </div>
-<h3>button controls for mouse players</h3>
+<h3>button controls for hard-to-remember keybindings</h3>
 <table id="move_table" style="float: left">
   <tr>
     <td style="text-align: right"><button id="hex_move_upleft"></button></td>
@@ -52,13 +52,13 @@ keyboard input/control: <span id="keyboard_control"></span>
     <td><button id="switch_to_play"></button></td>
     <td>
       <button id="switch_to_take_thing"></button>
-      <button id="drop_thing"></button>
+      <button id="switch_to_drop_thing"></button>
       <button id="door"></button>
       <button id="consume"></button>
       <button id="switch_to_command_thing"></button>
       <button id="teleport"></button>
-      <button id="install"></button>
       <button id="wear"></button>
+      <button id="spin"></button>
     </td>
   </tr>
   <tr>
@@ -66,6 +66,7 @@ keyboard input/control: <span id="keyboard_control"></span>
     <td>
       <button id="switch_to_write"></button>
       <button id="flatten"></button>
+      <button id="install"></button>
       <button id="switch_to_annotate"></button>
       <button id="switch_to_portal"></button>
       <button id="switch_to_name_thing"></button>
@@ -99,11 +100,12 @@ keyboard input/control: <span id="keyboard_control"></span>
 <li>help: <input id="key_help" type="text" value="h" />
 <li>flatten surroundings: <input id="key_flatten" type="text" value="F" />
 <li>teleport: <input id="key_teleport" type="text" value="p" />
-<li>drop thing: <input id="key_drop_thing" type="text" value="u" />
+<li>spin: <input id="key_spin" type="text" value="S" />
 <li>open/close: <input id="key_door" type="text" value="D" />
 <li>consume: <input id="key_consume" type="text" value="C" />
 <li>install: <input id="key_install" type="text" value="I" />
 <li>(un-)wear: <input id="key_wear" type="text" value="W" />
+<li><input id="key_switch_to_drop_thing" type="text" value="u" />
 <li><input id="key_switch_to_enter_face" type="text" value="f" />
 <li><input id="key_switch_to_take_thing" type="text" value="z" />
 <li><input id="key_switch_to_chat" type="text" value="t" />
@@ -126,8 +128,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:8000/";
 
 let mode_helps = {
     'play': {
@@ -159,6 +161,11 @@ let mode_helps = {
         'intro': 'Pick up a thing in reach by entering its index number.  Enter nothing to abort.',
         'long': 'You see a list of things which you could pick up.  Enter the target thing\'s index, or, to leave, nothing.'
     },
+    'drop_thing': {
+        'short': 'drop thing',
+        'intro': 'Enter number of direction to which you want to drop thing.',
+        'long': 'Drop currently carried thing by entering the target direction index.  Enter nothing to return to play mode..'
+    },
     'admin_thing_protect': {
         'short': 'change thing protection',
         'intro': '@ enter thing protection character:',
@@ -244,11 +251,11 @@ let key_descriptions = {
     'help': 'help',
     'flatten': 'flatten surroundings',
     'teleport': 'teleport',
-    'drop_thing': 'drop thing',
     'door': 'open/close',
     'consume': 'consume',
     'install': '(un-)install',
     'wear': '(un-)wear',
+    'spin': 'spin',
     'toggle_map_mode': 'toggle map view',
     'toggle_tile_draw': 'toggle protection character drawing',
     'hex_move_upleft': 'up-left',
@@ -447,7 +454,6 @@ let server = {
         this.url = url;
         this.websocket = new WebSocket(this.url);
         this.websocket.onopen = function(event) {
-            server.connected = true;
             game.thing_types = {};
             game.terrains = {};
             server.send(['TASKS']);
@@ -457,7 +463,6 @@ let server = {
             tui.switch_mode('login');
         };
         this.websocket.onclose = function(event) {
-            server.connected = false;
             tui.switch_mode('waiting_for_server');
             tui.log_msg("@ server disconnected :(");
         };
@@ -485,6 +490,7 @@ let server = {
             t.type_ = tokens[2];
             t.protection = tokens[3];
             t.portable = parseInt(tokens[5]);
+            t.commandable = parseInt(tokens[6]);
         } else if (tokens[0] === 'THING_NAME') {
             let t = game.get_thing(tokens[1], false);
             t.name_ = tokens[2];
@@ -502,11 +508,12 @@ let server = {
             tui.mode_write.legal = game.tasks.includes('WRITE');
             tui.mode_command_thing.legal = game.tasks.includes('WRITE');
             tui.mode_take_thing.legal = game.tasks.includes('PICK_UP');
+            tui.mode_drop_thing.legal = game.tasks.includes('DROP');
         } else if (tokens[0] === 'THING_TYPE') {
             game.thing_types[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'THING_CARRYING') {
             let t = game.get_thing(tokens[1], false);
-            t.carrying = true;
+            t.carrying = game.get_thing(tokens[2], false);
         } else if (tokens[0] === 'THING_INSTALLED') {
             let t = game.get_thing(tokens[1], false);
             t.installed = true;
@@ -523,11 +530,13 @@ let server = {
             game.map_control = tokens[1]
         } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
             game.turn_complete = true;
+            game.player = game.things[game.player_id];
+            explorer.info_cached = false;
             if (tui.mode.name == 'post_login_wait') {
                 tui.switch_mode('play');
+            } else {
+                tui.full_refresh();
             }
-            explorer.info_cached = false;
-            tui.full_refresh();
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);
         } else if (tokens[0] === 'REPLY') {
@@ -670,6 +679,7 @@ let tui = {
   mode_name_thing: new Mode('name_thing', true, true),
   mode_command_thing: new Mode('command_thing', true),
   mode_take_thing: new Mode('take_thing', true),
+  mode_drop_thing: new Mode('drop_thing', true),
   mode_enter_face: new Mode('enter_face', true),
   mode_admin_enter: new Mode('admin_enter', true),
   mode_admin: new Mode('admin'),
@@ -686,15 +696,16 @@ let tui = {
       'wear': 'WEAR',
       'command': 'COMMAND',
       'consume': 'INTOXICATE',
+      'spin': 'SPIN',
   },
   offset: [0,0],
   map_lines: [],
   selectables: [],
   init: function() {
       this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
-                                        "command_thing", "take_thing"]
-      this.mode_play.available_actions = ["move", "drop_thing", "teleport",
-                                          "door", "consume", "install", "wear"];
+                                        "command_thing", "take_thing", "drop_thing"]
+      this.mode_play.available_actions = ["move", "teleport", "door", "consume",
+                                          "wear", "spin"];
       this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
       this.mode_study.available_actions = ["toggle_map_mode", "move_explorer"];
       this.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
@@ -706,7 +717,8 @@ let tui = {
       this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                         "password", "chat", "study", "play",
                                         "admin_enter", "enter_face"]
-      this.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
+      this.mode_edit.available_actions = ["move", "flatten", "install",
+                                          "toggle_map_mode"]
       this.inputEl = document.getElementById("input");
       this.inputEl.focus();
       this.switch_mode('waiting_for_server');
@@ -752,29 +764,44 @@ let tui = {
       return game.tasks.includes(this.action_tasks[action]);
   },
   switch_mode: function(mode_name) {
+
+    function fail(msg, return_mode) {
+        tui.log_msg('? ' + msg);
+        terminal.blink_screen();
+        this.switch_mode(return_mode);
+    }
+
     if (this.mode && this.mode.name == 'control_tile_draw') {
         tui.log_msg('@ finished tile protection drawing.')
     }
     this.tile_draw = false;
+      if (mode_name == 'command_thing' && (!game.player.carrying
+                                           || !game.player.carrying.commandable)) {
+        return fail('not carrying anything commandable', 'play');
+    };
+    if (mode_name == 'take_thing' && game.player.carrying) {
+        return fail('already carrying something', 'play');
+    };
+    if (mode_name == 'drop_thing' && !game.player.carrying) {
+        return fail('not carrying anything droppable', 'play');
+    }
     if (mode_name == 'admin_enter' && this.is_admin) {
         mode_name = 'admin';
     } else if (['name_thing', 'admin_thing_protect'].includes(mode_name)) {
-        let player_position = game.things[game.player_id].position;
         let thing_id = null;
         for (let t_id in game.things) {
             if (t_id == game.player_id) {
                 continue;
             }
             let t = game.things[t_id];
-            if (player_position[0] == t.position[0] && player_position[1] == t.position[1]) {
+            if (game.player.position[0] == t.position[0]
+                && game.player.position[1] == t.position[1]) {
                 thing_id = t_id;
                 break;
             }
         }
         if (!thing_id) {
-            terminal.blink_screen();
-            this.log_msg('? not standing over thing');
-            return;
+            return fail('not standing over thing', 'fail');
         } else {
             this.selected_thing_id = thing_id;
         }
@@ -789,7 +816,7 @@ let tui = {
         this.inputEl.focus();
     }
     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;
+        explorer.position = game.player.position;
     }
     this.inputEl.value = "";
     this.restore_input_values();
@@ -826,9 +853,8 @@ let tui = {
         this.show_help = true;
     } else if (this.mode.name == 'take_thing') {
         this.log_msg("Portable things in reach for pick-up:");
-        const player = game.things[game.player_id];
-        const y = player.position[0]
-        const x = player.position[1]
+        const y = game.player.position[0]
+        const x = game.player.position[1]
         let select_range = [y.toString() + ':' + x.toString(),
                             (y + 0).toString() + ':' + (x - 1).toString(),
                             (y + 0).toString() + ':' + (x + 1).toString(),
@@ -849,16 +875,26 @@ let tui = {
             if (select_range.includes(t.position[0].toString()
                                       + ':' + t.position[1].toString())
                 && t.portable) {
-                this.selectables.push([t_id, t]);
+                this.selectables.push(t_id);
             }
         };
         if (this.selectables.length == 0) {
-            this.log_msg('none')
+            this.log_msg('none');
+            terminal.blink_screen();
+            this.switch_mode('play');
+            return;
         } else {
-            for (let [i, t] of this.selectables.entries()) {
-                this.log_msg(i + ': ' + explorer.get_thing_info(t[1]));
+            for (let [i, t_id] of this.selectables.entries()) {
+                const t = game.things[t_id];
+                this.log_msg(i + ': ' + explorer.get_thing_info(t));
             }
         }
+    } else if (this.mode.name == 'drop_thing') {
+        this.log_msg('Direction to drop thing to:');
+        this.selectables = ['HERE'].concat(Object.values(this.movement_keys));
+        for (let [i, direction] of this.selectables.entries()) {
+            this.log_msg(i + ': ' + direction);
+        };
     } else if (this.mode.name == 'command_thing') {
         server.send(['TASK:COMMAND', 'HELP']);
     } else if (this.mode.name == 'control_pw_pw') {
@@ -979,6 +1015,16 @@ let tui = {
       };
       this.full_refresh();
   },
+  pick_selectable: function(task_name) {
+      const i = parseInt(this.inputEl.value);
+      if (isNaN(i) || i < 0 || i >= this.selectables.length) {
+          tui.log_msg('? invalid index, aborted');
+      } else {
+          server.send(['TASK:' + task_name, tui.selectables[i]]);
+      }
+      this.inputEl.value = "";
+      this.switch_mode('play');
+  },
   draw_map: function() {
     if (!game.turn_complete && this.map_lines.length == 0) {
         return;
@@ -1000,8 +1046,9 @@ let tui = {
         };
         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 ';
+            for (const [coordinate, _] of Object.entries(explorer.annotations)) {
+                const yx = coordinate.split(',')
+                map_lines_split[yx[0]][yx[1]] = 'A ';
             }
         } else if (this.map_mode == 'terrain + things') {
             for (const p in game.portals) {
@@ -1038,11 +1085,10 @@ let tui = {
                 }
             };
         }
-        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]] = '??';
+            map_lines_split[game.player.position[0]][game.player.position[1]] = '??';
         }
         this.map_lines = []
         if (game.map_geometry == 'Square') {
@@ -1061,7 +1107,7 @@ let tui = {
             };
         }
         let window_center = [terminal.rows / 2, this.window_width / 2];
-        let center_position = [player.position[0], player.position[1]];
+        let center_position = [game.player.position[0], game.player.position[1]];
         if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
             center_position = [explorer.position[0], explorer.position[1]];
         }
@@ -1169,7 +1215,8 @@ let tui = {
       content += this.mode.list_available_modes();
       let start_x = 0;
       if (!this.mode.has_input_prompt) {
-          start_x = this.window_width
+          start_x = this.window_width;
+          this.draw_links = false;
       }
       terminal.drawBox(0, start_x, terminal.rows, this.window_width);
       let [lines, _] = this.msg_into_lines_of_width(content, this.window_width);
@@ -1196,6 +1243,7 @@ let tui = {
       }
   },
   full_refresh: function() {
+    this.draw_links = true;
     this.links = {};
     terminal.drawBox(0, 0, terminal.rows, terminal.cols);
     this.recalc_input_lines();
@@ -1216,6 +1264,9 @@ let tui = {
     if (this.show_help) {
         this.draw_help();
     }
+    if (!this.draw_links) {
+        this.links = {};
+    }
     terminal.refresh();
   }
 }
@@ -1283,9 +1334,8 @@ let game = {
         return target;
     },
     teleport: function() {
-        let player = this.get_thing(game.player_id);
-        if (player.position in this.portals) {
-            server.reconnect_to(this.portals[player.position]);
+        if (game.player.position in this.portals) {
+            server.reconnect_to(this.portals[game.player.position]);
         } else {
             terminal.blink_screen();
             tui.log_msg('? not standing on portal')
@@ -1428,11 +1478,12 @@ tui.inputEl.addEventListener('keydown', (event) => {
     if (event.key == 'Enter') {
         event.preventDefault();
     }
-    if (tui.mode.has_input_prompt && event.key == 'Enter'
-        && tui.inputEl.value.length == 0
-        && ['chat', 'command_thing', 'take_thing',
-            'admin_enter'].includes(tui.mode.name)) {
-        if (tui.mode.name != 'chat') {
+    if ((!tui.mode.is_intro && event.key == 'Escape')
+        || (tui.mode.has_input_prompt && event.key == 'Enter'
+            && tui.inputEl.value.length == 0
+            && ['chat', 'command_thing', 'take_thing', 'drop_thing',
+                'admin_enter'].includes(tui.mode.name))) {
+        if (!['chat', 'play', 'study', 'edit'].includes(tui.mode.name)) {
             tui.log_msg('@ aborted');
         }
         tui.switch_mode('play');
@@ -1456,19 +1507,12 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.inputEl.value = "";
         tui.switch_mode('edit');
     } else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
-        if (tui.task_action_on('command')) {
-            server.send(['TASK:COMMAND', tui.inputEl.value]);
-            tui.inputEl.value = "";
-        }
-    } else if (tui.mode.name == 'take_thing' && event.key == 'Enter') {
-        const i = parseInt(tui.inputEl.value);
-        if (isNaN(i) || i < 0 || i >= tui.selectables.length) {
-            tui.log_msg('? invalid index, aborted');
-        } else {
-            server.send(['TASK:PICK_UP', tui.selectables[i][0]]);
-        }
+        server.send(['TASK:COMMAND', tui.inputEl.value]);
         tui.inputEl.value = "";
-        tui.switch_mode('play');
+    } else if (tui.mode.name == 'take_thing' && event.key == 'Enter') {
+        tui.pick_selectable('PICK_UP');
+    } else if (tui.mode.name == 'drop_thing' && event.key == 'Enter') {
+        tui.pick_selectable('DROP');
     } else if (tui.mode.name == 'control_pw_pw' && event.key == 'Enter') {
         if (tui.inputEl.value.length == 0) {
             tui.log_msg('@ aborted');
@@ -1547,16 +1591,14 @@ tui.inputEl.addEventListener('keydown', (event) => {
     } else if (tui.mode.name == 'play') {
           if (tui.mode.mode_switch_on_key(event)) {
               null;
-          } else if (event.key === tui.keys.drop_thing && tui.task_action_on('drop_thing')) {
-              server.send(["TASK:DROP"]);
           } else if (event.key === tui.keys.consume && tui.task_action_on('consume')) {
               server.send(["TASK:INTOXICATE"]);
           } else if (event.key === tui.keys.door && tui.task_action_on('door')) {
               server.send(["TASK:DOOR"]);
-          } else if (event.key === tui.keys.install && tui.task_action_on('install')) {
-              server.send(["TASK:INSTALL"]);
           } else if (event.key === tui.keys.wear && tui.task_action_on('wear')) {
               server.send(["TASK:WEAR"]);
+          } else if (event.key === tui.keys.spin && tui.task_action_on('spin')) {
+              server.send(["TASK:SPIN"]);
           } else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
               server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
           } else if (event.key === tui.keys.teleport) {
@@ -1591,6 +1633,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
             server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
         } else if (event.key === tui.keys.flatten && tui.task_action_on('flatten')) {
             server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
+          } else if (event.key === tui.keys.install && tui.task_action_on('install')) {
+              server.send(["TASK:INSTALL", tui.password]);
         } else if (event.key == tui.keys.toggle_map_mode) {
             tui.toggle_map_mode();
         }
@@ -1622,13 +1666,13 @@ for (let key_selector of key_selectors) {
     }, false);
 }
 window.setInterval(function() {
-    if (server.connected) {
+    if (server.websocket.readyState == 1) {
         server.send(['PING']);
-    } else {
+    } else if (server.websocket.readyState != 0) {
         server.reconnect_to(server.url);
         tui.log_msg('@ attempting reconnect …')
     }
-}, 5000);
+}, 1000);
 window.setInterval(function() {
     let val = "?";
     let span_decoration = "none";
@@ -1664,9 +1708,6 @@ document.getElementById("toggle_map_mode").onclick = function() {
     tui.toggle_map_mode();
     tui.full_refresh();
 };
-document.getElementById("drop_thing").onclick = function() {
-    server.send(['TASK:DROP']);
-};
 document.getElementById("flatten").onclick = function() {
     server.send(['TASK:FLATTEN_SURROUNDINGS', tui.password]);
 };
@@ -1682,17 +1723,23 @@ document.getElementById("install").onclick = function() {
 document.getElementById("wear").onclick = function() {
     server.send(['TASK:WEAR']);
 };
+document.getElementById("spin").onclick = function() {
+    server.send(['TASK:SPIN']);
+};
 document.getElementById("teleport").onclick = function() {
     game.teleport();
 };
 for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
+    if (move_button.id.startsWith('key_')) {  // not a move button
+        continue;
+    };
     let direction = move_button.id.split('_')[2].toUpperCase();
     move_button.onclick = function() {
-        if (tui.mode.available_actions.includes("move")
-            || tui.mode.available_actions.includes("move_explorer")) {
+        if (tui.mode.available_actions.includes("move")) {
             server.send(['TASK:MOVE', direction]);
-        } else {
+        } else if (tui.mode.available_actions.includes("move_explorer")) {
             explorer.move(direction);
+            tui.full_refresh();
         };
     };
 };