X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=rogue_chat_curses.py;h=ec9eee5b276b1373a77588b2cfc01a78e1625545;hb=dfb05774efac717d1adc699e97b6140599e5df1e;hp=d4693403fcedf8a6aba64fe3d155ac02715fea88;hpb=a2ae7f2fa2c5188c91c093800404779895c35891;p=plomrogue2 diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index d469340..ec9eee5 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -294,6 +294,7 @@ def cmd_GAME_STATE_COMPLETE(game): 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.weariness = game.weariness_new game.turn_complete = True if game.tui.mode.name == 'post_login_wait': game.tui.switch_mode('play') @@ -361,9 +362,10 @@ def cmd_RANDOM_COLORS(game): game.tui.set_random_colors() cmd_RANDOM_COLORS.argtypes = '' -def cmd_BLADDER_PRESSURE(game, bladder_pressure): +def cmd_STATS(game, bladder_pressure, weariness): game.bladder_pressure_new = bladder_pressure -cmd_BLADDER_PRESSURE.argtypes = 'int:nonneg' + game.weariness_new = weariness +cmd_STATS.argtypes = 'int:nonneg int:nonneg' class Game(GameBase): turn_complete = False @@ -404,7 +406,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_BLADDER_PRESSURE) + self.register_command(cmd_STATS) self.map_content = '' self.players_hat_chars = '' self.player_id = -1 @@ -414,8 +416,6 @@ class Game(GameBase): self.portals_new = {} self.terrains = {} self.player = None - self.bladder_pressure_new = 0 - self.bladder_pressure = 0 def get_string_options(self, string_option_type): if string_option_type == 'map_geometry': @@ -944,7 +944,9 @@ class TUI: y += 1 def draw_stats(): - safe_addstr(0, self.window_width, 'BLADDER: ' + str(self.game.bladder_pressure)) + stats = 'WEARY: %s BLADDER: %s' % (self.game.weariness, + self.game.bladder_pressure) + safe_addstr(0, self.window_width, stats) def draw_mode(): help = "hit [%s] for help" % self.keys['help']