X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=rogue_chat.html;h=0c0cb307c65366d9ff1d6ec0de0c45f55230bf6f;hb=51addf32b5a876c47325fb55756aacaea65ed0da;hp=3d17c5a32e172fc8917d3e150827b8bcccec5e37;hpb=118102d4306465cfc3215c142c8d13ecff033710;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 3d17c5a..0c0cb30 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -196,7 +196,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',
@@ -488,6 +488,11 @@ 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);
+            if (t) {
+                t.carrying = true;
+            };
         } else if (tokens[0] === 'TERRAIN') {
             game.terrains[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'MAP') {
@@ -666,7 +671,6 @@ let tui = {
   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",
@@ -995,6 +999,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());
             }
@@ -1120,13 +1127,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)) {
@@ -1394,7 +1395,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();
@@ -1406,23 +1415,16 @@ tui.inputEl.addEventListener('keydown', (event) => {
         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')) {
+        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 {
-            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:PICK_UP', tui.selectables[i][0]]);
         }
         tui.inputEl.value = "";
         tui.switch_mode('play');
@@ -1485,15 +1487,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 {