X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat_curses.py;h=f7ac8cf0bf33c492eac88482d18f7c0b1a9c7c9b;hb=2dc444966037a42b51ed190ab0eab88a09c0282a;hp=e3046cfe5f787dba7a993500805bc1459e5ed65e;hpb=cfb8df3d49ecb0bbdf55de23d31a2a33a7c20edc;p=plomrogue2

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index e3046cf..f7ac8cf 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -296,7 +296,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.energy = game.energy_new
     game.turn_complete = True
     if game.tui.mode.name == 'post_login_wait':
         game.tui.switch_mode('play')
@@ -364,9 +364,9 @@ def cmd_RANDOM_COLORS(game):
     game.tui.set_random_colors()
 cmd_RANDOM_COLORS.argtypes = ''
 
-def cmd_STATS(game, bladder_pressure, weariness):
+def cmd_STATS(game, bladder_pressure, energy):
     game.bladder_pressure_new = bladder_pressure
-    game.weariness_new = weariness
+    game.energy_new = energy
 cmd_STATS.argtypes = 'int:nonneg int'
 
 class Game(GameBase):
@@ -512,13 +512,13 @@ 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"]
@@ -566,6 +566,7 @@ class TUI:
             'install': 'I',
             'wear': 'W',
             'spin': 'S',
+            'dance': 'T',
             'help': 'h',
             'toggle_map_mode': 'L',
             'toggle_tile_draw': 'm',
@@ -702,7 +703,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:
@@ -946,8 +947,8 @@ class TUI:
                 y += 1
 
         def draw_stats():
-            stats = 'WEARY: %s BLADDER: %s' % (self.game.weariness,
-                                               self.game.bladder_pressure)
+            stats = 'ENERGY: %s BLADDER: %s' % (self.game.energy,
+                                                self.game.bladder_pressure)
             safe_addstr(0, self.window_width, stats)
 
         def draw_mode():
@@ -1116,9 +1117,11 @@ class TUI:
             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')
+            if len(self.input_) > 6:
+                self.log_msg('? wrong input length, must be max 6; try again')
                 return
+            if len(self.input_) < 6:
+                self.input_ += ' ' * (6 - len(self.input_))
             self.log_msg('  ' + self.input_)
             self.full_ascii_draw += self.input_
             self.ascii_draw_stage += 1
@@ -1144,6 +1147,7 @@ class TUI:
             'door': 'open/close',
             'consume': 'consume',
             'spin': 'spin',
+            'dance': 'dance',
         }
 
         action_tasks = {
@@ -1157,6 +1161,7 @@ class TUI:
             'command': 'COMMAND',
             'consume': 'INTOXICATE',
             'spin': 'SPIN',
+            'dance': 'DANCE',
         }
 
         curses.curs_set(False)  # hide cursor
@@ -1167,6 +1172,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
@@ -1201,6 +1207,13 @@ class TUI:
             keycode = None
             if len(key) == 1:
                 keycode = ord(key)
+                # workaround for <https://stackoverflow.com/a/56390915>
+                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':
@@ -1329,6 +1342,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]
@@ -1351,6 +1366,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':