From 282df8a9e4ca42ffc2297ec8a763a3e38629771d Mon Sep 17 00:00:00 2001
From: mikeeusa <mikeeusa@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 13 Nov 2005 22:44:00 +0000
Subject: [PATCH] CVS: maps-bigworld: made navar thamshop, jeweler, and IPO
 walls adobe(yellowearthwall) as outer arch suggests

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4035 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/misc/IPO_navar | 167 ++++++++++++++++++++++----------------
 navar_city/misc/jeweler   | 158 +++++++++++++++++++++---------------
 navar_city/misc/thamshop  | 134 ++++++++++++++++--------------
 3 files changed, 260 insertions(+), 199 deletions(-)

diff --git a/navar_city/misc/IPO_navar b/navar_city/misc/IPO_navar
index b148b83d1..0cfe495b8 100644
--- a/navar_city/misc/IPO_navar
+++ b/navar_city/misc/IPO_navar
@@ -1,82 +1,83 @@
 arch map
-region navar
 name Imperial Post Office
+difficulty 2
+region navar
+width 10
+height 10
+enter_x 5
+enter_y 8
 msg
 Creator: Commander Gros
 Email: yann.chachkoff@mailandnews.com
 Date: Wed Sep  5 22:09:24 2001
 Following a Lord MiDS idea
 endmsg
-width 10
-height 10
-enter_x 5
-enter_y 8
 end
 arch tile_tan_floor
 end
-arch wall_2_2_2
+arch bwall_2_2_2
 end
 arch tile_tan_floor
 y 1
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 y 1
 end
 arch tile_tan_floor
 y 2
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 y 2
 end
 arch tile_tan_floor
 y 3
 end
-arch wall_3_2
-y 3
-end
 arch dungeon_magic
 y 3
 end
+arch bwall_3_2
+y 3
+end
 arch tile_tan_floor
 y 4
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 y 4
 end
 arch tile_tan_floor
 y 5
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 y 5
 end
 arch tile_tan_floor
 y 6
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 y 6
 end
 arch tile_tan_floor
 y 7
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 y 7
 end
 arch tile_tan_floor
 y 8
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 y 8
 end
 arch tile_tan_floor
 y 9
 end
-arch wall_2_2_1
+arch bwall_2_2_1
 y 9
 end
 arch tile_tan_floor
 x 1
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 1
 end
 arch tile_tan_floor
@@ -103,6 +104,10 @@ arch dungeon_magic
 x 1
 y 3
 end
+arch bwall_1_3
+x 1
+y 3
+end
 arch tile_tan_floor
 x 1
 y 4
@@ -115,11 +120,12 @@ Greetings.  Have a pleasant day.
 We donna tollerate no shenanigans around these parts.
 endmsg
 exp 0
-unaggressive 1
-friendly 1
-stand_still 1
+
 x 1
 y 4
+friendly 1
+unaggressive 1
+stand_still 1
 end
 arch tile_tan_floor
 x 1
@@ -139,30 +145,32 @@ y 8
 end
 arch sign
 name Navar Message Board
-arch event_say
-title Python
-slaying /python/IPO/board.py
-name Navar board
-end
+name_pl Navar Message Board
 msg
 I am a talking board, please say something to me.
 If you don't know what to say, say help.
 endmsg
 x 1
 y 8
+arch event_say
+name Navar board
+name_pl Navar board
+title Python
+slaying /python/IPO/board.py
+end
 end
 arch tile_tan_floor
 x 1
 y 9
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 1
 y 9
 end
 arch tile_tan_floor
 x 2
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 2
 end
 arch tile_tan_floor
@@ -171,9 +179,10 @@ y 1
 end
 arch halfling2
 name Gofer
-friendly 1
+name_pl Gofer
 x 2
 y 1
+friendly 1
 end
 arch tile_tan_floor
 x 2
@@ -215,14 +224,14 @@ arch tile_tan_floor
 x 2
 y 9
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 2
 y 9
 end
 arch tile_tan_floor
 x 3
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 3
 end
 arch tile_tan_floor
@@ -243,6 +252,7 @@ y 2
 end
 arch cauldron
 name Coffee supplies
+name_pl Coffee supplies
 x 3
 y 2
 end
@@ -258,6 +268,10 @@ arch dungeon_magic
 x 3
 y 3
 end
+arch bwall_0
+x 3
+y 3
+end
 arch tile_tan_floor
 x 3
 y 4
