[Arianne-commits] stendhal/data/conf/zones ados.xml, 1.45, 1.46 fado.xml, 1.11, 1.12

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

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

Modified Files:
	ados.xml fado.xml 
Log Message:
fixed and tested the broken portals in bug report 1703720

Index: ados.xml
===================================================================
RCS file: /cvsroot/arianne/stendhal/data/conf/zones/ados.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ados.xml	21 Apr 2007 09:31:19 -0000	1.45
--- ados.xml	22 Apr 2007 23:05:34 -0000	1.46
***************
*** 372,388 ****
     <zone name="int_ados_temple" file="int_ados_temple.xstend">
      <portal x="10" y="23" ref="entrance_left">
!      <destination zone="0_ados_city_n" ref="temple_entrance"/>
      </portal>
  
      <portal x="11" y="23" ref="entrance_center_left">
!      <destination zone="0_ados_city_n" ref="temple_entrance"/>
      </portal>
  
      <portal x="12" y="23" ref="entrance_center_right">
!      <destination zone="0_ados_city_n" ref="temple_entrance"/>
      </portal>
  
      <portal x="13" y="23" ref="entrance_right">
!      <destination zone="0_ados_city_n" ref="temple_entrance"/>
      </portal>
     </zone>
--- 372,388 ----
     <zone name="int_ados_temple" file="int_ados_temple.xstend">
      <portal x="10" y="23" ref="entrance_left">
!      <destination zone="0_ados_wall" ref="temple_entrance_left"/>
      </portal>
  
      <portal x="11" y="23" ref="entrance_center_left">
!      <destination zone="0_ados_wall" ref="temple_entrance_left"/>
      </portal>
  
      <portal x="12" y="23" ref="entrance_center_right">
!      <destination zone="0_ados_wall" ref="temple_entrance_center"/>
      </portal>
  
      <portal x="13" y="23" ref="entrance_right">
!      <destination zone="0_ados_wall" ref="temple_entrance_right"/>
      </portal>
     </zone>
***************
*** 481,484 ****
--- 481,487 ----
      	</implementation>
    	 </entity>
+   <portal x="118" y="103" ref="caves_exit">
+    <implementation class-name="games.stendhal.server.entity.portal.OneWayPortalDestination"/>
+   </portal>
     </zone>
     
***************
*** 487,490 ****
--- 490,502 ----
     
     <zone name="0_ados_wall" level="0" x="500768" y="500000" file="0_ados_wall.xstend">
+      <portal x="100" y="52" ref="temple_entrance_left">
+       <destination zone="int_ados_temple" ref="entrance_center_left"/>
+     </portal>
+     <portal x="101" y="52" ref="temple_entrance_center">
+       <destination zone="int_ados_temple" ref="entrance_center_right"/>
+     </portal>
+     <portal x="102" y="52" ref="temple_entrance_right">
+       <destination zone="int_ados_temple" ref="entrance_right"/>
+     </portal>
     </zone>
     
***************
*** 558,562 ****
  
  <zone name="-1_ados_caves_se" level="-1" x="500512" y="500000" file="sub_1_ados_caves_se.xstend">
!   <portal x="4" y="23" ref="0">
     <destination zone="0_ados_rock" ref="caves_exit"/>
    </portal>
--- 570,574 ----
  
  <zone name="-1_ados_caves_se" level="-1" x="500512" y="500000" file="sub_1_ados_caves_se.xstend">
!   <portal x="123" y="107" ref="0">
     <destination zone="0_ados_rock" ref="caves_exit"/>
    </portal>

Index: fado.xml
===================================================================
RCS file: /cvsroot/arianne/stendhal/data/conf/zones/fado.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** fado.xml	6 Apr 2007 23:34:42 -0000	1.11
--- fado.xml	22 Apr 2007 23:05:34 -0000	1.12
***************
*** 318,322 ****
  	 <zone name="int_fado_battle_arena" file="int_fado_battle_arena.xstend">
             <portal x="31" y="63" ref="entrance">
!              <destination zone="0_fado_city" ref="battle_arena_enterance"/>
             </portal>
           </zone>
--- 318,322 ----
  	 <zone name="int_fado_battle_arena" file="int_fado_battle_arena.xstend">
             <portal x="31" y="63" ref="entrance">
!              <destination zone="0_fado_city" ref="battle_arena_entrance"/>
             </portal>
           </zone>