[Arianne-commits] stendhal/data/conf/zones ados.xml, 1.67, 1.68 athor.xml, 1.25, 1.26 fado.xml, 1.30, 1.31

[Katie <ky...@us...>]

Update of /cvsroot/arianne/stendhal/data/conf/zones
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16452

Modified Files:
	ados.xml athor.xml fado.xml 
Log Message:
corrected the y coords after y+1 fix for the athor NPCs, sarzina in fado and eliza in ados


Index: ados.xml
===================================================================
RCS file: /cvsroot/arianne/stendhal/data/conf/zones/ados.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** ados.xml	15 Aug 2007 19:56:47 -0000	1.67
--- ados.xml	22 Aug 2007 13:49:49 -0000	1.68
***************
*** 1003,1007 ****
   
   <zone name="0_ados_coast_s_w2" level="0" x="500640" y="500256" file="Level 0/ados/coast_s_w2.tmx">
!    <entity x="101" y="102">
       <implementation class-name="games.stendhal.server.maps.ados.coast.FerryConveyerNPC">
         <parameter name="name">Eliza</parameter>
--- 1003,1007 ----
   
   <zone name="0_ados_coast_s_w2" level="0" x="500640" y="500256" file="Level 0/ados/coast_s_w2.tmx">
!    <entity x="101" y="103">
       <implementation class-name="games.stendhal.server.maps.ados.coast.FerryConveyerNPC">
         <parameter name="name">Eliza</parameter>

Index: athor.xml
===================================================================
RCS file: /cvsroot/arianne/stendhal/data/conf/zones/athor.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** athor.xml	11 Aug 2007 17:19:12 -0000	1.25
--- athor.xml	22 Aug 2007 13:49:49 -0000	1.26
***************
*** 28,32 ****
  
       <zone name="0_athor_ship_w2" level="0" x="500768" y="500384" file="Level 0/athor/ship_w2.tmx">
!        <entity x="22" y="37">
           <implementation class-name="games.stendhal.server.maps.athor.ship.CaptainNPC">
             <parameter name="name">Captain</parameter>
--- 28,32 ----
  
       <zone name="0_athor_ship_w2" level="0" x="500768" y="500384" file="Level 0/athor/ship_w2.tmx">
!        <entity x="22" y="38">
           <implementation class-name="games.stendhal.server.maps.athor.ship.CaptainNPC">
             <parameter name="name">Captain</parameter>
***************
*** 35,39 ****
           </implementation>
         </entity>
!        <entity x="29" y="33">
           <implementation class-name="games.stendhal.server.maps.athor.ship.CoastConveyerNPC">
             <parameter name="name">Jackie</parameter>
--- 35,39 ----
           </implementation>
         </entity>
!        <entity x="29" y="34">
           <implementation class-name="games.stendhal.server.maps.athor.ship.CoastConveyerNPC">
             <parameter name="name">Jackie</parameter>
***************
*** 126,130 ****
         </portal>
         
!        <entity x="16" y="89">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.FerryConveyerNPC">
             <parameter name="name">Jessica</parameter>
--- 126,130 ----
         </portal>
         
!        <entity x="16" y="90">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.FerryConveyerNPC">
             <parameter name="name">Jessica</parameter>
***************
*** 141,145 ****
           </implementation>
         </entity>
!        <entity x="27" y="43">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.HusbandNPC">
             <parameter name="name">John</parameter>
--- 141,145 ----
           </implementation>
         </entity>
!        <entity x="27" y="44">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.HusbandNPC">
             <parameter name="name">John</parameter>
***************
*** 148,152 ****
           </implementation>
         </entity>
!        <entity x="44" y="39">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.SunbatherNPC">
             <parameter name="name">Cyk</parameter>
--- 148,152 ----
           </implementation>
         </entity>
!        <entity x="44" y="40">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.SunbatherNPC">
             <parameter name="name">Cyk</parameter>
***************
*** 163,167 ****
           </implementation>
         </entity>
!        <entity x="60" y="32">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.TouristFromAdosNPC">
             <parameter name="name">Zara</parameter>
--- 163,167 ----
           </implementation>
         </entity>
!        <entity x="60" y="33">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.TouristFromAdosNPC">
             <parameter name="name">Zara</parameter>
***************
*** 259,263 ****
           </implementation>
         </entity>
!        <entity x="28" y="43">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.WifeNPC">
             <parameter name="name">Jane</parameter>
--- 259,263 ----
           </implementation>
         </entity>
!        <entity x="28" y="44">
           <implementation class-name="games.stendhal.server.maps.athor.holiday_area.WifeNPC">
             <parameter name="name">Jane</parameter>
***************
*** 367,371 ****
           <destination zone="0_athor_island" ref="dressing_room_m_entrance"/>
         </portal>
