--- deliantra/maps/elmex/school.map	2007/01/28 14:02:56	1.5
+++ deliantra/maps/elmex/school.map	2008/12/23 19:18:22	1.12
@@ -11,147 +11,147 @@
 arch cobblestones
 end
 arch wall_2_2_2
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 1
 end
 arch wall_2_1_1
 y 1
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 2
 end
 arch wall_2_1_1
 y 2
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 3
 end
 arch wall_2_1_1
 y 3
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 4
 end
 arch wall_2_1_1
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 5
 end
 arch wall_2_1_1
 y 5
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 6
 end
 arch wall_2_1_1
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 7
 end
 arch wall_2_1_1
 y 7
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 8
 end
 arch wall_2_1_1
 y 8
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 9
 end
 arch wall_2_1_1
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 10
 end
 arch wall_2_1_1
 y 10
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 11
 end
 arch wall_2_1_1
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 12
 end
 arch wall_2_1_1
 y 12
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 13
 end
 arch wall_2_1_1
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 14
 end
 arch wall_2_1_1
 y 14
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 15
 end
 arch wall_2_1_1
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 16
 end
 arch wall_2_1_1
 y 16
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 17
 end
 arch wall_2_1_1
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 18
 end
 arch wall_2_1_1
 y 18
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 y 19
 end
 arch wall_2_2_1
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 1
 end
 arch wall_2_1_2
 x 1
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 1
@@ -176,7 +176,7 @@
 arch door_2
 x 1
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 1
@@ -225,7 +225,7 @@
 arch door_2
 x 1
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 1
@@ -238,7 +238,7 @@
 arch door_2
 x 1
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 1
@@ -251,14 +251,14 @@
 arch wall_2_1_2
 x 1
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 2
 end
 arch wall_2_1_2
 x 2
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 2
@@ -283,7 +283,7 @@
 arch wall_1_4
 x 2
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 2
@@ -388,7 +388,7 @@
 arch wall_1_4
 x 2
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 2
@@ -401,7 +401,7 @@
 arch wall_1_4
 x 2
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 2
@@ -411,7 +411,7 @@
 slaying elmex1
 x 2
 y 18
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 2
@@ -420,14 +420,14 @@
 arch wall_2_1_2
 x 2
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 3
 end
 arch wall_2_1_2
 x 3
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 3
@@ -456,7 +456,7 @@
 arch wall_2_1_2
 x 3
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 3
@@ -573,7 +573,7 @@
 arch wall_2_1_2
 x 3
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 3
@@ -590,7 +590,7 @@
 arch wall_2_1_2
 x 3
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 3
@@ -603,14 +603,14 @@
 arch wall_2_1_2
 x 3
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 4
 end
 arch wall_2_1_2
 x 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 4
@@ -629,12 +629,12 @@
 msg
 @match hello|hi|quest
 Hello! Please help us, this school was taken
-over by these evil orgres.  I'm afraid they
+over by these evil ogres.  I'm afraid they
 take the treasure...
 @match treasure
-The treasure is on the attic, the key there has 
+The treasure is in the attic, the key there has 
 long been lost in the well in the backyard.
-But i've seen the orgres going there.
+But I've seen the ogres going there.
 endmsg
 x 4
 y 2