@@ -282,14 +296,14 @@ arch tile_tan_floor
 x 3
 y 9
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 3
 y 9
 end
 arch tile_tan_floor
 x 4
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 4
 end
 arch tile_tan_floor
@@ -306,18 +320,19 @@ y 2
 end
 arch c_woman
 name Babs
-arch event_say
-title Python
-slaying /python/IPO/say.py
-end
+name_pl Babs
 msg
 @match *
 I'm on a break.
 endmsg
-monster 0
-stand_still 1
 x 4
 y 2
+monster 0
+stand_still 1
+arch event_say
+title Python
+slaying /python/IPO/say.py
+end
 end
 arch tile_tan_floor
 x 4
@@ -355,14 +370,14 @@ arch tile_tan_floor
 x 4
 y 9
 end
-arch wall_1_3
+arch bwall_1_3
 x 4
 y 9
 end
 arch tile_tan_floor
 x 5
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 5
 end
 arch tile_tan_floor
@@ -389,6 +404,10 @@ arch dungeon_magic
 x 5
 y 3
 end
+arch bwall_0
+x 5
+y 3
+end
 arch tile_tan_floor
 x 5
 y 4
@@ -423,7 +442,7 @@ end
 arch tile_tan_floor
 x 6
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 6
 end
 arch tile_tan_floor
@@ -478,14 +497,14 @@ arch tile_tan_floor
 x 6
 y 9
 end
-arch wall_1_4
+arch bwall_1_4
 x 6
 y 9
 end
 arch tile_tan_floor
 x 7
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 7
 end
 arch tile_tan_floor
@@ -508,6 +527,10 @@ arch dungeon_magic
 x 7
 y 3
 end
+arch bwall_1_4
+x 7
+y 3
+end
 arch tile_tan_floor
 x 7
 y 4
@@ -530,6 +553,7 @@ y 7
 end
 arch scroll
 name Prospectus
+name_pl Prospectus
 msg
 Imperial Post Services
 -----------------------
@@ -548,6 +572,7 @@ y 7
 end
 arch book_read
 name Manual
+name_pl Manual
 msg
 Receiving Mail
 -----------------------
@@ -581,14 +606,14 @@ arch tile_tan_floor
 x 7
 y 9
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 7
 y 9
 end
 arch tile_tan_floor
 x 8
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 8
 end
 arch tile_tan_floor
@@ -607,11 +632,11 @@ arch tile_tan_floor
 x 8
 y 3
 end
-arch wall_2_1_2
+arch dungeon_magic
 x 8
 y 3
 end
-arch dungeon_magic
+arch bwall_2_1_2
 x 8
 y 3
 end
@@ -620,19 +645,19 @@ x 8
 y 4
 end
 arch mailbox
-arch event_close
-title Python
-slaying /python/IPO/send.py
-end
+x 8
+y 4
+material 0
+weight 0
+no_pick 1
 arch event_apply
 title Python
 slaying /python/IPO/receive.py
 end
-material 0
-weight 0
-no_pick 1
-x 8
-y 4
+arch event_close
+title Python
+slaying /python/IPO/send.py
+end
 end
 arch tile_tan_floor
 x 8
@@ -658,21 +683,21 @@ arch tile_tan_floor
 x 8
 y 9
 end
-arch wall_2_1_2
+arch bwall_2_1_2
 x 8
 y 9
 end
 arch tile_tan_floor
 x 9
 end
-arch wall_2_2_3
+arch bwall_2_2_3
 x 9
 end
 arch tile_tan_floor
 x 9
 y 1
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 x 9
 y 1
 end
@@ -680,7 +705,7 @@ arch tile_tan_floor
 x 9
 y 2
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 x 9
 y 2
 end
@@ -688,19 +713,19 @@ arch tile_tan_floor
 x 9
 y 3
 end
-arch wall_3_4
-x 9
-y 3
-end
 arch dungeon_magic
 x 9
 y 3
 end
+arch bwall_3_4
+x 9
+y 3
+end
 arch tile_tan_floor
 x 9
 y 4
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 x 9
 y 4
 end
@@ -708,7 +733,7 @@ arch tile_tan_floor
 x 9
 y 5
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 x 9
 y 5
 end
@@ -716,7 +741,7 @@ arch tile_tan_floor
 x 9
 y 6
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 x 9
 y 6
 end
@@ -724,7 +749,7 @@ arch tile_tan_floor
 x 9
 y 7
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 x 9
 y 7
 end
