Fix input line recalculation bugs.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 466c9b7d72a69f25ed999cf18bf13b2bd1ab5da3..7ffee570842b6bb234e1bd143889c331006d7188 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -20,8 +20,12 @@ mode_helps = {
         'short': 'study',
         'long': 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it.  Toggle the map view to show or hide different information layers.'},
     'edit': {
-        'short': 'map edit',
-        'long': 'This mode allows you to change the map in various ways.  Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view.  You can edit a tile if you set the map edit password that matches its protection character.  The character "." marks the absence of protection:  Such tiles can always be edited.'
+        'short': 'world edit',
+        'long': 'This mode allows you to change the game world in various ways.  Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view.  You can edit a tile if you set the map edit password that matches its protection character.  The character "." marks the absence of protection:  Such tiles can always be edited.'
+    },
+    'name_thing': {
+        'short': 'name thing',
+        'long': 'Give name to/change name of thing here.'
     },
     'write': {
         'short': 'change terrain',
@@ -238,7 +242,6 @@ cmd_ANNOTATION_HINT.argtypes = 'yx_tuple:nonneg'
 
 def cmd_ANNOTATION(game, position, msg):
     game.info_db[position] = msg
-    game.tui.restore_input_values()
     if game.tui.mode.shows_info:
         game.tui.do_refresh = True
 cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'
@@ -364,6 +367,7 @@ class TUI:
     mode_login = Mode('login', has_input_prompt=True, is_intro=True)
     mode_post_login_wait = Mode('post_login_wait', is_intro=True)
     mode_password = Mode('password', has_input_prompt=True)
+    mode_name_thing = Mode('name_thing', has_input_prompt=True, shows_info=True)
     is_admin = False
     tile_draw = False
 
@@ -376,7 +380,7 @@ class TUI:
                                            "control_tile_type", "chat",
                                            "study", "play", "edit"]
         self.mode_control_tile_draw.available_modes = ["admin_enter"]
-        self.mode_edit.available_modes = ["write", "annotate", "portal",
+        self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                           "password", "chat", "study", "play",
                                           "admin_enter"]
         self.mode = None
@@ -400,6 +404,7 @@ class TUI:
             'switch_to_study': '?',
             'switch_to_edit': 'E',
             'switch_to_write': 'm',
+            'switch_to_name_thing': 'N',
             'switch_to_admin_enter': 'A',
             'switch_to_control_pw_type': 'C',
             'switch_to_control_tile_type': 'Q',
@@ -500,6 +505,9 @@ class TUI:
             self.input_ = self.game.portals[self.explorer]
         elif self.mode.name == 'password':
             self.input_ = self.password
+        elif self.mode.name == 'name_thing':
+            if hasattr(self.thing_selected, 'name'):
+                self.input_ = self.thing_selected.name
 
     def send_tile_control_command(self):
         self.send('SET_TILE_CONTROL %s %s' %
@@ -519,8 +527,21 @@ class TUI:
         self.tile_draw = False
         if mode_name == 'admin_enter' and self.is_admin:
             mode_name = 'admin'
+        elif mode_name == 'name_thing':
+            player = self.game.get_thing(self.game.player_id)
+            thing = None
+            for t in [t for t in self.game.things if t.position == player.position
+                      and t.id_ != player.id_]:
+                thing = t
+                break
+            if not thing:
+                self.flash = True
+                self.log_msg('? not standing over thing')
+                return
+            else:
+                self.thing_selected = thing
         self.mode = getattr(self, 'mode_' + mode_name)
-        if self.mode and self.mode.name == 'control_tile_draw':
+        if self.mode.name == 'control_tile_draw':
             self.log_msg('@ finished tile protection drawing.')
         if self.mode.name in {'control_tile_draw', 'control_tile_type',
                               'control_pw_type'}:
@@ -801,8 +822,8 @@ class TUI:
 
         def draw_screen():
             stdscr.clear()
+            recalc_input_lines()
             if self.mode.has_input_prompt:
-                recalc_input_lines()
                 draw_input()
             if self.mode.shows_info:
                 draw_info()
@@ -924,6 +945,12 @@ class TUI:
                 else:
                     self.send('ALL ' + quote(self.input_))
                 self.input_ = ""
+            elif self.mode.name == 'name_thing' and key == '\n':
+                if self.input_ == '':
+                    self.input_ = ' '
+                self.send('THING_NAME %s %s' % (self.thing_selected.id_,
+                                                quote(self.input_)))
+                self.switch_mode('edit')
             elif self.mode.name == 'annotate' and key == '\n':
                 if self.input_ == '':
                     self.input_ = ' '