@@ -650,7 +650,7 @@
 arch wall_2_1_2
 x 4
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 4
@@ -752,7 +752,7 @@
 arch wall_2_1_2
 x 4
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 4
@@ -769,7 +769,7 @@
 arch wall_2_1_2
 x 4
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 4
@@ -782,14 +782,14 @@
 arch wall_2_1_2
 x 4
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 5
 end
 arch wall_2_1_2
 x 5
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 5
@@ -814,7 +814,7 @@
 arch wall_2_1_2
 x 5
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 5
@@ -923,7 +923,7 @@
 arch wall_2_1_2
 x 5
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 5
@@ -940,7 +940,7 @@
 arch wall_2_1_2
 x 5
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 5
@@ -953,14 +953,14 @@
 arch wall_2_1_2
 x 5
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
 end
 arch wall_2_2_3
 x 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -969,7 +969,7 @@
 arch wall_2_1_1
 x 6
 y 1
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -978,7 +978,7 @@
 arch window_win1
 x 6
 y 2
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -987,7 +987,7 @@
 arch wall_2_1_1
 x 6
 y 3
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -996,7 +996,7 @@
 arch wall_3_4
 x 6
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1005,7 +1005,7 @@
 arch window_win1
 x 6
 y 5
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1014,7 +1014,7 @@
 arch wall_3_2
 x 6
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1023,7 +1023,7 @@
 arch wall_2_1_1
 x 6
 y 7
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1032,7 +1032,7 @@
 arch wall_2_1_1
 x 6
 y 8
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1041,7 +1041,7 @@
 arch window_win1
 x 6
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1050,7 +1050,7 @@
 arch wall_2_1_1
 x 6
 y 10
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1059,7 +1059,7 @@
 arch wall_2_1_1
 x 6
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1068,7 +1068,7 @@
 arch window_win1
 x 6
 y 12
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1077,7 +1077,7 @@
 arch wall_2_1_1
 x 6
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1086,7 +1086,7 @@
 arch wall_2_1_1
 x 6
 y 14
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1095,7 +1095,7 @@
 arch wall_2_2_4
 x 6
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1112,7 +1112,7 @@
 arch wall_2_1_2
 x 6
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 6
@@ -1125,7 +1125,7 @@
 arch wall_2_1_2
 x 6
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass_only
 x 7
@@ -1146,11 +1146,11 @@
 x 7
 y 2
 end
-arch grass_br_gr
+arch grass_only
 x 7
 y 3
 end
-arch tree4
+arch swall_1_4
 x 7
 y 3
 end
@@ -1173,7 +1173,7 @@
 arch wall_2_1_2
 x 7
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 7
@@ -1259,7 +1259,7 @@
 arch wall_2_1_2
 x 7
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 7
@@ -1272,7 +1272,7 @@
 arch wall_2_1_2
 x 7
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass_only
 x 8
@@ -1289,6 +1289,10 @@
 x 8
 y 3
 end
+arch swall_2_1_2
+x 8
+y 3
+end
 arch grass_only
 x 8
 y 4
@@ -1304,7 +1308,7 @@
 arch window_win2
 x 8
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1325,7 +1329,7 @@
 arch wall_2_2_2
 x 8
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1334,7 +1338,7 @@
 arch wall_2_1_1
 x 8
 y 10
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1343,7 +1347,7 @@
 arch wall_2_1_1
 x 8
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1352,7 +1356,7 @@
 arch wall_2_1_1
 x 8
 y 12
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1361,7 +1365,7 @@
 arch wall_2_1_1
 x 8
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1370,7 +1374,7 @@
 arch wall_2_1_1
 x 8
 y 14
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1379,7 +1383,7 @@
 arch wall_2_1_1
 x 8
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1388,7 +1392,7 @@
 arch wall_2_1_1
 x 8
 y 16
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1397,7 +1401,7 @@
 arch wall_2_2_4
 x 8
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 8
@@ -1410,16 +1414,15 @@
 arch wall_2_1_2
 x 8
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass_only
 x 9
 end
 arch exit
-slaying /world/world_105_116
-hp 11
-sp 4
+slaying *elmex_school_exit_entrance
 x 9
+tag elmex_school_entrance
 end
 arch grass_only
 x 9
@@ -1429,10 +1432,26 @@
 x 9
 y 2
 end
+arch sign
+name warning sign
+msg
+WARNING!!!
+This is a map you should only enter if you
+have reached at least level 10. You might need a 
+higher level to finish it...
+endmsg
+x 9
+y 2
+move_on fly_low walk
+end
 arch grass_only
 x 9
 y 3
 end
+arch swall_2_1_2
+x 9
+y 3
+end
 arch grass_only
 x 9
 y 4
