Updated maps to remove 0 destination coordinates warnings from server log files. Other changes are from Map Editor reformatting. RJT, Feb-11-2007

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5477 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-11 06:53:43 +00:00 · 2007-02-11 06:53:43 +00:00 · 7dc3f0542a
parent 2c48a84283
commit 7dc3f0542a
26 changed files with 10704 additions and 10676 deletions
--- a/darcap/forgotten_town/city
+++ b/darcap/forgotten_town/city
@ -1,15 +1,15 @@
 arch map
 name Forgotten City
 region Forgotten Town
+width 30
+height 41
+enter_x 2
+enter_y 2
 msg
 Creator: K. Ahlers
 Date:    7/17/2005
 Mail: info@knutshome.de
 endmsg
-width 30
-height 41
-enter_x 2
-enter_y 2
 end
 arch cobblestones2
 end
@ -415,37 +415,37 @@ y 22
 end
 arch altar
 name Drop 200pp for a teleport to scorn
-type 31
 slaying platinum coin
-food 200
-connected 41
 exp 30
+food 200
 x 1
 y 22
+type 31
+connected 41
 end
 arch cobblestones2
+x 1
+y 23
 no_magic 1
 damned 1
-x 1
-y 23
 end
 arch teleporter
-speed 0.0
 x 1
 y 23
+speed 0.0
 end
 arch spikes_closed
-connected 41
 x 1
 y 23
+connected 41
 end
 arch teleporter
-invisible 1
 slaying /world/world_105_115
 hp 5
 sp 35
 x 1
 y 23
+invisible 1
 end
 arch cobblestones2
 x 1
@ -682,9 +682,9 @@ x 2
 y 17
 end
 arch igateTrg2
-connected 1223
 x 2
 y 17
+connected 1223
 end
 arch dungeon_magic
 x 2
@ -716,37 +716,37 @@ y 22
 end
 arch altar
 name Drop 200pp for a teleport to navar
-type 31
 slaying platinum coin
-food 200
-connected 42
 exp 30
+food 200
 x 2
 y 22
+type 31
+connected 42
 end
 arch cobblestones2
+x 2
+y 23
 no_magic 1
 damned 1
-x 2
-y 23
 end
 arch teleporter
-speed 0.0
 x 2
 y 23
+speed 0.0
 end
 arch spikes_closed
-connected 42
 x 2
 y 23
+connected 42
 end
 arch teleporter
-invisible 1
 slaying /world/world_121_116
 hp 37
 sp 46
 x 2
 y 23
+invisible 1
 end
 arch cobblestones2
 x 2
@ -875,35 +875,35 @@ x 3
 y 2
 end
 arch button_small
-invisible 1
-connected 1
 x 3
 y 3
+invisible 1
+connected 1
 end
 arch blackmarble
 x 3
 y 3
 end
 arch button_small
-invisible 1
-connected 1
 x 3
 y 4
+invisible 1
+connected 1
 end
 arch marble
 x 3
 y 4
 end
 arch spikes_closed
-connected 1
 x 3
 y 4
+connected 1
 end
 arch button_small
-invisible 1
-connected 1
 x 3
 y 5
+invisible 1
+connected 1
 end
 arch marble
 x 3
@ -986,10 +986,10 @@ x 3
 y 17
 end
 arch check_floor
-connected 1223
 slaying azumauindolvl0pass
 x 3
 y 17
+connected 1223
 end
 arch cobblestones2
 x 3
@ -1008,10 +1008,10 @@ x 3
 y 19
 end
 arch check_floor
-connected 1223
 slaying azumauindolvl0pass
 x 3
 y 19
+connected 1223
 end
 arch cobblestones2
 x 3
@ -1031,37 +1031,37 @@ y 22
 end
 arch altar
 name Drop 200pp for a teleport to wolfsburg
-type 31
 slaying platinum coin
-food 200
-connected 43
 exp 30
+food 200
 x 3
 y 22
+type 31
+connected 43
 end
 arch cobblestones2
+x 3
+y 23
 no_magic 1
 damned 1
-x 3
-y 23
 end
 arch teleporter
-speed 0.0
 x 3
 y 23
+speed 0.0
 end
 arch spikes_closed
-connected 43
 x 3
 y 23
+connected 43
 end
 arch teleporter
-invisible 1
 slaying /world/world_128_109
 hp 35
 sp 13
 x 3
 y 23
+invisible 1
 end
 arch cobblestones2
 x 3
@ -1191,10 +1191,10 @@ you also can find teleporters to different cities.
 Greetings
 The Administration
 endmsg
-walk_on 1
-fly_on 1
 x 4
 y 3
+walk_on 1
+fly_on 1
 end
 arch dungeon_magic
 x 4
@ -1314,37 +1314,37 @@ y 22
 end
 arch altar
 name Drop 200pp for a teleport to st. Dominion
-type 31
 slaying platinum coin
-food 200
-connected 44
 exp 30
+food 200
 x 4
 y 22
+type 31
+connected 44
 end
 arch cobblestones2
+x 4
+y 23
 no_magic 1
 damned 1
-x 4
-y 23
 end
 arch teleporter
-speed 0.0
 x 4
 y 23
+speed 0.0
 end
 arch spikes_closed
-connected 44
 x 4
 y 23
+connected 44
 end
 arch teleporter
-invisible 1
 slaying /world/world_102_108
 hp 17
 sp 12
 x 4
 y 23
+invisible 1
 end
 arch cobblestones2
 x 4
@ -1586,37 +1586,37 @@ y 22
 end
 arch altar
 name Drop 200pp for a teleport to red town
-type 31
 slaying platinum coin
-food 200
-connected 45
 exp 30
+food 200
 x 5
 y 22
+type 31
+connected 45
 end
 arch cobblestones2
+x 5
+y 23
 no_magic 1
 damned 1
-x 5
-y 23
 end
 arch teleporter
-speed 0.0
 x 5
 y 23
+speed 0.0
 end
 arch spikes_closed
-connected 45
 x 5
 y 23
+connected 45
 end
 arch teleporter
-invisible 1
 slaying /pup_land/rainbow/station
 hp 7
 sp 3
 x 5
 y 23
+invisible 1
 end
 arch cobblestones2
 x 5
@ -1849,37 +1849,37 @@ y 22
 end
 arch altar
 name Drop 200pp for a teleport to lone town
-type 31
 slaying platinum coin
-food 200
-connected 46
 exp 30
+food 200
 x 6
 y 22
+type 31
+connected 46
 end
 arch cobblestones2
+x 6
+y 23
 no_magic 1
 damned 1
-x 6
-y 23
 end
 arch teleporter
-speed 0.0
 x 6
 y 23
+speed 0.0
 end
 arch spikes_closed
-connected 46
 x 6
 y 23
+connected 46
 end
 arch teleporter
-invisible 1
 slaying /pup_land/lone_town/town
 hp 22
 sp 11
 x 6
 y 23
+invisible 1
 end
 arch cobblestones2
 x 6
@ -1981,24 +1981,24 @@ arch blocked
 x 7
 end
 arch button_small
-connected 12322
 x 7
 y 1
+connected 12322
 end
 arch gateTrg1
-connected 12321
 x 7
 y 1
+connected 12321
 end
 arch button_small
-connected 12323
 x 7
 y 2
+connected 12323
 end
 arch grate_open_1
-connected 12323
 x 7
 y 2
+connected 12323
 end
 arch boulder
 x 7
@ -2364,9 +2364,9 @@ x 8
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 8
 y 24
+connected 12322
 end
 arch grass
 x 8
@ -2627,9 +2627,9 @@ x 9
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 9
 y 24
+connected 12322
 end
 arch grass
 x 9
@ -2862,9 +2862,9 @@ x 10
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 10
 y 24
+connected 12322
 end
 arch grass
 x 10
@ -3097,9 +3097,9 @@ x 11
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 11
 y 24
+connected 12322
 end
 arch grass
 x 11
@ -3332,9 +3332,9 @@ x 12
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 12
 y 24
+connected 12322
 end
 arch grass
 x 12
@ -3531,9 +3531,9 @@ x 13
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 13
 y 24
+connected 12322
 end
 arch grass
 x 13
@ -3640,11 +3640,11 @@ x 13
 y 38
 end
 arch grass
+x 13
+y 39
 no_pass 1
 no_magic 1
 damned 1
-x 13
-y 39
 end
 arch cobblestones2
 x 13
@ -3761,9 +3761,9 @@ msg
@match maveric|Maveric
 Click.
 endmsg
-connected 12321
 x 14
 y 23
+connected 12321
 end
 arch marble
 x 14
@ -3774,9 +3774,9 @@ x 14
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 14
 y 24
+connected 12322
 end
 arch footpath_2_1_1
 x 14
@ -3987,9 +3987,9 @@ x 15
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 15
 y 24
+connected 12322
 end
 arch grass
 x 15
@ -4096,11 +4096,11 @@ x 15
 y 38
 end
 arch grass
+x 15
+y 39
 no_pass 1
 no_magic 1
 damned 1
-x 15
-y 39
 end
 arch cobblestones2
 x 15
@ -4217,9 +4217,9 @@ x 16
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 16
 y 24
+connected 12322
 end
 arch grass
 x 16
@ -4452,9 +4452,9 @@ x 17
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 17
 y 24
+connected 12322
 end
 arch grass
 x 17
@ -4687,9 +4687,9 @@ x 18
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 18
 y 24
+connected 12322
 end
 arch grass
 x 18
@ -4922,9 +4922,9 @@ x 19
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 19
 y 24
+connected 12322
 end
 arch grass
 x 19
@ -5157,9 +5157,9 @@ x 20
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 20
 y 24
+connected 12322
 end
 arch grass
 x 20
@ -5392,9 +5392,9 @@ x 21
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 21
 y 24
+connected 12322
 end
 arch grass
 x 21
@ -5587,9 +5587,9 @@ x 22
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 22
 y 24
+connected 12322
 end
 arch grass
 x 22
@ -5752,6 +5752,7 @@ end
 arch minihouse
 name Funhouse
 slaying ft_funhouse
+sp 4
 x 23
 y 12
 end
@ -5804,9 +5805,9 @@ x 23
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 23
 y 24
+connected 12322
 end
 arch grass
 x 23
@ -6015,9 +6016,9 @@ x 24
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 24
 y 24
+connected 12322
 end
 arch grass
 x 24
@ -6226,9 +6227,9 @@ x 25
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 25
 y 24
+connected 12322
 end
 arch grass
 x 25
@ -6441,9 +6442,9 @@ x 26
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 26
 y 24
+connected 12322
 end
 arch grass
 x 26
@ -6622,6 +6623,8 @@ end
 arch shrine
 name Forgotten Town Library
 slaying ft_dragonslib
+hp 9
+sp 19
 x 27
 y 12
 end
@ -6674,9 +6677,9 @@ x 27
 y 24
 end
 arch igate_closed_1
-connected 12322
 x 27
 y 24
+connected 12322
 end
 arch grass
 x 27
@ -7420,6 +7423,8 @@ end
 arch store_alchemy
 name potionshop
 slaying shops/potion
+hp 13
+sp 13
 x 10
 y 2
 end
@ -7450,12 +7455,16 @@ end
 arch store_armour
 name armourshop
 slaying shops/armour
+hp 13
+sp 13
 x 13
 y 2
 end
 arch store_general
 name generalshop
 slaying shops/general
+hp 13
+sp 13
 x 16
 y 2
 end
@ -7493,6 +7502,8 @@ y 36
 end
 arch store_magic
 slaying shops/magic
+hp 13
+sp 13
 x 19
 y 2
 end
@ -7514,7 +7525,9 @@ y 36
 end
 arch store_weapons
 name weaponshop
-slaying /darcap/forgotten_town/shops/weapon
+slaying shops/weapon
+hp 7
+sp 14
 x 22
 y 2
 end
@ -7536,6 +7549,8 @@ y 36
 end
 arch inn
 slaying inn
+hp 9
+sp 14
 x 24
 y 12
 end
@ -7562,6 +7577,8 @@ end
 arch dark_palace
 name Palace of forgotten Town
 slaying palace
+hp 9
+sp 19
 x 25
 y 2
 end
--- a/darcap/forgotten_town/ft_dragonslib
+++ b/darcap/forgotten_town/ft_dragonslib
@ -1,14 +1,14 @@
 arch map
 name Dragons Library
+width 42
+height 20
+enter_x 9
+enter_y 19
 msg
 Creator: K. Ahlers
 Date:    6/5/2006
 Mail: info@knutshome.de
 endmsg
-width 42
-height 20
-enter_x 9
-enter_y 19
 end
 arch magic_banned
 end
@ -378,9 +378,9 @@ x 2
 y 1
 end
 arch bookshelf
-no_pick 1
 x 2
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -427,9 +427,9 @@ x 2
 y 4
 end
 arch bookshelf
-no_pick 1
 x 2
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -476,9 +476,9 @@ x 2
 y 7
 end
 arch bookshelf
-no_pick 1
 x 2
 y 7
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -525,9 +525,9 @@ x 2
 y 10
 end
 arch bookshelf
-no_pick 1
 x 2
 y 10
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -574,9 +574,9 @@ x 2
 y 13
 end
 arch bookshelf
-no_pick 1
 x 2
 y 13
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -607,9 +607,9 @@ x 2
 y 14
 end
 arch a_townsman3
+x 2
+y 14
 random_movement 1
-x 2
-y 14
 end
 arch magic_banned
 x 2
@ -628,9 +628,9 @@ x 2
 y 16
 end
 arch bookshelf
-no_pick 1
 x 2
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -863,9 +863,9 @@ x 4
 y 1
 end
 arch bookshelf
-no_pick 1
 x 4
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -896,9 +896,9 @@ x 4
 y 2
 end
 arch a_townsman
+x 4
+y 2
 random_movement 1
-x 4
-y 2
 end
 arch magic_banned
 x 4
@ -917,9 +917,9 @@ x 4
 y 4
 end
 arch bookshelf
-no_pick 1
 x 4
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -966,9 +966,9 @@ x 4
 y 7
 end
 arch bookshelf
-no_pick 1
 x 4
 y 7
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1015,9 +1015,9 @@ x 4
 y 10
 end
 arch bookshelf
-no_pick 1
 x 4
 y 10
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1064,9 +1064,9 @@ x 4
 y 13
 end
 arch bookshelf
-no_pick 1
 x 4
 y 13
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1113,9 +1113,9 @@ x 4
 y 16
 end
 arch bookshelf
-no_pick 1
 x 4
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1348,9 +1348,9 @@ x 6
 y 1
 end
 arch bookshelf
-no_pick 1
 x 6
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1397,9 +1397,9 @@ x 6
 y 4
 end
 arch bookshelf
-no_pick 1
 x 6
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1534,9 +1534,9 @@ x 6
 y 16
 end
 arch bookshelf
-no_pick 1
 x 6
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1785,9 +1785,9 @@ x 8
 y 1
 end
 arch bookshelf
-no_pick 1
 x 8
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1834,9 +1834,9 @@ x 8
 y 4
 end
 arch bookshelf
-no_pick 1
 x 8
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -1892,7 +1892,7 @@ y 8
 end
 arch stair3_ystone_do
 slaying ft_dragonslib
-hp 30
+hp 31
 sp 8
 x 8
 y 8
@ -1922,9 +1922,9 @@ x 8
 y 11
 end
 arch stair3_ystone_do
+slaying ft_dragonslib
 hp 30
 sp 11
-slaying ft_dragonslib
 x 8
 y 11
 end
@ -1969,9 +1969,9 @@ x 8
 y 16
 end
 arch bookshelf
-no_pick 1
 x 8
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -2207,9 +2207,9 @@ x 10
 y 1
 end
 arch bookshelf
