Cosmetic wall changes for nicer merging

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11052 282e977c-c81d-0410-88c4-b93c2d0d6712
master
rjtanner 2008-12-21 07:40:49 +00:00
parent ce6856c934
commit 20fb69cdaa
13 changed files with 307 additions and 19 deletions

View File

@ -10,7 +10,7 @@ enter_x 15
enter_y 31
msg
Created: 1997-07-10 Viola Krings
Modified: 2008-12-14 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -1044,6 +1044,10 @@ arch wall_2_1_1
x 5
y 3
end
arch wall_2_short
x 5
y 3
end
arch woodfloor
x 5
y 4
@ -2109,6 +2113,10 @@ arch wall_2_1_1
x 10
y 3
end
arch wall_2_short
x 10
y 3
end
arch woodfloor
x 10
y 4
@ -2967,6 +2975,10 @@ arch wall_2_1_1
x 15
y 3
end
arch wall_2_short
x 15
y 3
end
arch woodfloor
x 15
y 4
@ -3999,6 +4011,10 @@ arch wall_2_1_1
x 20
y 3
end
arch wall_2_short
x 20
y 3
end
arch woodfloor
x 20
y 4
@ -4954,6 +4970,10 @@ arch wall_2_1_1
x 25
y 3
end
arch wall_2_short
x 25
y 3
end
arch woodfloor
x 25
y 4
@ -6197,6 +6217,10 @@ arch wall_2_1_1
x 31
y 3
end
arch wall_2_short
x 31
y 3
end
arch woodfloor
x 31
y 4

View File

@ -8,7 +8,7 @@ enter_x 8
enter_y 30
msg
Created: 1997-07-15 Viola Krings
Modified: 2008-11-21 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch dungeon_floor
@ -880,11 +880,15 @@ arch stwall_1_2
x 4
y 30
end
arch dwall_1_1
x 4
y 30
end
arch dungeon_floor
x 4
y 31
end
arch dwall_2_1_2
arch dwall_3_1
x 4
y 31
end
@ -2387,11 +2391,15 @@ arch stwall_1_2
x 11
y 30
end
arch dwall_1_1
x 11
y 30
end
arch dungeon_floor
x 11
y 31
end
arch dwall_2_1_2
arch dwall_3_1
x 11
y 31
end

View File

@ -11,7 +11,7 @@ enter_x 7
enter_y 15
msg
Created: 1997-02-22
Modified: 2008-12-01 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -261,6 +261,10 @@ arch wall_1_2
x 2
y 7
end
arch wall_2_short
x 2
y 7
end
arch woodfloor
x 2
y 8
@ -1392,6 +1396,10 @@ arch wall_2_1_1
x 15
y 10
end
arch wall_2_short
x 15
y 10
end
arch woodfloor
x 15
y 11

View File

@ -11,7 +11,7 @@ enter_x 7
enter_y 7
msg
Created: 1997-07-22
Modified: 2008-10-20 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -255,6 +255,10 @@ arch wall_1_1
x 2
y 9
end
arch wall_2_short
x 2
y 9
end
arch woodfloor
x 2
y 10

View File

@ -11,7 +11,7 @@ enter_x 7
enter_y 3
msg
Created: 1997-07-22
Modified: 2008-10-20 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -247,6 +247,10 @@ arch wall_1_1
x 2
y 7
end
arch wall_2_short
x 2
y 7
end
arch woodfloor
x 2
y 8

View File

@ -11,7 +11,7 @@ enter_x 4
enter_y 4
msg
Created: 1997-07-22
Modified: 2008-10-20 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -251,6 +251,10 @@ arch wall_1_1
x 2
y 8
end
arch wall_2_short
x 2
y 8
end
arch woodfloor
x 2
y 9

View File

@ -11,7 +11,7 @@ enter_x 7
enter_y 4
msg
Created: 1997-07-23
Modified: 2008-10-20 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -255,6 +255,10 @@ arch wall_1_1
x 2
y 8
end
arch wall_2_short
x 2
y 8
end
arch woodfloor
x 2
y 9