@@ -1448,7 +1467,7 @@
 arch wall_1_3
 x 9
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 9
@@ -1469,7 +1488,7 @@
 arch wall_2_1_2
 x 9
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 9
@@ -1529,7 +1548,7 @@
 arch wall_2_1_2
 x 9
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass_only
 x 10
@@ -1538,6 +1557,11 @@
 x 10
 y 1
 end
+arch button_small
+x 10
+y 2
+connected 1
+end
 arch grass_only
 x 10
 y 2
@@ -1546,6 +1570,16 @@
 x 10
 y 3
 end
+arch ggate_closed
+x 10
+y 3
+connected 1
+end
+arch button_small
+x 10
+y 4
+connected 1
+end
 arch grass_only
 x 10
 y 4
@@ -1561,7 +1595,7 @@
 arch door_2
 x 10
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1578,7 +1612,7 @@
 arch wall_2_2_3
 x 10
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1587,7 +1621,7 @@
 arch wall_2_1_1
 x 10
 y 10
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1596,7 +1630,7 @@
 arch wall_2_1_1
 x 10
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1605,7 +1639,7 @@
 arch wall_2_1_1
 x 10
 y 12
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1614,7 +1648,7 @@
 arch wall_2_1_1
 x 10
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1623,7 +1657,7 @@
 arch wall_2_1_1
 x 10
 y 14
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1632,7 +1666,7 @@
 arch wall_3_2
 x 10
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1641,7 +1675,7 @@
 arch wall_2_1_1
 x 10
 y 16
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1650,7 +1684,7 @@
 arch wall_1_2
 x 10
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 10
@@ -1663,7 +1697,7 @@
 arch wall_2_1_2
 x 10
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass_only
 x 11
@@ -1684,11 +1718,11 @@
 x 11
 y 2
 end
-arch grass_br_gr
+arch grass_only
 x 11
 y 3
 end
-arch tree4
+arch swall_1_3
 x 11
 y 3
 end
@@ -1711,7 +1745,7 @@
 arch wall_1_4
 x 11
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 11
@@ -1776,7 +1810,7 @@
 arch wall_2_1_2
 x 11
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 11
@@ -1797,14 +1831,14 @@
 arch wall_2_1_2
 x 11
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
 end
 arch wall_2_2_2
 x 12
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1813,7 +1847,7 @@
 arch wall_2_1_1
 x 12
 y 1
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1822,7 +1856,7 @@
 arch window_win1
 x 12
 y 2
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1831,7 +1865,7 @@
 arch wall_2_1_1
 x 12
 y 3
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1840,7 +1874,7 @@
 arch window_win1
 x 12
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1849,7 +1883,7 @@
 arch wall_2_1_1
 x 12
 y 5
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1858,7 +1892,7 @@
 arch wall_3_4
 x 12
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1867,7 +1901,7 @@
 arch wall_2_1_1
 x 12
 y 7
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1876,7 +1910,7 @@
 arch window_win1
 x 12
 y 8
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1885,7 +1919,7 @@
 arch wall_2_1_1
 x 12
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1894,7 +1928,7 @@
 arch wall_2_1_1
 x 12
 y 10
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1903,7 +1937,7 @@
 arch wall_2_2_1
 x 12
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1920,7 +1954,7 @@
 arch wall_2_2_2
 x 12
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1929,7 +1963,7 @@
 arch window_win1
 x 12
 y 14
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1938,7 +1972,7 @@
 arch wall_3_4
 x 12
 y 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1947,7 +1981,7 @@
 arch wall_1_2
 x 12
 y 16
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1956,7 +1990,7 @@
 arch door_look_2
 x 12
 y 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1965,7 +1999,7 @@
 arch wall_1_1
 x 12
 y 18
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 12
@@ -1974,14 +2008,14 @@
 arch wall_2_2_4
 x 12
 y 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 13
 end
 arch wall_2_1_2
 x 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 13
@@ -2091,7 +2125,7 @@
 arch wall_1_3
 x 13
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 13
@@ -2108,7 +2142,7 @@
 arch wall_2_1_2
 x 13
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass
 x 13