-no_pick 1
 x 10
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -2256,9 +2256,9 @@ x 10
 y 4
 end
 arch bookshelf
-no_pick 1
 x 10
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -2377,9 +2377,9 @@ x 10
 y 16
 end
 arch bookshelf
-no_pick 1
 x 10
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -2503,9 +2503,9 @@ x 11
 y 8
 end
 arch stair3_ystone_do
+slaying ft_dragonslib
 hp 33
 sp 8
-slaying ft_dragonslib
 x 11
 y 8
 end
@ -2534,9 +2534,9 @@ x 11
 y 11
 end
 arch stair3_ystone_do
+slaying ft_dragonslib
 hp 33
 sp 11
-slaying ft_dragonslib
 x 11
 y 11
 end
@ -2626,9 +2626,9 @@ x 12
 y 1
 end
 arch bookshelf
-no_pick 1
 x 12
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -2675,9 +2675,9 @@ x 12
 y 4
 end
 arch bookshelf
-no_pick 1
 x 12
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -2812,9 +2812,9 @@ x 12
 y 16
 end
 arch bookshelf
-no_pick 1
 x 12
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3063,9 +3063,9 @@ x 14
 y 1
 end
 arch bookshelf
-no_pick 1
 x 14
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3112,9 +3112,9 @@ x 14
 y 4
 end
 arch bookshelf
-no_pick 1
 x 14
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3233,9 +3233,9 @@ x 14
 y 16
 end
 arch bookshelf
-no_pick 1
 x 14
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3468,9 +3468,9 @@ x 16
 y 1
 end
 arch bookshelf
-no_pick 1
 x 16
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3517,9 +3517,9 @@ x 16
 y 4
 end
 arch bookshelf
-no_pick 1
 x 16
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3566,9 +3566,9 @@ x 16
 y 7
 end
 arch bookshelf
-no_pick 1
 x 16
 y 7
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3599,9 +3599,9 @@ x 16
 y 8
 end
 arch a_townsman2
+x 16
+y 8
 random_movement 1
-x 16
-y 8
 end
 arch magic_banned
 x 16
@ -3620,9 +3620,9 @@ x 16
 y 10
 end
 arch bookshelf
-no_pick 1
 x 16
 y 10
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3669,9 +3669,9 @@ x 16
 y 13
 end
 arch bookshelf
-no_pick 1
 x 16
 y 13
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3718,9 +3718,9 @@ x 16
 y 16
 end
 arch bookshelf
-no_pick 1
 x 16
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -3953,9 +3953,9 @@ x 18
 y 1
 end
 arch bookshelf
-no_pick 1
 x 18
 y 1
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -4006,9 +4006,9 @@ x 18
 y 4
 end
 arch bookshelf
-no_pick 1
 x 18
 y 4
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -4055,9 +4055,9 @@ x 18
 y 7
 end
 arch bookshelf
-no_pick 1
 x 18
 y 7
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -4104,9 +4104,9 @@ x 18
 y 10
 end
 arch bookshelf
-no_pick 1
 x 18
 y 10
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -4153,9 +4153,9 @@ x 18
 y 13
 end
 arch bookshelf
-no_pick 1
 x 18
 y 13
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -4202,9 +4202,9 @@ x 18
 y 16
 end
 arch bookshelf
-no_pick 1
 x 18
 y 16
+no_pick 1
 arch random_reading
 no_pick 1
 identified 1
@ -5540,9 +5540,9 @@ x 30
 y 8
 end
 arch stair3_ystone_up
+slaying ft_dragonslib
 hp 8
 sp 8
-slaying ft_dragonslib
 x 30
 y 8
 end
@ -5571,9 +5571,9 @@ x 30
 y 11
 end
 arch stair3_ystone_up
+slaying ft_dragonslib
 hp 8
 sp 11
-slaying ft_dragonslib
 x 30
 y 11
 end
@ -5908,9 +5908,9 @@ x 33
 y 8
 end
 arch stair3_ystone_up
+slaying ft_dragonslib
 hp 11
 sp 8
-slaying ft_dragonslib
 x 33
 y 8
 end
@ -5939,9 +5939,9 @@ x 33
 y 11
 end
 arch stair3_ystone_up
+slaying ft_dragonslib
 hp 11
 sp 11
-slaying ft_dragonslib
 x 33
 y 11
 end
@ -6819,14 +6819,14 @@ msg
@match *
 SILENCE!
 endmsg
-randomitems none
-can_cast_spell 0
-can_see_in_dark 1
-monster 0
-unaggressive 1
-friendly 1
-sleep 0
-random_movement 1
 x 9
 y 9
+randomitems none
+monster 0
+friendly 1
+unaggressive 1
+can_cast_spell 0
+sleep 0
+can_see_in_dark 1
+random_movement 1
 end
--- a/dungeons/grukks/grukks.1
+++ b/dungeons/grukks/grukks.1
@ -1,16 +1,16 @@
 arch map
 name grukks
+reset_timeout 7200
+difficulty 4
+width 25
+height 25
+enter_x 13
+enter_y 12
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sun May  1 20:51:40 1994
 endmsg
-width 25
-height 25
-enter_x 13
-enter_y 12
-reset_timeout 7200
-difficulty 4
 end
 arch flagstone
 end
@ -2210,6 +2210,8 @@ y 11
 end
 arch stair2_up
 slaying /dungeons/grukks/grukks.2
