X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=inline;f=rogue_chat_nocanvas_monochrome.html;h=7928e2412f8b6c2acfd3006dad58bb0c164a0e95;hb=3ffed06ffef414e46ba5655316c1f60afaa95fa5;hp=0299d6ca771f46216632ff56a97695e9bb9d47ae;hpb=63170d5dd0c58026021d5fb747c596bead34417d;p=plomrogue2

diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index 0299d6c..7928e24 100644
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -29,7 +29,9 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 <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>
-<button id="toggle_map_mode">toggle terrain/control view</button>
+<button id="toggle_map_mode">toggle terrain/annotations/control view</button>
+<button id="switch_to_admin">become admin</button>
+<button id="switch_to_control_pw_type">change tile control password</button>
 </div>
 <h3>edit keybindings</h3> (see <a href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a> for non-obvious available values):<br />
 <ul>
@@ -53,14 +55,71 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 <li>switch to study mode: <input id="key_switch_to_study" type="text" value="?" />
 <li>edit tile (from play mode): <input id="key_switch_to_edit" type="text" value="m" />
 <li>enter tile password (from play mode): <input id="key_switch_to_password" type="text" value="P" />
+<li>enter admin password (from play mode): <input id="key_switch_to_admin" type="text" value="A" />
+<li>change tile control password (from play mode): <input id="key_switch_to_control_pw_type" type="text" value="C" />
 <li>annotate tile (from play mode): <input id="key_switch_to_annotate" type="text" value="M" />
 <li>annotate portal (from play mode): <input id="key_switch_to_portal" type="text" value="T" />
-<li>toggle terrain/control view (from study mode): <input id="key_toggle_map_mode" type="text" value="M" />
+<li>toggle terrain/annotations/control view (from study mode): <input id="key_toggle_map_mode" type="text" value="M" />
 </ul>
 </div>
 <script>
 "use strict";
 let websocket_location = "wss://plomlompom.com/rogue_chat/";
