Refactor clients.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index e5c2dad6e63feab72339c7ed54c61202cf15623b..2066f6ca00a1ffc9ac0fd18323bc0335a94d391a 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -390,12 +390,13 @@ class TUI:
                                            "control_tile_type", "chat",
                                            "study", "play", "edit"]
         self.mode_admin.available_actions = ["move"]
-        self.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
-        self.mode_control_tile_draw.available_actions = ["toggle_tile_draw"]
         self.mode_control_tile_draw.available_modes = ["admin_enter"]
+        self.mode_control_tile_draw.available_actions = ["move_explorer",
+                                                         "toggle_tile_draw"]
         self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                           "password", "chat", "study", "play",
                                           "admin_enter"]
+        self.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
         self.mode = None
         self.host = host
         self.game = Game()
@@ -1023,7 +1024,7 @@ class TUI:
                     else:
                         self.flash = True
                         self.log_msg('? not standing on portal')
-                elif key in self.movement_keys and task_action_on('move'):# 'MOVE' in self.game.tasks:
+                elif key in self.movement_keys and task_action_on('move'):
                     self.send('TASK:MOVE ' + self.movement_keys[key])
             elif self.mode.name == 'write':
                 self.send('TASK:WRITE %s %s' % (key, quote(self.password)))