--- deliantra/maps/elmex/school.map	2007/01/28 01:58:37	1.4
+++ deliantra/maps/elmex/school.map	2007/10/21 11:22:34	1.10
@@ -7,152 +7,151 @@
 height 20
 enter_x 9
 enter_y 0
-region scorn_city
 end
 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
@@ -177,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
@@ -226,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
@@ -239,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
@@ -252,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
@@ -284,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
@@ -389,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
@@ -402,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
@@ -412,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
@@ -421,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
@@ -457,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
@@ -574,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
@@ -591,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
@@ -604,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
@@ -633,7 +632,7 @@
 over by these evil orgres.  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.
 endmsg
@@ -651,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
@@ -753,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
@@ -770,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
@@ -783,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
@@ -815,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
@@ -924,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
@@ -941,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
@@ -954,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
@@ -970,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
@@ -979,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
@@ -988,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
@@ -997,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
@@ -1006,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
@@ -1015,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
@@ -1024,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
@@ -1033,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
@@ -1042,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
@@ -1051,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
@@ -1060,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
@@ -1069,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
@@ -1078,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
@@ -1087,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
@@ -1096,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
@@ -1113,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
@@ -1126,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
@@ -1147,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
@@ -1174,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
@@ -1260,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
@@ -1273,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
@@ -1290,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
@@ -1305,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
@@ -1326,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
@@ -1335,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
@@ -1344,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
@@ -1353,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
@@ -1362,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
@@ -1371,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
@@ -1380,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
@@ -1389,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
@@ -1398,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
@@ -1411,15 +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 /world/world_105_115
+hp 15
+sp 28
 x 9
 end
 arch grass_only
@@ -1430,10 +1433,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
@@ -1449,7 +1468,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
@@ -1470,7 +1489,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
@@ -1530,7 +1549,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
@@ -1539,6 +1558,11 @@
 x 10
 y 1
 end
+arch button_small
+x 10
+y 2
+connected 1
+end
 arch grass_only
 x 10
 y 2
@@ -1547,6 +1571,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
@@ -1562,7 +1596,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
@@ -1579,7 +1613,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
@@ -1588,7 +1622,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
@@ -1597,7 +1631,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
@@ -1606,7 +1640,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
@@ -1615,7 +1649,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
@@ -1624,7 +1658,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
@@ -1633,7 +1667,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
@@ -1642,7 +1676,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
@@ -1651,7 +1685,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
@@ -1664,7 +1698,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
@@ -1685,11 +1719,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
@@ -1712,7 +1746,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
@@ -1777,7 +1811,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
@@ -1798,14 +1832,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
@@ -1814,7 +1848,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
@@ -1823,7 +1857,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
@@ -1832,7 +1866,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
@@ -1841,7 +1875,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
@@ -1850,7 +1884,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
@@ -1859,7 +1893,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
@@ -1868,7 +1902,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
@@ -1877,7 +1911,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
@@ -1886,7 +1920,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
@@ -1895,7 +1929,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
@@ -1904,7 +1938,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
@@ -1921,7 +1955,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
@@ -1930,7 +1964,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
@@ -1939,7 +1973,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
@@ -1948,7 +1982,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
@@ -1957,7 +1991,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
@@ -1966,7 +2000,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
@@ -1975,14 +2009,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
@@ -2092,7 +2126,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
@@ -2109,7 +2143,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
@@ -2144,7 +2178,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
@@ -2257,7 +2291,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
@@ -2274,7 +2308,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
@@ -2313,7 +2347,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
@@ -2414,7 +2448,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
@@ -2431,7 +2465,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
@@ -2475,7 +2509,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
@@ -2580,7 +2614,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
@@ -2593,7 +2627,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
@@ -2636,7 +2670,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
@@ -2654,7 +2688,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
@@ -2663,7 +2697,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
@@ -2672,7 +2706,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
@@ -2681,7 +2715,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
@@ -2690,7 +2724,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
@@ -2699,7 +2733,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
@@ -2708,7 +2742,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
@@ -2717,7 +2751,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
@@ -2726,7 +2760,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
@@ -2735,7 +2769,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
@@ -2748,7 +2782,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
@@ -2787,7 +2821,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
@@ -2844,7 +2878,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
@@ -2883,7 +2917,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
@@ -2892,7 +2926,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
@@ -2901,7 +2935,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
@@ -2910,7 +2944,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
@@ -2919,7 +2953,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
@@ -2928,7 +2962,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
@@ -2937,7 +2971,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
@@ -2946,7 +2980,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
@@ -2955,7 +2989,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
@@ -2964,7 +2998,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
@@ -2973,7 +3007,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
@@ -2982,7 +3016,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
@@ -2991,7 +3025,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
@@ -3000,7 +3034,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
@@ -3023,6 +3057,7 @@
 msg
 layoutstyle rogue
 floorstyle stones2
+decorstyle goblinjunk
 wallstyle earthen
 exitstyle ladder
 monsterstyle humanoid