Save thing installation status.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 6a30f746f8cdc86e7fc787dfc676c1f3955a59e1..e6ddda87a20f62e71d64974dba56ad82d1e1653c 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -194,7 +194,7 @@ def cmd_PLAYER_ID(game, player_id):
     game.player_id = player_id
 cmd_PLAYER_ID.argtypes = 'int:nonneg'
 
-def cmd_THING(game, yx, thing_type, protection, thing_id):
+def cmd_THING(game, yx, thing_type, protection, thing_id, portable):
     t = game.get_thing(thing_id)
     if not t:
         t = ThingBase(game, thing_id)
@@ -202,7 +202,8 @@ def cmd_THING(game, yx, thing_type, protection, thing_id):
     t.position = yx
     t.type_ = thing_type
     t.protection = protection
-cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg'
+    t.portable = portable
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg bool'
 
 def cmd_THING_NAME(game, thing_id, name):
     t = game.get_thing(thing_id)
@@ -432,7 +433,8 @@ class TUI:
         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"]
+                                            "teleport", "door", "consume",
+                                            "install"]
         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",
@@ -479,6 +481,7 @@ class TUI:
             'teleport': 'p',
             'consume': 'C',
             'door': 'D',
+            'install': 'I',
             'help': 'h',
             'toggle_map_mode': 'L',
             'toggle_tile_draw': 'm',
@@ -628,7 +631,7 @@ class TUI:
             else:
                 self.log_msg('@ enter username')
         elif self.mode.name == 'take_thing':
-            self.log_msg('Things in reach for pick-up:')
+            self.log_msg('Portable things in reach for pick-up:')
             player = self.game.get_thing(self.game.player_id)
             select_range = [player.position,
                             player.position + YX(0,-1),
@@ -643,8 +646,7 @@ class TUI:
                     select_range += [player.position + YX(-1, -1),
                                      player.position + YX(1, -1)]
             self.selectables = [t for t in self.game.things
-                                if t != player and t.type_ != 'Player'
-                                and t.position in select_range]
+                                if t.portable and t.position in select_range]
             if len(self.selectables) == 0:
                 self.log_msg('none')
             else:
@@ -950,6 +952,7 @@ class TUI:
             'drop_thing': 'drop thing',
             'toggle_map_mode': 'toggle map view',
             'toggle_tile_draw': 'toggle protection character drawing',
+            'install': 'install',
             'door': 'open/close',
             'consume': 'consume',
         }
@@ -959,6 +962,7 @@ class TUI:
             'take_thing': 'PICK_UP',
             'drop_thing': 'DROP',
             'door': 'DOOR',
+            'install': 'INSTALL',
             'move': 'MOVE',
             'command': 'COMMAND',
             'consume': 'INTOXICATE',
@@ -1131,6 +1135,8 @@ class TUI:
                     self.send('TASK:DOOR')
                 elif key == self.keys['consume'] and task_action_on('consume'):
                     self.send('TASK:INTOXICATE')
+                elif key == self.keys['install'] and task_action_on('install'):
+                    self.send('TASK:INSTALL')
                 elif key == self.keys['teleport']:
                     player = self.game.get_thing(self.game.player_id)
                     if player.position in self.game.portals: