--- deliantra/maps/navar_city/light/smugship1.map	2006/02/05 00:01:11	1.1
+++ deliantra/maps/navar_city/light/smugship1.map	2006/05/07 08:54:34	1.2
@@ -1,13 +1,13 @@
 arch map
-region navar
 name <untitled>
+region navar
+width 29
+height 25
 msg
 Creator:
 Email:
 Date: Wed Nov 17 18:23:59 1993
 endmsg
-width 29
-height 25
 end
 arch woodfloor
 y 5
@@ -90,9 +90,9 @@
 y 8
 end
 arch button_handle
-connected 20
 x 1
 y 8
+connected 20
 end
 arch woodfloor
 x 1
@@ -179,8 +179,8 @@
 y 8
 end
 arch locked_door2
-face ldoor_brown2.111
 slaying set_individual_value smugd1
+face ldoor_brown2.111
 x 2
 y 8
 end
@@ -276,9 +276,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 3
 y 6
+level 5
 end
 arch woodfloor
 name deck
@@ -301,10 +301,10 @@
 sp 80
 maxsp 80
 ac -5
-level 11
-carrying 100
 x 3
 y 8
+level 11
+carrying 100
 arch key2
 name Skeleton Key
 slaying set_individual_value smugd1
@@ -330,9 +330,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 3
 y 10
+level 5
 end
 arch woodfloor
 name deck
@@ -554,10 +554,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 3
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -569,10 +569,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 4
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -584,10 +584,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 5
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -599,10 +599,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 6
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -614,10 +614,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 7
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -629,10 +629,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 8
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -644,10 +644,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 9
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -659,10 +659,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 10
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -674,10 +674,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 11
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -689,10 +689,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 12
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -704,10 +704,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 13
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -719,10 +719,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 14
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -734,10 +734,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 5
 y 15
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 x 5
@@ -818,10 +818,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 6
 y 1
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -833,10 +833,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 6
 y 2
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -848,10 +848,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 6
 y 3
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -878,10 +878,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 6
 y 7
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -893,10 +893,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 6
 y 8
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -913,10 +913,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 6
 y 10
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -948,10 +948,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 6
 y 15
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 x 6
@@ -1512,9 +1512,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 10
 y 19
+level 5
 end
 arch woodfloor
 name deck
@@ -1527,9 +1527,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 10
 y 20
+level 5
 end
 arch woodfloor
 name deck
@@ -1542,9 +1542,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 10
 y 21
+level 5
 end
 arch woodfloor
 name deck
@@ -1557,9 +1557,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 10
 y 22
+level 5
 end
 arch woodfloor
 name deck
@@ -1572,9 +1572,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 10
 y 23
+level 5
 end
 arch woodfloor
 x 10
@@ -1651,9 +1651,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 11
 y 19
+level 5
 end
 arch woodfloor
 name deck
@@ -1666,9 +1666,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 11
 y 20
+level 5
 end
 arch woodfloor
 name deck
@@ -1681,9 +1681,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 11
 y 21
+level 5
 end
 arch woodfloor
 name deck
@@ -1696,9 +1696,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 11
 y 22
+level 5
 end
 arch woodfloor
 name deck
@@ -1711,9 +1711,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 11
 y 23
+level 5
 end
 arch woodfloor
 x 11
@@ -1742,9 +1742,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 12
 y 19
+level 5
 end
 arch woodfloor
 name deck
@@ -1757,9 +1757,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 12
 y 20
+level 5
 end
 arch woodfloor
 name deck
@@ -1772,9 +1772,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 12
 y 21
+level 5
 end
 arch woodfloor
 name deck
@@ -1787,9 +1787,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 12
 y 22
+level 5
 end
 arch woodfloor
 name deck
@@ -1802,9 +1802,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 12
 y 23
+level 5
 end
 arch woodfloor
 x 12
@@ -1922,30 +1922,30 @@
 y 20
 end
 arch grate_closed_2
-connected 20
-blocksview 1
 x 14
 y 20
+connected 20
+blocksview 1
 end
 arch woodfloor
 x 14
 y 21
 end
 arch grate_closed_2
-connected 20
-blocksview 1
 x 14
 y 21
+connected 20
+blocksview 1
 end
 arch woodfloor
 x 14
 y 22
 end
 arch grate_closed_2
-connected 20
-blocksview 1
 x 14
 y 22
+connected 20
+blocksview 1
 end
 arch woodfloor
 x 14
@@ -2287,30 +2287,30 @@
 y 20
 end
 arch grate_closed_2
-connected 10
-blocksview 1
 x 17
 y 20
+connected 10
+blocksview 1
 end
 arch woodfloor
 x 17
 y 21
 end
 arch grate_closed_2
-connected 10
-blocksview 1
 x 17
 y 21
+connected 10
+blocksview 1
 end
 arch woodfloor
 x 17
 y 22
 end
 arch grate_closed_2
-connected 10
-blocksview 1
 x 17
 y 22
+connected 10
+blocksview 1
 end
 arch woodfloor
 x 17
@@ -2456,10 +2456,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 19
 y 3
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2511,10 +2511,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 19
 y 12
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2586,10 +2586,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 20
 y 3
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2601,10 +2601,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 20
 y 4
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2616,10 +2616,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 20
 y 5
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2656,10 +2656,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 20
 y 11
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2671,10 +2671,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 20
 y 12
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2760,10 +2760,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 21
 y 5
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2775,10 +2775,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 21
 y 6
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2790,10 +2790,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 21
 y 7
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2815,10 +2815,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 21
 y 10
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2830,10 +2830,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 21
 y 11
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2938,10 +2938,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 22
 y 7
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2953,10 +2953,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 22
 y 8
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2968,10 +2968,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 22
 y 9
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -2983,10 +2983,10 @@
 hp 60
 maxhp 60
 exp 60
-speed_left -0.580000
-level 5
 x 22
 y 10
+speed_left -0.580000
+level 5
 end
 arch woodfloor
 name deck
@@ -3044,8 +3044,8 @@
 @match *
 You will never kill me scummer!!!!
 endmsg
-Str 19
-Int 15
+str 19
+int 15
 hp 350
 maxhp 350
 sp 100
@@ -3054,9 +3054,9 @@
 dam 15
 wc 5
 ac -7
-carrying 2500
 x 22
 y 21
+carrying 2500
 arch girdle_str
 end
 arch spell_mass_confusion
@@ -3105,9 +3105,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 23
 y 5
+level 5
 end
 arch woodfloor
 name deck
@@ -3247,9 +3247,9 @@
 maxhp 150
 exp 90
 dam 15
-level 5
 x 24
 y 10
+level 5
 end
 arch woodfloor
 name deck
@@ -3364,10 +3364,10 @@
 dam 12
 wc 5
 ac -5
-level 11
-carrying 100
 x 25
 y 8
+level 11
+carrying 100
 arch key2
 name Skeleton Key
 slaying set_individual_value smugd1
@@ -3446,8 +3446,8 @@
 y 8
 end
 arch locked_door2
-face ldoor_brown2.111
 slaying set_individual_value smugd1
+face ldoor_brown2.111
 x 26
 y 8
 end
@@ -3505,9 +3505,9 @@
 y 8
 end
 arch button_handle
-connected 10
 x 27
 y 8
+connected 10
 end
 arch woodfloor
 x 27