# HG changeset patch
# User prock@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1274909386 0
# Node ID e4cd18a179af720e6dd84ffaa43b5e8a638af1a5
# Parent  c3a026cdd91b70c6516422db64297ea62ecedf8b
Added the PlayerActionListener.
Added the ability to load NPCs from the settings file (this may be temporary).  The idea of putting the NPCs in the settings file is to allow for custom attributes to be added without modification to the editor.

diff -r c3a026cdd91b -r e4cd18a179af demos/rpg/scripts/actors/player.py
--- a/demos/rpg/scripts/actors/player.py	Wed May 26 15:28:25 2010 +0000
+++ b/demos/rpg/scripts/actors/player.py	Wed May 26 21:29:46 2010 +0000
@@ -28,8 +28,20 @@
 
 from fife import fife
 from scripts.actors.baseactor import Actor, ActorStates
+from scripts.objects.baseobject import ObjectActionListener, BaseGameObject
+
+class PlayerActionListener(ObjectActionListener):
+	def __init__(self, gamecontroller, obj):
+		super(PlayerActionListener, self).__init__(gamecontroller, obj)
+
+	def onInstanceActionFinished(self, instance, action):
+		if action.getId() == 'walk':
+			print "player done walking"
+			#self._object.completeAction()
 
 class Player(Actor):
 	def __init__(self, gamecontroller, playermodelname):
 		super(Player, self).__init__(gamecontroller, playermodelname, "player", True)
 		self._playermodelname = playermodelname
+		
+		self._playeractionlistener = PlayerActionListener(self._gamecontroller, self)
diff -r c3a026cdd91b -r e4cd18a179af demos/rpg/scripts/objects/baseobject.py
--- a/demos/rpg/scripts/objects/baseobject.py	Wed May 26 15:28:25 2010 +0000
+++ b/demos/rpg/scripts/objects/baseobject.py	Wed May 26 21:29:46 2010 +0000
@@ -75,6 +75,16 @@
 		if self._instance :
 			self._gamecontroller.scene.actorlayer.deleteInstance(self._instance)
 			self._instance = None	
+			
+	def setMapPosition(self, x, y):
+		curloc = self.location
+	
+		exactloc = self.location.getExactLayerCoordinates()
+		exactloc.x = x
+		exactloc.y = y
+				
+		curloc.setExactLayerCoordinates(exactloc)
+		self.location = curloc
 
 	def _createFIFEInstance(self):
 		"""
diff -r c3a026cdd91b -r e4cd18a179af demos/rpg/scripts/scene.py
--- a/demos/rpg/scripts/scene.py	Wed May 26 15:28:25 2010 +0000
+++ b/demos/rpg/scripts/scene.py	Wed May 26 21:29:46 2010 +0000
@@ -29,6 +29,7 @@
 from fife import fife
 from fife.extensions.loaders import loadMapFile
 
+from scripts.actors.baseactor import Actor
 from scripts.actors.player import Player
 
 class Scene(object):
@@ -42,6 +43,7 @@
 		self._actorlayer = None
 		
 		self._player = None
+		self._npclist = []
 		
 	def createScene(self, mapfilename):
 		if not self._map:
@@ -58,15 +60,31 @@
 		
 		self._player = Player(self._gamecontroller, "warrior")
 		
+		mapname = os.path.splitext(os.path.basename(mapfilename))
+		for npc in self._gamecontroller.settings.get(mapname[0], "npclist", []):
+			(modelname, posx, posy) = self._gamecontroller.settings.get(mapname[0], npc, ["warrior", "0", "0"])
+			actor = Actor(self._gamecontroller, modelname, npc, True)
+			actor.setMapPosition(float(posx), float(posy))
+			self._npclist.append(actor)
+			
+		
 	def destroyScene(self):
 		self._cameras.clear()
 		
+		self._player.destroy()
+		
+		for npc in self._npclist:
+			npc.destroy()
+
 		if self._map:
 			self._gamecontroller.engine.getModel().deleteMap(self._map)
 		
 		self._map = None
 		self._actorlayer = None
 		
+		self._player = None
+		self._npclist = []
+		
 	def getInstancesAt(self, clickpoint):
 		"""
 		Query the main camera for instances on our actor layer.
diff -r c3a026cdd91b -r e4cd18a179af demos/rpg/settings-dist.xml
--- a/demos/rpg/settings-dist.xml	Wed May 26 15:28:25 2010 +0000
+++ b/demos/rpg/settings-dist.xml	Wed May 26 21:29:46 2010 +0000
@@ -33,4 +33,9 @@
 		
 		<Setting name="DefaultActorWalkSpeed" type="float"> 2.5 </Setting>
 	</Module>
+	
+	<Module name="town">
+		<Setting name="npclist" type="list"> Quiller </Setting>
+		<Setting name="Quiller" type="list"> warrior ; 0 ; 0</Setting>
+	</Module>
 </Settings>