From: Christian Heller Date: Thu, 19 Nov 2020 21:41:15 +0000 (+0100) Subject: Some mode code refactoring. X-Git-Url: https://plomlompom.com/repos/te"st.html?a=commitdiff_plain;h=ec31980e8ff8d59b36add05f2e0e3d53e8325af6;p=plomrogue2 Some mode code refactoring. --- diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index 3e07881..182a1e7 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -10,6 +10,22 @@ from plomrogue.things import ThingBase from plomrogue.misc import quote from plomrogue.errors import BrokenSocketConnection +mode_helps = { + 'play': 'This mode allows you to interact with the map.', + '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.', + '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.', + 'control_pw_type': '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': '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': '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': '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': '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': 'Pick your player name.', + 'waiting_for_server': 'Waiting for a server response.', + 'post_login_wait': 'Waiting for a server response.', + '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.', + 'admin': 'This mode allows you to become admin if you know an admin password.' +} + from ws4py.client import WebSocketBaseClient class WebSocketClient(WebSocketBaseClient): @@ -233,55 +249,40 @@ class TUI: class Mode: - def __init__(self, name, help_intro, has_input_prompt=False, + def __init__(self, name, has_input_prompt=False, shows_info=False, is_intro = False, is_single_char_entry=False): self.name = name self.has_input_prompt = has_input_prompt self.shows_info = shows_info self.is_intro = is_intro - self.help_intro = help_intro + self.help_intro = mode_helps[name] self.is_single_char_entry = is_single_char_entry def __init__(self, host): import os import json self.host = host - self.mode_play = self.Mode('play', - 'This mode allows you to interact with the map.') - self.mode_study = self.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.', shows_info=True) - self.mode_edit = self.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.', - is_single_char_entry=True) + self.mode_play = self.Mode('play') + self.mode_study = self.Mode('study', shows_info=True) + self.mode_edit = self.Mode('edit', is_single_char_entry=True) self.mode_control_pw_type = self.Mode('control_pw_type', - '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!', is_single_char_entry=True) self.mode_control_pw_pw = self.Mode('control_pw_pw', - '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.', has_input_prompt=True) - self.mode_annotate = self.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.', - has_input_prompt=True, shows_info=True) - self.mode_portal = self.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.', - has_input_prompt=True, shows_info=True) - self.mode_chat = self.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:', has_input_prompt=True) + self.mode_annotate = self.Mode('annotate', has_input_prompt=True, + shows_info=True) + self.mode_portal = self.Mode('portal', has_input_prompt=True, + shows_info=True) + self.mode_chat = self.Mode('chat', has_input_prompt=True) self.mode_waiting_for_server = self.Mode('waiting_for_server', - 'Waiting for a server response.', is_intro=True) - self.mode_login = self.Mode('login', - 'Pick your player name.', - has_input_prompt=True, is_intro=True) + self.mode_login = self.Mode('login', has_input_prompt=True, + is_intro=True) self.mode_post_login_wait = self.Mode('post_login_wait', - 'Waiting for a server response.', is_intro=True) - self.mode_password = self.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.', - has_input_prompt=True) - self.mode_admin = self.Mode('admin', - 'This mode allows you to become admin if you know an admin password.', - has_input_prompt=True) + self.mode_password = self.Mode('password', has_input_prompt=True) + self.mode_admin = self.Mode('admin', has_input_prompt=True) self.game = Game() self.game.tui = self self.parser = Parser(self.game) @@ -604,7 +605,7 @@ class TUI: def draw_help(): content = "%s mode help\n\n%s\n\n" % (self.mode.name, self.mode.help_intro) - if self.mode == self.mode_play: + if self.mode.name == 'play': content += "Available actions:\n" if 'MOVE' in self.game.tasks: content += "[%s] – move player\n" % ','.join(self.movement_keys) @@ -625,14 +626,14 @@ class TUI: content += '[%s] – become admin\n' % self.keys['switch_to_admin'] content += '[%s] – change tile control password' % self.keys['switch_to_control_pw'] - elif self.mode == self.mode_study: + elif self.mode.name == 'study': content += 'Available actions:\n' content += '[%s] – move question mark\n' % ','.join(self.movement_keys) content += '[%s] – toggle view between terrain, annotations, and password protection areas\n' % self.keys['toggle_map_mode'] content += '\n\nOther modes available from here:' content += '[%s] – chat mode\n' % self.keys['switch_to_chat'] content += '[%s] – play mode\n' % self.keys['switch_to_play'] - elif self.mode == self.mode_chat: + elif self.mode.name == 'chat': content += '/nick NAME – re-name yourself to NAME\n' content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play'] content += '/%s or /study – switch to study mode\n' % self.keys['switch_to_study'] @@ -719,28 +720,28 @@ class TUI: self.input_ = self.input_[:max_length] elif key == self.keys['help'] and not self.mode.is_single_char_entry: self.show_help = True - elif self.mode == self.mode_login and key == '\n': + elif self.mode.name == 'login' and key == '\n': self.login_name = self.input_ self.send('LOGIN ' + quote(self.input_)) self.input_ = "" - elif self.mode == self.mode_control_pw_pw and key == '\n': + elif self.mode.name == 'control_pw_pw' and key == '\n': if self.input_ == '': self.log_msg('@ aborted') else: self.send('SET_MAP_CONTROL_PASSWORD ' + quote(self.tile_control_char) + ' ' + quote(self.input_)) self.input_ = "" self.switch_mode('play') - elif self.mode == self.mode_password and key == '\n': + elif self.mode.name == 'password' and key == '\n': if self.input_ == '': self.input_ = ' ' self.password = self.input_ self.input_ = "" self.switch_mode('play') - elif self.mode == self.mode_admin and key == '\n': + elif self.mode.name == 'admin' and key == '\n': self.send('BECOME_ADMIN ' + quote(self.input_)) self.input_ = "" self.switch_mode('play') - elif self.mode == self.mode_chat and key == '\n': + elif self.mode.name == 'chat' and key == '\n': if self.input_ == '': continue if self.input_[0] == '/': # FIXME fails on empty input @@ -759,21 +760,21 @@ class TUI: else: self.send('ALL ' + quote(self.input_)) self.input_ = "" - elif self.mode == self.mode_annotate and key == '\n': + elif self.mode.name == 'annotate' and key == '\n': if self.input_ == '': self.input_ = ' ' self.send('ANNOTATE %s %s %s' % (self.explorer, quote(self.input_), quote(self.password))) self.input_ = "" self.switch_mode('play') - elif self.mode == self.mode_portal and key == '\n': + elif self.mode.name == 'portal' and key == '\n': if self.input_ == '': self.input_ = ' ' self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_), quote(self.password))) self.input_ = "" self.switch_mode('play') - elif self.mode == self.mode_study: + elif self.mode.name == 'study': if key == self.keys['switch_to_chat']: self.switch_mode('chat') elif key == self.keys['switch_to_play']: @@ -787,7 +788,7 @@ class TUI: self.map_mode = 'terrain' elif key in self.movement_keys: move_explorer(self.movement_keys[key]) - elif self.mode == self.mode_play: + elif self.mode.name == 'play': if key == self.keys['switch_to_chat']: self.switch_mode('chat') elif key == self.keys['switch_to_study']: @@ -822,10 +823,10 @@ class TUI: self.log_msg('? not standing on portal') elif key in self.movement_keys and 'MOVE' in self.game.tasks: self.send('TASK:MOVE ' + self.movement_keys[key]) - elif self.mode == self.mode_edit: + elif self.mode.name == 'edit': self.send('TASK:WRITE %s %s' % (key, quote(self.password))) self.switch_mode('play') - elif self.mode == self.mode_control_pw_type: + elif self.mode.name == 'control_pw_type': self.tile_control_char = key self.switch_mode('control_pw_pw') diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html index 9feb615..021ae85 100644 --- a/rogue_chat_nocanvas_monochrome.html +++ b/rogue_chat_nocanvas_monochrome.html @@ -67,6 +67,21 @@ terminal columns: let websocket_location = "wss://plomlompom.com/rogue_chat/"; //let websocket_location = "ws://localhost:8000/"; +let mode_helps = { + 'play': 'This mode allows you to interact with the map.', + '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.', + '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.', + 'control_pw_type': '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': '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': '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': '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': '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': 'Pick your player name.', + 'post_login_wait': 'Waiting for a server response.', + '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.', + 'admin': '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"); let key_selectors = document.querySelectorAll('[id^="key_"]'); @@ -207,11 +222,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; @@ -262,9 +277,9 @@ let server = { game.map_control = tokens[1] } else if (tokens[0] === 'GAME_STATE_COMPLETE') { game.turn_complete = true; - 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(); @@ -274,7 +289,7 @@ 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]; @@ -329,56 +344,17 @@ let unparser = { } class Mode { - constructor(name, help_intro, has_input_prompt=false, shows_info=false, + constructor(name, has_input_prompt=false, shows_info=false, is_intro=false, is_single_char_entry=false) { this.name = name; 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]; this.is_single_char_entry = is_single_char_entry; } } - 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.') - 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); - 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.') - 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, false, true); - let mode_control_pw_type = new Mode('control_pw_type', - '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!', - false, false, false, true); - 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); - let mode_admin = new Mode('admin', - 'This mode allows you to become admin if you know an admin password.', - true); - let mode_control_pw_pw = new Mode('control_pw_pw', - '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.', - true); - let tui = { - mode: mode_waiting_for_server, log: [], input_prompt: '> ', input_lines: [], @@ -388,7 +364,23 @@ 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 = this.mode_waiting_for_server; this.inputEl = document.getElementById("input"); this.inputEl.focus(); this.recalc_input_lines(); @@ -418,15 +410,15 @@ 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) { + 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.mode = this['mode_' + mode_name]; this.empty_input(); this.restore_input_values(); document.getElementById("take_thing").disabled = true; @@ -451,7 +443,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') { @@ -464,22 +456,22 @@ let tui = { document.getElementById("move_down").disabled = false; } } - if (!mode.is_intro && mode != mode_play) { + if (!this.mode.is_intro && this.mode != this.mode_play) { document.getElementById("switch_to_play").disabled = false; } - if (!mode.is_intro && mode != mode_study) { + if (!this.mode.is_intro && this.mode != this.mode_study) { document.getElementById("switch_to_study").disabled = false; } - if (!mode.is_intro && mode != mode_chat) { + if (!this.mode.is_intro && this.mode != this.mode_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; } @@ -498,29 +490,29 @@ let tui = { document.getElementById("switch_to_password").disabled = false; document.getElementById("switch_to_admin").disabled = false; document.getElementById("switch_to_control_pw").disabled = false; - } else if (mode == mode_study) { + } else if (this.mode.name == 'study') { document.getElementById("toggle_map_mode").disabled = false; - } else if (mode.is_single_char_entry) { + } else if (this.mode.is_single_char_entry) { this.show_help = true; - } else if (mode == mode_admin) { + } else if (this.mode.name == 'admin') { this.log_msg('@ enter admin password:') - } else if (mode == mode_control_pw_pw) { + } 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(); } @@ -678,7 +670,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"; @@ -702,14 +694,14 @@ let tui = { content += '[' + this.keys.switch_to_password + '] – password input mode\n'; content += '[' + this.keys.switch_to_admin + '] – become admin\n'; content += '[' + this.keys.switch_to_control_pw + '] – change tile control password\n'; - } else if (this.mode == mode_study) { + } 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, annotations, 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) { + } 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'; @@ -842,14 +834,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 = {}; this.info_hints = []; - if (tui.mode == mode_study) { + if (tui.mode.name == 'study') { tui.full_refresh(); } }, @@ -918,12 +910,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); - } else if (tui.mode == mode_control_pw_type && tui.inputEl.value.length > 0) { + 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(mode_control_pw_pw); + tui.switch_mode('control_pw_pw'); } tui.full_refresh(); }, false); @@ -939,41 +931,41 @@ tui.inputEl.addEventListener('keydown', (event) => { } 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_control_pw_pw && 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(mode_play); - } else if (tui.mode == mode_portal && event.key == 'Enter') { + 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_admin && event.key == 'Enter') { + tui.switch_mode('play'); + } else if (tui.mode.name == 'admin' && event.key == 'Enter') { server.send(['BECOME_ADMIN', tui.inputEl.value]); - tui.switch_mode(mode_play); - } else if (tui.mode == mode_chat && event.key == 'Enter') { + 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]]); @@ -990,25 +982,25 @@ tui.inputEl.addEventListener('keydown', (event) => { server.send(['ALL', tui.inputEl.value]); } tui.empty_input(); - } else if (tui.mode == mode_play) { + } else if (tui.mode.name == 'play') { if (event.key === tui.keys.switch_to_chat) { event.preventDefault(); - tui.switch_mode(mode_chat); + tui.switch_mode('chat'); } else if (event.key === tui.keys.switch_to_edit && game.tasks.includes('WRITE')) { event.preventDefault(); - tui.switch_mode(mode_edit); + tui.switch_mode('edit'); } else if (event.key === tui.keys.switch_to_study) { - tui.switch_mode(mode_study); + tui.switch_mode('study'); } else if (event.key === tui.keys.switch_to_admin) { event.preventDefault(); - tui.switch_mode(mode_admin); + tui.switch_mode('admin'); } else if (event.key === tui.keys.switch_to_control_pw) { event.preventDefault(); - tui.switch_mode(mode_control_pw_type); + tui.switch_mode('control_pw_type'); } else if (event.key === tui.keys.switch_to_password) { event.preventDefault(); - tui.switch_mode(mode_password); + tui.switch_mode('password'); } else if (event.key === tui.keys.flatten && game.tasks.includes('FLATTEN_SURROUNDINGS')) { server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]); @@ -1025,17 +1017,17 @@ 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) { + } else if (tui.mode.name == 'study') { if (event.key === tui.keys.switch_to_chat) { event.preventDefault(); - tui.switch_mode(mode_chat); + tui.switch_mode('chat'); } 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) { @@ -1090,39 +1082,39 @@ 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(mode_admin); + tui.switch_mode('admin'); tui.full_refresh(); }; document.getElementById("switch_to_control_pw").onclick = function() { - tui.switch_mode(mode_control_pw_type); + tui.switch_mode('control_pw_type'); tui.full_refresh(); }; document.getElementById("toggle_map_mode").onclick = function() { @@ -1148,56 +1140,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');