!        <entity x="3" y="10">
           <implementation class-name="games.stendhal.server.maps.athor.dressingroom_male.LifeguardNPC">
             <parameter name="name">David</parameter>
--- 367,371 ----
           <destination zone="0_athor_island" ref="dressing_room_m_entrance"/>
         </portal>
!        <entity x="3" y="11">
           <implementation class-name="games.stendhal.server.maps.athor.dressingroom_male.LifeguardNPC">
             <parameter name="name">David</parameter>
***************
*** 407,422 ****
  
       <zone name="-1_athor_ship_w2" level="-1" x="500768" y="500384" file="Level -1/athor/ship_w2.tmx">
!        <entity x="27" y="27">
           <implementation class-name="games.stendhal.server.maps.athor.ship.CookNPC">
             <parameter name="name">Laura</parameter>
             <parameter name="class">tavernbarmaidnpc</parameter>
             <!-- to the oven -->
!            <parameter name="node0">27,27</parameter>
             <!-- to the table -->
!            <parameter name="node1">27,30</parameter>
             <!-- to the dining room -->
!            <parameter name="node2">18,30</parameter>
             <!-- to the barrel -->
!            <parameter name="node2">28,30</parameter>
           </implementation>
     </entity>
--- 407,422 ----
  
       <zone name="-1_athor_ship_w2" level="-1" x="500768" y="500384" file="Level -1/athor/ship_w2.tmx">
!        <entity x="27" y="28">
           <implementation class-name="games.stendhal.server.maps.athor.ship.CookNPC">
             <parameter name="name">Laura</parameter>
             <parameter name="class">tavernbarmaidnpc</parameter>
             <!-- to the oven -->
!            <parameter name="node0">27,28</parameter>
             <!-- to the table -->
!            <parameter name="node1">27,31</parameter>
             <!-- to the dining room -->
!            <parameter name="node2">18,31</parameter>
             <!-- to the barrel -->
!            <parameter name="node2">28,31</parameter>
           </implementation>
     </entity>
***************
*** 470,474 ****
  
   <zone name="-2_athor_ship_w2" level="-2" x="500768" y="500384" file="Level -2/athor/ship_w2.tmx">
!    <entity x="24" y="41">
       <implementation class-name="games.stendhal.server.maps.athor.ship.CargoWorkerNPC">
         <parameter name="name">Klaas</parameter>
--- 470,474 ----
  
   <zone name="-2_athor_ship_w2" level="-2" x="500768" y="500384" file="Level -2/athor/ship_w2.tmx">
!    <entity x="24" y="42">
       <implementation class-name="games.stendhal.server.maps.athor.ship.CargoWorkerNPC">
         <parameter name="name">Klaas</parameter>
***************
*** 476,490 ****
  
         <!-- to the bucket -->
!        <parameter name="node0">24,41</parameter>
         <!-- along the corridor -->
!        <parameter name="node1">24,34</parameter>
         <!-- walk between barrels and boxes -->
!        <parameter name="node2">17,34</parameter>
         <!-- to the stairs -->
!        <parameter name="node3">17,38</parameter>
         <!-- walk between the barrels -->
!        <parameter name="node4">22,38</parameter>
         <!-- towards the bow -->
!        <parameter name="node5">22,41</parameter>
       </implementation>
     </entity>
--- 476,490 ----
  
         <!-- to the bucket -->
!        <parameter name="node0">24,42</parameter>
         <!-- along the corridor -->
!        <parameter name="node1">24,35</parameter>
         <!-- walk between barrels and boxes -->
!        <parameter name="node2">17,35</parameter>
         <!-- to the stairs -->
!        <parameter name="node3">17,39</parameter>
         <!-- walk between the barrels -->
!        <parameter name="node4">22,39</parameter>
         <!-- towards the bow -->
!        <parameter name="node5">22,42</parameter>
       </implementation>
     </entity>

Index: fado.xml
===================================================================
RCS file: /cvsroot/arianne/stendhal/data/conf/zones/fado.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** fado.xml	22 Aug 2007 10:02:55 -0000	1.30
--- fado.xml	22 Aug 2007 13:49:49 -0000	1.31
***************
*** 238,242 ****
  	 
  	 <zone name="int_fado_hut" file="interiors/fado/hut.tmx">
! 	 <entity x="3" y="4">
  	  <implementation class-name="games.stendhal.server.maps.fado.hut.SellerNPC">
  	   <parameter name="name">Sarzina</parameter>
--- 238,242 ----
  	 
  	 <zone name="int_fado_hut" file="interiors/fado/hut.tmx">
! 	 <entity x="3" y="5">
  	  <implementation class-name="games.stendhal.server.maps.fado.hut.SellerNPC">
  	   <parameter name="name">Sarzina</parameter>