--- cf.schmorp.de/maps/inn_and_outpost/treehouse_df1.map	2006/02/05 00:02:04	1.1
+++ cf.schmorp.de/maps/inn_and_outpost/treehouse_df1.map	2006/06/11 08:00:34	1.3
@@ -1,163 +1,183 @@
 arch map
 name DF Outpost 1
+width 10
+height 10
+enter_x 6
+enter_y 6
 msg
 Creator: Avion
 CF Java Map Editor
 Date:    5/30/2004
 endmsg
-width 10
-height 10
-enter_x 6
-enter_y 6
 outdoor 1
 end
 arch invis_exit
 slaying /world/world_115_101
 hp 44
 sp 43
-fly_on 0
+move_on 0
 end
 arch brush
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 2
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 3
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 4
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 5
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 6
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 7
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch invis_exit
 slaying /world/world_115_101
 hp 44
 sp 43
-fly_on 0
 y 9
+move_on 0
 end
 arch brush
 y 9
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 2
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 3
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 4
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 5
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 6
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 7
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 1
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 2
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 2
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woodfloor
 x 2
@@ -185,30 +205,34 @@
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 2
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 2
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 3
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 3
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woodfloor
 x 3
@@ -232,7 +256,7 @@
 end
 arch elf_guard
 msg
-@match who|what|job|guard|duty
+@match duty|guard|job|what|who
 We are on watch.
 @match watch
 The princess has said we
@@ -244,27 +268,27 @@
 @match *
 Greetings.
 endmsg
-randomitems elf
-level 6
+wis 10
 exp 250
+x 3
+y 6
 speed 0.25
+level 6
 attacktype 1
+randomitems elf
+run_away 5
+pick_up 30
 see_invisible 0
-can_see_in_dark 1
-can_use_weapon 1
+can_use_scroll 1
 can_use_bow 1
 can_use_armour 1
+can_use_weapon 1
 can_use_ring 1
-can_use_wand 1
-can_use_rod 1
-can_use_scroll 1
-can_use_skill 1
 stand_still 0
-pick_up 30
-Wis 10
-run_away 5
-x 3
-y 6
+can_use_skill 1
+can_use_rod 1
+can_see_in_dark 1
+can_use_wand 1
 end
 arch woodfloor
 x 3
@@ -272,30 +296,34 @@
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 3
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 3
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 4
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 4
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woodfloor
 x 4
@@ -331,30 +359,34 @@
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 4
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 4
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 5
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 5
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woodfloor
 x 5
@@ -390,30 +422,34 @@
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 5
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 5
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 6
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 6
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woodfloor
 x 6
@@ -428,27 +464,27 @@
 @match *
 Hello.
 endmsg
-randomitems elf
-level 6
+wis 10
 exp 250
+x 6
+y 3
 speed 0.25
+level 6
 attacktype 1
+randomitems elf
+run_away 5
+pick_up 30
 see_invisible 0
-can_see_in_dark 1
-can_use_weapon 1
+can_use_scroll 1
 can_use_bow 1
 can_use_armour 1
+can_use_weapon 1
 can_use_ring 1
-can_use_wand 1
-can_use_rod 1
-can_use_scroll 1
-can_use_skill 1
 stand_still 0
-pick_up 30
-Wis 10
-run_away 5
-x 6
-y 3
+can_use_skill 1
+can_use_rod 1
+can_see_in_dark 1
+can_use_wand 1
 end
 arch woodfloor
 x 6
@@ -475,30 +511,34 @@
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 6
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 6
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 7
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 7
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woodfloor
 x 7
@@ -526,160 +566,180 @@
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 7
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 7
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 2
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 3
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 4
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 5
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 6
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 7
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 8
 y 9
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch invis_exit
 slaying /world/world_115_101
 hp 44
 sp 43
-fly_on 0
 x 9
+move_on 0
 end
 arch brush
 x 9
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 1
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 2
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 3
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 4
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 5
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 6
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 7
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch woods_2
 name foilage
-blocksview 1
-slow_move 3
 x 9
 y 8
+move_slow walk
+move_slow_penalty 3
+blocksview 1
 end
 arch invis_exit
 slaying /world/world_115_101
 hp 44
 sp 43
-fly_on 0
 x 9
 y 9
+move_on 0
 end
 arch brush
 x 9