+hp 12
+sp 12
 x 12
 y 11
 end
--- a/dungeons/grukks/grukks.2
+++ b/dungeons/grukks/grukks.2
@ -1,4 +1,5 @@
 arch map
+name <unnamed>
 reset_timeout 7200
 difficulty 7
 width 25
@ -2401,6 +2402,8 @@ y 11
 end
 arch stair2_up
 slaying /dungeons/grukks/grukks.3
+hp 12
+sp 12
 x 12
 y 11
 end
@ -2410,6 +2413,8 @@ y 12
 end
 arch stair2_down
 slaying /dungeons/grukks/grukks.1
+hp 12
+sp 11
 x 12
 y 12
 end
--- a/dungeons/grukks/grukks.3
+++ b/dungeons/grukks/grukks.3
@ -1,4 +1,5 @@
 arch map
+name <unnamed>
 reset_timeout 7200
 difficulty 9
 width 25
@ -1769,6 +1770,8 @@ y 11
 end
 arch stair2_up
 slaying /dungeons/grukks/grukks.4
+hp 12
+sp 12
 x 12
 y 11
 end
@ -1778,6 +1781,8 @@ y 12
 end
 arch stair2_down
 slaying /dungeons/grukks/grukks.2
+hp 12
+sp 11
 x 12
 y 12
 end
--- a/dungeons/grukks/grukks.4
+++ b/dungeons/grukks/grukks.4
@ -1332,14 +1332,6 @@ arch flagstone
 x 8
 y 2
 end
-arch dread
-name Grukk
-hp 1000
-maxhp 1000
-x 8
-y 2
-speed -0.200000
-end
 arch flagstone
 x 8
 y 3
@ -1958,6 +1950,8 @@ y 12
 end
 arch stair_down
 slaying /dungeons/grukks/grukks.3
+hp 12
+sp 11
 x 12
 y 12
 end
@ -3925,3 +3919,11 @@ arch bwall_2_2_4
 x 24
 y 24
 end
+arch dread
+name Grukk
+hp 1000
+maxhp 1000
+x 8
+y 2
+speed -0.200000
+end
--- a/euthville/map.fr.0
+++ b/euthville/map.fr.0
@ -1,4 +1,5 @@
 arch map
+name <unnamed>
 reset_timeout 7200
 difficulty 3
 width 22
@ -1766,6 +1767,8 @@ y 8
 end
 arch stair_down
 slaying map.fr.1
+hp 15
+sp 15
 x 13
 y 8
 end
--- a/euthville/map.fr.1
+++ b/euthville/map.fr.1
@ -1,13 +1,14 @@
 arch map
+name <unnamed>
+width 31
+height 31
+enter_x 15
+enter_y 15
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Tue Dec 27 01:47:28 1994
 endmsg
-hp 15
-sp 15
-x 31
-y 31
 end
 arch woodfloor
 end
@ -5346,6 +5347,8 @@ y 29
 end
 arch stair_down
 slaying map.fr.2
+hp 1
+sp 5
 x 29
 y 29
 end
--- a/euthville/map.fr.2
+++ b/euthville/map.fr.2
@ -1,4 +1,5 @@
 arch map
+name <unnamed>
 reset_timeout 7200
 difficulty 6
 width 73
@ -13855,6 +13856,8 @@ y 11
 end
 arch stair_down
 slaying map.fr.3
+hp 16
+sp 1
 x 64
 y 11
 end
--- a/pup_land/rainbow/Lv3/e_hall
+++ b/pup_land/rainbow/Lv3/e_hall
@ -1,13 +1,13 @@
 arch map
-region pupland
 name e_hall
+region pupland
+width 20
+height 20
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Tue Jun 18 17:39:03 1996
 endmsg
-x 20
-y 20
 end
 arch permanent_lava
 end
@ -128,8 +128,6 @@ arch permanent_lava
 y 19
 end
 arch blocked
-msg
-endmsg
 y 19
 end
 arch permanent_lava
@ -467,8 +465,6 @@ arch permanent_lava
 x 4
 end
 arch blocked
-msg
-endmsg
 x 4
 end
 arch permanent_lava
@ -567,8 +563,6 @@ arch permanent_lava
 x 5
 end
 arch blocked
-msg
-endmsg
 x 5
 end
 arch permanent_lava
@ -672,8 +666,6 @@ x 5
 y 19
 end
 arch blocked
-msg
-endmsg
 x 5
 y 19
 end
@ -681,8 +673,6 @@ arch permanent_lava
 x 6
 end
 arch blocked
-msg
-endmsg
 x 6
 end
 arch permanent_lava
@ -782,8 +772,6 @@ x 6
 y 19
 end
 arch blocked
-msg
-endmsg
 x 6
 y 19
 end
@ -791,8 +779,6 @@ arch permanent_lava
 x 7
 end
 arch blocked
-msg
-endmsg
 x 7
 end
 arch permanent_lava
@ -895,8 +881,6 @@ arch permanent_lava
 x 8
 end
 arch blocked
-msg
-endmsg
 x 8
 end
 arch permanent_lava
@ -987,8 +971,6 @@ arch permanent_lava
 x 9
 end
 arch blocked
-msg
-endmsg
 x 9
 end
 arch permanent_lava
@ -1090,8 +1072,6 @@ arch permanent_lava
 x 10
 end
 arch blocked