@@ -2143,7 +2177,7 @@
 end
 arch wall_2_1_2
 x 14
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 14
@@ -2256,7 +2290,7 @@
 arch door_2
 x 14
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 14
@@ -2273,7 +2307,7 @@
 arch window_win2
 x 14
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass
 x 14
@@ -2312,7 +2346,7 @@
 end
 arch wall_2_1_2
 x 15
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 15
@@ -2413,7 +2447,7 @@
 arch wall_1_4
 x 15
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 15
@@ -2430,7 +2464,7 @@
 arch wall_2_1_2
 x 15
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass
 x 15
@@ -2474,7 +2508,7 @@
 end
 arch wall_2_1_2
 x 16
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 16
@@ -2579,7 +2613,7 @@
 arch wall_2_1_2
 x 16
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 16
@@ -2592,7 +2626,7 @@
 arch wall_2_1_2
 x 16
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass
 x 16
@@ -2635,7 +2669,7 @@
 end
 arch wall_2_1_2
 x 17
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2653,7 +2687,7 @@
 arch wall_1_1
 x 17
 y 2
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2662,7 +2696,7 @@
 arch wall_2_1_1
 x 17
 y 3
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2671,7 +2705,7 @@
 arch wall_2_1_1
 x 17
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2680,7 +2714,7 @@
 arch wall_2_1_1
 x 17
 y 5
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2689,7 +2723,7 @@
 arch wall_2_1_1
 x 17
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2698,7 +2732,7 @@
 arch wall_2_1_1
 x 17
 y 7
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2707,7 +2741,7 @@
 arch wall_2_1_1
 x 17
 y 8
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2716,7 +2750,7 @@
 arch wall_2_1_1
 x 17
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2725,7 +2759,7 @@
 arch wall_2_1_1
 x 17
 y 10
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2734,7 +2768,7 @@
 arch wall_2_2_4
 x 17
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 17
@@ -2747,7 +2781,7 @@
 arch window_win2
 x 17
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass
 x 17
@@ -2786,7 +2820,7 @@
 end
 arch wall_2_1_2
 x 18
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 18
@@ -2843,7 +2877,7 @@
 arch wall_2_1_2
 x 18
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass
 x 18
@@ -2882,7 +2916,7 @@
 end
 arch wall_2_2_3
 x 19
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2891,7 +2925,7 @@
 arch wall_2_1_1
 x 19
 y 1
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2900,7 +2934,7 @@
 arch wall_2_1_1
 x 19
 y 2
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2909,7 +2943,7 @@
 arch wall_2_1_1
 x 19
 y 3
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2918,7 +2952,7 @@
 arch wall_2_1_1
 x 19
 y 4
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2927,7 +2961,7 @@
 arch wall_2_1_1
 x 19
 y 5
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2936,7 +2970,7 @@
 arch wall_2_1_1
 x 19
 y 6
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2945,7 +2979,7 @@
 arch wall_2_1_1
 x 19
 y 7
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2954,7 +2988,7 @@
 arch wall_2_1_1
 x 19
 y 8
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2963,7 +2997,7 @@
 arch wall_2_1_1
 x 19
 y 9
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2972,7 +3006,7 @@
 arch wall_2_1_1
 x 19
 y 10
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2981,7 +3015,7 @@
 arch wall_2_1_1
 x 19
 y 11
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2990,7 +3024,7 @@
 arch wall_2_1_1
 x 19
 y 12
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch cobblestones
 x 19
@@ -2999,7 +3033,7 @@
 arch wall_2_2_4
 x 19
 y 13
-move_block walk fly_low fly_high swim
+move_block swim fly_high fly_low walk
 end
 arch grass
 x 19
@@ -3022,6 +3056,7 @@
 msg
 layoutstyle rogue
 floorstyle stones2
+decorstyle goblinjunk
 wallstyle earthen
 exitstyle ladder
 monsterstyle humanoid