From c5d41ea10b77aba751ebbb85ca79d702b72a4811 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 4 Dec 2008 06:41:37 +0000
Subject: [PATCH] Cosmetic change with how fences (swall) merge with nearby
 walls

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10830 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 pup_land/ancient/village/shop | 32 ++++++++++++++++++++++++++------
 pup_land/hall2                |  7 +++++--
 pup_land/hq_ud                | 23 +++++++++++++++++++----
 pup_land/lone_town/mshop      | 15 +++++++++++----
 pup_land/nurnberg/hq          | 10 ++++++++--
 5 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/pup_land/ancient/village/shop b/pup_land/ancient/village/shop
index 39448f6a6..e003cec3d 100644
--- a/pup_land/ancient/village/shop
+++ b/pup_land/ancient/village/shop
@@ -11,7 +11,7 @@ enter_x 7
 enter_y 8
 msg
 Created:  1996-05-21
-Modified: 2008-12-03 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch blocked
@@ -132,6 +132,10 @@ arch wwall_2_2_4
 x 2
 y 3
 end
+arch swall_1_4_half
+x 2
+y 3
+end
 arch afloor_right
 x 2
 y 4
@@ -190,7 +194,7 @@ arch dungeon_magic
 x 3
 y 3
 end
-arch swall_1_4
+arch swall_2_1_2
 x 3
 y 3
 end
@@ -671,7 +675,7 @@ arch dungeon_magic
 x 11
 y 3
 end
-arch swall_1_3
+arch swall_2_1_2
 x 11
 y 3
 end
@@ -734,6 +738,10 @@ arch wwall_2_2_1
 x 12
 y 3
 end
+arch swall_1_3_half
+x 12
+y 3
+end
 arch afloor_right
 x 12
 y 4
@@ -864,6 +872,10 @@ arch wwall_2_2_4
 x 14
 y 3
 end
+arch swall_1_4_half
+x 14
+y 3
+end
 arch afloor_right
 x 14
 y 4
@@ -922,7 +934,7 @@ arch dungeon_magic
 x 15
 y 3
 end
-arch swall_1_4
+arch swall_2_1_2
 x 15
 y 3
 end
@@ -1163,7 +1175,7 @@ arch dungeon_magic
 x 18
 y 8
 end
-arch swall_1_2
+arch swall_2_1_1
 x 18
 y 8
 end
@@ -1171,6 +1183,10 @@ arch afloor_right
 x 18
 y 9
 end
+arch swall_1_2_half
+x 18
+y 9
+end
 arch wwall_2_1_2
 x 18
 y 9
@@ -1417,7 +1433,7 @@ arch dungeon_magic
 x 23
 y 3
 end
-arch swall_1_3
+arch swall_2_1_2
 x 23
 y 3
 end
@@ -1479,6 +1495,10 @@ arch wwall_2_2_1
 x 24
 y 3
 end
+arch swall_1_3_half
+x 24
+y 3
+end
 arch shop_empty
 x 24
 y 4
diff --git a/pup_land/hall2 b/pup_land/hall2
index e9d053f03..ab0c2a80d 100644
--- a/pup_land/hall2
+++ b/pup_land/hall2
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1996-04-11
-Modified: 2008-10-24 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch cobblestones2
@@ -98,11 +98,14 @@ end
 arch dwall_2_1_2
 x 2
 end
+arch swall_1_1_half
+x 2
+end
 arch cobblestones2
 x 2
 y 1
 end
-arch swall_1_1
+arch swall_2_1_1
 x 2
 y 1
 end
diff --git a/pup_land/hq_ud b/pup_land/hq_ud
index 69958f6a1..437f55933 100644
--- a/pup_land/hq_ud
+++ b/pup_land/hq_ud
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 4
 msg
 Created:  1996-02-15
-Modified: 2008-10-28 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch marble
@@ -24,7 +24,10 @@ end
 arch marble
 y 2
 end
-arch dwall_3_2
+arch swall_1_4_half
+y 2
+end
+arch dwall_2_1_1
 y 2
 end
 arch marble
@@ -681,6 +684,10 @@ arch marble
 x 4
 y 6
 end
+arch swall_1_2_half
+x 4
+y 6
+end
 arch dwall_2_1_2
 x 4
 y 6
@@ -1362,6 +1369,10 @@ arch marble
 x 8
 y 6
 end
+arch swall_1_2_half
+x 8
+y 6
+end
 arch dwall_2_1_2
 x 8
 y 6
@@ -1838,7 +1849,7 @@ arch marble
 x 11
 y 2
 end
-arch swall_1_3
+arch swall_2_1_2
 x 11
 y 2
 end
@@ -2011,7 +2022,11 @@ arch marble
 x 12
 y 2
 end
-arch dwall_2_2_3
+arch swall_1_3_half
+x 12
+y 2
+end
+arch dwall_1_1
 x 12
 y 2
 end
diff --git a/pup_land/lone_town/mshop b/pup_land/lone_town/mshop
index 97630b072..88eb2ad6e 100644
--- a/pup_land/lone_town/mshop
+++ b/pup_land/lone_town/mshop
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 1
 msg
 Created:  1996-01-29
-Modified: 2008-12-03 Rick Tanner
+Modified: 2008-12-04 Rick Tanner
 endmsg
 end
 arch grass
@@ -122,6 +122,10 @@ arch shop_empty
 x 1
 y 4
 end
+arch swall_1_4_half
+x 1
+y 4
+end
 arch wwall_2_1_1
 x 1
 y 4
@@ -304,7 +308,7 @@ arch shop_empty
 x 2
 y 4
 end
-arch swall_1_4
+arch swall_2_1_2
 x 2
 y 4
 end
@@ -1232,11 +1236,14 @@ end
 arch wwall_2_1_2
 x 8
 end
+arch swall_1_1_half
+x 8
+end
 arch shop_empty
 x 8
 y 1
 end
-arch swall_1_1
+arch swall_2_1_1
 x 8
 y 1
 end
@@ -3831,7 +3838,7 @@ arch shop_empty
 x 24
 y 2
 end
-arch wwall_2_2_1
+arch wwall_1_4
 x 24
 y 2
 end
diff --git a/pup_land/nurnberg/hq b/pup_land/nurnberg/hq
index d45b1da69..58c284177 100644
--- a/pup_land/nurnberg/hq
+++ b/pup_land/nurnberg/hq
@@ -862,11 +862,14 @@ end
 arch dwall_2_1_2
 x 7
 end
+arch swall_1_1_half
+x 7
+end
 arch dungeon_floor
 x 7
 y 1
 end
-arch swall_1_1
+arch swall_2_1_1
 x 7
 y 1
 end
@@ -1545,11 +1548,14 @@ end
 arch dwall_2_1_2
 x 11
 end
+arch swall_1_1_half
+x 11
+end
 arch dungeon_floor
 x 11
 y 1
 end
-arch swall_1_1
+arch swall_2_1_1
 x 11
 y 1
 end