-msg
-endmsg
 x 10
 end
 arch permanent_lava
@ -1190,8 +1170,6 @@ arch permanent_lava
 x 11
 end
 arch blocked
-msg
-endmsg
 x 11
 end
 arch permanent_lava
@ -1294,8 +1272,6 @@ arch permanent_lava
 x 12
 end
 arch blocked
-msg
-endmsg
 x 12
 end
 arch permanent_lava
@ -1390,8 +1366,6 @@ arch permanent_lava
 x 13
 end
 arch blocked
-msg
-endmsg
 x 13
 end
 arch permanent_lava
@ -1490,8 +1464,6 @@ arch permanent_lava
 x 14
 end
 arch blocked
-msg
-endmsg
 x 14
 end
 arch permanent_lava
@ -1594,8 +1566,6 @@ arch permanent_lava
 x 15
 end
 arch blocked
-msg
-endmsg
 x 15
 end
 arch permanent_lava
@ -1698,8 +1668,6 @@ arch permanent_lava
 x 16
 end
 arch blocked
-msg
-endmsg
 x 16
 end
 arch permanent_lava
@ -1814,8 +1782,6 @@ arch permanent_lava
 x 17
 end
 arch blocked
-msg
-endmsg
 x 17
 end
 arch permanent_lava
@ -1922,8 +1888,6 @@ arch permanent_lava
 x 18
 end
 arch blocked
-msg
-endmsg
 x 18
 end
 arch permanent_lava
@ -1999,8 +1963,6 @@ x 18
 y 11
 end
 arch blocked
-msg
-endmsg
 x 18
 y 11
 end
@ -2056,8 +2018,6 @@ arch permanent_lava
 x 19
 end
 arch blocked
-msg
-endmsg
 x 19
 end
 arch permanent_lava
@ -2065,8 +2025,6 @@ x 19
 y 1
 end
 arch blocked
-msg
-endmsg
 x 19
 y 1
 end
@ -2139,8 +2097,6 @@ x 19
 y 10
 end
 arch blocked
-msg
-endmsg
 x 19
 y 10
 end
@ -2149,8 +2105,6 @@ x 19
 y 11
 end
 arch blocked
-msg
-endmsg
 x 19
 y 11
 end
@ -2159,8 +2113,6 @@ x 19
 y 12
 end
 arch blocked
-msg
-endmsg
 x 19
 y 12
 end
@ -2214,6 +2166,8 @@ y 18
 end
 arch invis_exit
 slaying e-path
+hp 1
+sp 1
 x 19
 y 19
 end
--- a/santo_dominion/lord_byron/main
+++ b/santo_dominion/lord_byron/main
@ -1,10 +1,11 @@
 arch map
+name <unnamed>
 region santodominion
-hp 25
-sp 58
-x 50
-y 60
 shopitems *:0
+width 50
+height 60
+enter_x 25
+enter_y 58
 end
 arch sea
 end
@ -7254,6 +7255,8 @@ y 9
 end
 arch stair2_up
 slaying 1st_floor
+hp 20
+sp 5
 x 25
 y 9
 end
--- a/scorn/dtabb/cave
+++ b/scorn/dtabb/cave
@ -1,14 +1,14 @@
 arch map
-region scorn
 name cave
+region scorn
+width 32
+height 32
+enter_x 28
 msg
 Creator: Cater & Wade
 Email: john_cater@yahoo.com
 Date: Fri Oct 15 17:33:34 1998
 endmsg
-width 32
-height 32
-enter_x 28
 end
 arch dirtfloor
 end
@ -1325,10 +1325,10 @@ x 6
 y 28
 end
 arch dun2
-no_pass 0
-pass_thru 1
 x 6
 y 28
+no_pass 0
+pass_thru 1
 end
 arch dirtfloor
 x 6
@ -1336,6 +1336,8 @@ y 29
 end
 arch stair_down
 slaying cave2
+hp 22
+sp 18
 x 6
 y 29
 end
@ -1345,6 +1347,8 @@ y 30
 end
 arch stair_down
 slaying cave2
+hp 22
+sp 19
 x 6
 y 30
 end
@ -1511,10 +1515,10 @@ x 7
 y 28
 end
 arch dun2
-no_pass 0
-pass_thru 1
 x 7
 y 28
+no_pass 0
+pass_thru 1
 end
 arch dirtfloor
 x 7
@ -1711,10 +1715,10 @@ x 8
 y 28
 end
 arch dun2
-no_pass 0
-pass_thru 1
 x 8
 y 28
+no_pass 0
+pass_thru 1
 end
 arch dirtfloor
 x 8
--- a/scorn/houses/house.haunted
+++ b/scorn/houses/house.haunted
@ -1,14 +1,15 @@
 arch map
+name <unnamed>
 region scorn
+width 20
+height 20
+enter_x 17
+enter_y 18
 msg
 Creator: 
 Email: 
 Date: Fri Oct 15 13:32:27 1993
 endmsg
-hp 17
-sp 18
-x 20
-y 20
 end
 arch cobblestones
 end
@ -362,11 +363,13 @@ x 3
 y 1
 end
 arch stair_3_down
-name Cobwep lined basement 
+name Cobwep lined basement
 slaying /scorn/kar/creepy.house
 msg
 /kar/creepy.hous
 endmsg
+hp 1
+sp 1
 x 3
 y 1
 end
@ -1656,7 +1659,7 @@ y 8
 end
 arch magic_mouth
 msg
-Upper level hard.  level  5 or more 
+Upper level hard.  level  5 or more
 endmsg
 x 13
 y 9
@ -1671,6 +1674,8 @@ y 10
 end
 arch stair2_up
 slaying house.haunted2
+hp 11
+sp 10
 x 13
 y 10
 end
--- a/scorn/towers/tower.mad2
+++ b/scorn/towers/tower.mad2
@ -1,13 +1,15 @@
 arch map
-region scorn
 name tower
+region scorn
+width 16
+height 16
+enter_x 1
+enter_y 1
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat May 27 00:36:48 2000
 endmsg
-hp 1
-sp 1
 end
 arch woodfloor
 end
@ -988,6 +990,8 @@ y 10
 end
 arch stair_up
 slaying tower.mad3
+hp 10
+sp 10
 x 9
 y 10
 end
@ -1098,6 +1102,8 @@ y 10
 end
 arch stair_up
 slaying tower.mad3
+hp 10
+sp 11
 x 10
 y 10
 end
--- a/wolfsburg/dungeons/hut
+++ b/wolfsburg/dungeons/hut
@ -1,12 +1,10 @@
 arch map
-region wolfsburg
 name hut
-msg
-
-endmsg
-hp 3
-sp 3
-x 15
+region wolfsburg
+width 15
+height 16
+enter_x 3
+enter_y 3
 end
 arch woodfloor
 y 1
@ -106,12 +104,11 @@ y 2
 end
 arch exit
 slaying /world/world_128_108
-face woodfloor.111
+face oakdoor.111
 hp 19
 sp 30
 x 1
 y 2
-is_animated 0
 end
 arch woodfloor
 x 1
--- a/wolfsburg/dungeons/underworld
+++ b/wolfsburg/dungeons/underworld
@ -1,13 +1,13 @@
 arch map
-region wolfsburg
 name underworld
+region wolfsburg
+width 60
+height 40
+enter_x 7
+enter_y 6
 msg
-You have entered the Underworld. 
+You have entered the Underworld.
 endmsg
-hp 7
-sp 6
-x 60
-y 40
 end
 arch woodfloor
 end
@ -785,9 +785,9 @@ y 5
 end
 arch exit
 slaying /world/world_128_108
+face woodfloor.111
 hp 13
 sp 44
-face woodfloor.111
 x 5
 y 5
 is_animated 0
@ -924,9 +924,9 @@ y 5
 end
 arch exit
 slaying /world/world_128_108
+face woodfloor.111
 hp 13
 sp 44
-face woodfloor.111
 x 6
 y 5
 is_animated 0
@ -1150,13 +1150,13 @@ x 7
 y 5
 end
 arch exit
+name ladder going up
 slaying /world/world_128_108
+face ladder2_up.111
 hp 13
 sp 44
-face woodfloor.111
 x 7
 y 5
-is_animated 0
 end
 arch woodfloor
 x 7
@ -1420,8 +1420,8 @@ x 8
 y 5
 end
 arch exit
-face woodfloor.111
 slaying /world/world_128_108
+face woodfloor.111
 hp 13
 sp 44
 x 8
@ -1707,9 +1707,9 @@ y 5
 end
 arch exit
 slaying /world/world_128_108
+face woodfloor.111
 hp 13
 sp 44
-face woodfloor.111
 x 9
 y 5
 is_animated 0
@ -8123,7 +8123,7 @@ arch northman
 name Odin, The All-Father
 msg
@match *
-Come back later, after the feasting 
+Come back later, after the feasting
 endmsg
 hp 500
 x 41
@ -9247,7 +9247,7 @@ arch northman
 msg
@match *
 Feasting and eternal war, could anything be
-more glorious 
+more glorious
 endmsg
 x 46
 y 2
--- a/wolfsburg/temple/enterance
+++ b/wolfsburg/temple/enterance
@ -1,14 +1,15 @@
 arch map
+name <unnamed>
 region wolfsburg
+width 23
+height 25
+enter_x 12
+enter_y 23
 msg
 Creator: 
 Email: 
 Date: Wed Oct 27 10:43:44 1993
 endmsg
-hp 12
-sp 23
-x 23
-y 25
 end
 arch jungle_2
 end
@ -2409,6 +2410,8 @@ end
 arch courthouse
 name Temple
 slaying temple
+hp 12
+sp 23
 x 11
 y 9
 end
--- a/wolfsburg/temple/temple
+++ b/wolfsburg/temple/temple
@ -1,12 +1,10 @@
 arch map
+name <unnamed>
 region wolfsburg
-msg
-
-endmsg
-hp 12
-sp 22
-x 25
-y 25
+width 25
+height 25
+enter_x 12
+enter_y 22
 end
 arch marble
 end
@ -1646,6 +1644,8 @@ end
 arch stair_down
 name stairs leading out
 slaying enterance
+hp 11
+sp 11
 x 12
 y 23
 end
--- a/world/world_102_107
+++ b/world/world_102_107
@ -1,15 +1,12 @@
 arch map
 name world_102_107
+reset_timeout 7200
+difficulty 1
 region santodominion
-msg
-
-endmsg
 width 50
 height 50
 enter_x 1
 enter_y 1
-reset_timeout 7200
-difficulty 1
 outdoor 1
 tile_path_1 world_102_106
 tile_path_2 world_103_107
@ -2160,9 +2157,9 @@ x 10
 y 45
 end
 arch shallow_sea
-no_pass 0
 x 10
 y 46
+no_pass 0
 end
 arch stonebridge_2_1_2
 x 10
@ -2364,9 +2361,9 @@ x 11
 y 45
 end
 arch shallow_sea
-no_pass 0
 x 11
 y 46
+no_pass 0
 end
 arch stonebridge_2_1_2
 x 11
@ -2568,9 +2565,9 @@ x 12
 y 45
 end
 arch shallow_sea
-no_pass 0
 x 12
 y 46
+no_pass 0
 end
 arch stonebridge_2_1_2
 x 12
@ -2772,9 +2769,9 @@ x 13
 y 45
 end
 arch shallow_sea
-no_pass 0
 x 13
 y 46
+no_pass 0
 end
 arch stonebridge_2_1_2
 x 13
@ -5951,6 +5948,8 @@ end
 arch hut
 name Stig's Hut
 slaying /santo_dominion/map.stigkr.1
+hp 17
+sp 1
 x 29
 y 41
 end
--- a/world/world_105_113
+++ b/world/world_105_113
@ -1918,9 +1918,9 @@ arch hole
 name Abyss
 slaying /euthville/wiz1
 hp 3
+sp 1
 x 7
 y 17
-is_floor 0
 end
 arch desert
 x 7
--- a/world/world_107_123
+++ b/world/world_107_123
--- a/world/world_116_102
+++ b/world/world_116_102
@ -13221,6 +13221,8 @@ end
 arch store_weapons
 name Spike's Weapons
 slaying /darcap/darcap/shop_w
+hp 14
+sp 14
 x 19
 y 37
 end
@ -13263,6 +13265,8 @@ end
 arch courthouse
 name Courthouse
 slaying /darcap/darcap/quest
+hp 17
+sp 7
 x 22
 y 40
 end
@ -13348,6 +13352,8 @@ end
 arch guild_northwest
 name Guild of the Smoking Cauldron
 slaying /darcap/darcap/guilds/smoking_cauldron/ground
+hp 12
+sp 23
 x 31
 y 25
 end
--- a/world/world_122_117
+++ b/world/world_122_117
@ -39,8 +39,8 @@ y 2
 end
 arch tavern
 name Kaisa's place
-name_pl Kaisa's place
 slaying /navar_city/magara/houses/kaisas_place
+hp 1
 sp 3
 y 2
 end
@ -13776,8 +13776,9 @@ x 3
 end
 arch guild_west
 name Central Library
-name_pl Central Library
 slaying /navar_city/misc/library
+hp 9
+sp 15
 x 5
 y 4
 end
@ -13896,8 +13897,8 @@ y 4
 end
 arch city_tower_west
 name Lighthouse
-name_pl Lighthouse
 slaying /navar_city/light/light1
+hp 1
 sp 11
 x 18
 y 1
--- a/world/world_128_108
+++ b/world/world_128_108
--- a/world/world_128_109
+++ b/world/world_128_109
@ -7752,9 +7752,10 @@ y 11
 end
 arch oakdoor
 name slave pits
-name_pl slave pits
 slaying /wolfsburg/slave_pit1
 face gwall_0.111
+hp 1
+sp 1
 x 32
 y 11
 end
@ -8003,7 +8004,6 @@ y 11
 end
 arch oakdoor
 name slave pits
-name_pl slave pits
 slaying /wolfsburg/slave_pit2
 face gwall_0.111
 hp 2
@ -8256,9 +8256,10 @@ y 11
 end
 arch oakdoor
 name slave pits
-name_pl slave pits
 slaying /wolfsburg/slave_pit3
 face gwall_0.111
+hp 1
+sp 1
 x 34
 y 11
 end
@ -11039,8 +11040,9 @@ y 41
 end
 arch fort_sym
 name temple
-name_pl temple
 slaying /wolfsburg/temple/enterance
+hp 11
+sp 23
 x 45
 y 41
 end
@ -12130,8 +12132,9 @@ walk_on 1
 end
 arch barn
 name warehouse
-name_pl warehouse
 slaying /wolfsburg/ware1
+hp 1
+sp 1
 x 15
 y 1
 end
@ -12214,8 +12217,9 @@ y 10
 end
 arch church
 name The Eternal Reward
-name_pl The Eternal Reward
 slaying /wolfsburg/etern_rew
+hp 7
+sp 23
 x 21
 y 13
 end
@ -12286,11 +12290,11 @@ y 10
 end
 arch guild
 name Guild of the Damned Heretics
-name_pl Guild of the Damned Heretics
 slaying /wolfsburg/guilds/damned_heretics/ground
+hp 12
+sp 23
 x 27
 y 14
-no_pass 0
 end
 arch keep
 name east gatehouse
@ -12333,8 +12337,9 @@ y 1
 end
 arch inn
 name The Red Light District
-name_pl The Red Light District
 slaying /wolfsburg/whorehouse
+hp 1
+sp 1
 x 36
 y 8
 end
@ -12397,8 +12402,9 @@ y 24
 end
 arch city_tower
 name twin towers
-name_pl twin towers
 slaying /wolfsburg/tt/tta1
+hp 1
+sp 18
 x 43
 y 8
 end
--- a/world/world_129_108
+++ b/world/world_129_108