View File

@ -11,7 +11,7 @@ enter_x 7
enter_y 9
msg
Created: 1997-07-23
Modified: 2008-10-20 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -251,6 +251,10 @@ arch wall_1_1
x 2
y 8
end
arch wall_2_short
x 2
y 8
end
arch woodfloor
x 2
y 9

View File

@ -11,7 +11,7 @@ enter_x 12
enter_y 3
msg
Created: 1997-07-23
Modified: 2008-10-20 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch woodfloor
@ -280,6 +280,10 @@ arch wall_1_1
x 2
y 8
end
arch wall_2_short
x 2
y 8
end
arch woodfloor
x 2
y 9

View File

@ -8,7 +8,7 @@ enter_x 14
enter_y 14
msg
Created: 1997-06-17
Modified: 2008-09-14 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch dungeon_floor
@ -498,7 +498,7 @@ end
arch awall_2_1_2
x 4
end
arch awall_3_3
arch awall_0
x 4
end
arch dungeon_floor
@ -532,7 +532,7 @@ arch dungeon_floor
x 4
y 4
end
arch awall_2_2_4
arch awall_1_3
x 4
y 4
end

View File

@ -8,7 +8,7 @@ enter_x 10
enter_y 13
msg
Created: 1997-06-17
Modified: 2008-10-21 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch grass
@ -616,7 +616,11 @@ arch woodfloor
x 7
y 2
end
arch dwall_2_1_2
arch dwall_3_3
x 7
y 2
end
arch dwall_0
x 7
y 2
end
@ -676,7 +680,11 @@ arch woodfloor
x 7
y 10
end
arch dwall_2_1_2
arch dwall_3_1
x 7
y 10
end
arch dwall_0
x 7
y 10
end

View File

@ -8,7 +8,7 @@ enter_x 4
enter_y 4
msg
Created: 1997-07-10
Modified: 2008-12-13 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch grass
@ -1010,6 +1010,10 @@ arch wall_1_2
x 4
y 28
end
arch swall_1_1_half
x 4
y 28
end
arch blackmarble
x 4
y 29
@ -1022,6 +1026,10 @@ arch blackmarble
x 4
y 30
end
arch swall_1_2_half
x 4
y 30
end
arch wall_1_1
x 4
y 30
@ -1062,6 +1070,10 @@ arch wall_1_2
x 4
y 36
end
arch swall_1_1_half
x 4
y 36
end
arch blackmarble
x 4
y 37
@ -1074,6 +1086,10 @@ arch blackmarble
x 4
y 38
end
arch swall_1_2_half
x 4
y 38
end
arch wall_1_1
x 4
y 38
@ -1273,6 +1289,10 @@ arch blackmarble
x 5
y 27
end
arch swall_1_4_half
x 5
y 27
end
arch wall_1_3
x 5
y 27
@ -1351,6 +1371,10 @@ arch blackmarble
x 5
y 39
end
arch swall_1_4_half
x 5
y 39
end
arch wall_1_3
x 5
y 39
@ -1750,6 +1774,10 @@ arch blackmarble
x 7
y 27
end
arch swall_1_3_half
x 7
y 27
end
arch wall_1_4
x 7
y 27
@ -1833,6 +1861,10 @@ arch blackmarble
x 7
y 39
end
arch swall_1_3_half
x 7
y 39
end
arch wall_1_4
x 7
y 39
@ -3455,6 +3487,10 @@ arch blackmarble
x 13
y 27
end
arch swall_1_4_half
x 13
y 27
end
arch wall_1_3
x 13
y 27
@ -3538,6 +3574,10 @@ arch blackmarble
x 13
y 39
end
arch swall_1_4_half
x 13
y 39
end
arch wall_1_3
x 13
y 39
@ -3982,6 +4022,10 @@ arch blackmarble
x 15
y 27
end
arch swall_1_3_half
x 15
y 27
end
arch wall_1_4
x 15
y 27
@ -4067,6 +4111,10 @@ arch blackmarble
x 15
y 39
end
arch swall_1_3_half
x 15
y 39
end
arch wall_1_4
x 15
y 39
@ -4266,6 +4314,10 @@ arch wall_1_2
x 16
y 28
end
arch swall_1_1_half
x 16
y 28
end
arch blackmarble
x 16
y 29
@ -4278,6 +4330,10 @@ arch blackmarble
x 16
y 30
end
arch swall_1_2_half
x 16
y 30
end
arch wall_1_1
x 16
y 30
@ -4318,6 +4374,10 @@ arch wall_1_2
x 16
y 36
end
arch swall_1_1_half
x 16
y 36
end
arch blackmarble
x 16
y 37
@ -4330,6 +4390,10 @@ arch blackmarble
x 16
y 38
end
arch swall_1_2_half
x 16
y 38
end
arch wall_1_1
x 16
y 38
@ -6786,6 +6850,10 @@ arch wall_1_2
x 27
y 28
end
arch swall_1_1_half
x 27
y 28
end
arch blackmarble
x 27
y 29
@ -6798,6 +6866,10 @@ arch blackmarble
x 27
y 30
end
arch swall_1_2_half
x 27
y 30
end
arch wall_1_1
x 27
y 30
@ -6838,6 +6910,10 @@ arch wall_1_2
x 27
y 36
end
arch swall_1_1_half
x 27
y 36
end
arch blackmarble
x 27
y 37
@ -6850,6 +6926,10 @@ arch blackmarble
x 27
y 38
end
arch swall_1_2_half
x 27
y 38
end
arch wall_1_1
x 27
y 38
@ -7056,6 +7136,10 @@ arch blackmarble
x 28
y 27
end
arch swall_1_4_half
x 28
y 27
end
arch wall_1_3
x 28
y 27
@ -7079,6 +7163,10 @@ arch blackmarble
x 28
y 31
end
arch swall_1_4_half
x 28
y 31
end
arch wall_1_3
x 28
y 31
@ -7099,6 +7187,10 @@ arch blackmarble
x 28
y 35
end
arch swall_1_4_half
x 28
y 35
end
arch wall_1_3
x 28
y 35
@ -7122,6 +7214,10 @@ arch blackmarble
x 28
y 39
end
arch swall_1_4_half
x 28
y 39
end
arch wall_1_3
x 28
y 39
@ -7582,6 +7678,10 @@ arch blackmarble
x 30
y 27
end
arch swall_1_3_half
x 30
y 27
end
arch wall_1_4
x 30
y 27
@ -7612,6 +7712,10 @@ arch blackmarble
x 30
y 31
end
arch swall_1_3_half
x 30
y 31
end
arch wall_1_4
x 30
y 31
@ -7632,6 +7736,10 @@ arch blackmarble
x 30
y 35
end
arch swall_1_3_half
x 30
y 35
end
arch wall_1_4
x 30
y 35
@ -7662,6 +7770,10 @@ arch blackmarble
x 30
y 39
end
arch swall_1_3_half
x 30
y 39
end
arch wall_1_4
x 30
y 39
@ -7873,6 +7985,10 @@ arch wall_1_2
x 31
y 28
end
arch swall_1_1_half
x 31
y 28
end
arch blackmarble
x 31
y 29
@ -7885,6 +8001,10 @@ arch blackmarble
x 31
y 30
end
arch swall_1_2_half
x 31
y 30
end
arch wall_1_1
x 31
y 30
@ -7925,6 +8045,10 @@ arch wall_1_2
x 31
y 36
end
arch swall_1_1_half
x 31
y 36
end
arch blackmarble
x 31
y 37
@ -7937,6 +8061,10 @@ arch blackmarble
x 31
y 38
end
arch swall_1_2_half
x 31
y 38
end
arch wall_1_1
x 31
y 38
@ -8884,6 +9012,10 @@ arch wall_1_2
x 35
y 28
end
arch swall_1_1_half
x 35
y 28
end
arch blackmarble
x 35
y 29
@ -8896,6 +9028,10 @@ arch blackmarble
x 35
y 30
end
arch swall_1_2_half
x 35
y 30
end
arch wall_1_1
x 35
y 30
@ -8936,6 +9072,10 @@ arch wall_1_2
x 35
y 36
end
arch swall_1_1_half
x 35
y 36
end
arch blackmarble
x 35
y 37
@ -8948,6 +9088,10 @@ arch blackmarble
x 35
y 38
end
arch swall_1_2_half
x 35
y 38
end
arch wall_1_1
x 35
y 38
@ -9142,6 +9286,10 @@ arch blackmarble
x 36
y 27
end
arch swall_1_4_half
x 36
y 27
end
arch wall_1_3
x 36
y 27
@ -9172,6 +9320,10 @@ arch blackmarble
x 36
y 31
end
arch swall_1_4_half
x 36
y 31
end
arch wall_1_3
x 36
y 31
@ -9192,6 +9344,10 @@ arch blackmarble
x 36
y 35
end
arch swall_1_4_half
x 36
y 35
end
arch wall_1_3
x 36
y 35
@ -9226,6 +9382,10 @@ arch blackmarble
x 36
y 39
end
arch swall_1_4_half
x 36
y 39
end
arch wall_1_3
x 36
y 39
@ -9674,6 +9834,10 @@ arch blackmarble
x 38
y 27
end
arch swall_1_3_half
x 38
y 27
end
arch wall_1_4
x 38
y 27
@ -9697,6 +9861,10 @@ arch blackmarble
x 38
y 31
end
arch swall_1_3_half
x 38
y 31
end
arch wall_1_4
x 38
y 31
@ -9717,6 +9885,10 @@ arch blackmarble
x 38
y 35
end
arch swall_1_3_half
x 38
y 35
end
arch wall_1_4
x 38
y 35
@ -9740,6 +9912,10 @@ arch blackmarble
x 38
y 39
end
arch swall_1_3_half
x 38
y 39
end
arch wall_1_4
x 38
y 39
@ -9891,6 +10067,10 @@ arch wall_1_2
x 39
y 28
end
arch swall_1_1_half
x 39
y 28
end
arch blackmarble
x 39
y 29
@ -9903,6 +10083,10 @@ arch blackmarble
x 39
y 30
end
arch swall_1_2_half
x 39
y 30
end
arch wall_1_1
x 39
y 30
@ -9943,6 +10127,10 @@ arch wall_1_2
x 39
y 36
end
arch swall_1_1_half
x 39
y 36
end
arch blackmarble
x 39
y 37
@ -9955,6 +10143,10 @@ arch blackmarble
x 39
y 38
end
arch swall_1_2_half
x 39
y 38
end
arch wall_1_1
x 39
y 38

View File

@ -8,7 +8,7 @@ enter_x 4
enter_y 4
msg
Created: 1997-07-09
Modified: 2008-09-15 Rick Tanner
Modified: 2008-12-21 Rick Tanner
endmsg
end
arch grass_only
@ -314,6 +314,10 @@ arch wall_1_2
x 3
y 3
end
arch wall_2_short
x 3
y 3
end
arch woodfloor
x 3
y 4
@ -550,6 +554,10 @@ arch wall_1_2
x 5
y 3
end
arch wall_2_short
x 5
y 3
end
arch woodfloor
x 5
y 4
@ -748,6 +756,10 @@ arch wall_2_2_1
x 7
y 3
end
arch wall_2_short
x 7
y 3
end
arch woodfloor
x 7
y 4
@ -1050,6 +1062,10 @@ arch wall_1_2
x 10
y 3
end
arch wall_2_short
x 10
y 3
end
arch woodfloor
x 10
y 4
@ -1221,6 +1237,10 @@ arch wall_1_2
x 12
y 3
end
arch wall_2_short
x 12
y 3
end
arch woodfloor
x 12
y 4
@ -1420,6 +1440,10 @@ arch wall_2_1_1
x 14
y 3
end
arch wall_2_short
x 14
y 3
end
arch woodfloor
x 14
y 4