X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=rogue_chat_curses.py;h=d4693403fcedf8a6aba64fe3d155ac02715fea88;hb=15ad903f7da0dd35945f79ff26e4528378eaf31f;hp=65d5385ee2d20d17f5fb117a4ac82ea987163445;hpb=1c16b715953524a6d9e84993963cf4f7adcc5bbe;p=plomrogue2
diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 65d5385..d469340 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -174,7 +174,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'
@@ -256,14 +255,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 +293,7 @@ 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.turn_complete = True
if game.tui.mode.name == 'post_login_wait':
game.tui.switch_mode('play')
@@ -361,6 +361,10 @@ def cmd_RANDOM_COLORS(game):
game.tui.set_random_colors()
cmd_RANDOM_COLORS.argtypes = ''
+def cmd_BLADDER_PRESSURE(game, bladder_pressure):
+ game.bladder_pressure_new = bladder_pressure
+cmd_BLADDER_PRESSURE.argtypes = 'int:nonneg'
+
class Game(GameBase):
turn_complete = False
tasks = {}
@@ -400,6 +404,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.map_content = ''
self.players_hat_chars = ''
self.player_id = -1
@@ -409,6 +414,8 @@ 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':
@@ -936,10 +943,8 @@ 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():
+ safe_addstr(0, self.window_width, 'BLADDER: ' + str(self.game.bladder_pressure))
def draw_mode():
help = "hit [%s] for help" % self.keys['help']
@@ -1087,7 +1092,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()