Changeset 68

Timestamp:

05/13/09 16:21:58 (11 years ago)

Author:

maximinus_parpg

Message:

Cleaned up NPC class (a lot)
Right-clicking an object now shows info, albeit on the terminal.
Added information to /maps/map_objects.xml

Location:

trunk/PARPG

Files:

• maps/map_objects.xml (modified) (1 diff)
• run.py (modified) (1 diff)
• scripts/agents/agent.py (deleted)
• scripts/agents/hero.py (modified) (2 diffs)
• scripts/agents/npc.py (modified) (1 diff)
• scripts/engine.py (modified) (6 diffs)
• scripts/objects.py (added)
• scripts/world.py (modified) (3 diffs)

trunk/PARPG/maps/map_objects.xml

@@ -7 +7 @@
     <PC xpos="0.0" ypos="0.0"></PC>
     <!-- There can be any number of NPC characters -->
-    <NPC gfx="npc-woman" xpos="-4.0" ypos="-7.0"></NPC>
+    <NPC gfx="npc-woman" xpos="-4.0" ypos="-7.0" id="women01"
+         text="A friendly woman"></NPC>
     <!-- There can be any number of objects -->
     <!-- Object blocking is set in the objects own xml file -->
-    <object gfx="crate" xpos="-3.0" ypos="-4.0"></object>
-    <object gfx="crate" xpos="-4.0" ypos="-6.0"></object>
+    <object gfx="crate" xpos="-3.0" ypos="-4.0" id="crate01" 
+            text="Just a crate"></object>
+    <object gfx="crate" xpos="-4.0" ypos="-6.0" id="crate02"
+            text="A dirty old crate"></object>
 </objects>
 

trunk/PARPG/run.py

@@ -67 +67 @@
         self.world = world.World(self.engine)
         self.model = engine.Engine(self.world)
+        self.world.data = self.model
         self.listener = ApplicationListener(self.engine,self.world)
         self.world.quitFunction = self.listener.quitGame

trunk/PARPG/scripts/agents/hero.py

@@ -1 @@
-from agent import Agent
+#!/usr/bin/python
+
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import fife
 from settings import Setting
 
@@ -5 +20 @@
 _STATE_NONE, _STATE_IDLE, _STATE_RUN = xrange(3)
 
-class Hero(Agent):
+class Hero(fife.InstanceActionListener):
     """This is the class we use for the PC character"""
     def __init__(self, agentName, layer):
-        super(Hero, self).__init__(agentName, layer)
+        # add this class for callbacks from fife itself
+        fife.InstanceActionListener.__init__(self)
+        self.agentName = agentName
+        self.agent = layer.getInstance(agentName)
+        self.agent.addActionListener(self)
         self.state = _STATE_NONE
         self.idlecounter = 1

trunk/PARPG/scripts/agents/npc.py

@@ -17 +17 @@
 
 from agent import Agent
-from settings import Setting
 
-TDS = Setting()
-_STATE_NONE, _STATE_IDLE, _STATE_RUN = xrange(3)
+class NPC:
+    """This is the class we use for all NPCs"""
+    def __init__(self, xpos, ypos, ident, text):
+        self.xpos = xpos
+        self.ypos = ypos
+        self.id = ident
+        self.text = text
 
-class NPC(Agent):
-    """This is the class we use for all NPCs"""
-    def __init__(self, model, agentName, layer, uniqInMap=True):
-        super(NPC, self).__init__(model, agentName, layer, uniqInMap)
-        self.state = _STATE_NONE
-        self.idlecounter = 1
-        #self.speed=float(TDS.readSetting("PCSpeed"))
-
-    def onInstanceActionFinished(self, instance, action):
-        self.idle()
-        if action.getId() != 'stand':
-            self.idlecounter = 1
-        else:
-            self.idlecounter += 1
-
-    def start(self):
-        self.idle()
-
-    def idle(self):
-        self.state = _STATE_IDLE
-        self.agent.act('stand', self.agent.getFacingLocation())
-
-    def run(self, location):
-        self.state = _STATE_RUN
-        self.agent.move('run',location,self.speed)
-

trunk/PARPG/scripts/engine.py

@@ -21 +21 @@
 from agents.hero import Hero
 from agents.npc import NPC
+from objects import GameObject
 
 # design note:
@@ -65 +66 @@
                 ypos = attrs.getValue("ypos")
                 gfx = attrs.getValue("gfx")
+                ident = attrs.getValue("id")
+                text = attrs.getValue("text")
             except(KeyError):
                 sys.stderr.write("Error: Data missing in NPC definition\n")
                 sys.exit(False)
             # now we have the data, save it for later
-            self.npcs.append([xpos,ypos,gfx])
+            self.npcs.append([xpos, ypos, gfx, ident, text])
         elif(name == "object"):
             # same old same old
@@ -76 +79 @@
                 ypos = attrs.getValue("ypos")
                 gfx = attrs.getValue("gfx")
+                ident = attrs.getValue("id")
+                text = attrs.getValue("text")
             except(KeyError):
                 sys.stderr.write("Error: Data missing in object definition\n")
                 sys.exit(False)
             # now we have the data, save it for later
-            self.objects.append([xpos, ypos, gfx])
+            self.objects.append([xpos, ypos, gfx, ident, text])
 
 class Engine:
@@ -132 +137 @@
         for i in objects:
             self.view.addObject(float(i[0]), float(i[1]), i[2])
+            # now add it as an engine object
+            self.objects.append(GameObject(int(float(i[0])),
+                                           int(float(i[1])), i[3], i[4]))
 
     def addNPCs(self,npcs):
@@ -137 +145 @@
            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])
+            # 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"""
+        # 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
+        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
+        # nothing, but return the empty string in case we print it
+        return ""
 
     def loadMap(self,map_file):
@@ -146 +171 @@
         # then we update FIFE with the PC, NPC and object details
         self.loadObjects(map_file[:-4]+"_objects.xml")
-        # add a callbacks routine to handle mouse clicks
-        # TODO: not totally happy about this code
-        self.view.mouseCallback=self.handleMouseClick
 
     def handleMouseClick(self,position):

trunk/PARPG/scripts/world.py

@@ -67 +67 @@
         self.inventoryShown = False
         self.firstInventory = True
+        self.data = None
         self.mouseCallback = None
 
@@ -121 +122 @@
         fife.InstanceVisual.create(obj)
 
+    def displayInventory(self):
+        """Pause the game and enter the inventory screen"""
+
     # all key / mouse event handling routines go here
     def keyPressed(self, evt):
-        """When a key is depressed, fife calls this routine."""
+        """When a key is pressed, fife calls this routine."""
         key = evt.getKey()
         keyval = key.getValue()
@@ -159 +163 @@
                 self.inventoryShown = True
 
+    def getCoords(self, click):
+        """Get the map location x, y cords that have been clicked"""
+        coord = self.cameras["main"].toMapCoordinates(click, False)
+        coord.z = 0
+        location = fife.Location(self.agent_layer)
+        location.setMapCoordinates(coord)
+        return location
+
     def mousePressed(self, evt):
         """If a mouse button is pressed down, fife cals this routine
            Currently we only check for a left click, and we assume this is on
            the map"""
-        clickpoint = fife.ScreenPoint(evt.getX(), evt.getY())
-        if (evt.getButton() == fife.MouseEvent.LEFT):
-            target_mapcoord = self.cameras['main'].toMapCoordinates(clickpoint,
-                                                                    False)
-            target_mapcoord.z = 0
-            l = fife.Location(self.agent_layer)
-            l.setMapCoordinates(target_mapcoord)
-            self.mouseCallback(l)
-            
+        click = fife.ScreenPoint(evt.getX(), evt.getY())
+        if(evt.getButton() == fife.MouseEvent.LEFT):
+            self.data.handleMouseClick(self.getCoords(click))
+        elif(evt.getButton() == fife.MouseEvent.RIGHT):
+            # there's no need to query fife about what things are where,
+            # the engine code should know....
+            coords = self.getCoords(click).getLayerCoordinates()
+            obj = self.data.getObjectString(coords.x, coords.y)
+            if(obj != ""):
+                print obj
+
     def toggle_renderer (self, r_name):
         """Enable or disable the renderer named `r_name`"""