--- a/behaviours/moving.py	Fri Sep 09 15:05:23 2011 +0200
+++ b/behaviours/moving.py	Fri Sep 09 15:18:17 2011 +0200
@@ -14,55 +14,21 @@
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
 from fife import fife
+import base
+from base import BaseBehaviour
 
-_AGENT_STATE_NONE, _AGENT_STATE_IDLE, _AGENT_STATE_APPROACH, _AGENT_STATE_RUN, _AGENT_STATE_WANDER, _AGENT_STATE_TALK = xrange(6)
-
-class MovingAgentBehaviour (fife.InstanceActionListener):
+class MovingAgentBehaviour (BaseBehaviour):
     """Fife agent listener"""
     def __init__(self):
-        fife.InstanceActionListener.__init__(self)
-        self.agent = None
-        self.state = None
+        BaseBehaviour.__init__(self)
         self.speed = 0
         self.idle_counter = 1
-    
-    def attachToLayer(self, agent_ID, layer):
-        """Attaches to a certain layer
-           @type agent_ID: String
-           @param agent_ID: ID of the layer to attach to.
-           @type layer: Fife layer
-           @param layer: Layer of the agent to attach the behaviour to
-           @return: None"""
-        self.agent = layer.getInstance(agent_ID)
-        self.agent.addActionListener(self)
-        self.state = _AGENT_STATE_NONE
-        
-    def getX(self):
-        """Get the NPC's x position on the map.
-           @rtype: integer"
-           @return: the x coordinate of the NPC's location"""
-        return self.agent.getLocation().getLayerCoordinates().x
-
-    def getY(self):
-        """Get the NPC's y position on the map.
-           @rtype: integer
-           @return: the y coordinate of the NPC's location"""
-        return self.agent.getLocation().getLayerCoordinates().y
         
     def onNewMap(self, layer):
         """Sets the agent onto the new layer."""
-        if self.agent is not None:
-            self.agent.removeActionListener(self)
-            
-        self.agent = layer.getInstance(self.parent.fifeagent.identifier)
-        self.agent.addActionListener(self)
-        self.state = _AGENT_STATE_NONE
+        BaseBehaviour.onNewMap(self, layer)
         self.idle_counter = 1
-    
-    def idle(self):
-        """@return: None"""
-        self.state = _AGENT_STATE_IDLE
-        self.agent.act('stand', self.agent.getFacingLocation())
+
 
     def approach(self, location, action=None):
         """Approaches a location and then perform an action (if set).
@@ -71,7 +37,7 @@
            @type action: Action
            @param action: The action to schedule for execution after the approach.
            @return: None"""
-        self.state = _AGENT_STATE_APPROACH
+        self.state = base._AGENT_STATE_APPROACH
         self.nextAction = action
         boxLocation = tuple([int(float(i)) for i in location])
         l = fife.Location(self.agent.getLocation())
@@ -84,39 +50,19 @@
            @type action: ???
            @param action: ???
            @return: None"""
-        # First we reset the next behavior 
-        act = self.nextAction
-        self.nextAction = None 
-        self.idle()
-        
-        if act:
-            act.execute()
+        BaseBehaviour.onInstanceActionFinished(self, instance, action)
             
         if(action.getId() != 'stand'):
             self.idle_counter = 1
         else:
             self.idle_counter += 1 
-            
-    def getLocation(self):
-        """Get the agents position as a fife.Location object. 
-           @rtype: fife.Location
-           @return: the location of the agent"""
-        return self.agent.getLocation()
-    
-        
-    def talk(self, pc):
-        """Makes the agent ready to talk to the PC
-           @return: None"""
-        self.state = _AGENT_STATE_TALK
-        self.pc = pc.behaviour.agent
-        self.idle()
         
     def run(self, location):
         """Makes the PC run to a certain location
            @type location: fife.ScreenPoint
            @param location: Screen position to run to.
            @return: None"""
-        self.state = _AGENT_STATE_RUN
+        self.state = base._AGENT_STATE_RUN
         self.nextAction = None
         self.agent.move('run', location, self.speed + 1)
 
@@ -125,7 +71,7 @@
            @type location: fife.ScreenPoint
            @param location: Screen position to walk to.
            @return: None"""
-        self.state = _AGENT_STATE_RUN
+        self.state = base._AGENT_STATE_RUN
         self.nextAction = None 
         self.agent.move('walk', location, self.speed - 1)
         
\ No newline at end of file