From: Katie R. <ky...@us...> - 2010-10-31 17:50:40
|
Update of /cvsroot/arianne/stendhal/data/conf/zones In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32592/data/conf/zones Modified Files: ados.xml Log Message: put Eliza and Ritati Dragontracker into pure java not mixed java-xml and update the tests which call them. Used the odds and ends shop from ShopList for Ritati Dragontracker (was already there for his sign but he was still using a different copy of the list in his own file) Index: ados.xml =================================================================== RCS file: /cvsroot/arianne/stendhal/data/conf/zones/ados.xml,v retrieving revision 1.205 retrieving revision 1.206 diff -C2 -d -r1.205 -r1.206 *** ados.xml 27 Oct 2010 10:38:25 -0000 1.205 --- ados.xml 31 Oct 2010 17:50:31 -0000 1.206 *************** *** 3274,3278 **** <zone name="0_ados_coast_s_w2" level="0" x="500640" y="500256" file="Level 0/ados/coast_s_w2.tmx"> ! <entity x="96" y="105"> <implementation class-name="games.stendhal.server.entity.mapstuff.sound.PeriodicAmbientSoundSource"> --- 3274,3278 ---- <zone name="0_ados_coast_s_w2" level="0" x="500640" y="500256" file="Level 0/ados/coast_s_w2.tmx"> ! <configurator class-name="games.stendhal.server.maps.ados.coast.FerryConveyerNPC" /> <entity x="96" y="105"> <implementation class-name="games.stendhal.server.entity.mapstuff.sound.PeriodicAmbientSoundSource"> *************** *** 3285,3296 **** </entity> - <entity x="101" y="103"> - <implementation class-name="games.stendhal.server.maps.ados.coast.FerryConveyerNPC"> - <parameter name="name">Eliza</parameter> - <parameter name="direction">left</parameter> - </implementation> - - <attribute name="class">woman_008_npc</attribute> - </entity> </zone> --- 3285,3288 ---- *************** *** 3473,3476 **** --- 3465,3469 ---- <zone name="-3_ados_abandoned_keep" level="-3" x="500512" y="499744" file="Level -3/ados/abandoned_keep.tmx"> + <configurator class-name="games.stendhal.server.maps.ados.abandonedkeep.DwarfBuyerGuyNPC"/> <entity x="35" y="31"> <implementation class-name="games.stendhal.server.entity.mapstuff.sign.ShopSign"> *************** *** 3481,3492 **** <attribute name="class">blackboard</attribute> </entity> ! <entity x="25" y="32"> ! <implementation class-name="games.stendhal.server.maps.ados.abandonedkeep.DwarfBuyerGuyNPC"> ! <parameter name="name">Ritati Dragontracker</parameter> ! <parameter name="node0">25,32</parameter> ! <parameter name="node1">38,32</parameter> ! </implementation> ! <attribute name="class">olddwarfnpc</attribute> ! </entity> </zone> --- 3474,3478 ---- <attribute name="class">blackboard</attribute> </entity> ! </zone> |