X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=rogue_chat_curses.py;h=aeb955e60f9593d113f37fb6f0f33c4f9b2817d6;hb=dbb17811ffb485471c228544549e8c8ff940a946;hp=89c841140edc871c4108d91c6bb3b5f389599e0a;hpb=c7a3af00680ba0449310bbb7336a187dd4ed6bcf;p=plomrogue2

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 89c8411..aeb955e 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -49,7 +49,7 @@ mode_helps = {
     'enter_face': {
         'short': 'enter your face',
         'intro': '@ enter face line (enter nothing to abort):',
-        'long': 'Draw your face as ASCII art.  The string you enter must be 9 characters long, and will be divided on display into three lines of three characters each, from top to bottom..'
+        '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..'
     },
     'write': {
         'short': 'change terrain',
@@ -220,6 +220,11 @@ def cmd_THING_FACE(game, thing_id, face):
     t.face = face
 cmd_THING_FACE.argtypes = 'int:pos string'
 
+def cmd_THING_HAT(game, thing_id, hat):
+    t = game.get_thing(thing_id)
+    t.hat = hat
+cmd_THING_HAT.argtypes = 'int:pos string'
+
 def cmd_THING_CHAR(game, thing_id, c):
     t = game.get_thing(thing_id)
     t.thing_char = c
@@ -343,6 +348,7 @@ class Game(GameBase):
         self.register_command(cmd_THING_NAME)
         self.register_command(cmd_THING_CHAR)
         self.register_command(cmd_THING_FACE)
+        self.register_command(cmd_THING_HAT)
         self.register_command(cmd_THING_CARRYING)
         self.register_command(cmd_THING_INSTALLED)
         self.register_command(cmd_TERRAIN)
@@ -449,7 +455,7 @@ class TUI:
                                           "command_thing", "take_thing"]
         self.mode_play.available_actions = ["move", "drop_thing",
                                             "teleport", "door", "consume",
-                                            "install"]
+                                            "install", "wear"]
         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",
@@ -498,6 +504,7 @@ class TUI:
             'consume': 'C',
             'door': 'D',
             'install': 'I',
+            'wear': 'W',
             'help': 'h',
             'toggle_map_mode': 'L',
             'toggle_tile_draw': 'm',
@@ -665,6 +672,9 @@ class TUI:
                                 if t.portable and t.position in select_range]
             if len(self.selectables) == 0:
                 self.log_msg('none')
+                self.flash = True
+                self.switch_mode('play')
+                return
             else:
                 for i in range(len(self.selectables)):
                     t = self.selectables[i]
@@ -708,10 +718,14 @@ class TUI:
                     if protection == '.':
                         protection = 'none'
                     info_to_cache += ' / protection: %s\n' % protection
+                    if hasattr(t, 'hat'):
+                        info_to_cache += t.hat[0:6] + '\n'
+                        info_to_cache += t.hat[6:12] + '\n'
+                        info_to_cache += t.hat[12:18] + '\n'
                     if hasattr(t, 'face'):
-                        info_to_cache += t.face[0:3] + '\n'
-                        info_to_cache += t.face[3:6] + '\n'
-                        info_to_cache += t.face[6:9] + '\n'
+                        info_to_cache += t.face[0:6] + '\n'
+                        info_to_cache += t.face[6:12] + '\n'
+                        info_to_cache += t.face[12:18] + '\n'
             terrain_char = self.game.map_content[pos_i]
             terrain_desc = '?'
             if terrain_char in self.game.terrains:
@@ -975,6 +989,7 @@ class TUI:
             'toggle_map_mode': 'toggle map view',
             'toggle_tile_draw': 'toggle protection character drawing',
             'install': '(un-)install',
+            'wear': '(un-)wear',
             'door': 'open/close',
             'consume': 'consume',
         }
@@ -985,6 +1000,7 @@ class TUI:
             'drop_thing': 'DROP',
             'door': 'DOOR',
             'install': 'INSTALL',
+            'wear': 'WEAR',
             'move': 'MOVE',
             'command': 'COMMAND',
             'consume': 'INTOXICATE',
@@ -1056,7 +1072,7 @@ class TUI:
                 self.send('LOGIN ' + quote(self.input_))
                 self.input_ = ""
             elif self.mode.name == 'enter_face' and key == '\n':
-                if len(self.input_) != 9:
+                if len(self.input_) != 18:
                     self.log_msg('? wrong input length, aborting')
                 else:
                     self.send('PLAYER_FACE %s' % quote(self.input_))
@@ -1166,6 +1182,8 @@ class TUI:
                     self.send('TASK:INTOXICATE')
                 elif key == self.keys['install'] and task_action_on('install'):
                     self.send('TASK:INSTALL')
+                elif key == self.keys['wear'] and task_action_on('wear'):
+                    self.send('TASK:WEAR')
                 elif key == self.keys['teleport']:
                     player = self.game.get_thing(self.game.player_id)
                     if player.position in self.game.portals: