Updated maps that were using 'unnamed' as their name. Cosmetic changes on how 'swall' sections merged with adjacent wall sections. Other changes are due to Map Editor reformatting.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5629 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-01 02:50:17 +00:00 · 2007-03-01 02:50:17 +00:00 · b2a130d68c
parent 4388a52699
commit b2a130d68c
9 changed files with 1188 additions and 2654 deletions
--- a/navar_city/mlab/dream
+++ b/navar_city/mlab/dream
@ -1,17 +1,17 @@
 arch map
-name <untitled>
+name Dream
+reset_timeout 7200
+difficulty 1
 region dream
+width 16
+height 16
+enter_x 1
+enter_y 1
 msg
 Creator: mikeeusa
 Email: gnu@foo.bar
 Date: Tue Aug 27 17:31:46 2002
 endmsg
-width 16
-height 16
-enter_x 1
-enter_y 1
-reset_timeout 7200
-difficulty 1
 end
 arch blocked
 end
@ -30,37 +30,37 @@ end
 arch blocked
 name nothing
 name_pl nothing
+y 6
 no_pass 0
 blocksview 0
-y 6
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 y 7
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 y 8
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 y 9
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 y 10
+no_pass 0
+blocksview 0
 end
 arch blocked
 x 1
@ -75,10 +75,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 1
 y 1
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 1
@ -101,10 +101,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 1
 y 2
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 1
@ -127,10 +127,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 1
 y 3
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 1
@ -150,18 +150,18 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 1
 y 6
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 1
 y 10
+no_pass 0
+blocksview 0
 end
 arch blocked
 x 2
@ -176,10 +176,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 2
 y 1
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 2
@ -202,10 +202,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 2
 y 2
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 2
@ -228,10 +228,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 2
 y 3
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 2
@ -244,18 +244,18 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 2
 y 6
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 2
 y 10
+no_pass 0
+blocksview 0
 end
 arch blocked
 x 3
@ -270,10 +270,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 3
 y 1
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 3
@ -296,10 +296,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 3
 y 2
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 3
@ -322,10 +322,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 3
 y 3
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 3
@ -345,18 +345,18 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 3
 y 6
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 3
 y 10
+no_pass 0
+blocksview 0
 end
 arch blocked
 x 4
@ -380,42 +380,42 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 4
 y 6
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 4
 y 7
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 4
 y 8
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 4
 y 9
+no_pass 0
+blocksview 0
 end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 4
 y 10
+no_pass 0
+blocksview 0
 end
 arch blocked
 x 6
@ -456,10 +456,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 7
 y 1
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 7
@ -482,10 +482,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 7
 y 2
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 7
@ -508,10 +508,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 7
 y 3
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 7
@ -541,10 +541,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 8
 y 1
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 8
@ -560,10 +560,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 8
 y 2
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 8
@ -586,10 +586,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 8
 y 3
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 8
@ -619,10 +619,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 9
 y 1
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 9
@ -645,10 +645,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 9
 y 2
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 9
@ -671,10 +671,10 @@ end
 arch blocked
 name nothing
 name_pl nothing
-no_pass 0
-blocksview 0
 x 9
 y 3
+no_pass 0
+blocksview 0
 end
 arch dungeon_magic
 x 9
--- a/navar_city/mlab/tavern
+++ b/navar_city/mlab/tavern
@ -1,7 +1,8 @@
 arch map
-region navar
+name Western Navar Tavern
 reset_timeout 7200
 difficulty 1
+region navar
 width 95
 height 80
 enter_x 1
@ -1215,11 +1216,15 @@ arch cwall_2_2_1
 x 2
 y 10
 end
+arch swall_1_1_half
+x 2
+y 10
+end
 arch grass
 x 2
 y 11
 end
-arch swall_1_1
+arch swall_2_1_1
 x 2
 y 11
 end
@ -1352,7 +1357,7 @@ arch grass
 x 2
 y 26
 end
-arch swall_1_2
+arch swall_2_1_1
 x 2
 y 26
 end
@ -1362,6 +1367,10 @@ name_pl stonefloor
 x 2
 y 27
 end
+arch swall_1_2
+x 2
+y 27
+end
 arch wwall_2_2_2
 x 2
 y 27
@ -1898,7 +1907,7 @@ arch grass
 x 3
 y 18
 end
-arch swall_1_3
+arch swall_2_1_2
 x 3
 y 18
 end
@ -2397,6 +2406,10 @@ arch wwall_1_2
 x 4
 y 18
 end
+arch swall_1_3_half
+x 4
+y 18
+end
 arch flagstone
 x 4
 y 19
@ -5395,6 +5408,10 @@ name_pl stonefloor
 x 10
 y 2
 end
+arch swall_1_4_half
+x 10
+y 2
+end
 arch cwall_2_2_3
 x 10
 y 2
@ -5925,7 +5942,7 @@ arch grass
 x 11
 y 2
 end
-arch swall_1_4
+arch swall_2_1_2
 x 11
 y 2
 end
@ -7027,6 +7044,10 @@ name_pl stonefloor
 x 13
 y 6
 end
+arch swall_1_4_half
+x 13
+y 6
+end
 arch cwall_1_2
 x 13
 y 6
@ -7045,6 +7066,10 @@ name_pl stonefloor
 x 13
 y 9
 end
+arch swall_1_4_half
+x 13
+y 9
+end
 arch cwall_1_1
 x 13
 y 9
@ -7519,7 +7544,7 @@ arch grass
 x 14
 y 2
 end
-arch swall_1_3
+arch swall_2_1_2
 x 14
 y 2
 end
@ -7541,7 +7566,7 @@ name_pl stonefloor
 x 14
 y 6
 end
-arch swall_1_3
+arch swall_2_1_2
 x 14
 y 6
 end
@ -7559,7 +7584,7 @@ name_pl stonefloor
 x 14
 y 9
 end
-arch swall_1_3
+arch swall_2_1_2
 x 14
 y 9
 end
@ -7994,6 +8019,10 @@ name_pl stonefloor
 x 15
 y 2
 end
+arch swall_1_3_half
+x 15
+y 2
+end
 arch awall_2_2_2
 x 15
 y 2
@ -8038,6 +8067,10 @@ arch awall_1_2
 x 15
 y 6
 end
+arch swall_1_3_half
+x 15
+y 6
+end
 arch cwall_1_1
 x 15
 y 6
@ -8068,6 +8101,10 @@ arch awall_1_1
 x 15
 y 9
 end
+arch swall_1_3_half
+x 15
+y 9
+end
 arch cwall_1_2
 x 15
 y 9
@ -8254,6 +8291,14 @@ name_pl stonefloor
 x 15
 y 29
 end
+arch swall_1_4
+x 15
+y 29
+end
+arch swall_1_1
+x 15
+y 29
+end
 arch awall_2_2_4
 x 15
 y 29
@ -8264,7 +8309,7 @@ name_pl stonefloor
 x 15
 y 30
 end
-arch swall_1_1
+arch swall_2_1_1
 x 15
 y 30
 end
@ -8305,7 +8350,7 @@ name_pl stonefloor
 x 15
 y 34
 end
-arch swall_1_2
+arch swall_2_1_1
 x 15
 y 34
 end
@ -8315,6 +8360,10 @@ name_pl stonefloor
 x 15
 y 35
 end
+arch swall_1_2
+x 15
+y 35
+end
 arch awall_2_2_2
 x 15
 y 35
@ -8854,7 +8903,7 @@ name_pl stonefloor
 x 16
 y 29
 end
-arch swall_1_4
+arch swall_2_1_2
 x 16
 y 29
 end
@ -10123,7 +10172,7 @@ name_pl stonefloor
 x 18
 y 34
 end
-arch swall_1_2
+arch swall_2_1_1
 x 18
 y 34
 end
@ -10133,6 +10182,10 @@ name_pl stonefloor
 x 18
 y 35
 end
+arch swall_1_2
+x 18
+y 35
+end
 arch awall_2_1_2
 x 18
 y 35
@ -11102,8 +11155,8 @@ CHURCH OF VALRIEL TIES TO VIOLENCE:
 An undercover investigation into the
 'Holy Church of Valriel' has
 discovered monetary ties to a
-militant group opreating under the 
-'Traveling Ministry Of The Most 
+militant group opreating under the
+'Traveling Ministry Of The Most
 Holy Power'. When asked about this
 situation the High Priest of Valriel
 said "Ask God".
@ -13481,11 +13534,15 @@ arch wwall_1_3
 x 24
 y 2
 end
+arch swall_1_1_half
+x 24
+y 2
+end
 arch woodfloor
 x 24
 y 3
 end
-arch swall_1_1
+arch swall_2_1_1
 x 24
 y 3
 end
@ -15719,11 +15776,15 @@ arch wwall_1_4
 x 28
 y 2
 end
+arch swall_1_1_half
+x 28
+y 2
+end
 arch woodfloor
 x 28
 y 3
 end
-arch swall_1_1
+arch swall_2_1_1
 x 28
 y 3
 end
@ -16368,6 +16429,10 @@ arch awall_1_1
 x 29
 y 10
 end
+arch swall_1_4
+x 29
+y 10
+end
 arch cwall_2_2_4
 x 29
 y 10
@ -16588,6 +16653,10 @@ name_pl stonefloor
 x 29
 y 35
 end
+arch swall_1_4
+x 29
+y 35
+end
 arch cwall_2_2_3
 x 29
 y 35
@ -17021,7 +17090,7 @@ arch dungeon_floor
 x 30
 y 10
 end
-arch swall_1_4
+arch swall_2_1_2
 x 30
 y 10
 end
@ -17253,7 +17322,7 @@ name_pl floor
 x 30
 y 35
 end
-arch swall_1_4
+arch swall_2_1_2
 x 30
 y 35
 end
@ -17574,7 +17643,7 @@ arch dungeon_floor
 x 31
 y 12
 end
-arch swall_1_2
+arch swall_2_1_1
 x 31
 y 12
 end
@ -17584,6 +17653,10 @@ name_pl stonefloor
 x 31
 y 13
 end
+arch swall_1_2
+x 31
+y 13
+end
 arch awall_1_3
 x 31
 y 13
@ -23486,7 +23559,7 @@ name_pl floor
 x 42
 y 35
 end
-arch swall_1_3
+arch swall_2_1_2
 x 42
 y 35
 end
@ -24024,6 +24097,10 @@ name_pl stonefloor
 x 43
 y 35
 end
+arch swall_1_3
+x 43
+y 35
+end
 arch cwall_2_2_2
 x 43
 y 35
@ -24948,8 +25025,8 @@ CHURCH OF VALRIEL TIES TO VIOLENCE:
 An undercover investigation into the
 'Holy Church of Valriel' has
 discovered monetary ties to a
-militant group opreating under the 
-'Traveling Ministry Of The Most 
+militant group opreating under the
+'Traveling Ministry Of The Most
 Holy Power'. When asked about this
 situation the High Priest of Valriel
 said "Ask God".
@ -34947,6 +35024,10 @@ arch brush
 x 65
 y 2
 end
+arch swall_1_4_half
+x 65
+y 2
+end
 arch hedge_1_1
 x 65
 y 2
@ -35572,7 +35653,7 @@ arch brush
 x 66
 y 2
 end
-arch swall_1_4
+arch swall_2_1_2
 x 66
 y 2
 end
@ -36232,6 +36313,10 @@ arch mine13
 x 67
 y 48
 end
+arch dungeon_magic
+x 67
+y 49
+end
 arch dungeon_floor
 x 67
 y 49
@ -36247,17 +36332,13 @@ unique 1
 end
 arch dungeon_magic
 x 67
-y 49
+y 50
 end
 arch dungeon_floor
 x 67
 y 50
 unique 1
 end
-arch dungeon_magic
-x 67
-y 50
-end
 arch grate_closed_1
 x 67
 y 50
@ -36755,6 +36836,10 @@ arch mine13
 x 68
 y 48
 end
+arch dungeon_magic
+x 68
+y 49
+end
 arch dungeon_floor
 x 68
 y 49
@ -36762,17 +36847,13 @@ unique 1
 end
 arch dungeon_magic
 x 68
-y 49
+y 50
 end
 arch dungeon_floor
 x 68
 y 50
 unique 1
 end
-arch dungeon_magic
-x 68
-y 50
-end
 arch swall_1_4
 x 68
 y 50
@ -37069,10 +37150,6 @@ arch cobblestones2
 x 69
 y 20
 end
-arch dragon
-x 69
-y 20
-end
 arch cobblestones2
 x 69
 y 21
@ -37157,26 +37234,14 @@ arch cobblestones2
 x 69
 y 31
 end
-arch dragon
-x 69
-y 31
-end
 arch cobblestones2
 x 69
 y 32
 end
-arch dragon
-x 69
-y 32
-end
 arch cobblestones2
 x 69
 y 33
 end
-arch dragon
-x 69
-y 33
-end
 arch cobblestones2
 x 69
 y 34
@ -37253,18 +37318,26 @@ arch mine13
 x 69
 y 48
 end
+arch swall_1_1_half
+x 69
+y 48
+end
+arch dungeon_magic
+x 69
+y 49
+end
 arch dungeon_floor
 x 69
 y 49
 unique 1
 end
-arch swall_1_1
+arch swall_2_1_1
 x 69
 y 49
 end
 arch dungeon_magic
 x 69
-y 49
+y 50
 end
 arch dungeon_floor
 x 69
@ -37275,10 +37348,6 @@ arch swall_2_2_4
 x 69
 y 50
 end
-arch dungeon_magic
-x 69
-y 50
-end
 arch dungeon_floor
 x 69
 y 51
@ -37588,10 +37657,6 @@ arch cobblestones2
 x 70
 y 22
 end
-arch dragon
-x 70
-y 22
-end
 arch cobblestones2
 x 70
 y 23
@ -39707,10 +39772,6 @@ arch cobblestones2
 x 74
 y 25
 end
-arch cobra
-x 74
-y 25
-end
 arch cobblestones2
 x 74
 y 26
@ -40250,10 +40311,6 @@ arch cobblestones2
 x 75
 y 22
 end
-arch serpent
-x 75
-y 22
-end
 arch cobblestones2
 x 75
 y 23
@ -41496,10 +41553,6 @@ arch cobblestones2
 x 77
 y 22
 end
-arch cobra
-x 77
-y 22
-end
 arch cobblestones2
 x 77
 y 23
@ -47269,10 +47322,6 @@ end
 arch random_treasure
 end
 end
-arch dragon
-x 86
-y 28
-end
 arch cobblestones2
 x 86
 y 29
@ -47287,10 +47336,6 @@ end
 arch random_treasure
 end
 end
-arch dragon
-x 86
-y 29
-end
 arch cobblestones2
 x 86
 y 30
@ -50928,7 +50973,7 @@ arch brush
 x 93
 y 2
 end
-arch swall_1_3
+arch swall_2_1_2
 x 93
 y 2
 end
@ -51384,6 +51429,10 @@ arch brush
 x 94
 y 2
 end
+arch swall_1_3_half
+x 94
+y 2
+end
 arch hedge_1_1
 x 94
 y 2
@ -51979,3 +52028,43 @@ arch grass
 x 94
 y 79
 end
+arch dragon
+x 69
+y 20
+end
+arch dragon
+x 69
+y 31
+end
+arch dragon
+x 69
+y 32
+end
+arch dragon
+x 69
+y 33
+end
+arch dragon
+x 70
+y 22
+end
+arch cobra
+x 74
+y 25
+end
+arch serpent
+x 75
+y 22
+end
+arch cobra
+x 77
+y 22
+end
+arch dragon
+x 86
+y 28
+end
+arch dragon
+x 86
+y 29
+end
--- a/navar_city/mlab/tavern2
+++ b/navar_city/mlab/tavern2
--- a/navar_city/mlab/tavern3
+++ b/navar_city/mlab/tavern3
--- a/navar_city/mlab/tavern4
+++ b/navar_city/mlab/tavern4
@ -1,7 +1,8 @@
 arch map
-region navar
+name Western Navar Tavern
 reset_timeout 7200
 difficulty 1
+region navar
 width 18
 height 18
 enter_x 1
--- a/navar_city/mlab/tavern5
+++ b/navar_city/mlab/tavern5
@ -1,7 +1,8 @@
 arch map
-region navar
+name Western Navar Tavern
 reset_timeout 7200
 difficulty 1
+region navar
 width 18
 height 18
 enter_x 1
--- a/navar_city/mlab/tavern6
+++ b/navar_city/mlab/tavern6
@ -1,7 +1,8 @@
 arch map
-region navar
+name Western Navar Tavern
 reset_timeout 7200
 difficulty 1
+region navar
 width 18
 height 18
 enter_x 1
--- a/navar_city/mlab/tavern7
+++ b/navar_city/mlab/tavern7
@ -1,7 +1,8 @@
 arch map
-region navar
+name Western Navar Tavern
 reset_timeout 7200
 difficulty 1
+region navar
 width 18
 height 18
 enter_x 1
@ -1761,7 +1762,7 @@ fool taketh his life, and his corpse.
 To the alter his physical being
 strives. To the alter where the
 physical must to dust turn so the
-spirit may be free. 
+spirit may be free.
 endmsg
 x 9
 y 6
--- a/navar_city/mlab/tavernb1
+++ b/navar_city/mlab/tavernb1