Changeset 77 for trunk/PARPG/scripts

Timestamp:

06/01/09 12:10:27 (11 years ago)

Author:

maximinus_parpg

Message:

Added new code for object display

Location:

trunk/PARPG/scripts

Files:

• engine.py (modified) (3 diffs)
• world.py (modified) (3 diffs)

trunk/PARPG/scripts/engine.py

@@ -132 +132 @@
     def addPC(self,pc):
         """Add the PC to the world"""
-        self.view.addObject(float(pc[0]), float(pc[1]),"PC")
+        self.view.addObject(float(pc[0]), float(pc[1]),"PC","PC")
         self.PC = Hero("PC", self.view.agent_layer)
         # ensure the PC starts on a default action
@@ -144 +144 @@
         for i in objects:
             if(i[0] == True):
-                self.view.addObject(float(i[1]), float(i[2]), i[3])
+                self.view.addObject(float(i[1]), float(i[2]), i[3], i[4])
                 # now add it as an engine object
                 self.objects.append(GameObject(i))
@@ -152 +152 @@
            and into this class"""
         for i in npcs:
-            self.view.addObject(float(i[0]), float(i[1]), i[2])
+            self.view.addObject(float(i[0]), float(i[1]), i[2], i[3])
             # now add as engine data
             self.npcs.append(NPC(int(float(i[0])), int(float(i[1])),
                                  i[3], i[4]))
 
-    def getObjectString(self, xpos, ypos):
-        """Get the objects description of itself"""
+    def getObjectText(self, xpos, ypos):
+        """Get the objects id and description of itself"""
         # cycle through all of the objects; do we have something there?
         for i in self.objects:
             if((xpos == i.xpos)and(ypos == i.ypos)):
                 # yes, we have a match, so return the text
-                return i.text
+                return i.id, i.text
         for i in self.npcs:
             if((xpos == i.xpos)and(ypos == i.ypos)):
                 # yes, we have a match, so return the text
-                return i.text
+                return i.id, i.text
         # nothing, but return the empty string in case we print it
-        return ""
+        return "",""
 
     def loadMap(self,map_file):

trunk/PARPG/scripts/world.py

@@ -72 +72 @@
         self.data = None
         self.mouseCallback = None
+        self.obj_hash={}
 
         self.hud = hud.Hud(self.engine, TDS)
@@ -125 +126 @@
         self.cameras['main'].attach(agent)
     
-    def addObject(self, xpos, ypos, name):
+    def addObject(self, xpos, ypos, gfx, name):
         """Add an object or an NPC to the map
            It makes no difference to fife which is which"""
         obj = self.agent_layer.createInstance(
-                self.model.getObject(str(name), "PARPG"),
-                fife.ExactModelCoordinate(xpos,ypos,0.0), str(name))
+                self.model.getObject(str(gfx), "PARPG"),
+                fife.ExactModelCoordinate(xpos,ypos,0.0), str(gfx))
         obj.setRotation(0)
+        # save it for later use
+        self.obj_hash[name]=obj
         fife.InstanceVisual.create(obj)
+
+    def displayObjectText(self, obj, text):
+        """Display on screen the text of the object over the object"""
+        # make sure that the object exists first
+        if obj in self.obj_hash:
+            # NOT WORKING!
+            #self.obj_hash[obj].say(text,3500)
+            print text
 
     def displayInventory(self, callFromHud):
@@ -213 +224 @@
             # the engine code should know....
             coords = self.getCoords(click).getLayerCoordinates()
-            obj = self.data.getObjectString(coords.x, coords.y)
+            obj, text = self.data.getObjectText(coords.x, coords.y)
             if(obj != ""):
-                print obj
+                self.displayObjectText(obj, text)
 
     def toggle_renderer (self, r_name):