@@ -732,7 +757,7 @@ arch tile_tan_floor
 x 9
 y 8
 end
-arch wall_2_1_1
+arch bwall_2_1_1
 x 9
 y 8
 end
@@ -740,7 +765,7 @@ arch tile_tan_floor
 x 9
 y 9
 end
-arch wall_2_2_4
+arch bwall_2_2_4
 x 9
 y 9
 end
diff --git a/navar_city/misc/jeweler b/navar_city/misc/jeweler
index 9cb6a2ab0..f49e9be6c 100644
--- a/navar_city/misc/jeweler
+++ b/navar_city/misc/jeweler
@@ -1,17 +1,17 @@
 arch map
-region navar
 name jeweler
+reset_timeout 7200
+difficulty 2
+region navar
+width 13
+height 14
+enter_x 7
+enter_y 13
 msg
 Creator: Avion
 CFJavaEditor
 Date: 21/02/04
 endmsg
-width 13
-height 14
-enter_x 7
-enter_y 13
-reset_timeout 7200
-difficulty 2
 outdoor 1
 end
 arch shallow_sea
@@ -117,7 +117,7 @@ arch woodfloor
 x 2
 y 1
 end
-arch woodwall_2_2_2
+arch bwall_2_2_2
 x 2
 y 1
 end
@@ -125,7 +125,7 @@ arch woodfloor
 x 2
 y 2
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 2
 y 2
 end
@@ -137,6 +137,10 @@ arch woodwall_2_1_1
 x 2
 y 3
 end
+arch bwall_1_2
+x 2
+y 3
+end
 arch woodfloor
 x 2
 y 4
@@ -153,11 +157,15 @@ arch woodwall_2_1_1
 x 2
 y 5
 end
+arch bwall_1_1
+x 2
+y 5
+end
 arch woodfloor
 x 2
 y 6
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 2
 y 6
 end
@@ -165,7 +173,7 @@ arch woodfloor
 x 2
 y 7
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 2
 y 7
 end
@@ -177,6 +185,10 @@ arch woodwall_2_1_1
 x 2
 y 8
 end
+arch bwall_1_2
+x 2
+y 8
+end
 arch woodfloor
 x 2
 y 9
@@ -193,6 +205,10 @@ arch woodwall_2_1_1
 x 2
 y 10
 end
+arch bwall_1_1
+x 2
+y 10
+end
 arch woodfloor
 x 2
 y 11
@@ -201,11 +217,11 @@ arch swall_1_4_half
 x 2
 y 11
 end
-arch woodwall_2_1_1
+arch dungeon_magic
 x 2
 y 11
 end
-arch dungeon_magic
+arch bwall_2_1_1
 x 2
 y 11
 end
@@ -213,7 +229,7 @@ arch woodfloor
 x 2
 y 12
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 2
 y 12
 end
@@ -221,7 +237,7 @@ arch woodfloor
 x 2
 y 13
 end
-arch woodwall_2_2_1
+arch bwall_2_2_1
 x 2
 y 13
 end
@@ -232,7 +248,7 @@ arch woodfloor
 x 3
 y 1
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 3
 y 1
 end
@@ -242,10 +258,10 @@ y 2
 end
 arch platinum_converter
 name Buy Amulet (100pp)
-other_arch amulet
 name_pl Buy Amulet (100pp)
-food 100
+other_arch amulet
 sp 1
+food 100
 x 3
 y 2
 end
@@ -301,7 +317,7 @@ arch woodfloor
 x 3
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 3
 y 13
 end
@@ -312,7 +328,7 @@ arch woodfloor
 x 4
 y 1
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 4
 y 1
 end
@@ -321,9 +337,9 @@ x 4
 y 2
 end
 arch table
-no_pick 1
 x 4
 y 2
+no_pick 1
 end
 arch woodfloor
 x 4
@@ -389,7 +405,7 @@ arch woodfloor
 x 4
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 4
 y 13
 end
@@ -400,7 +416,7 @@ arch woodfloor
 x 5
 y 1
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 5
 y 1
 end
@@ -409,9 +425,9 @@ x 5
 y 2
 end
 arch table
-no_pick 1
 x 5
 y 2
+no_pick 1
 end
 arch woodfloor
 x 5
@@ -465,7 +481,7 @@ arch woodfloor
 x 5
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 5
 y 13
 end
