Make thing dropping directional.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 15f59bf5d915bd13d8b3c5fafe1f761440854cd8..657523fbcf3257aca52daaa749a8ad880ed8906f 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -41,6 +41,11 @@ mode_helps = {
         'intro': 'Pick up a thing in reach by entering its index number.  Enter nothing to abort.',
         'long': 'You see a list of things which you could pick up.  Enter the target thing\'s index, or, to leave, nothing.'
     },
+    'drop_thing': {
+        'short': 'drop thing',
+        'intro': 'Enter number of direction to which you want to drop thing.',
+        'long': 'Drop currently carried thing by entering the target direction index.  Enter nothing to return to play mode..'
+    },
     'admin_thing_protect': {
         'short': 'change thing protection',
         'intro': '@ enter thing protection character:',
@@ -300,6 +305,7 @@ def cmd_TASKS(game, tasks_comma_separated):
     game.tui.mode_write.legal = 'WRITE' in game.tasks
     game.tui.mode_command_thing.legal = 'COMMAND' in game.tasks
     game.tui.mode_take_thing.legal = 'PICK_UP' in game.tasks
+    game.tui.mode_drop_thing.legal = 'DROP' in game.tasks
 cmd_TASKS.argtypes = 'string'
 
 def cmd_THING_TYPE(game, thing_type, symbol_hint):
@@ -445,6 +451,7 @@ class TUI:
     mode_name_thing = Mode('name_thing', has_input_prompt=True, shows_info=True)
     mode_command_thing = Mode('command_thing', has_input_prompt=True)
     mode_take_thing = Mode('take_thing', has_input_prompt=True)
+    mode_drop_thing = Mode('drop_thing', has_input_prompt=True)
     mode_enter_face = Mode('enter_face', has_input_prompt=True)
     is_admin = False
     tile_draw = False
@@ -453,9 +460,9 @@ class TUI:
         import os
         import json
         self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
-                                          "command_thing", "take_thing"]
-        self.mode_play.available_actions = ["move", "drop_thing",
-                                            "teleport", "door", "consume",
+                                          "command_thing", "take_thing",
+                                          "drop_thing"]
+        self.mode_play.available_actions = ["move", "teleport", "door", "consume",
                                             "install", "wear"]
         self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
         self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"]
@@ -500,7 +507,7 @@ class TUI:
             'flatten': 'F',
             'switch_to_enter_face': 'f',
             'switch_to_take_thing': 'z',
-            'drop_thing': 'u',
+            'switch_to_drop_thing': 'u',
             'teleport': 'p',
             'consume': 'C',
             'door': 'D',
@@ -675,7 +682,7 @@ class TUI:
                 else:
                     select_range += [player.position + YX(-1, -1),
                                      player.position + YX(1, -1)]
-            self.selectables = [t for t in self.game.things
+            self.selectables = [t.id_ for t in self.game.things
                                 if t.portable and t.position in select_range]
             if len(self.selectables) == 0:
                 self.log_msg('none')
@@ -684,8 +691,14 @@ class TUI:
                 return
             else:
                 for i in range(len(self.selectables)):
-                    t = self.selectables[i]
+                    t = self.game.get_thing(self.selectables[i])
                     self.log_msg(str(i) + ': ' + self.get_thing_info(t))
+        elif self.mode.name == 'drop_thing':
+            self.log_msg('Direction to drop thing to:')
+            self.selectables =\
+                ['HERE'] + list(self.game.tui.movement_keys.values())
+            for i in range(len(self.selectables)):
+                self.log_msg(str(i) + ': ' + self.selectables[i])
         elif self.mode.name == 'command_thing':
             self.send('TASK:COMMAND ' + quote('HELP'))
         elif self.mode.name == 'control_pw_pw':
@@ -987,6 +1000,18 @@ class TUI:
             if self.show_help:
                 draw_help()
 
+        def pick_selectable(task_name):
+            try:
+                i = int(self.input_)
+                if i < 0 or i >= len(self.selectables):
+                    self.log_msg('? invalid index, aborted')
+                else:
+                    self.send('TASK:%s %s' % (task_name, self.selectables[i]))
+            except ValueError:
+                self.log_msg('? invalid index, aborted')
+            self.input_ = ''
+            self.switch_mode('play')
+
         action_descriptions = {
             'move': 'move',
             'flatten': 'flatten surroundings',
@@ -1059,7 +1084,7 @@ class TUI:
                 self.input_ = self.input_[:-1]
             elif self.mode.has_input_prompt and key == '\n' and self.input_ == ''\
                  and self.mode.name in {'chat', 'command_thing', 'take_thing',
-                                        'admin_enter'}:
+                                        'drop_thing', 'admin_enter'}:
                 if self.mode.name != 'chat':
                     self.log_msg('@ aborted')
                 self.switch_mode('play')
@@ -1086,16 +1111,9 @@ class TUI:
                 self.input_ = ""
                 self.switch_mode('edit')
             elif self.mode.name == 'take_thing' and key == '\n':
-                try:
-                    i = int(self.input_)
-                    if i < 0 or i >= len(self.selectables):
-                        self.log_msg('? invalid index, aborted')
-                    else:
-                        self.send('TASK:PICK_UP %s' % self.selectables[i].id_)
-                except ValueError:
-                    self.log_msg('? invalid index, aborted')
-                self.input_ = ''
-                self.switch_mode('play')
+                pick_selectable('PICK_UP')
+            elif self.mode.name == 'drop_thing' and key == '\n':
+                pick_selectable('DROP')
             elif self.mode.name == 'command_thing' and key == '\n':
                 self.send('TASK:COMMAND ' + quote(self.input_))
                 self.input_ = ""
@@ -1180,8 +1198,6 @@ class TUI:
             elif self.mode.name == 'play':
                 if self.mode.mode_switch_on_key(self, key):
                     continue
-                elif key == self.keys['drop_thing'] and task_action_on('drop_thing'):
-                    self.send('TASK:DROP')
                 elif key == self.keys['door'] and task_action_on('door'):
                     self.send('TASK:DOOR')
                 elif key == self.keys['consume'] and task_action_on('consume'):