X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=rogue_chat.html;h=d865516eaad3d93054f99e7611cda281f1a85964;hb=49741de058b5320f181c69894da6dbdac2a6fa8d;hp=cf82cf9e2ebf855c1104ad02a47ab1bb3dc53452;hpb=1f65215b70d2a8a255aa9327497b88b94c4b1f17;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index cf82cf9..d865516 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -49,32 +49,26 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
   <tr>
     <td><button id="switch_to_play">play mode</button></td>
     <td>
-      <table>
-        <tr>
-          <td><button id="take_thing">take thing</button></td>
-          <td><button id="switch_to_annotate">annotate tile</button></td>
-          <td><button id="switch_to_edit">change tile</button></td>
-          <td><button id="teleport">teleport</button></td>
-        </tr>
-        <tr>
-          <td><button id="drop_thing">drop thing</button></td>
-          <td><button id="flatten">flatten surroundings</button></td>
-          <td><button id="switch_to_password">change tile editing password</button></td>
-          <td><button id="switch_to_portal">edit portal link</button></td>
-        </tr>
-      </table>
+      <button id="take_thing">take thing</button>
+      <button id="teleport">teleport</button>
+      <button id="drop_thing">drop thing</button>
     </td>
   </tr>
+  <tr>
+    <td><button id="switch_to_edit">map edit mode</button></td>
+    <td>
+      <button id="switch_to_write">change tile</button>
+      <button id="flatten">flatten surroundings</button>
+      <button id="switch_to_password">change tile editing password</button>
+      <button id="switch_to_annotate">annotate tile</button>
+      <button id="switch_to_portal">edit portal link</button>
+    </td>
+  </tr>
+  <tr>
     <td><button id="switch_to_admin_enter">admin mode</button></td>
     <td>
-      <table>
-        <tr>
-          <td><button id="switch_to_control_pw_type">change tile control password</button></td>
-        </tr>
-        <tr>
-          <td><button id="switch_to_control_tile_type">change tiles control</button></td>
-        </tr>
-      </table>
+      <button id="switch_to_control_pw_type">change tile control password</button>
+      <button id="switch_to_control_tile_type">change tiles control</button>
     </td>
   <tr>
   </tr>
@@ -99,7 +93,8 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 <li><input id="key_switch_to_chat" type="text" value="t" />
 <li><input id="key_switch_to_play" type="text" value="p" />
 <li><input id="key_switch_to_study" type="text" value="?" />
