X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat_curses.py;h=3cd5914c217f2ea4a710413f587292592f63fc7f;hb=1f65215b70d2a8a255aa9327497b88b94c4b1f17;hp=0db2695266ea5aa45c66fff3153d0a230b46a714;hpb=3ffed06ffef414e46ba5655316c1f60afaa95fa5;p=plomrogue2 diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index 0db2695..3cd5914 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -3,6 +3,7 @@ import curses import queue import threading import time +import sys from plomrogue.game import GameBase from plomrogue.parser import Parser from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex @@ -23,15 +24,23 @@ mode_helps = { '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', + 'short': 'change tiles 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': '', + 'short': 'change tiles control password', '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.' }, + 'control_tile_type': { + 'short': 'change tiles control', + 'long': 'This mode is the first of two steps to change tile control areas on the map. First enter the tile control character you want to write.' + }, + 'control_tile_draw': { + 'short': 'change tiles control', + 'long': 'This mode is the second of two steps to change tile control areas on the map. Move cursor around the map to draw selected tile control character' + }, 'annotate': { - 'short': 'annotation', + 'short': 'annotate tile', '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': { @@ -39,28 +48,32 @@ mode_helps = { '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', + 'short': 'chat', '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': '', + 'short': 'login', 'long': 'Pick your player name.' }, 'waiting_for_server': { - 'short': '', + 'short': 'waiting for server response', 'long': 'Waiting for a server response.' }, 'post_login_wait': { - 'short': '', + 'short': 'waiting for server response', 'long': 'Waiting for a server response.' }, 'password': { - 'short': 'password input', + 'short': 'map edit password', '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': { + 'admin_enter': { 'short': 'become admin', 'long': 'This mode allows you to become admin if you know an admin password.' + }, + 'admin': { + 'short': 'admin', + 'long': 'This mode allows you access to actions limited to administrators.' } } @@ -119,6 +132,13 @@ def cmd_LOGIN_OK(game): game.tui.log_msg('@ welcome') cmd_LOGIN_OK.argtypes = '' +def cmd_ADMIN_OK(game): + game.tui.is_admin = True + game.tui.log_msg('@ you now have admin rights') + game.tui.switch_mode('admin') + game.tui.do_refresh = True +cmd_ADMIN_OK.argtypes = '' + def cmd_CHAT(game, msg): game.tui.log_msg('# ' + msg) game.tui.do_refresh = True @@ -244,6 +264,7 @@ class Game(GameBase): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.register_command(cmd_LOGIN_OK) + self.register_command(cmd_ADMIN_OK) self.register_command(cmd_PONG) self.register_command(cmd_CHAT) self.register_command(cmd_PLAYER_ID) @@ -322,12 +343,15 @@ class Mode: return False class TUI: - mode_admin = Mode('admin', has_input_prompt=True) + mode_admin_enter = Mode('admin_enter', has_input_prompt=True) + mode_admin = Mode('admin') mode_play = Mode('play') mode_study = Mode('study', shows_info=True) mode_edit = Mode('edit', is_single_char_entry=True) mode_control_pw_type = Mode('control_pw_type', is_single_char_entry=True) mode_control_pw_pw = Mode('control_pw_pw', has_input_prompt=True) + mode_control_tile_type = Mode('control_tile_type', is_single_char_entry=True) + mode_control_tile_draw = Mode('control_tile_draw') mode_annotate = Mode('annotate', has_input_prompt=True, shows_info=True) mode_portal = Mode('portal', has_input_prompt=True, shows_info=True) mode_chat = Mode('chat', has_input_prompt=True) @@ -335,15 +359,19 @@ class TUI: mode_login = Mode('login', has_input_prompt=True, is_intro=True) mode_post_login_wait = Mode('post_login_wait', is_intro=True) mode_password = Mode('password', has_input_prompt=True) + is_admin = False def __init__(self, host): import os import json self.mode_play.available_modes = ["chat", "study", "edit", "annotate", "portal", - "password", "admin", - "control_pw_type"] - self.mode_study.available_modes = ["chat", "play"] + "password", "admin_enter"] + self.mode_study.available_modes = ["chat", "play", "admin_enter"] + self.mode_admin.available_modes = ["chat", "play", "study", + "control_pw_type", + "control_tile_type"] + self.mode_control_tile_draw.available_modes = ["admin"] self.host = host self.game = Game() self.game.tui = self @@ -363,8 +391,9 @@ class TUI: 'switch_to_portal': 'T', 'switch_to_study': '?', 'switch_to_edit': 'm', - 'switch_to_admin': 'A', + 'switch_to_admin_enter': 'A', 'switch_to_control_pw_type': 'C', + 'switch_to_control_tile_type': 'Q', 'flatten': 'F', 'take_thing': 'z', 'drop_thing': 'u', @@ -461,13 +490,23 @@ class TUI: elif self.mode.name == 'password': self.input_ = self.password + def send_tile_control_command(self): + self.send('SET_TILE_CONTROL %s %s' % + (self.explorer, quote(self.tile_control_char))) + def switch_mode(self, mode_name): self.map_mode = 'terrain' + if mode_name == 'admin_enter' and self.is_admin: + mode_name = 'admin' self.mode = getattr(self, 'mode_' + mode_name) - if self.mode.shows_info: + if self.mode.shows_info or self.mode.name == 'control_tile_draw': player = self.game.get_thing(self.game.player_id) self.explorer = YX(player.position.y, player.position.x) - self.query_info() + if self.mode.shows_info: + self.query_info() + elif self.mode.name == 'control_tile_draw': + self.send_tile_control_command() + self.map_mode = 'control' if self.mode.is_single_char_entry: self.show_help = True if self.mode.name == 'waiting_for_server': @@ -477,7 +516,7 @@ class TUI: self.send('LOGIN ' + quote(self.login_name)) else: self.log_msg('@ enter username') - elif self.mode.name == 'admin': + elif self.mode.name == 'admin_enter': self.log_msg('@ enter admin password:') elif self.mode.name == 'control_pw_pw': self.log_msg('@ enter tile control password for "%s":' % self.tile_control_char) @@ -510,6 +549,8 @@ class TUI: lines += [chunk] chunk = '' x = 0 + if msg[i] == "\n": + x -= 1 if msg[i] != "\n": chunk += msg[i] x += 1 @@ -533,7 +574,10 @@ class TUI: target = self.game.map_geometry.move_yx(self.explorer, direction) if target: self.explorer = target - self.query_info() + if self.mode.shows_info: + self.query_info() + elif self.mode.name == 'control_tile_draw': + self.send_tile_control_command() else: self.flash = True @@ -604,7 +648,8 @@ class TUI: help = "hit [%s] for help" % self.keys['help'] if self.mode.has_input_prompt: help = "enter /help for help" - safe_addstr(1, self.window_width, 'MODE: %s – %s' % (self.mode.name, help)) + safe_addstr(1, self.window_width, + 'MODE: %s – %s' % (self.mode.short_desc, help)) def draw_map(): if not self.game.turn_complete: @@ -633,7 +678,7 @@ class TUI: meta_char = '+' map_lines_split[t.position.y][t.position.x] = symbol + meta_char used_positions += [t.position] - if self.mode.shows_info: + if self.mode.shows_info or self.mode.name == 'control_tile_draw': map_lines_split[self.explorer.y][self.explorer.x] = '??' map_lines = [] if type(self.game.map_geometry) == MapGeometryHex: @@ -665,8 +710,8 @@ class TUI: map_y += 1 def draw_help(): - content = "%s mode help\n\n%s\n\n" % (self.mode.name, - self.mode.help_intro) + content = "%s help\n\n%s\n\n" % (self.mode.short_desc, + self.mode.help_intro) if self.mode.name == 'play': content += "Available actions:\n" if 'MOVE' in self.game.tasks: @@ -688,6 +733,7 @@ class TUI: 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'] + content += '/%s or /admin – switch to admin mode\n' % self.keys['switch_to_admin_enter'] content += self.mode.list_available_modes(self) for i in range(self.size.y): safe_addstr(i, @@ -782,14 +828,14 @@ class TUI: else: self.send('SET_MAP_CONTROL_PASSWORD ' + quote(self.tile_control_char) + ' ' + quote(self.input_)) self.input_ = "" - self.switch_mode('play') + self.switch_mode('admin') 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.name == 'admin' and key == '\n': + elif self.mode.name == 'admin_enter' and key == '\n': self.send('BECOME_ADMIN ' + quote(self.input_)) self.input_ = "" self.switch_mode('play') @@ -801,6 +847,8 @@ class TUI: self.switch_mode('play') elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}: self.switch_mode('study') + elif self.input_ in {'/' + self.keys['switch_to_admin_enter'], '/admin'}: + self.switch_mode('admin_enter') elif self.input_.startswith('/nick'): tokens = self.input_.split(maxsplit=1) if len(tokens) == 2: @@ -864,6 +912,19 @@ class TUI: elif self.mode.name == 'control_pw_type': self.tile_control_char = key self.switch_mode('control_pw_pw') + elif self.mode.name == 'control_tile_type': + self.tile_control_char = key + self.switch_mode('control_tile_draw') + elif self.mode.name == 'control_tile_draw': + if self.mode.mode_switch_on_key(self, key): + continue + elif key in self.movement_keys: + move_explorer(self.movement_keys[key]) + elif self.mode.name == 'admin': + if self.mode.mode_switch_on_key(self, key): + continue -#TUI('localhost:5000') -TUI('wss://plomlompom.com/rogue_chat/') +if len(sys.argv) != 2: + raise ArgError('wrong number of arguments, need game host') +host = sys.argv[1] +TUI(host)