Toggle tile drawing in tile control drawing mode.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 67f63a1cd09dd9980f9783a5e737ce79f5f4ad39..698360915a513fa0329e220680081f731ee13866 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -41,7 +41,7 @@ mode_helps = {
     },
     'control_tile_draw': {
         'short': 'change tiles control',
     },
     'control_tile_draw': {
         'short': 'change tiles control',

-        'long': 'This mode is the second of two steps to change tile control areas on the map.  Move cursor around the map to draw selected tile control character'
+        'long': 'This mode is the second of two steps to change tile control areas on the map.  Toggle tile control drawing on, then move cursor around the map to draw selected tile control character.'

     },
     'annotate': {
         'short': 'annotate tile',
     },
     'annotate': {
         'short': 'annotate tile',


@@ -365,6 +365,7 @@ class TUI:
     mode_post_login_wait = Mode('post_login_wait', is_intro=True)
     mode_password = Mode('password', has_input_prompt=True)
     is_admin = False
     mode_post_login_wait = Mode('post_login_wait', is_intro=True)
     mode_password = Mode('password', has_input_prompt=True)
     is_admin = False

+    tile_draw = False

 
     def __init__(self, host):
         import os
 
     def __init__(self, host):
         import os


@@ -407,6 +408,7 @@ class TUI:
             'teleport': 'p',
             'help': 'h',
             'toggle_map_mode': 'M',
             'teleport': 'p',
             'help': 'h',
             'toggle_map_mode': 'M',

+            'toggle_tile_draw': 'm',

             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',
             'hex_move_right': 'd',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',
             'hex_move_right': 'd',


@@ -503,6 +505,7 @@ class TUI:
 
     def switch_mode(self, mode_name):
         self.map_mode = 'all'
 
     def switch_mode(self, mode_name):
         self.map_mode = 'all'

+        self.tile_draw = False

         if mode_name == 'admin_enter' and self.is_admin:
             mode_name = 'admin'
         self.mode = getattr(self, 'mode_' + mode_name)
         if mode_name == 'admin_enter' and self.is_admin:
             mode_name = 'admin'
         self.mode = getattr(self, 'mode_' + mode_name)


@@ -511,9 +514,6 @@ class TUI:
             self.explorer = YX(player.position.y, player.position.x)
             if self.mode.shows_info:
                 self.query_info()
             self.explorer = YX(player.position.y, player.position.x)
             if self.mode.shows_info:
                 self.query_info()

-            elif self.mode.name == 'control_tile_draw':
-                self.send_tile_control_command()
-                self.map_mode = 'control'

         if self.mode.is_single_char_entry:
             self.show_help = True
         if self.mode.name == 'waiting_for_server':
         if self.mode.is_single_char_entry:
             self.show_help = True
         if self.mode.name == 'waiting_for_server':


@@ -583,7 +583,7 @@ class TUI:
                 self.explorer = target
                 if self.mode.shows_info:
                     self.query_info()
                 self.explorer = target
                 if self.mode.shows_info:
                     self.query_info()

-                elif self.mode.name == 'control_tile_draw':
+                if self.tile_draw:

                     self.send_tile_control_command()
             else:
                 self.flash = True
                     self.send_tile_control_command()
             else:
                 self.flash = True


@@ -746,6 +746,10 @@ class TUI:
                 if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']
                 content += '\n'
                 if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']
                 content += '\n'

+            elif self.mode.name == 'control_tile_draw':
+                content += "Available actions:\n"
+                content += "[%s] – toggle tile control drawing\n" % self.keys['toggle_tile_draw']
+                content += '\n'

             elif self.mode.name == 'chat':
                 content += '/nick NAME – re-name yourself to NAME\n'
                 content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play']
             elif self.mode.name == 'chat':
                 content += '/nick NAME – re-name yourself to NAME\n'
                 content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play']


@@ -937,6 +941,8 @@ class TUI:
                     continue
                 elif key in self.movement_keys:
                     move_explorer(self.movement_keys[key])
                     continue
                 elif key in self.movement_keys:
                     move_explorer(self.movement_keys[key])

+                elif key == self.keys['toggle_tile_draw']:
+                    self.tile_draw = False if self.tile_draw else True

             elif self.mode.name == 'admin':
                 if self.mode.mode_switch_on_key(self, key):
                     continue
             elif self.mode.name == 'admin':
                 if self.mode.mode_switch_on_key(self, key):
                     continue