X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat_curses.py;h=a6471eed4f9da9c206b900a5e7d55437b0c26a94;hb=69849fbd3ecdf9f937d1353a8ffbd96bfb44b742;hp=c26c3805a0ec092c6e4ff8affead14a222c7127f;hpb=feb0ffb7c7523ddee0cbd685cbc9c2e768a56cbd;p=plomrogue2 diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index c26c380..a6471ee 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -53,13 +53,18 @@ mode_helps = { }, 'enter_face': { 'short': 'edit face', - 'intro': '@ enter face line (enter nothing to abort):', + 'intro': '@ enter face line:', 'long': 'Draw your face as ASCII art. The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..' }, + 'enter_design': { + 'short': 'edit design', + 'intro': '@ enter design:', + 'long': 'Enter design for carried thing as ASCII art.' + }, 'enter_hat': { 'short': 'edit hat', - 'intro': '@ enter hat line (enter nothing to abort):', - 'long': 'Draw your face as ASCII art. The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom. Eat cookies to extend the ASCII characters available for drawing.' + 'intro': '@ enter hat line:', + 'long': 'Draw your hat as ASCII art. The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom. Eat cookies to extend the ASCII characters available for drawing.' }, 'write': { 'short': 'edit tile', @@ -174,7 +179,6 @@ class PlomSocketClient(PlomSocket): pass # we assume socket will be known as dead by now def cmd_TURN(game, n): - game.turn = n game.turn_complete = False cmd_TURN.argtypes = 'int:nonneg' @@ -187,7 +191,9 @@ cmd_OTHER_WIPE.argtypes = '' def cmd_LOGIN_OK(game): game.tui.switch_mode('post_login_wait') game.tui.send('GET_GAMESTATE') - game.tui.log_msg('@ welcome') + game.tui.log_msg('@ welcome!') + game.tui.log_msg('@ hint: see top of terminal for how to get help.') + game.tui.log_msg('@ hint: enter study mode to understand your environment.') cmd_LOGIN_OK.argtypes = '' def cmd_ADMIN_OK(game): @@ -247,6 +253,11 @@ def cmd_THING_HAT(game, thing_id, hat): t.hat = hat cmd_THING_HAT.argtypes = 'int:pos string' +def cmd_THING_DESIGN(game, thing_id, size, design): + t = game.get_thing_temp(thing_id) + t.design = [size, design] +cmd_THING_DESIGN.argtypes = 'int:pos yx_tuple string' + def cmd_THING_CHAR(game, thing_id, c): t = game.get_thing_temp(thing_id) t.thing_char = c @@ -256,14 +267,14 @@ def cmd_MAP(game, geometry, size, content): map_geometry_class = globals()['MapGeometry' + geometry] game.map_geometry_new = map_geometry_class(size) game.map_content_new = content - if type(game.map_geometry) == MapGeometrySquare: + if type(game.map_geometry_new) == MapGeometrySquare: game.tui.movement_keys = { game.tui.keys['square_move_up']: 'UP', game.tui.keys['square_move_left']: 'LEFT', game.tui.keys['square_move_down']: 'DOWN', game.tui.keys['square_move_right']: 'RIGHT', } - elif type(game.map_geometry) == MapGeometryHex: + elif type(game.map_geometry_new) == MapGeometryHex: game.tui.movement_keys = { game.tui.keys['hex_move_upleft']: 'UPLEFT', game.tui.keys['hex_move_upright']: 'UPRIGHT', @@ -294,6 +305,8 @@ def cmd_GAME_STATE_COMPLETE(game): game.map_control_content = game.map_control_content_new game.player = game.get_thing(game.player_id) game.players_hat_chars = game.players_hat_chars_new + game.bladder_pressure = game.bladder_pressure_new + game.energy = game.energy_new game.turn_complete = True if game.tui.mode.name == 'post_login_wait': game.tui.switch_mode('play') @@ -361,6 +374,11 @@ def cmd_RANDOM_COLORS(game): game.tui.set_random_colors() cmd_RANDOM_COLORS.argtypes = '' +def cmd_STATS(game, bladder_pressure, energy): + game.bladder_pressure_new = bladder_pressure + game.energy_new = energy +cmd_STATS.argtypes = 'int:nonneg int' + class Game(GameBase): turn_complete = False tasks = {} @@ -384,6 +402,7 @@ class Game(GameBase): self.register_command(cmd_THING_CHAR) self.register_command(cmd_THING_FACE) self.register_command(cmd_THING_HAT) + self.register_command(cmd_THING_DESIGN) self.register_command(cmd_THING_CARRYING) self.register_command(cmd_THING_INSTALLED) self.register_command(cmd_TERRAIN) @@ -400,6 +419,7 @@ class Game(GameBase): self.register_command(cmd_FOV) self.register_command(cmd_DEFAULT_COLORS) self.register_command(cmd_RANDOM_COLORS) + self.register_command(cmd_STATS) self.map_content = '' self.players_hat_chars = '' self.player_id = -1 @@ -493,6 +513,7 @@ class TUI: mode_drop_thing = Mode('drop_thing', has_input_prompt=True) mode_enter_face = Mode('enter_face', has_input_prompt=True) mode_enter_hat = Mode('enter_hat', has_input_prompt=True) + mode_enter_design = Mode('enter_design', has_input_prompt=True) is_admin = False tile_draw = False @@ -503,19 +524,19 @@ class TUI: "command_thing", "take_thing", "drop_thing"] self.mode_play.available_actions = ["move", "teleport", "door", "consume", - "install", "wear", "spin"] + "install", "wear", "spin", "dance"] self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"] self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"] self.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type", "control_tile_type", "chat", "study", "play", "edit"] - self.mode_admin.available_actions = ["move"] + self.mode_admin.available_actions = ["move", "toggle_map_mode"] self.mode_control_tile_draw.available_modes = ["admin_enter"] self.mode_control_tile_draw.available_actions = ["move_explorer", "toggle_tile_draw"] self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing", "enter_face", "enter_hat", - "password", + "enter_design", "password", "chat", "study", "play", "admin_enter"] self.mode_edit.available_actions = ["move", "flatten", "install", "toggle_map_mode"] @@ -549,6 +570,7 @@ class TUI: 'flatten': 'F', 'switch_to_enter_face': 'f', 'switch_to_enter_hat': 'H', + 'switch_to_enter_design': 'D', 'switch_to_take_thing': 'z', 'switch_to_drop_thing': 'u', 'teleport': 'p', @@ -557,6 +579,7 @@ class TUI: 'install': 'I', 'wear': 'W', 'spin': 'S', + 'dance': 'T', 'help': 'h', 'toggle_map_mode': 'L', 'toggle_tile_draw': 'm', @@ -662,6 +685,11 @@ class TUI: self.input_ = self.game.player.face[start:end] elif self.mode.name == 'enter_hat': self.input_ = self.game.player.hat[start:end] + elif self.mode.name == 'enter_design': + width = self.game.player.carrying.design[0].x + start = self.ascii_draw_stage * width + end = (self.ascii_draw_stage + 1) * width + self.input_ = self.game.player.carrying.design[1][start:end] def send_tile_control_command(self): self.send('SET_TILE_CONTROL %s %s' % @@ -693,7 +721,7 @@ class TUI: not self.game.player.carrying.commandable): return fail('not carrying anything commandable') if mode_name == 'name_thing' and not self.game.player.carrying: - return fail('not carrying anything to re-name') + return fail('not carrying anything to re-name', 'edit') if mode_name == 'admin_thing_protect' and not self.game.player.carrying: return fail('not carrying anything to protect') if mode_name == 'take_thing' and self.game.player.carrying: @@ -702,6 +730,10 @@ class TUI: return fail('not carrying anything droppable') if mode_name == 'enter_hat' and not hasattr(self.game.player, 'hat'): return fail('not wearing hat to edit', 'edit') + if mode_name == 'enter_design' and\ + (not self.game.player.carrying or + not hasattr(self.game.player.carrying, 'design')): + return fail('not carrying designable to edit', 'edit') if mode_name == 'admin_enter' and self.is_admin: mode_name = 'admin' self.mode = getattr(self, 'mode_' + mode_name) @@ -724,26 +756,41 @@ class TUI: self.log_msg('@ enter username') elif self.mode.name == 'take_thing': self.log_msg('Portable things in reach for pick-up:') - select_range = [self.game.player.position, - self.game.player.position + YX(0,-1), - self.game.player.position + YX(0, 1), - self.game.player.position + YX(-1, 0), - self.game.player.position + YX(1, 0)] - if type(self.game.map_geometry) == MapGeometryHex: + directed_moves = { + 'HERE': YX(0, 0), 'LEFT': YX(0, -1), 'RIGHT': YX(0, 1) + } + if type(self.game.map_geometry) == MapGeometrySquare: + directed_moves['UP'] = YX(-1, 0) + directed_moves['DOWN'] = YX(1, 0) + elif type(self.game.map_geometry) == MapGeometryHex: if self.game.player.position.y % 2: - select_range += [self.game.player.position + YX(-1, 1), - self.game.player.position + YX(1, 1)] + directed_moves['UPLEFT'] = YX(-1, 0) + directed_moves['UPRIGHT'] = YX(-1, 1) + directed_moves['DOWNLEFT'] = YX(1, 0) + directed_moves['DOWNRIGHT'] = YX(1, 1) else: - select_range += [self.game.player.position + YX(-1, -1), - self.game.player.position + YX(1, -1)] - self.selectables = [t.id_ for t in self.game.things - if t.portable and t.position in select_range] + directed_moves['UPLEFT'] = YX(-1, -1) + directed_moves['UPRIGHT'] = YX(-1, 0) + directed_moves['DOWNLEFT'] = YX(1, -1) + directed_moves['DOWNRIGHT'] = YX(1, 0) + select_range = {} + for direction in directed_moves: + move = directed_moves[direction] + select_range[direction] = self.game.player.position + move + self.selectables = [] + directions = [] + for direction in select_range: + for t in [t for t in self.game.things + if t.portable and t.position == select_range[direction]]: + self.selectables += [t.id_] + directions += [direction] if len(self.selectables) == 0: return fail('nothing to pick-up') else: for i in range(len(self.selectables)): t = self.game.get_thing(self.selectables[i]) - self.log_msg(str(i) + ': ' + self.get_thing_info(t)) + self.log_msg('%s %s: %s' % (i, directions[i], + self.get_thing_info(t))) elif self.mode.name == 'drop_thing': self.log_msg('Direction to drop thing to:') self.selectables =\ @@ -799,6 +846,18 @@ class TUI: info_to_cache += t.face[0:6] + '\n' info_to_cache += t.face[6:12] + '\n' info_to_cache += t.face[12:18] + '\n' + if hasattr(t, 'design'): + import textwrap + line_length = t.design[0].x + wrapper = textwrap.TextWrapper(drop_whitespace=False, + width=line_length) + lines = wrapper.wrap(t.design[1]) + if t.type_ == 'Sign': + info_to_cache += '-' * (line_length + 4) + '\n' + for line in lines: + info_to_cache += '| %s |\n' % line + if t.type_ == 'Sign': + info_to_cache += '-' * (line_length + 4) + '\n' terrain_char = self.game.map_content[pos_i] terrain_desc = '?' if terrain_char in self.game.terrains: @@ -921,10 +980,10 @@ class TUI: safe_addstr(y, self.window_width, self.input_lines[i]) y += 1 - def draw_turn(): - if not self.game.turn_complete: - return - safe_addstr(0, self.window_width, 'TURN: ' + str(self.game.turn)) + def draw_stats(): + stats = 'ENERGY: %s BLADDER: %s' % (self.game.energy, + self.game.bladder_pressure) + safe_addstr(0, self.window_width, stats) def draw_mode(): help = "hit [%s] for help" % self.keys['help'] @@ -1072,7 +1131,7 @@ class TUI: draw_history() draw_mode() if not self.mode.is_intro: - draw_turn() + draw_stats() draw_map() if self.show_help: draw_help() @@ -1091,17 +1150,24 @@ class TUI: self.input_ = '' self.switch_mode('play') - def enter_ascii_art(command): - if len(self.input_) != 6: - self.log_msg('? wrong input length, must be 6; try again') + def enter_ascii_art(command, height, width, with_pw=False): + if len(self.input_) > width: + self.log_msg('? wrong input length, ' + 'must be max %s; try again' % width) return + if len(self.input_) < width: + self.input_ += ' ' * (width - len(self.input_)) self.log_msg(' ' + self.input_) self.full_ascii_draw += self.input_ self.ascii_draw_stage += 1 - if self.ascii_draw_stage < 3: + if self.ascii_draw_stage < height: self.restore_input_values() else: - self.send('%s %s' % (command, quote(self.full_ascii_draw))) + if with_pw: + self.send('%s %s %s' % (command, quote(self.full_ascii_draw), + quote(self.password))) + else: + self.send('%s %s' % (command, quote(self.full_ascii_draw))) self.full_ascii_draw = "" self.ascii_draw_stage = 0 self.input_ = "" @@ -1120,6 +1186,7 @@ class TUI: 'door': 'open/close', 'consume': 'consume', 'spin': 'spin', + 'dance': 'dance', } action_tasks = { @@ -1133,6 +1200,7 @@ class TUI: 'command': 'COMMAND', 'consume': 'INTOXICATE', 'spin': 'SPIN', + 'dance': 'DANCE', } curses.curs_set(False) # hide cursor @@ -1143,6 +1211,7 @@ class TUI: reset_screen_size() self.explorer = YX(0, 0) self.input_ = '' + store_widechar = False input_prompt = '> ' interval = datetime.timedelta(seconds=5) last_ping = datetime.datetime.now() - interval @@ -1177,6 +1246,13 @@ class TUI: keycode = None if len(key) == 1: keycode = ord(key) + # workaround for + if store_widechar: + store_widechar = False + key = bytes([195, keycode]).decode() + if keycode == 195: + store_widechar = True + continue self.show_help = False self.draw_face = False if key == 'KEY_RESIZE': @@ -1208,9 +1284,13 @@ class TUI: self.send('LOGIN ' + quote(self.input_)) self.input_ = "" elif self.mode.name == 'enter_face' and key == '\n': - enter_ascii_art('PLAYER_FACE') + enter_ascii_art('PLAYER_FACE', 3, 6) elif self.mode.name == 'enter_hat' and key == '\n': - enter_ascii_art('PLAYER_HAT') + enter_ascii_art('PLAYER_HAT', 3, 6) + elif self.mode.name == 'enter_design' and key == '\n': + enter_ascii_art('THING_DESIGN', + self.game.player.carrying.design[0].y, + self.game.player.carrying.design[0].x, True) elif self.mode.name == 'take_thing' and key == '\n': pick_selectable('PICK_UP') elif self.mode.name == 'drop_thing' and key == '\n': @@ -1305,6 +1385,8 @@ class TUI: self.send('TASK:WEAR') elif key == self.keys['spin'] and task_action_on('spin'): self.send('TASK:SPIN') + elif key == self.keys['dance'] and task_action_on('dance'): + self.send('TASK:DANCE') elif key == self.keys['teleport']: if self.game.player.position in self.game.portals: self.host = self.game.portals[self.game.player.position] @@ -1327,6 +1409,8 @@ class TUI: elif self.mode.name == 'admin': if self.mode.mode_switch_on_key(self, key): continue + elif key == self.keys['toggle_map_mode']: + self.toggle_map_mode() elif key in self.movement_keys and task_action_on('move'): self.send('TASK:MOVE ' + self.movement_keys[key]) elif self.mode.name == 'edit':