From: Christian Heller Date: Sun, 6 Dec 2020 21:26:50 +0000 (+0100) Subject: Minor client mode switch refactor. X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=c99f3476d21b7416d584c33bfe3b1010ada523e2;p=plomrogue2 Minor client mode switch refactor. --- diff --git a/rogue_chat.html b/rogue_chat.html index 2b104a3..3c6fe00 100644 --- a/rogue_chat.html +++ b/rogue_chat.html @@ -126,85 +126,106 @@ let websocket_location = "wss://plomlompom.com/rogue_chat/"; let mode_helps = { 'play': { 'short': 'play', + 'intro': '', 'long': 'This mode allows you to interact with the map in various ways.' }, 'study': { 'short': 'study', + 'intro': '', '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. Toggle the map view to show or hide different information layers.'}, 'edit': { 'short': 'world edit', + 'intro': '', 'long': 'This mode allows you to change the game world in various ways. Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view. You can edit a tile if you set the world edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.' }, 'name_thing': { 'short': 'name thing', + 'intro': '', 'long': 'Give name to/change name of thing here.' }, 'command_thing': { 'short': 'command thing', + 'intro': '', 'long': 'Enter a command to the thing you carry. Enter nothing to return to play mode.' }, 'take_thing': { 'short': 'take thing', + 'intro': '', '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': { 'short': 'change thing protection', + 'intro': '@ enter thing protection character:', 'long': 'Change protection character for thing here.' }, 'write': { 'short': 'change terrain', + 'intro': '', 'long': 'This mode allows you to change the map tile you currently stand on (if your world editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.' }, 'control_pw_type': { 'short': 'change protection character password', + 'intro': '@ enter protection character for which you want to change the password:', 'long': 'This mode is the first of two steps to change the password for a protection character. First enter the protection character for which you want to change the password.' }, 'control_pw_pw': { 'short': 'change protection character password', + 'intro': '', 'long': 'This mode is the second of two steps to change the password for a protection character. Enter the new password for the protection character you chose.' }, 'control_tile_type': { 'short': 'change tiles protection', + 'intro': '@ enter protection character which you want to draw:', 'long': 'This mode is the first of two steps to change tile protection areas on the map. First enter the tile protection character you want to write.' }, 'control_tile_draw': { 'short': 'change tiles protection', + 'intro': '', 'long': 'This mode is the second of two steps to change tile protection areas on the map. Toggle tile protection drawing on/off and move the ?? cursor around the map to draw the selected protection character.' }, 'annotate': { 'short': 'annotate tile', + 'intro': '', 'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your world editing password authorizes you so). Hit Return to leave.' }, 'portal': { 'short': 'edit portal', + 'intro': '', 'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your world 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', + '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:' }, 'login': { 'short': 'login', + 'intro': '', 'long': 'Enter your player name.' }, 'waiting_for_server': { 'short': 'waiting for server response', + 'intro': '@ waiting for server …', 'long': 'Waiting for a server response.' }, 'post_login_wait': { 'short': 'waiting for server response', + 'intro': '', 'long': 'Waiting for a server response.' }, 'password': { 'short': 'set world edit password', + 'intro': '', 'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected elements of the world. Hit return to confirm and leave.' }, 'admin_enter': { 'short': 'become admin', + 'intro': '@ enter admin password:', 'long': 'This mode allows you to become admin if you know an admin password.' }, 'admin': { 'short': 'admin', + 'intro': '', 'long': 'This mode allows you access to actions limited to administrators.' } } @@ -562,6 +583,7 @@ class Mode { this.shows_info= shows_info; this.is_intro = is_intro; this.help_intro = mode_helps[name].long; + this.intro_msg = mode_helps[name].intro; this.is_single_char_entry = is_single_char_entry; this.legal = true; } @@ -660,12 +682,11 @@ let tui = { "password", "chat", "study", "play", "admin_enter"] this.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"] - this.mode = this.mode_waiting_for_server; this.inputEl = document.getElementById("input"); this.inputEl.focus(); + this.switch_mode('waiting_for_server'); this.recalc_input_lines(); this.height_header = this.height_turn_line + this.height_mode_line; - this.log_msg("@ waiting for server connection ..."); this.init_keys(); }, init_keys: function() { @@ -706,7 +727,7 @@ let tui = { return game.tasks.includes(this.action_tasks[action]); }, switch_mode: function(mode_name) { - if (this.mode.name == 'control_tile_draw') { + if (this.mode && this.mode.name == 'control_tile_draw') { tui.log_msg('@ finished tile protection drawing.') } this.tile_draw = false; @@ -767,6 +788,9 @@ let tui = { for (const mode_name of this.mode.available_modes) { document.getElementById('switch_to_' + mode_name).disabled = false; } + if (this.mode.intro_msg.length > 0) { + this.log_msg(this.mode.intro_msg); + } if (this.mode.name == 'login') { if (this.login_name) { server.send(['LOGIN', this.login_name]); @@ -796,14 +820,6 @@ let tui = { } } else if (this.mode.name == 'command_thing') { server.send(['TASK:COMMAND', 'HELP']); - } else if (this.mode.name == 'admin_enter') { - this.log_msg('@ enter admin password:') - } else if (this.mode.name == 'control_pw_type') { - this.log_msg('@ enter protection character for which you want to change the password:') - } else if (this.mode.name == 'control_tile_type') { - this.log_msg('@ enter protection character which you want to draw:') - } else if (this.mode.name == 'admin_thing_protect') { - this.log_msg('@ enter thing protection character:') } else if (this.mode.name == 'control_pw_pw') { this.log_msg('@ enter protection password for "' + this.tile_control_char + '":'); } else if (this.mode.name == 'control_tile_draw') { diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index b098e04..db5f993 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -14,85 +14,106 @@ from plomrogue.errors import BrokenSocketConnection, ArgError mode_helps = { 'play': { 'short': 'play', + 'intro': '', 'long': 'This mode allows you to interact with the map in various ways.' }, 'study': { 'short': 'study', + 'intro': '', '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. Toggle the map view to show or hide different information layers.'}, 'edit': { 'short': 'world edit', + 'intro': '', 'long': 'This mode allows you to change the game world in various ways. Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view. You can edit a tile if you set the world edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.' }, 'name_thing': { 'short': 'name thing', + 'intro': '', 'long': 'Give name to/change name of thing here.' }, 'command_thing': { 'short': 'command thing', + 'intro': '', 'long': 'Enter a command to the thing you carry. Enter nothing to return to play mode.' }, 'take_thing': { 'short': 'take thing', + 'intro': '', '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': { 'short': 'change thing protection', + 'intro': '@ enter thing protection character:', 'long': 'Change protection character for thing here.' }, 'write': { 'short': 'change terrain', + 'intro': '', 'long': 'This mode allows you to change the map tile you currently stand on (if your world editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.' }, 'control_pw_type': { 'short': 'change protection character password', + 'intro': '@ enter protection character for which you want to change the password:', 'long': 'This mode is the first of two steps to change the password for a protection character. First enter the protection character for which you want to change the password.' }, 'control_pw_pw': { 'short': 'change protection character password', + 'intro': '', 'long': 'This mode is the second of two steps to change the password for a protection character. Enter the new password for the protection character you chose.' }, 'control_tile_type': { 'short': 'change tiles protection', + 'intro': '@ enter protection character which you want to draw:', 'long': 'This mode is the first of two steps to change tile protection areas on the map. First enter the tile protection character you want to write.' }, 'control_tile_draw': { 'short': 'change tiles protection', + 'intro': '', 'long': 'This mode is the second of two steps to change tile protection areas on the map. Toggle tile protection drawing on/off and move the ?? cursor around the map to draw the selected protection character.' }, 'annotate': { 'short': 'annotate tile', + 'intro': '', 'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your world editing password authorizes you so). Hit Return to leave.' }, 'portal': { 'short': 'edit portal', + 'intro': '', 'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your world 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', + '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:' }, 'login': { 'short': 'login', + 'intro': '', 'long': 'Enter your player name.' }, 'waiting_for_server': { 'short': 'waiting for server response', + 'intro': '@ waiting for server …', 'long': 'Waiting for a server response.' }, 'post_login_wait': { 'short': 'waiting for server response', + 'intro': '', 'long': 'Waiting for a server response.' }, 'password': { 'short': 'set world edit password', + 'intro': '', 'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected elements of the world. Hit return to confirm and leave.' }, 'admin_enter': { 'short': 'become admin', + 'intro': '@ enter admin password:', 'long': 'This mode allows you to become admin if you know an admin password.' }, 'admin': { 'short': 'admin', + 'intro': '', 'long': 'This mode allows you access to actions limited to administrators.' } } @@ -348,6 +369,7 @@ class Mode: self.shows_info = shows_info self.is_intro = is_intro self.help_intro = mode_helps[name]['long'] + self.intro_msg = mode_helps[name]['intro'] self.is_single_char_entry = is_single_char_entry self.legal = True @@ -564,6 +586,8 @@ class TUI: self.map_mode = 'terrain only' def switch_mode(self, mode_name): + if self.mode and self.mode.name == 'control_tile_draw': + self.log_msg('@ finished tile protection drawing.') self.tile_draw = False if mode_name == 'admin_enter' and self.is_admin: mode_name = 'admin' @@ -581,8 +605,6 @@ class TUI: else: self.thing_selected = thing self.mode = getattr(self, 'mode_' + mode_name) - if self.mode.name == 'control_tile_draw': - self.log_msg('@ finished tile protection drawing.') if self.mode.name in {'control_tile_draw', 'control_tile_type', 'control_pw_type'}: self.map_mode = 'protections' @@ -593,9 +615,9 @@ class TUI: self.explorer = YX(player.position.y, player.position.x) if self.mode.is_single_char_entry: self.show_help = True - if self.mode.name == 'waiting_for_server': - self.log_msg('@ waiting for server …') - elif self.mode.name == 'login': + if len(self.mode.intro_msg) > 0: + self.log_msg(self.mode.intro_msg) + if self.mode.name == 'login': if self.login_name: self.send('LOGIN ' + quote(self.login_name)) else: @@ -613,14 +635,6 @@ class TUI: self.log_msg(str(t.id_) + ' ' + self.get_thing_info(t)) elif self.mode.name == 'command_thing': self.send('TASK:COMMAND ' + quote('HELP')) - elif self.mode.name == 'admin_enter': - self.log_msg('@ enter admin password:') - elif self.mode.name == 'control_pw_type': - self.log_msg('@ enter protection character for which you want to change the password:') - elif self.mode.name == 'control_tile_type': - self.log_msg('@ enter protection character which you want to draw:') - elif self.mode.name == 'admin_thing_protect': - self.log_msg('@ enter thing protection character:') elif self.mode.name == 'control_pw_pw': self.log_msg('@ enter protection password for "%s":' % self.tile_control_char) elif self.mode.name == 'control_tile_draw':