@@ -480,14 +496,18 @@ arch woodwall_2_1_2
 x 6
 y 1
 end
+arch bwall_1_3
+x 6
+y 1
+end
 arch woodfloor
 x 6
 y 2
 end
 arch bookshelf
-no_pick 1
 x 6
 y 2
+no_pick 1
 end
 arch woodfloor
 x 6
@@ -553,7 +573,7 @@ arch woodfloor
 x 6
 y 13
 end
-arch woodwall_1_3
+arch bwall_1_3
 x 6
 y 13
 end
@@ -573,9 +593,9 @@ x 7
 y 2
 end
 arch clock
-no_pick 1
 x 7
 y 2
+no_pick 1
 end
 arch woodfloor
 x 7
@@ -659,14 +679,18 @@ arch woodwall_2_1_2
 x 8
 y 1
 end
+arch bwall_1_4
+x 8
+y 1
+end
 arch woodfloor
 x 8
 y 2
 end
 arch bookshelf
-no_pick 1
 x 8
 y 2
+no_pick 1
 end
 arch woodfloor
 x 8
@@ -732,7 +756,7 @@ arch woodfloor
 x 8
 y 13
 end
-arch woodwall_1_4
+arch bwall_1_4
 x 8
 y 13
 end
@@ -743,7 +767,7 @@ arch woodfloor
 x 9
 y 1
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 9
 y 1
 end
@@ -752,9 +776,9 @@ x 9
 y 2
 end
 arch table
-no_pick 1
 x 9
 y 2
+no_pick 1
 end
 arch woodfloor
 x 9
@@ -809,29 +833,29 @@ x 9
 y 12
 end
 arch trigger_marker
+slaying jewler_navar
 msg
 You have one day's use of these facilities.
 endmsg
-slaying jewler_navar
-connected 10
-speed 1.0
 food 504
 x 9
 y 12
+connected 10
 end
 arch altar_trigger
 name Drop 200 platinum to enter
+name_pl Drop 200 platinum to enter
 slaying platinacoin
 food 200
-connected 10
 x 9
 y 12
+connected 10
 end
 arch woodfloor
 x 9
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 9
 y 13
 end
@@ -842,7 +866,7 @@ arch woodfloor
 x 10
 y 1
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 10
 y 1
 end
@@ -851,9 +875,9 @@ x 10
 y 2
 end
 arch table
-no_pick 1
 x 10
 y 2
+no_pick 1
 end
 arch woodfloor
 x 10
@@ -900,21 +924,21 @@ x 10
 y 10
 end
 arch pedestal
-invisible 1
-connected 11
 x 10
 y 10
+invisible 1
+connected 11
 end
 arch woodfloor
 x 10
 y 11
 end
 arch ggate_closed
-damned 1
-no_magic 1
-connected 11
 x 10
 y 11
+connected 11
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 10
@@ -922,15 +946,15 @@ y 12
 end
 arch check_floor
 slaying jewler_navar
-connected 11
 x 10
 y 12
+connected 11
 end
 arch woodfloor
 x 10
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 10
 y 13
 end
@@ -941,7 +965,7 @@ arch woodfloor
 x 11
 y 1
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 11
 y 1
 end
@@ -951,10 +975,10 @@ y 2
 end
 arch platinum_converter
 name Buy Ring (50pp)
-other_arch ring
-food 50
-sp 1
 name_pl Buy Ring (50pp)
+other_arch ring
+sp 1
+food 50
 x 11
 y 2
 end
@@ -1014,7 +1038,7 @@ arch woodfloor
 x 11
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 11
 y 13
 end
@@ -1025,7 +1049,7 @@ arch woodfloor
 x 12
 y 1
 end
-arch woodwall_2_2_3
+arch bwall_2_2_3
 x 12
 y 1
 end
@@ -1033,7 +1057,7 @@ arch woodfloor
 x 12
 y 2
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 2
 end
@@ -1041,7 +1065,7 @@ arch woodfloor
 x 12
 y 3
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 3
 end
@@ -1049,7 +1073,7 @@ arch woodfloor
 x 12
 y 4
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 4
 end
@@ -1057,7 +1081,7 @@ arch woodfloor
 x 12
 y 5
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 5
 end
@@ -1065,7 +1089,7 @@ arch woodfloor
 x 12
 y 6
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 6
 end
@@ -1073,7 +1097,7 @@ arch woodfloor
 x 12
 y 7
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 7
 end
