Changeset 197

Timestamp:

07/09/09 22:54:01 (10 years ago)

Author:

bretzel_parpg

Message:

Fixed examining and opening objects

Location:

trunk/PARPG/scripts

Files:

• objects/actors.py (modified) (6 diffs)
• world.py (modified) (1 diff)

trunk/PARPG/scripts/objects/actors.py

@@ -16 +16 @@
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 import fife
+from scripts import world
 from base import *
 
@@ -46 +47 @@
     def getY(self):
         """Get the NPC's y position on the map.
-           @rtype: integer
+s           @rtype: integer
            @return: the y coordinate of the NPC's location"""
         return self.agent.getLocation().getLayerCoordinates().y
@@ -62 +63 @@
         self.idlecounter = 1
         self.speed = float(TDS.readSetting("PCSpeed")) # TODO: rework/improve
+        self.nextAction = None
+        self.examineName = None
+        self.examineDesc = None
         
     def onInstanceActionFinished(self, instance, action):
@@ -71 +75 @@
         if action.getId() == 'approachDoor':
             # issue map change
-            self.parent.engine.changeMap(self.targetMap, self.targetLocation)
+            self.engine.changeMap(self.targetMap, self.targetLocation)
         if self.state == _AGENT_STATE_TALK:
             # TODO: do something
             pass
+        if self.nextAction == "open_box":
+            self.engine.view.createBoxGUI()
+            self.nextAction = None
+        elif self.nextAction == "examine_obj":
+            self.engine.view.createExamineBox(self.examineName, self.examineDesc)
+            self.nextAction = None
+
         self.idle()
         if(action.getId() != 'stand'):
@@ -124 +135 @@
         self.state = _AGENT_STATE_RUN
         self.behaviour.agent.move('run', location, self.behaviour.speed)
-
+        
     def approachNPC(self, npcLoc):
         """Approaches an npc and then ???.
@@ -167 +178 @@
         l.setLayerCoordinates(fife.ModelCoordinate(*boxLocation))
         self.behaviour.agent.move('run', l, self.behaviour.speed)
-        self.atBox = True
+        self.behaviour.nextAction = "open_box"
+
+    def approachAndExamine(self, location, name, description):
+        """
+        Approach something and then examine it
+        @type location: list
+        @param location: list that is converted to fife.Location
+        @type name: string
+        @param name: The name of the object
+        @type description: string
+        @param description: a detailed description of the object
+        @return: None
+        """
+        self.state = _STATE_RUN
+        objLocation = tuple([int(float(i)) for i in location])
+        l = fife.Location(self.agent.getLocation())
+        l.setLayerCoordinates(fife.ModelCoordinate(*objLocation))
+        self.behaviour.nextAction = "examine_obj"
+        self.behaviour.examineName = name
+        self.behaviour.examineDesc = description
+        self.behaviour.agent.move('run', l, self.speed)
 
 class NPCBehaviour(ActorBehaviour):

trunk/PARPG/scripts/world.py

@@ -416 +416 @@
         if ((self.boxCreated == True) and (self.boxOpen == False)):
             # if it has already been created, just show it
+            print 'show'
             self.box_container.showContainer()
             self.boxOpen = True
         else:
+            print 'create'
             # otherwise create it then show it
-            self.box_container = ContainerGUI(self.engine, unicode("Box"), "gui/inv_images/inv_backpack.png")
+            self.box_container = ContainerGUI(self.engine, unicode("Box"), "dagger01")
             def close_and_delete():
                 self.box_container.hideContainer()