-<li><input id="key_switch_to_edit" type="text" value="m" />
+<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_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" />
@@ -111,8 +106,8 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 </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': {
@@ -123,7 +118,11 @@ let mode_helps = {
         'short': 'study',
         'long': 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it.'},
     'edit': {
-        'short': 'terrain edit',
+        'short': 'map edit',
+        'long': 'This mode allows you to change the map in various ways.'
+    },
+    'write': {
+        'short': 'terrain write',
         'long': 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.'
     },
     'control_pw_type': {
@@ -392,7 +391,7 @@ let server = {
             };
         } else if (tokens[0] === 'TASKS') {
             game.tasks = tokens[1].split(',');
-            tui.mode_edit.legal = game.tasks.includes('WRITE');
+            tui.mode_write.legal = game.tasks.includes('WRITE');
         } else if (tokens[0] === 'THING_TYPE') {
             game.thing_types[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'TERRAIN') {
@@ -542,7 +541,8 @@ let tui = {
   mode_annotate: new Mode('annotate', true, true),
   mode_play: new Mode('play'),
   mode_study: new Mode('study', false, true),
-  mode_edit: new Mode('edit', false, false, false, true),
+  mode_write: new Mode('write', false, false, false, true),
+  mode_edit: new Mode('edit'),
   mode_control_pw_type: new Mode('control_pw_type',
                                   false, false, false, true),
   mode_portal: new Mode('portal', true, true),
@@ -554,14 +554,15 @@ let tui = {
                                    false, false, false, true),
   mode_control_tile_draw: new Mode('control_tile_draw'),
   init: function() {
-      this.mode_play.available_modes = ["chat", "study", "edit",
-                                        "annotate", "portal",
-                                        "password", "admin_enter"];
-      this.mode_study.available_modes = ["chat", "play", "admin_enter"];
-      this.mode_admin.available_modes = ["chat", "play", "study",
-                                         "control_pw_type",
-                                         "control_tile_type"];
-      this.mode_control_tile_draw.available_modes = ["admin_enter"];
+      this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+      this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
+      this.mode_admin.available_modes = ["control_pw_type",
+                                         "control_tile_type", "chat",
+                                         "study", "play", "edit"]
+      this.mode_control_tile_draw.available_modes = ["admin"]
+      this.mode_edit.available_modes = ["write", "annotate", "portal",
+                                        "password", "chat", "study", "play",
+                                        "admin_enter"]
       this.mode = this.mode_waiting_for_server;
       this.inputEl = document.getElementById("input");
       this.inputEl.focus();
@@ -627,7 +628,7 @@ let tui = {
         el.disabled = true;
     }
     document.getElementById("help").disabled = false;
-    if (this.mode.name == 'play' || this.mode.name == 'study' || this.mode.name == 'control_tile_draw') {
+    if (this.mode.name == 'play' || this.mode.name == 'study' || this.mode.name == 'control_tile_draw' || this.mode.name == 'edit') {
         for (const move_key of document.querySelectorAll('[id^="move_"]')) {
             move_key.disabled = false;
         }
@@ -641,6 +642,9 @@ let tui = {
     if (!this.mode.is_intro && this.mode.name != 'chat') {
         document.getElementById("switch_to_chat").disabled = false;
     }
+    if (!this.mode.is_intro && this.mode.name != 'edit') {
+        document.getElementById("switch_to_edit").disabled = false;
+    }
     if (!this.mode.is_intro && this.mode.name != 'admin' && this.mode.name != 'admin_enter') {
         document.getElementById("switch_to_admin_enter").disabled = false;
     }
@@ -657,17 +661,17 @@ let tui = {
         if (game.tasks.includes('DROP')) {
             document.getElementById("drop_thing").disabled = false;
         }
-        if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
-            document.getElementById("flatten").disabled = false;
-        }
         if (game.tasks.includes('MOVE')) {
         }
         document.getElementById("teleport").disabled = false;
+    } else if (this.mode.name == 'edit') {
+        if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
+            document.getElementById("flatten").disabled = false;
+        }
         document.getElementById("switch_to_annotate").disabled = false;
-        document.getElementById("switch_to_edit").disabled = false;
+        document.getElementById("switch_to_write").disabled = false;
         document.getElementById("switch_to_portal").disabled = false;
         document.getElementById("switch_to_password").disabled = false;
-        document.getElementById("switch_to_admin_enter").disabled = false;
     } else if (this.mode.name == 'admin') {
         document.getElementById("switch_to_control_pw_type").disabled = false;
         document.getElementById("switch_to_control_tile_type").disabled = false;
@@ -810,7 +814,8 @@ let tui = {
     } else if (this.map_mode == 'terrain') {
         for (const p in game.portals) {
             let coordinate = p.split(',')
-            map_lines_split[coordinate[0]][coordinate[1]] = 'P ';
+            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) {
@@ -934,13 +939,10 @@ let tui = {
               content += "[" + movement_keys_desc + "] – move player\n";
           }
           if (game.tasks.includes('PICK_UP')) {
-              content += "[" + this.keys.take_thing + "] – take thing under player\n";
+              content += "[" + this.keys.take_thing + "] – pick up thing\n";
           }
           if (game.tasks.includes('DROP')) {
-              content += "[" + this.keys.drop_thing + "] – drop carried thing\n";
-          }
-          if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
-              content += "[" + tui.keys.flatten + "] – flatten player's surroundings\n";
+              content += "[" + this.keys.drop_thing + "] – drop picked up thing\n";
           }
           content += "[" + tui.keys.teleport + "] – teleport to other space\n";
           content += '\n';
@@ -949,10 +951,17 @@ let tui = {
           content += '[' + movement_keys_desc + '] – move question mark\n';
           content += '[' + this.keys.toggle_map_mode + '] – toggle view between terrain, annotations, and password protection areas\n';
           content += '\n';
+      } else if (this.mode.name == 'edit') {
+          content += "Available actions:\n";
+          if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
+              content += "[" + tui.keys.flatten + "] – flatten player's surroundings\n";
+          }
+          content += '\n';
       } else 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 map edit mode\n';
           content += '/' + this.keys.switch_to_admin_enter + ' or /admin – switch to admin mode\n';
       }
       content += this.mode.list_available_modes();
@@ -1168,9 +1177,9 @@ tui.inputEl.addEventListener('input', (event) => {
             tui.inputEl.value = tui.inputEl.value.slice(0, max_length);
         };
         tui.recalc_input_lines();
-    } else if (tui.mode.name == 'edit' && tui.inputEl.value.length > 0) {
+    } else if (tui.mode.name == 'write' && tui.inputEl.value.length > 0) {
         server.send(["TASK:WRITE", tui.inputEl.value[0], tui.password]);
-        tui.switch_mode('play');
+        tui.switch_mode('edit');
     } else if (tui.mode.name == 'control_pw_type' && tui.inputEl.value.length > 0) {
         tui.tile_control_char = tui.inputEl.value[0];
         tui.switch_mode('control_pw_pw');
@@ -1206,16 +1215,16 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.switch_mode('admin');
     } else if (tui.mode.name == 'portal' && event.key == 'Enter') {
         explorer.set_portal(tui.inputEl.value);
-        tui.switch_mode('play');
+        tui.switch_mode('edit');
     } else if (tui.mode.name == 'annotate' && event.key == 'Enter') {
         explorer.annotate(tui.inputEl.value);
-        tui.switch_mode('play');
+        tui.switch_mode('edit');
     } else if (tui.mode.name == 'password' && event.key == 'Enter') {
         if (tui.inputEl.value.length == 0) {
             tui.inputEl.value = " ";
         }
         tui.password = tui.inputEl.value
-        tui.switch_mode('play');
+        tui.switch_mode('edit');
     } else if (tui.mode.name == 'admin_enter' && event.key == 'Enter') {
         server.send(['BECOME_ADMIN', tui.inputEl.value]);
         tui.switch_mode('play');
@@ -1227,6 +1236,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
                     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') {
@@ -1248,9 +1259,6 @@ 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.flatten
-                     && game.tasks.includes('FLATTEN_SURROUNDINGS')) {
-              server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
           } else if (event.key === tui.keys.take_thing
                      && game.tasks.includes('PICK_UP')) {
               server.send(["TASK:PICK_UP"]);
@@ -1262,12 +1270,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
               server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
           } else if (event.key === tui.keys.teleport) {
               game.teleport();
-          } else if (event.key === tui.keys.switch_to_portal) {
-              event.preventDefault();
-              tui.switch_mode('portal');
-          } else if (event.key === tui.keys.switch_to_annotate) {
-              event.preventDefault();
-              tui.switch_mode('annotate');
           };
     } else if (tui.mode.name == 'study') {
         if (tui.mode.mode_switch_on_key(event)) {
@@ -1293,6 +1295,16 @@ tui.inputEl.addEventListener('keydown', (event) => {
         if (tui.mode.mode_switch_on_key(event)) {
               null;
         };
+    } else if (tui.mode.name == 'edit') {
+        if (tui.mode.mode_switch_on_key(event)) {
+              null;
+        } else if (event.key in tui.movement_keys
+                   && game.tasks.includes('MOVE')) {
+            server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
+        } else if (event.key === tui.keys.flatten
+                   && game.tasks.includes('FLATTEN_SURROUNDINGS')) {
+            server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
+        }
     }
     tui.full_refresh();
 }, false);
@@ -1335,45 +1347,12 @@ document.getElementById("help").onclick = function() {
     tui.show_help = true;
     tui.full_refresh();
 };
-document.getElementById("switch_to_play").onclick = function() {
-    tui.switch_mode('play');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_study").onclick = function() {
-    tui.switch_mode('study');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_chat").onclick = function() {
-    tui.switch_mode('chat');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_password").onclick = function() {
-    tui.switch_mode('password');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_edit").onclick = function() {
-    tui.switch_mode('edit');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_annotate").onclick = function() {
-    tui.switch_mode('annotate');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_portal").onclick = function() {
-    tui.switch_mode('portal');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_admin_enter").onclick = function() {
-    tui.switch_mode('admin');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_control_pw_type").onclick = function() {
-    tui.switch_mode('control_pw_type');
-    tui.full_refresh();
-};
-document.getElementById("switch_to_control_tile_type").onclick = function() {
-    tui.switch_mode('control_tile_type');
-    tui.full_refresh();
+for (const switchEl  of document.querySelectorAll('[id^="switch_to_"]')) {
+    const mode = switchEl.id.slice("switch_to_".length);
+    switchEl.onclick = function() {
+        tui.switch_mode(mode);
+        tui.full_refresh();
+    }
 };
 document.getElementById("toggle_map_mode").onclick = function() {
     if (tui.map_mode == 'terrain') {