@@ -1081,7 +1105,7 @@ arch woodfloor
 x 12
 y 8
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 8
 end
@@ -1089,7 +1113,7 @@ arch woodfloor
 x 12
 y 9
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 9
 end
@@ -1097,7 +1121,7 @@ arch woodfloor
 x 12
 y 10
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 10
 end
@@ -1105,10 +1129,6 @@ arch woodfloor
 x 12
 y 11
 end
-arch woodwall_2_1_1
-x 12
-y 11
-end
 arch swall_1_3_half
 x 12
 y 11
@@ -1117,11 +1137,15 @@ arch dungeon_magic
 x 12
 y 11
 end
+arch bwall_2_1_1
+x 12
+y 11
+end
 arch woodfloor
 x 12
 y 12
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 12
 y 12
 end
@@ -1129,7 +1153,7 @@ arch woodfloor
 x 12
 y 13
 end
-arch woodwall_2_2_4
+arch bwall_2_2_4
 x 12
 y 13
 end
diff --git a/navar_city/misc/thamshop b/navar_city/misc/thamshop
index db3462f1c..11be95b59 100644
--- a/navar_city/misc/thamshop
+++ b/navar_city/misc/thamshop
@@ -1,6 +1,13 @@
 arch map
 name Wizards Workshop
+reset_timeout 7200
+difficulty 1
 region navar
+darkness 2
+width 9
+height 14
+enter_x 4
+enter_y 13
 msg
 Creator: Avion
 CF Java Map Editor
@@ -8,46 +15,39 @@ Date:    22/02/2004
 Modified by: Gene Alexander
 Date:    30 May 2004
 endmsg
-width 9
-height 14
-enter_x 4
-enter_y 13
-reset_timeout 7200
-difficulty 1
-darkness 2
 end
 arch tile_white_floor
 end
-arch woodwall_2_2_2
+arch bwall_2_2_2
 end
 arch tile_white_floor
 y 1
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 1
 end
 arch tile_white_floor
 y 2
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 2
 end
 arch tile_white_floor
 y 3
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 3
 end
 arch tile_white_floor
 y 4
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 4
 end
 arch tile_white_floor
 y 5
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 5
 end
 arch tile_white_floor
@@ -59,52 +59,55 @@ end
 arch dungeon_magic
 y 6
 end
+arch bwall_2_1_1
+y 6
+end
 arch cobblestones2
 y 7
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 7
 end
 arch cobblestones2
 y 8
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 8
 end
 arch cobblestones2
 y 9
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 9
 end
 arch cobblestones2
 y 10
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 10
 end
 arch cobblestones2
 y 11
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 11
 end
 arch cobblestones2
 y 12
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 y 12
 end
 arch cobblestones2
 y 13
 end
-arch woodwall_2_2_1
+arch bwall_2_2_1
 y 13
 end
 arch tile_white_floor
 x 1
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 1
 end
 arch tile_white_floor
@@ -121,10 +124,11 @@ y 3
 end
 arch platinum_converter
 name Talisman of evocation (100 diamonds)
+name_pl Talisman of evocation (100 diamonds)
 slaying gem
-food 100
 other_arch talisman_evocation
 sp 1
+food 100
 x 1
 y 3
 end
@@ -134,10 +138,11 @@ y 4
 end
 arch platinum_converter
 name Talisman of sorcery (100 diamonds)
+name_pl Talisman of sorcery (100 diamonds)
 slaying gem
-food 100
 other_arch talisman_sorcery
 sp 1
+food 100
 x 1
 y 4
 end
@@ -147,10 +152,11 @@ y 5
 end
 arch platinum_converter
 name Talisman of pyromancy (100 diamonds)
+name_pl Talisman of pyromancy (100 diamonds)
 slaying gem
-food 100
 other_arch talisman_pyromancy
 sp 1
+food 100
 x 1
 y 5
 end
@@ -198,14 +204,14 @@ arch cobblestones2
 x 1
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 1
 y 13
 end
 arch tile_white_floor
 x 2
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 2
 end
 arch cobblestones2
@@ -268,14 +274,14 @@ arch cobblestones2
 x 2
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 2
 y 13
 end
 arch tile_white_floor
 x 3
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 3
 end
 arch cobblestones2
@@ -358,14 +364,14 @@ arch cobblestones2
 x 3
 y 13
 end
-arch woodwall_1_3
+arch bwall_1_3
 x 3
 y 13
 end
 arch tile_white_floor
 x 4
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 4
 end
 arch cobblestones2
