Cosmetic wall changes for nicer merging

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11047 282e977c-c81d-0410-88c4-b93c2d0d6712

scorn/houses/angrygiant

@@ -9,7 +9,7 @@ enter_x 7
 enter_y 14
 msg
 Created:  2003-01-04
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch grass
@@ -685,7 +685,7 @@ arch dungeon_floor
 x 6
 y 13
 end
-arch flagstone_2_1_2
+arch flagstone_1_3
 x 6
 y 13
 end
@@ -1008,7 +1008,7 @@ arch dungeon_floor
 x 9
 y 13
 end
-arch flagstone_2_1_2
+arch flagstone_1_4
 x 9
 y 13
 end

scorn/houses/barracks

@@ -9,7 +9,7 @@ enter_x 24
 enter_y 4
 msg
 Created:  2003-01-04
-Modified: 2008-11-25 lalo
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch cobblestones2
@@ -1465,7 +1465,7 @@ arch dirtfloor
 x 22
 y 3
 end
-arch cwall_2_2_2
+arch cwall_1_4
 x 22
 y 3
 end
@@ -1489,7 +1489,7 @@ arch dirtfloor
 x 22
 y 6
 end
-arch cwall_2_2_1
+arch cwall_1_4
 x 22
 y 6
 end

scorn/houses/breezy_acres

@@ -8,7 +8,7 @@ enter_x 12
 enter_y 1
 msg
 Created:  2003-04-27 Avion
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -3362,7 +3362,7 @@ arch woodfloor
 x 20
 y 7
 end
-arch wwall_2_1_2
+arch wwall_1_3
 x 20
 y 7
 end

scorn/houses/house.haunted

@@ -8,7 +8,7 @@ enter_x 16
 enter_y 18
 msg
 Created:  1993-10-15
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch cobblestones
@@ -258,7 +258,7 @@ arch woodfloor
 x 2
 y 5
 end
-arch awall_2_1_1
+arch awall_1_2
 x 2
 y 5
 end
@@ -276,7 +276,11 @@ arch woodfloor
 x 2
 y 7
 end
-arch awall_4
+arch awall_2_2_2
+x 2
+y 7
+end
+arch swall_1_3_half
 x 2
 y 7
 end
@@ -484,7 +488,10 @@ end
 arch woodfloor
 x 4
 end
-arch awall_3_3
+arch swall_1_3_half
+x 4
+end
+arch awall_2_2_2
 x 4
 end
 arch woodfloor
@@ -755,7 +762,7 @@ arch woodfloor
 x 6
 y 4
 end
-arch awall_2_1_1
+arch awall_1_1
 x 6
 y 4
 end
@@ -2447,7 +2454,11 @@ arch woodfloor
 x 19
 y 11
 end
-arch awall_3_4
+arch swall_1_1
+x 19
+y 11
+end
+arch awall_2_2_4
 x 19
 y 11
 end

scorn/houses/house.haunted2

@@ -7,7 +7,7 @@ height 15
 enter_x 11
 enter_y 10
 msg
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -1011,7 +1011,7 @@ arch woodfloor
 x 9
 y 6
 end
-arch awall_2_1_2
+arch awall_1_3
 x 9
 y 6
 end

scorn/houses/maze1

@@ -8,7 +8,7 @@ enter_x 1
 enter_y 18
 msg
 Created:  1994-11-13
-Modified: 2008-12-02 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -2038,7 +2038,7 @@ arch woodfloor
 x 11
 y 10
 end
-arch wall_2_1_2
+arch wall_1_3
 x 11
 y 10
 end
@@ -2378,7 +2378,7 @@ arch woodfloor
 x 13
 y 10
 end
-arch wall_2_1_2
+arch wall_1_4
 x 13
 y 10
 end

scorn/houses/scorn_trappers

@@ -9,7 +9,7 @@ enter_x 8
 enter_y 8
 msg
 Created:  2007-05-27 Nicolas Weeger
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 maplore
 @quest Lursendis
@@ -53,6 +53,9 @@ end
 arch whiteslate
 y 6
 end
+arch swall_1_4_half
+y 6
+end
 arch rough_wall_2_1_1
 y 6
 end
@@ -104,7 +107,7 @@ arch whiteslate
 x 1
 y 6
 end
-arch swall_1_4
+arch swall_2_1_2
 x 1
 y 6
 end
@@ -237,7 +240,7 @@ arch whiteslate
 x 3
 y 4
 end
-arch swall_1_3
+arch swall_2_1_2
 x 3
 y 4
 end
@@ -249,7 +252,7 @@ arch whiteslate
 x 3
 y 6
 end
-arch swall_1_3
+arch swall_2_1_2
 x 3
 y 6
 end
@@ -312,6 +315,10 @@ arch whiteslate
 x 4
 y 4
 end
+arch swall_1_3_half
+x 4
+y 4
+end
 arch rough_wall_1_4
 x 4
 y 4
@@ -329,6 +336,10 @@ arch whiteslate
 x 4
 y 6
 end
+arch swall_1_3_half
+x 4
+y 6
+end
 arch rough_wall_1_1
 x 4
 y 6
@@ -476,10 +487,6 @@ arch whiteslate
 x 6
 y 3
 end
-arch swall_1_2
-x 6
-y 3
-end
 arch whiteslate
 x 6
 y 4

scorn/kar/creepy.house

@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1993-12-07
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch dirtfloor
@@ -105,16 +105,16 @@ end
 arch mine3
 y 15
 end
-arch dirtfloor
+arch pstone_1
 y 16
 end
-arch mine4
+arch mine17
 y 16
 end
 arch pstone_1
 y 17
 end
-arch mine8
+arch mine3
 y 17
 end
 arch pstone_1
@@ -394,7 +394,7 @@ arch dirtfloor
 x 2
 y 16
 end
-arch mine2
+arch mine16
 x 2
 y 16
 end
@@ -402,7 +402,7 @@ arch pstone_1
 x 2
 y 17
 end
-arch mine8
+arch mine11
 x 2
 y 17
 end
@@ -1318,12 +1318,14 @@ end
 arch mine3
 x 8
 y 15
+move_block 0
+can_pass_thru 1
 end
 arch dirtfloor
 x 8
 y 16
 end
-arch mine12
+arch mine14
 x 8
 y 16
 end
@@ -1331,7 +1333,7 @@ arch pstone_1
 x 8
 y 17
 end
-arch mine8
+arch mine3
 x 8
 y 17
 end

scorn/kar/drink

@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1993-10-05
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch pstone_1
@@ -72,7 +72,7 @@ end
 arch cobblestones2
 y 10
 end
-arch awall_1_2
+arch awall_2_1_1
 y 10
 end
 arch pstone_1

scorn/kar/gorks2

@@ -7,7 +7,7 @@ height 18
 enter_x 15
 enter_y 3
 msg
-Modified: 2008-10-23 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -928,7 +928,7 @@ arch woodfloor
 x 10
 y 9
 end
-arch dwall_3_1
+arch dwall_2_2_1
 x 10
 y 9
 end

scorn/kar/gorks3

@@ -7,7 +7,7 @@ height 14
 enter_x 6
 enter_y 6
 msg
-Modified: 2008-10-23 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch cobblestones2
@@ -162,7 +162,7 @@ arch cobblestones2
 x 3
 y 12
 end
-arch dwall_2_1_2
+arch dwall_2_2_3
 x 3
 y 12
 end
@@ -170,6 +170,10 @@ arch cobblestones2
 x 3
 y 13
 end
+arch dwall_2_2_1
+x 3
+y 13
+end
 arch cobblestones2
 x 4
 y 2
@@ -226,15 +230,11 @@ arch cobblestones2
 x 4
 y 12
 end
-arch dwall_2_2_3
-x 4
-y 12
-end
 arch cobblestones2
 x 4
 y 13
 end
-arch dwall_2_2_1
+arch dwall_2_1_2
 x 4
 y 13
 end

scorn/shops/scorn.sale2

@@ -8,7 +8,7 @@ enter_x 10
 enter_y 1
 msg
 Created:  2004-07-01 Gene Alexander (gene@eracc.com)
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-12-21 Rick Tanner
 endmsg
 end
 arch shop_empty
@@ -3103,7 +3103,11 @@ arch shop_empty
 x 13
 y 11
 end
-arch dwall_3_2
+arch dwall_2_2_1
+x 13
+y 11
+end
+arch swall_1_1_half
 x 13
 y 11
 end
@@ -3121,9 +3125,12 @@ arch shop_empty
 x 13
 y 13
 unique 1
-damned 1
 end
-arch dwall_3_1
+arch swall_1_2_half
+x 13
+y 13
+end
+arch dwall_2_1_2
 x 13
 y 13
 end