+//let websocket_location = "ws://localhost:8000/";
+
+let mode_helps = {
+    'play': {
+        'short': 'play',
+        'long': 'This mode allows you to interact with the map.'
+    },
+    'study': {
+        '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',
+        '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': {
+        'short': 'change tile control password',
+        'long': 'This mode is the first of two steps to change the password for a tile control character.  First enter the tile control character for which you want to change the password!'
+    },
+    'control_pw_pw': {
+        'short': '',
+        'long': 'This mode is the second of two steps to change the password for a tile control character.  Enter the new password for the tile control character you chose.'
+    },
+    'annotate': {
+        'short': 'annotation',
+        'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.'
+    },
+    'portal': {
+        'short': 'edit portal',
+        'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.'
+    },
+    'chat': {
+        'short': 'chat mode',
+        '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:'
+    },
+    'login': {
+        'short': '',
+        'long': 'Pick your player name.'
+    },
+    'waiting_for_server': {
+        'short': '',
+        'long': 'Waiting for a server response.'
+    },
+    'post_login_wait': {
+        'short': '',
+        'long': 'Waiting for a server response.'
+    },
+    'password': {
+        'short': 'password input',
+        'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles.  Hit return to confirm and leave.'
+    },
+    'admin': {
+        'short': 'become admin',
+        'long': 'This mode allows you to become admin if you know an admin password.'
+    }
+}
 
 let rows_selector = document.getElementById("n_rows");
 let cols_selector = document.getElementById("n_cols");
@@ -202,11 +261,11 @@ let server = {
             server.send(['TERRAINS']);
             server.send(['THING_TYPES']);
             tui.log_msg("@ server connected! :)");
-            tui.switch_mode(mode_login);
+            tui.switch_mode('login');
         };
         this.websocket.onclose = function(event) {
             server.connected = false;
-            tui.switch_mode(mode_waiting_for_server);
+            tui.switch_mode('waiting_for_server');
             tui.log_msg("@ server disconnected :(");
         };
 	    this.websocket.onmessage = this.handle_event;
@@ -222,6 +281,7 @@ let server = {
         let tokens = parser.tokenize(event.data);
         if (tokens[0] === 'TURN') {
             game.turn_complete = false;
+            explorer.empty_info_db();
             game.things = {};
             game.portals = {};
             game.turn = parseInt(tokens[1]);
@@ -240,7 +300,8 @@ let server = {
                 t.player_char = tokens[2];
             };
         } else if (tokens[0] === 'TASKS') {
-            game.tasks = tokens[1].split(',')
+            game.tasks = tokens[1].split(',');
+            tui.mode_edit.legal = game.tasks.includes('WRITE');
         } else if (tokens[0] === 'THING_TYPE') {
             game.thing_types[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'TERRAIN') {
@@ -256,10 +317,9 @@ let server = {
             game.map_control = tokens[1]
         } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
             game.turn_complete = true;
-            explorer.empty_info_db();
-            if (tui.mode == mode_post_login_wait) {
-                tui.switch_mode(mode_play);
-            } else if (tui.mode == mode_study) {
+            if (tui.mode.name == 'post_login_wait') {
+                tui.switch_mode('play');
+            } else if (tui.mode.name == 'study') {
                 explorer.query_info();
             }
             tui.full_refresh();
@@ -269,13 +329,18 @@ let server = {
             game.player_id = parseInt(tokens[1]);
         } else if (tokens[0] === 'LOGIN_OK') {
             this.send(['GET_GAMESTATE']);
-            tui.switch_mode(mode_post_login_wait);
+            tui.switch_mode('post_login_wait');
         } 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]);
+            tui.restore_input_values();
+            tui.full_refresh();
         } else if (tokens[0] === 'UNHANDLED_INPUT') {
             tui.log_msg('? unknown command');
         } else if (tokens[0] === 'PLAY_ERROR') {
@@ -319,27 +384,50 @@ let unparser = {
 }
 
 class Mode {
-    constructor(name, help_intro, has_input_prompt=false, shows_info=false, is_intro=false) {
+    constructor(name, has_input_prompt=false, shows_info=false,
+                is_intro=false, is_single_char_entry=false) {
         this.name = name;
+        this.short_desc = mode_helps[name].short;
+        this.available_modes = [];
         this.has_input_prompt = has_input_prompt;
         this.shows_info= shows_info;
         this.is_intro = is_intro;
-        this.help_intro = help_intro;
+        this.help_intro = mode_helps[name].long;
+        this.is_single_char_entry = is_single_char_entry;
+        this.legal = true;
+    }
+    *iter_available_modes() {
+        for (let mode_name of this.available_modes) {
+            let mode = tui['mode_' + mode_name];
+            if (!mode.legal) {
+                continue;
+            }
+            let key = tui.keys['switch_to_' + mode.name];
+            yield [mode, key]
+        }
+    }
+    list_available_modes() {
+        let msg = ''
+        if (this.available_modes.length > 0) {
+            msg += 'Other modes available from here:\n';
+            for (let [mode, key] of this.iter_available_modes()) {
+                msg += '[' + key + '] – ' + mode.short_desc + '\n';
+            }
+        }
+        return msg;
+    }
+    mode_switch_on_key(key_event) {
+        for (let [mode, key] of this.iter_available_modes()) {
+            if (key_event.key == key) {
+                event.preventDefault();
+                tui.switch_mode(mode.name);
+                return true;
+            };
+        }
+        return false;
     }
 }
-let mode_waiting_for_server = new Mode('waiting_for_server', 'Waiting for a server response.', false, false, true);
-let mode_login = new Mode('login', 'Pick your player name.', true, false, true);
-let mode_post_login_wait = new Mode('waiting for game world', 'Waiting for a server response.', false, false, true);
-let mode_chat = new Mode('chat', '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:', true, false);
-  let mode_annotate = new Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.', true, true);
-let mode_play = new Mode('play', 'This mode allows you to interact with the map.', false, false);
-let mode_study = new Mode('study', '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.', false, true);
-let mode_edit = new Mode('edit', '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.', false, false);
-let mode_portal = new Mode('portal', 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.', true, true);
-let mode_password = new Mode('password', 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles.  Hit return to confirm and leave.', true, false, false);
-
 let tui = {
-  mode: mode_waiting_for_server,
   log: [],
   input_prompt: '> ',
   input_lines: [],
@@ -349,7 +437,28 @@ let tui = {
   height_input: 1,
   password: 'foo',
   show_help: false,
+  mode_waiting_for_server: new Mode('waiting_for_server',
+                                     false, false, true),
+  mode_login: new Mode('login', true, false, true),
+  mode_post_login_wait: new Mode('post_login_wait'),
+  mode_chat: new Mode('chat', true),
+  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_control_pw_type: new Mode('control_pw_type',
+                                  false, false, false, true),
+  mode_portal: new Mode('portal', true, true),
+  mode_password: new Mode('password', true),
+  mode_admin: new Mode('admin', true),
+  mode_control_pw_pw: new Mode('control_pw_pw', true),
   init: function() {
+      this.mode_play.available_modes = ["chat", "study", "edit",
+                                        "annotate", "portal",
+                                        "password", "admin",
+                                        "control_pw_type"]
+      this.mode_study.available_modes = ["chat", "play"]
+      this.mode = this.mode_waiting_for_server;
       this.inputEl = document.getElementById("input");
       this.inputEl.focus();
       this.recalc_input_lines();
@@ -379,14 +488,14 @@ let tui = {
         };
     };
   },
-  switch_mode: function(mode) {
+  switch_mode: function(mode_name) {
     this.inputEl.focus();
-    this.show_help = false;
     this.map_mode = 'terrain';
-    if (mode.shows_info && game.player_id in game.things) {
+    this.mode = this['mode_' + mode_name];
+    if (this.mode.shows_info && game.player_id in game.things) {
       explorer.position = game.things[game.player_id].position;
+      explorer.query_info();
     }
-    this.mode = mode;
     this.empty_input();
     this.restore_input_values();
     document.getElementById("take_thing").disabled = true;
@@ -401,6 +510,8 @@ let tui = {
     document.getElementById("switch_to_portal").disabled = true;
     document.getElementById("switch_to_annotate").disabled = true;
     document.getElementById("switch_to_password").disabled = true;
+    document.getElementById("switch_to_admin").disabled = true;
+    document.getElementById("switch_to_control_pw_type").disabled = true;
     document.getElementById("move_left").disabled = true;
     document.getElementById("move_upleft").disabled = true;
     document.getElementById("move_up").disabled = true;
@@ -409,7 +520,7 @@ let tui = {
     document.getElementById("move_down").disabled = true;
     document.getElementById("move_downright").disabled = true;
     document.getElementById("move_right").disabled = true;
-    if (mode == mode_play || mode == mode_study) {
+    if (this.mode.name == 'play' || this.mode.name == 'study') {
         document.getElementById("move_left").disabled = false;
         document.getElementById("move_right").disabled = false;
         if (game.map_geometry == 'Hex') {
@@ -422,22 +533,22 @@ let tui = {
             document.getElementById("move_down").disabled = false;
         }
     }
-    if (!mode.is_intro && mode != mode_play) {
+    if (!this.mode.is_intro && this.mode.name != 'play') {
         document.getElementById("switch_to_play").disabled = false;
     }
-    if (!mode.is_intro && mode != mode_study) {
+    if (!this.mode.is_intro && this.mode.name != 'study') {
         document.getElementById("switch_to_study").disabled = false;
     }
-    if (!mode.is_intro && mode != mode_chat) {
+    if (!this.mode.is_intro && this.mode.name != 'chat') {
         document.getElementById("switch_to_chat").disabled = false;
     }
-    if (mode == mode_login) {
+    if (this.mode.name == 'login') {
         if (this.login_name) {
             server.send(['LOGIN', this.login_name]);
         } else {
             this.log_msg("? need login name");
         }
-    } else if (mode == mode_play) {
+    } else if (this.mode.name == 'play') {
         if (game.tasks.includes('PICK_UP')) {
             document.getElementById("take_thing").disabled = false;
         }
@@ -454,25 +565,31 @@ let tui = {
         document.getElementById("switch_to_edit").disabled = false;
         document.getElementById("switch_to_portal").disabled = false;
         document.getElementById("switch_to_password").disabled = false;
-    } else if (mode == mode_study) {
+        document.getElementById("switch_to_admin").disabled = false;
+        document.getElementById("switch_to_control_pw_type").disabled = false;
+    } else if (this.mode.name == 'study') {
         document.getElementById("toggle_map_mode").disabled = false;
-    } else if (mode == mode_edit) {
+    } else if (this.mode.is_single_char_entry) {
         this.show_help = true;
+    } else if (this.mode.name == 'admin') {
+        this.log_msg('@ enter admin password:')
+    } else if (this.mode.name == 'control_pw_pw') {
+        this.log_msg('@ enter tile control password for "' + this.tile_control_char + '":');
     }
     this.full_refresh();
   },
   restore_input_values: function() {
-      if (this.mode == mode_annotate && explorer.position in explorer.info_db) {
+      if (this.mode.name == 'annotate' && explorer.position in explorer.info_db) {
           let info = explorer.info_db[explorer.position];
           if (info != "(none)") {
               this.inputEl.value = info;
               this.recalc_input_lines();
           }
-      } else if (this.mode == mode_portal && explorer.position in game.portals) {
+      } else if (this.mode.name == 'portal' && explorer.position in game.portals) {
           let portal = game.portals[explorer.position]
           this.inputEl.value = portal;
           this.recalc_input_lines();
-      } else if (this.mode == mode_password) {
+      } else if (this.mode.name == 'password') {
           this.inputEl.value = this.password;
           this.recalc_input_lines();
       }
@@ -528,7 +645,11 @@ let tui = {
         line.push(map_content[i] + ' ');
     };
     map_lines_split.push(line);
-    if (this.map_mode == 'terrain') {
+    if (this.map_mode == 'annotations') {
+        for (const coordinate of explorer.info_hints) {
+            map_lines_split[coordinate[0]][coordinate[1]] = 'A ';
+        }
+    } else if (this.map_mode == 'terrain') {
         for (const p in game.portals) {
             let coordinate = p.split(',')
             map_lines_split[coordinate[0]][coordinate[1]] = 'P ';
@@ -626,7 +747,7 @@ let tui = {
   draw_help: function() {
       let movement_keys_desc = Object.keys(this.movement_keys).join(',');
       let content = this.mode.name + " mode help\n\n" + this.mode.help_intro + "\n\n";
-      if (this.mode == mode_play) {
+      if (this.mode.name == 'play') {
           content += "Available actions:\n";
           if (game.tasks.includes('MOVE')) {
               content += "[" + movement_keys_desc + "] – move player\n";
@@ -641,25 +762,18 @@ let tui = {
               content += "[" + tui.keys.flatten + "] – flatten player's surroundings\n";
           }
           content += "[" + tui.keys.teleport + "] – teleport to other space\n";
-          content += '\nOther modes available from here:\n';
-          content += '[' + this.keys.switch_to_chat + '] – chat mode\n';
-          content += '[' + this.keys.switch_to_study + '] – study mode\n';
-          content += '[' + this.keys.switch_to_edit + '] – terrain edit mode\n';
-          content += '[' + this.keys.switch_to_portal + '] – portal edit mode\n';
-          content += '[' + this.keys.switch_to_annotate + '] – annotation mode\n';
-          content += '[' + this.keys.switch_to_password + '] – password input mode\n';
-      } else if (this.mode == mode_study) {
+          content += '\n';
+      } else if (this.mode.name == 'study') {
           content += "Available actions:\n";
           content += '[' + movement_keys_desc + '] – move question mark\n';
-          content += '[' + this.keys.toggle_map_mode + '] – toggle view between terrain, and password protection areas\n';
-          content += '\nOther modes available from here:\n';
-          content += '[' + this.keys.switch_to_chat + '] – chat mode\n';
-          content += '[' + this.keys.switch_to_play + '] – play mode\n';
-      } else if (this.mode == mode_chat) {
+          content += '[' + this.keys.toggle_map_mode + '] – toggle view between terrain, annotations, and password protection areas\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.mode.list_available_modes();
       let start_x = 0;
       if (!this.mode.has_input_prompt) {
           start_x = this.window_width
@@ -776,6 +890,7 @@ server.init(websocket_location);
 let explorer = {
     position: [0,0],
     info_db: {},
+    info_hints: [],
     move: function(direction) {
         let target = game.move(this.position, direction);
         if (target) {
@@ -787,13 +902,14 @@ let explorer = {
     },
     update_info_db: function(yx, str) {
         this.info_db[yx] = str;
-        if (tui.mode == mode_study) {
+        if (tui.mode.name == 'study') {
             tui.full_refresh();
         }
     },
     empty_info_db: function() {
         this.info_db = {};
-        if (tui.mode == mode_study) {
+        this.info_hints = [];
+        if (tui.mode.name == 'study') {
             tui.full_refresh();
         }
     },
@@ -812,6 +928,11 @@ let explorer = {
             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]) {
@@ -857,9 +978,12 @@ tui.inputEl.addEventListener('input', (event) => {
             tui.inputEl.value = tui.inputEl.value.slice(0, max_length);
         };
         tui.recalc_input_lines();
-    } else if (tui.mode == mode_edit && tui.inputEl.value.length > 0) {
+    } else if (tui.mode.name == 'edit' && tui.inputEl.value.length > 0) {
         server.send(["TASK:WRITE", tui.inputEl.value[0], tui.password]);
-        tui.switch_mode(mode_play);
+        tui.switch_mode('play');
+    } 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');
     }
     tui.full_refresh();
 }, false);
@@ -872,32 +996,44 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.show_help = true;
         tui.empty_input();
         tui.restore_input_values();
-    } else if (!tui.mode.has_input_prompt && event.key == tui.keys.help) {
+    } else if (!tui.mode.has_input_prompt && event.key == tui.keys.help
+               && !tui.mode.is_single_char_entry) {
         tui.show_help = true;
-    } else if (tui.mode == mode_login && event.key == 'Enter') {
+    } else if (tui.mode.name == 'login' && event.key == 'Enter') {
         tui.login_name = tui.inputEl.value;
         server.send(['LOGIN', tui.inputEl.value]);
         tui.empty_input();
-    } else if (tui.mode == mode_portal && event.key == 'Enter') {
+    } else if (tui.mode.name == 'control_pw_pw' && event.key == 'Enter') {
+        if (tui.inputEl.value.length == 0) {
+            tui.log_msg('@ aborted');
+        } else {
+            server.send(['SET_MAP_CONTROL_PASSWORD',
+                        tui.tile_control_char, tui.inputEl.value]);
+        }
+        tui.switch_mode('play');
+    } else if (tui.mode.name == 'portal' && event.key == 'Enter') {
         explorer.set_portal(tui.inputEl.value);
-        tui.switch_mode(mode_play);
-    } else if (tui.mode == mode_annotate && event.key == 'Enter') {
+        tui.switch_mode('play');
+    } else if (tui.mode.name == 'annotate' && event.key == 'Enter') {
         explorer.annotate(tui.inputEl.value);
-        tui.switch_mode(mode_play);
-    } else if (tui.mode == mode_password && event.key == 'Enter') {
+        tui.switch_mode('play');
+    } 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(mode_play);
-    } else if (tui.mode == mode_chat && event.key == 'Enter') {
-        let [tokens, token_starts] = parser.tokenize(tui.inputEl.value);
+        tui.switch_mode('play');
+    } else if (tui.mode.name == 'admin' && event.key == 'Enter') {
+        server.send(['BECOME_ADMIN', tui.inputEl.value]);
+        tui.switch_mode('play');
+    } else if (tui.mode.name == 'chat' && event.key == 'Enter') {
+        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(mode_play);
+                    tui.switch_mode('play');
                 } else if (tokens[0].slice(1) == 'study' || tokens[0][1] == tui.keys.switch_to_study) {
-                    tui.switch_mode(mode_study);
+                    tui.switch_mode('study');
                 } else if (tokens[0].slice(1) == 'nick') {
                     if (tokens.length > 1) {
                         server.send(['NICK', tokens[1]]);
@@ -914,19 +1050,9 @@ tui.inputEl.addEventListener('keydown', (event) => {
 	        server.send(['ALL', tui.inputEl.value]);
         }
         tui.empty_input();
-    } else if (tui.mode == mode_play) {
-          if (event.key === tui.keys.switch_to_chat) {
-              event.preventDefault();
-              tui.switch_mode(mode_chat);
-          } else if (event.key === tui.keys.switch_to_edit
-                     && game.tasks.includes('WRITE')) {
-              event.preventDefault();
-              tui.switch_mode(mode_edit);
-          } else if (event.key === tui.keys.switch_to_study) {
-              tui.switch_mode(mode_study);
-          } else if (event.key === tui.keys.switch_to_password) {
-              event.preventDefault();
-              tui.switch_mode(mode_password);
+    } 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]);
@@ -943,21 +1069,22 @@ tui.inputEl.addEventListener('keydown', (event) => {
               game.teleport();
           } else if (event.key === tui.keys.switch_to_portal) {
               event.preventDefault();
-              tui.switch_mode(mode_portal);
+              tui.switch_mode('portal');
           } else if (event.key === tui.keys.switch_to_annotate) {
               event.preventDefault();
-              tui.switch_mode(mode_annotate);
+              tui.switch_mode('annotate');
           };
-    } else if (tui.mode == mode_study) {
-        if (event.key === tui.keys.switch_to_chat) {
-            event.preventDefault();
-            tui.switch_mode(mode_chat);
+    } else if (tui.mode.name == 'study') {
+        if (tui.mode.mode_switch_on_key(event)) {
+              null;
         } else if (event.key == tui.keys.switch_to_play) {
-            tui.switch_mode(mode_play);
+            tui.switch_mode('play');
         } else if (event.key in tui.movement_keys) {
             explorer.move(tui.movement_keys[event.key]);
         } else if (event.key == tui.keys.toggle_map_mode) {
             if (tui.map_mode == 'terrain') {
+                tui.map_mode = 'annotations';
+            } else if (tui.map_mode == 'annotations') {
                 tui.map_mode = 'control';
             } else {
                 tui.map_mode = 'terrain';
@@ -968,7 +1095,7 @@ tui.inputEl.addEventListener('keydown', (event) => {
 }, false);
 
 rows_selector.addEventListener('input', function() {
-    if (rows_selector.value % 4 != 0) {
+    if (rows_selector.value % 4 != 0 || rows_selector.value < 24) {
         return;
     }
     window.localStorage.setItem(rows_selector.id, rows_selector.value);
@@ -976,7 +1103,7 @@ rows_selector.addEventListener('input', function() {
     tui.full_refresh();
 }, false);
 cols_selector.addEventListener('input', function() {
-    if (cols_selector.value % 4 != 0) {
+    if (cols_selector.value % 4 != 0 || cols_selector.value < 80) {
         return;
     }
     window.localStorage.setItem(cols_selector.id, cols_selector.value);
@@ -1006,35 +1133,45 @@ document.getElementById("help").onclick = function() {
     tui.full_refresh();
 };
 document.getElementById("switch_to_play").onclick = function() {
-    tui.switch_mode(mode_play);
+    tui.switch_mode('play');
     tui.full_refresh();
 };
 document.getElementById("switch_to_study").onclick = function() {
-    tui.switch_mode(mode_study);
+    tui.switch_mode('study');
     tui.full_refresh();
 };
 document.getElementById("switch_to_chat").onclick = function() {
-    tui.switch_mode(mode_chat);
+    tui.switch_mode('chat');
     tui.full_refresh();
 };
 document.getElementById("switch_to_password").onclick = function() {
-    tui.switch_mode(mode_password);
+    tui.switch_mode('password');
     tui.full_refresh();
 };
 document.getElementById("switch_to_edit").onclick = function() {
-    tui.switch_mode(mode_edit);
+    tui.switch_mode('edit');
     tui.full_refresh();
 };
 document.getElementById("switch_to_annotate").onclick = function() {
-    tui.switch_mode(mode_annotate);
+    tui.switch_mode('annotate');
     tui.full_refresh();
 };
 document.getElementById("switch_to_portal").onclick = function() {
-    tui.switch_mode(mode_portal);
+    tui.switch_mode('portal');
+    tui.full_refresh();
+};
+document.getElementById("switch_to_admin").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("toggle_map_mode").onclick = function() {
     if (tui.map_mode == 'terrain') {
+        tui.map_mode = 'annotations';
+    } else if (tui.map_mode == 'annotations') {
         tui.map_mode = 'control';
     } else {
         tui.map_mode = 'terrain';
@@ -1054,56 +1191,56 @@ document.getElementById("teleport").onclick = function() {
     game.teleport();
 };
 document.getElementById("move_upleft").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'UPLEFT']);
     } else {
         explorer.move('UPLEFT');
     };
 };
 document.getElementById("move_left").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'LEFT']);
     } else {
         explorer.move('LEFT');
     };
 };
 document.getElementById("move_downleft").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'DOWNLEFT']);
     } else {
         explorer.move('DOWNLEFT');
     };
 };
 document.getElementById("move_down").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'DOWN']);
     } else {
         explorer.move('DOWN');
     };
 };
 document.getElementById("move_up").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'UP']);
     } else {
         explorer.move('UP');
     };
 };
 document.getElementById("move_upright").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'UPRIGHT']);
     } else {
         explorer.move('UPRIGHT');
     };
 };
 document.getElementById("move_right").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'RIGHT']);
     } else {
         explorer.move('RIGHT');
     };
 };
 document.getElementById("move_downright").onclick = function() {
-    if (tui.mode == mode_play) {
+    if (tui.mode.name == 'play') {
         server.send(['TASK:MOVE', 'DOWNRIGHT']);
     } else {
         explorer.move('DOWNRIGHT');