@@ -397,21 +403,21 @@ x 4
 y 5
 end
 arch pedestal
-invisible 1
-connected 11
 x 4
 y 5
+invisible 1
+connected 11
 end
 arch cobblestones2
 x 4
 y 6
 end
 arch grate_closed_1
+x 4
+y 6
 connected 11
 no_magic 1
 damned 1
-x 4
-y 6
 end
 arch cobblestones2
 x 4
@@ -419,32 +425,32 @@ y 7
 end
 arch check_floor
 slaying tham_navar
-connected 11
 x 4
 y 7
+connected 11
 end
 arch cobblestones2
 x 4
 y 8
 end
 arch trigger_marker
+slaying tham_navar
 msg
 You have one day's use of these facilities.
 endmsg
-slaying tham_navar
-connected 10
-speed 1.0
 food 504
 x 4
 y 8
+connected 10
 end
 arch altar_trigger
 name Drop 200 platinum to enter
+name_pl Drop 200 platinum to enter
 slaying platinacoin
 food 200
-connected 10
 x 4
 y 8
+connected 10
 end
 arch cobblestones2
 x 4
@@ -467,8 +473,8 @@ x 4
 y 13
 end
 arch oakdoor
-face odoor_2.111
 slaying /world/world_121_117
+face odoor_2.111
 hp 48
 sp 8
 x 4
@@ -477,7 +483,7 @@ end
 arch tile_white_floor
 x 5
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 5
 end
 arch cobblestones2
@@ -560,14 +566,14 @@ arch cobblestones2
 x 5
 y 13
 end
-arch woodwall_1_4
+arch bwall_1_4
 x 5
 y 13
 end
 arch tile_white_floor
 x 6
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 6
 end
 arch cobblestones2
@@ -630,14 +636,14 @@ arch cobblestones2
 x 6
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 6
 y 13
 end
 arch tile_white_floor
 x 7
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 7
 end
 arch tile_white_floor
@@ -658,9 +664,10 @@ y 4
 end
 arch platinum_converter
 name Staff (100 platinum)
-food 100
+name_pl Staff (100 platinum)
 other_arch staff
 sp 1
+food 100
 x 7
 y 4
 end
@@ -670,9 +677,10 @@ y 5
 end
 arch platinum_converter
 name Holy symbol (120 platinum)
-food 120
+name_pl Holy symbol (120 platinum)
 other_arch holy_symbol
 sp 1
+food 120
 x 7
 y 5
 end
@@ -720,21 +728,21 @@ arch cobblestones2
 x 7
 y 13
 end
-arch woodwall_2_1_2
+arch bwall_2_1_2
 x 7
 y 13
 end
 arch tile_white_floor
 x 8
 end
-arch woodwall_2_2_3
+arch bwall_2_2_3
 x 8
 end
 arch tile_white_floor
 x 8
 y 1
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 1
 end
@@ -742,7 +750,7 @@ arch tile_white_floor
 x 8
 y 2
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 2
 end
@@ -750,7 +758,7 @@ arch tile_white_floor
 x 8
 y 3
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 3
 end
@@ -758,7 +766,7 @@ arch tile_white_floor
 x 8
 y 4
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 4
 end
@@ -766,7 +774,7 @@ arch tile_white_floor
 x 8
 y 5
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 5
 end
@@ -782,11 +790,15 @@ arch dungeon_magic
 x 8
 y 6
 end
+arch bwall_2_1_1
+x 8
+y 6
+end
 arch cobblestones2
 x 8
 y 7
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 7
 end
@@ -794,7 +806,7 @@ arch cobblestones2
 x 8
 y 8
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 8
 end
@@ -802,7 +814,7 @@ arch cobblestones2
 x 8
 y 9
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 9
 end
@@ -810,7 +822,7 @@ arch cobblestones2
 x 8
 y 10
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 10
 end
@@ -818,7 +830,7 @@ arch cobblestones2
 x 8
 y 11
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 11
 end
@@ -826,7 +838,7 @@ arch cobblestones2
 x 8
 y 12
 end
-arch woodwall_2_1_1
+arch bwall_2_1_1
 x 8
 y 12
 end
@@ -834,7 +846,7 @@ arch cobblestones2
 x 8
 y 13
 end
-arch woodwall_2_2_4
+arch bwall_2_2_4
 x 8
 y 13
 end