Changeset 395 for trunk/game/scripts/objects

Timestamp:

11/24/09 19:27:58 (10 years ago)

Author:

eliedebrauwer

Message:

Ticket #137 and #138. Patch by Beliar (confirmed by eliedebrauwer). Fixes footlocker animation, added support for opening/closing footlocker animations, added footlocker onto the map, isolates contents of containers. Added copyright notice to layer_fill_utility.py. fixes[s:trac, t:137] fixes[s:trac, t:138]

Location:

trunk/game/scripts/objects

Files:

• action.py (modified) (1 diff)
• base.py (modified) (5 diffs)
• containers.py (modified) (1 diff)

trunk/game/scripts/objects/action.py

@@ -48 +48 @@
 class OpenBoxAction(Action):
     """Open a box. Needs to be more generic, but will do for now."""
-    def __init__(self, engine, box_title):
+    def __init__(self, engine, container):
         """@type engine: Engine reference
            @param engine: A reference to the engine.
-           @type box_title: String
-           @param box_title: Box title.
+           @param container: A reference to the container
            """
         self.engine = engine
-        self.box_title = box_title
+        self.container = container
+        
+    def execute(self):
+        """Open the box."""
+        try:
+            self.container.open()
+        except ValueError:
+            self.engine.view.hud.createExamineBox(self.container.name, \
+                                              "The container is locked")
+        
+class UnlockBoxAction(Action):
+    """Unlocks a box. Needs to be more generic, but will do for now."""
+    def __init__(self,  container):
+        """@param container: A reference to the container
+           """
+        self.container = container
     
     def execute(self):
         """Open the box."""
-        self.engine.view.hud.createBoxGUI(self.box_title)
+        self.container.unlock()
         
+class LockBoxAction(Action):
+    """Locks a box. Needs to be more generic, but will do for now."""
+    def __init__(self, container):
+        """@param container: A reference to the container
+           """
+        self.container = container
+    def execute(self):
+        """Lock the box."""
+        self.container.lock()
+
+
 class ExamineBoxAction(Action):
     """Examine a box. Needs to be more generic, but will do for now."""

trunk/game/scripts/objects/base.py

@@ -54 +54 @@
 from settings import Setting
 from random import randrange
+from scripts.gui.popups import ExaminePopup, ContainerGUI
 
 class GameObject (object):
@@ -140 +141 @@
 class Lockable (Openable):
     """Allows objects to be locked"""
-    def __init__ (self, locked = False, is_open=True, **kwargs):
+    def __init__ (self, locked = False, is_open = True, **kwargs):
         """Init operation for lockable objects
         @type locked: Boolean
@@ -148 +149 @@
         """
         self.is_lockable = True
+        if locked == True: #HACK: For some reason locked appears to NOT be a bool. Needs investigation
+            locked = True
+        else: locked = False
         self.locked = locked
         if locked :
@@ -178 +182 @@
 class Container (object):
     """Gives objects the capability to hold other objects"""
-    def __init__ (self, **kwargs):
+    def __init__ (self,
+                  events = {},
+                  items = ["empty", "empty", "empty", "empty", "empty","empty", "empty", "empty", "empty"],
+                  engine = None, **kwargs):
         self.is_container = True
-        self.items = []
+        self.items = items
+        self.events = events
+        if not self.events:
+            self.events = {'takeAllButton':self.hideContainer,
+                      'closeButton':self.hideContainer}
+        self.containergui = engine.view.hud.createBoxGUI(self.name, self.items, self.events)
         
     def placeItem (self, item):
@@ -212 +224 @@
         return len(self.items)
 
+    def showContainer (self):        
+        self.containergui.showContainer()
+
+    def hideContainer(self):
+        self.containergui.hideContainer()
         
 class Living (object):

trunk/game/scripts/objects/containers.py

@@ -19 +19 @@
 barrels, chests, etc."""
 
-__all__ = ["WoodenCrate",]
+__all__ = ["WoodenCrate", "Footlocker"]
+
+_AGENT_STATE_NONE, _AGENT_STATE_OPENED, _AGENT_STATE_CLOSED, _AGENT_STATE_OPENING, _AGENT_STATE_CLOSING = xrange(5)
 
 from composed import ImmovableContainer
+import fife
 
 class WoodenCrate (ImmovableContainer):
     def __init__ (self, ID, name = 'Wooden Crate', \
             text = 'A battered crate', gfx = 'crate', **kwargs):
+        events = {'takeAllButton':self.close,
+          'closeButton':self.close}
         ImmovableContainer.__init__(self, ID = ID, name = name, gfx = gfx, \
-                text = text, **kwargs)
+                text = text, events = events, items = ["dagger01", "empty", "empty", "empty", "empty",
+                    "empty", "empty", "empty", "empty"], **kwargs)
+
+    def close(self, *args, **kwargs):
+        self.hideContainer()
+        super (WoodenCrate,self).close()
+
+    def open(self, *args, **kwargs):
+        super (WoodenCrate,self).open(*args,**kwargs)
+        self.showContainer()
+        
+class Footlocker(ImmovableContainer, fife.InstanceActionListener):
+    def __init__ (self, ID, agent_layer=None, name = 'Footlocker', \
+               text = 'A Footlocker', gfx = 'lock_box_metal01', **kwargs):
+        events = {'takeAllButton':self.close,
+                  'closeButton':self.close}
+        ImmovableContainer.__init__(self, ID = ID, name = name, gfx = gfx, \
+                text = text, events = events, items = ["dagger01", "empty", "empty", "empty", "empty",
+                                                       "empty", "empty", "empty", "empty"], **kwargs)
+        fife.InstanceActionListener.__init__(self)
+        self.layer = agent_layer
+        self.agent = self.layer.getInstance(self.ID)
+        self.agent.addActionListener(self)
+        self.state = _AGENT_STATE_CLOSED
+        self.agent.act('closed', self.agent.getLocation())
+        
+    def onInstanceActionFinished(self, instance, action):
+        """What the NPC does when it has finished an action.
+           Called by the engine and required for InstanceActionListeners.
+           @type instance: fife.Instance
+           @param instance: self.agent (the NPC listener is listening for this
+            instance)
+           @type action: ???
+           @param action: ???
+           @return: None"""
+        if self.state == _AGENT_STATE_OPENING:
+            self.agent.act('opened', self.agent.getFacingLocation(), True)
+            self.state = _AGENT_STATE_OPENED
+            self.showContainer()
+        if self.state == _AGENT_STATE_CLOSING:
+            self.agent.act('closed', self.agent.getFacingLocation(), True)
+            self.state = _AGENT_STATE_CLOSED
+        
+    def open (self):
+        super (Footlocker,self).open()
+        if self.state != _AGENT_STATE_OPENED and self.state != _AGENT_STATE_OPENING:
+            self.agent.act('open', self.agent.getLocation())
+            self.state = _AGENT_STATE_OPENING
+
+    def close(self):
+        super (Footlocker,self).close()
+        self.hideContainer()
+        if self.state != _AGENT_STATE_CLOSED and self.state != _AGENT_STATE_CLOSING:
+            self.agent.act('close', self.agent.getLocation())
+            self.state = _AGENT_STATE_CLOSING