X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=blobdiff_plain;ds=sidebyside;f=rogue_chat.html;h=a28951a86711b79df84b8e8102d59c78c5ed96c0;hb=77d92cc43df05bebecde95f39074024f359ad1be;hp=3c6fe00851e7c8c2454fa49d49de170782c52508;hpb=c99f3476d21b7416d584c33bfe3b1010ada523e2;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 3c6fe00..a28951a 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -57,6 +57,8 @@ keyboard input/control: <span id="keyboard_control"></span>
       <button id="consume"></button>
       <button id="switch_to_command_thing"></button>
       <button id="teleport"></button>
+      <button id="install"></button>
+      <button id="wear"></button>
     </td>
   </tr>
   <tr>
@@ -68,6 +70,7 @@ keyboard input/control: <span id="keyboard_control"></span>
       <button id="switch_to_portal"></button>
       <button id="switch_to_name_thing"></button>
       <button id="switch_to_password"></button>
+      <button id="switch_to_enter_face"></button>
     </td>
   </tr>
   <tr>
@@ -99,6 +102,9 @@ keyboard input/control: <span id="keyboard_control"></span>
 <li>drop thing: <input id="key_drop_thing" type="text" value="u" />
 <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_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" />
 <li><input id="key_switch_to_play" type="text" value="p" />
@@ -121,7 +127,7 @@ keyboard input/control: <span id="keyboard_control"></span>
 <script>
 "use strict";
 let websocket_location = "wss://plomlompom.com/rogue_chat/";
-//let websocket_location = "ws://localhost:8001/";
+//let websocket_location = "ws://localhost:8000/";
 
 let mode_helps = {
     'play': {
@@ -150,7 +156,7 @@ let mode_helps = {
     },
     'take_thing': {
         'short': 'take thing',
-        'intro': '',
+        '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.'
     },
     'admin_thing_protect': {
@@ -158,6 +164,11 @@ let mode_helps = {
         'intro': '@ enter thing protection character:',
         'long': 'Change protection character for thing here.'
     },
+    'enter_face': {
+        'short': 'enter your face',
+        'intro': '@ enter face line (enter nothing to abort):',
+        'long': 'Draw your face as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
+    },
     'write': {
         'short': 'change terrain',
         'intro': '',
@@ -196,7 +207,7 @@ let mode_helps = {
     'chat': {
         'short': 'chat',
         'intro': '',
-        'long': '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:'
+        'long': '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:\n\n/nick NAME – re-name yourself to NAME'
     },
     'login': {
         'short': 'login',
@@ -236,6 +247,8 @@ let key_descriptions = {
     'drop_thing': 'drop thing',
     'door': 'open/close',
     'consume': 'consume',
+    'install': '(un-)install',
+    'wear': '(un-)wear',
     'toggle_map_mode': 'toggle map view',
     'toggle_tile_draw': 'toggle protection character drawing',
     'hex_move_upleft': 'up-left',
@@ -471,16 +484,19 @@ let server = {
             t.position = parser.parse_yx(tokens[1]);
             t.type_ = tokens[2];
             t.protection = tokens[3];
+            t.portable = parseInt(tokens[5]);
         } else if (tokens[0] === 'THING_NAME') {
             let t = game.get_thing(tokens[1], false);
-            if (t) {
-                t.name_ = tokens[2];
-            };
+            t.name_ = tokens[2];
+        } else if (tokens[0] === 'THING_FACE') {
+            let t = game.get_thing(tokens[1], false);
+            t.face = tokens[2];
+        } else if (tokens[0] === 'THING_HAT') {
+            let t = game.get_thing(tokens[1], false);
+            t.hat = tokens[2];
         } else if (tokens[0] === 'THING_CHAR') {
             let t = game.get_thing(tokens[1], false);
-            if (t) {
-                t.thing_char = tokens[2];
-            };
+            t.thing_char = tokens[2];
         } else if (tokens[0] === 'TASKS') {
             game.tasks = tokens[1].split(',');
             tui.mode_write.legal = game.tasks.includes('WRITE');
@@ -488,6 +504,12 @@ let server = {
             tui.mode_take_thing.legal = game.tasks.includes('PICK_UP');
         } 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;
+        } else if (tokens[0] === 'THING_INSTALLED') {
+            let t = game.get_thing(tokens[1], false);
+            t.installed = true;
         } else if (tokens[0] === 'TERRAIN') {
             game.terrains[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'MAP') {
@@ -648,6 +670,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_enter_face: new Mode('enter_face', true),
   mode_admin_enter: new Mode('admin_enter', true),
   mode_admin: new Mode('admin'),
   mode_control_pw_pw: new Mode('control_pw_pw', true),
@@ -659,17 +682,19 @@ let tui = {
       'drop_thing': 'DROP',
       'move': 'MOVE',
       'door': 'DOOR',
+      'install': 'INSTALL',
+      'wear': 'WEAR',
       'command': 'COMMAND',
       'consume': 'INTOXICATE',
   },
   offset: [0,0],
   map_lines: [],
+  selectables: [],
   init: function() {
-      this.mode_chat.available_modes = ["play", "study", "edit", "admin_enter"]
       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"];
+      this.mode_play.available_actions = ["move", "drop_thing", "teleport",
+                                          "door", "consume", "install", "wear"];
       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",
@@ -680,7 +705,7 @@ let tui = {
       this.mode_control_tile_draw.available_actions = ["toggle_tile_draw"];
       this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                         "password", "chat", "study", "play",
-                                        "admin_enter"]
+                                        "admin_enter", "enter_face"]
       this.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
       this.inputEl = document.getElementById("input");
       this.inputEl.focus();
@@ -800,22 +825,38 @@ let tui = {
     } else if (this.mode.is_single_char_entry) {
         this.show_help = true;
     } else if (this.mode.name == 'take_thing') {
-        this.log_msg("selectable things:");
+        this.log_msg("Portable things in reach for pick-up:");
         const player = game.things[game.player_id];
-        let selectables = [];
+        const y = player.position[0]
+        const x = player.position[1]
+        let select_range = [y.toString() + ':' + x.toString(),
+                            (y + 0).toString() + ':' + (x - 1).toString(),
+                            (y + 0).toString() + ':' + (x + 1).toString(),
+                            (y - 1).toString() + ':' + (x).toString(),
+                            (y + 1).toString() + ':' + (x).toString()];
+        if (game.map_geometry == 'Hex') {
+            if (y % 2) {
+                select_range.push((y - 1).toString() + ':' + (x + 1).toString());
+                select_range.push((y + 1).toString() + ':' + (x + 1).toString());
+            } else {
+                select_range.push((y - 1).toString() + ':' + (x - 1).toString());
+                select_range.push((y + 1).toString() + ':' + (x - 1).toString());
+            }
+        };
+        this.selectables = [];
         for (const t_id in game.things) {
             const t = game.things[t_id];
-            if (t.position[0] == player.position[0]
-                && t.position[1] == player.position[1]
-                && t != player && t.type_ != 'Player') {
-                selectables.push([t_id, t]);
+            if (select_range.includes(t.position[0].toString()
+                                      + ':' + t.position[1].toString())
+                && t.portable) {
+                this.selectables.push([t_id, t]);
             }
         };
-        if (selectables.length == 0) {
+        if (this.selectables.length == 0) {
             this.log_msg('none')
         } else {
-            for (const t of selectables) {
-                this.log_msg(t[0] + ' ' + explorer.get_thing_info(t[1]));
+            for (let [i, t] of this.selectables.entries()) {
+                this.log_msg(i + ': ' + explorer.get_thing_info(t[1]));
             }
         }
     } else if (this.mode.name == 'command_thing') {
@@ -978,6 +1019,9 @@ let tui = {
                 if (used_positions.includes(t.position.toString())) {
                     meta_char = '+';
                 };
+                if (t.carrying) {
+                    meta_char = '$';
+                }
                 map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
                 used_positions.push(t.position.toString());
             }
@@ -1032,7 +1076,7 @@ let tui = {
     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++) {
+    for (; term_y < terminal.rows && map_y < this.map_lines.length; term_y++, map_y++) {
         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);
     }
@@ -1103,13 +1147,7 @@ let tui = {
           movement_keys_desc = Object.keys(this.movement_keys).join(',');
       }
       let content = this.mode.short_desc + " help\n\n" + this.mode.help_intro + "\n\n";
-      if (this.mode.name == 'chat') {
-          content += '/nick NAME – re-name yourself to NAME\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';
-          content += '/' + this.keys.switch_to_edit + ' or /edit – switch to world edit mode\n';
-          content += '/' + this.keys.switch_to_admin_enter + ' or /admin – switch to admin mode\n';
-      } else if (this.mode.available_actions.length > 0) {
+      if (this.mode.available_actions.length > 0) {
           content += "Available actions:\n";
           for (let action of this.mode.available_actions) {
               if (Object.keys(this.action_tasks).includes(action)) {
@@ -1297,17 +1335,6 @@ let explorer = {
         if (game.fov[position_i] != '.') {
             info_to_cache += 'outside field of view';
         } else {
-            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]) {
@@ -1317,8 +1344,29 @@ let explorer = {
                          protection = 'none';
                      }
                      info_to_cache += " / protection: " + protection + "\n";
+                     if (t.hat) {
+                         info_to_cache += t.hat.slice(0, 6) + '\n';
+                         info_to_cache += t.hat.slice(6, 12) + '\n';
+                         info_to_cache += t.hat.slice(12, 18) + '\n';
+                     }
+                     if (t.face) {
+                         info_to_cache += t.face.slice(0, 6) + '\n';
+                         info_to_cache += t.face.slice(6, 12) + '\n';
+                         info_to_cache += t.face.slice(12, 18) + '\n';
+                     }
                  }
             }
+            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';
             if (this.position in game.portals) {
                 info_to_cache += "PORTAL: " + game.portals[this.position] + "\n";
             }
@@ -1332,12 +1380,15 @@ let explorer = {
     get_thing_info: function(t) {
         const symbol = game.thing_types[t.type_];
         let info = t.type_ + " / " + symbol;
-         if (t.thing_char) {
-             info += t.thing_char;
-         };
-         if (t.name_) {
-             info += " (" + t.name_ + ")";
-         }
+        if (t.thing_char) {
+            info += t.thing_char;
+        };
+        if (t.name_) {
+            info += " (" + t.name_ + ")";
+        }
+        if (t.installed) {
+            info += " / installed";
+        }
         return info;
     },
     annotate: function(msg) {
@@ -1377,7 +1428,15 @@ tui.inputEl.addEventListener('keydown', (event) => {
     if (event.key == 'Enter') {
         event.preventDefault();
     }
-    if (tui.mode.has_input_prompt && event.key == 'Enter' && tui.inputEl.value == '/help') {
+    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') {
+            tui.log_msg('@ aborted');
+        }
+        tui.switch_mode('play');
+    } else if (tui.mode.has_input_prompt && event.key == 'Enter' && tui.inputEl.value == '/help') {
         tui.show_help = true;
         tui.inputEl.value = "";
         tui.restore_input_values();
@@ -1388,19 +1447,25 @@ 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 == 'enter_face' && event.key == 'Enter') {
+        if (tui.inputEl.value.length != 18) {
+            tui.log_msg('? wrong input length, aborting');
+        } else {
+            server.send(['PLAYER_FACE', tui.inputEl.value]);
+        }
+        tui.inputEl.value = "";
+        tui.switch_mode('edit');
     } 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')) {
+        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') {
-        if (tui.inputEl.value.length == 0) {
-            tui.log_msg('@ aborted');
+        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.inputEl.value]);
+            server.send(['TASK:PICK_UP', tui.selectables[i][0]]);
         }
         tui.inputEl.value = "";
         tui.switch_mode('play');
@@ -1463,15 +1528,7 @@ tui.inputEl.addEventListener('keydown', (event) => {
         let tokens = parser.tokenize(tui.inputEl.value);
         if (tokens.length > 0 && tokens[0].length > 0) {
             if (tui.inputEl.value[0][0] == '/') {
-                if (tokens[0].slice(1) == 'play' || tokens[0][1] == tui.keys.switch_to_play) {
-                    tui.switch_mode('play');
-                } else if (tokens[0].slice(1) == 'study' || tokens[0][1] == tui.keys.switch_to_study) {
-                    tui.switch_mode('study');
-                } else if (tokens[0].slice(1) == 'edit' || tokens[0][1] == tui.keys.switch_to_edit) {
-                    tui.switch_mode('edit');
-                } else if (tokens[0].slice(1) == 'admin' || tokens[0][1] == tui.keys.switch_to_admin_enter) {
-                    tui.switch_mode('admin_enter');
-                } else if (tokens[0].slice(1) == 'nick') {
+                if (tokens[0].slice(1) == 'nick') {
                     if (tokens.length > 1) {
                         server.send(['NICK', tokens[1]]);
                     } else {
@@ -1496,6 +1553,10 @@ tui.inputEl.addEventListener('keydown', (event) => {
               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 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) {
@@ -1615,17 +1676,23 @@ document.getElementById("door").onclick = function() {
 document.getElementById("consume").onclick = function() {
     server.send(['TASK:INTOXICATE']);
 };
+document.getElementById("install").onclick = function() {
+    server.send(['TASK:INSTALL']);
+};
+document.getElementById("wear").onclick = function() {
+    server.send(['TASK:WEAR']);
+};
 document.getElementById("teleport").onclick = function() {
     game.teleport();
 };
 for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
     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();
         };
     };
 };