--- deliantra/maps/pup_land/ancient/world.map	2006/02/05 00:01:28	1.1
+++ deliantra/maps/pup_land/ancient/world.map	2006/05/07 08:54:48	1.2
@@ -1,15 +1,15 @@
 arch map
-region ancientpupland
 name world
+region ancientpupland
+width 38
+height 37
+enter_x 1
+enter_y 1
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Thu Jan 25 20:16:45 1996
 endmsg
-width 38
-height 37
-enter_x 1
-enter_y 1
 end
 arch sea
 end
@@ -152,18 +152,18 @@
 y 6
 end
 arch sea
-speed_left -2.300000
 x 1
 y 6
+speed_left -2.300000
 end
 arch grass
 x 1
 y 7
 end
 arch sea
-speed_left -2.300000
 x 1
 y 7
+speed_left -2.300000
 end
 arch sea
 x 1
@@ -313,18 +313,18 @@
 y 6
 end
 arch sea
-speed_left -2.300000
 x 2
 y 6
+speed_left -2.300000
 end
 arch grass
 x 2
 y 7
 end
 arch sea
-speed_left -2.300000
 x 2
 y 7
+speed_left -2.300000
 end
 arch sea
 x 2
@@ -382,6 +382,22 @@
 x 2
 y 21
 end
+arch active_volcano
+face hillsrocky.111
+exp 1000
+x 2
+y 22
+is_floor 1
+end
+arch volcano_low
+slaying volcano/volcano.1
+hp 5
+sp 7
+exp 1000
+x 2
+y 22
+blocksview 0
+end
 arch hills_rocky
 x 2
 y 23
@@ -470,9 +486,9 @@
 y 6
 end
 arch sea
-speed_left -2.300000
 x 3
 y 6
+speed_left -2.300000
 end
 arch pstone_1
 x 3
@@ -622,18 +638,18 @@
 y 3
 end
 arch sea
-speed_left -2.300000
 x 4
 y 3
+speed_left -2.300000
 end
 arch grass
 x 4
 y 4
 end
 arch sea
-speed_left -2.300000
 x 4
 y 4
+speed_left -2.300000
 end
 arch sea
 x 4
@@ -644,9 +660,9 @@
 y 6
 end
 arch sea
-speed_left -2.300000
 x 4
 y 6
+speed_left -2.300000
 end
 arch pstone_1
 x 4
@@ -816,9 +832,9 @@
 slaying village/village
 hp 7
 sp 14
-blocksview 0
 x 5
 y 8
+blocksview 0
 end
 arch pstone_1
 x 5
@@ -964,9 +980,9 @@
 y 5
 end
 arch sea
-speed_left -2.300000
 x 6
 y 5
+speed_left -2.300000
 end
 arch sea
 x 6
@@ -1710,8 +1726,8 @@
 I'm sorry for Poppy's biting you.
 (_o_).
 endmsg
-Con 50
-Pow 14
+con 50
+pow 14
 hp 10000
 maxhp 10000
 sp 30
@@ -1719,6 +1735,8 @@
 dam 20
 wc -30
 ac -100
+x 10
+y 19
 speed 0.500000
 speed_left -6.000000
 attack_movement 0
@@ -1727,8 +1745,6 @@
 can_cast_spell 1
 sleep 0
 random_movement 1
-x 10
-y 19
 arch spell_hellfire
 end
 end
@@ -2035,10 +2051,10 @@
 y 13
 end
 arch mountain2
-no_pass 1
-blocksview 0
 x 12
 y 14
+move_block all
+blocksview 0
 end
 arch invis_exit
 slaying mountain/mountain.a1
@@ -2211,16 +2227,16 @@
 y 13
 end
 arch mountain2
-no_pass 1
-blocksview 0
 x 13
 y 14
+move_block all
+blocksview 0
 end
 arch mountain2
-no_pass 1
-blocksview 0
 x 13
 y 15
+move_block all
+blocksview 0
 end
 arch dungeon_magic
 x 13
@@ -2378,10 +2394,10 @@
 y 13
 end
 arch mountain2
-no_pass 1
-blocksview 0
 x 14
 y 14
+move_block all
+blocksview 0
 end
 arch invis_exit
 slaying mountain/mountain.a3
@@ -2391,9 +2407,9 @@
 y 15
 end
 arch mountain2
-blocksview 0
 x 14
 y 15
+blocksview 0
 end
 arch sea
 x 14
@@ -2592,9 +2608,9 @@
 y 19
 end
 arch sea
-speed_left -2.300000
 x 15
 y 19
+speed_left -2.300000
 end
 arch sea
 x 15
@@ -2756,9 +2772,9 @@
 y 21
 end
 arch sea
-speed_left -2.300000
 x 16
 y 21
+speed_left -2.300000
 end
 arch sea
 x 16
@@ -2902,9 +2918,9 @@
 arch pillars
 name flooded tower
 face s_tower2.111
-no_pass 1
 x 17
 y 18
+move_block all
 end
 arch sea
 x 17
@@ -2930,6 +2946,14 @@
 x 17
 y 24
 end
+arch tower_a
+name castle
+slaying castle/castle.1
+hp 15
+sp 30
+x 17
+y 24
+end
 arch grass
 x 17
 y 25
@@ -3706,12 +3730,12 @@
 y 26
 end
 arch button_plate
-protected 1
+x 22
+y 27
 weight 4000000
 invisible 1
 connected 1
-x 22
-y 27
+protected 1
 end
 arch grass
 x 22
@@ -5852,27 +5876,3 @@
 x 36
 y 36
 end
-arch active_volcano
-face hillsrocky.111
-exp 1000
-is_floor 1
-x 2
-y 22
-end
-arch volcano_low
-slaying volcano/volcano.1
-hp 5
-sp 7
-exp 1000
-blocksview 0
-x 2
-y 22
-end
-arch tower_a
-name castle
-slaying castle/castle.1
-hp 15
-sp 30
-x 17
-y 24
-end