From 4cb13e268b8c2f7b2dff79ed08a3162b55a12f42 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 13 Nov 2011 04:24:46 +0000
Subject: [PATCH] Removed unnecessary references to name_pl and corrected one
 reference (keys) in Small House (navar/spyhouse). Technical change, no
 functional changes.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15698 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/mlab/zealothouseb1 | 22 ++--------------------
 navar_city/spyhouse           |  7 ++-----
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/navar_city/mlab/zealothouseb1 b/navar_city/mlab/zealothouseb1
index f265c45df..1450336b6 100644
--- a/navar_city/mlab/zealothouseb1
+++ b/navar_city/mlab/zealothouseb1
@@ -10,7 +10,7 @@ enter_x 6
 enter_y 12
 msg
 Created:  2004-02-26 mikeeusa
-Modified: 2008-12-13 Rick Tanner
+Modified: 2011-11-12 Rick Tanner
 endmsg
 end
 arch blocked
@@ -946,7 +946,6 @@ y 6
 end
 arch mastif
 name weakened test mastif
-name_pl weakened test mastif
 hp 50
 x 13
 y 6
@@ -985,7 +984,6 @@ y 10
 end
 arch water
 name helium
-name_pl helium
 title of the wise
 x 13
 y 10
@@ -1037,7 +1035,6 @@ y 17
 end
 arch lightningwall_3
 name motified cannon
-name_pl motified cannon
 face cannon_0.111
 x 13
 y 17
@@ -1137,7 +1134,6 @@ y 10
 end
 arch water
 name neon
-name_pl neon
 title of the wise
 x 14
 y 10
@@ -1271,7 +1267,6 @@ y 10
 end
 arch water
 name krypton
-name_pl krypton
 title of the wise
 x 15
 y 10
@@ -1287,7 +1282,6 @@ y 11
 end
 arch water
 name xenon
-name_pl xenon
 title of the wise
 x 15
 y 11
@@ -1303,7 +1297,6 @@ y 12
 end
 arch water
 name radon
-name_pl radon
 title of the wise
 x 15
 y 12
@@ -1397,7 +1390,6 @@ y 6
 end
 arch dog
 name test dog
-name_pl test dog
 x 16
 y 6
 end
@@ -1785,7 +1777,6 @@ y 2
 end
 arch dog
 name weakened test dog
-name_pl weakened test dog
 hp 2
 x 19
 y 2
@@ -1831,7 +1822,6 @@ y 7
 end
 arch pup
 name test pup
-name_pl test pup
 x 19
 y 7
 end
@@ -1845,7 +1835,6 @@ y 9
 end
 arch dog
 name test dog
-name_pl test dog
 x 19
 y 9
 end
@@ -1859,7 +1848,6 @@ y 11
 end
 arch pup
 name test pup
-name_pl test pup
 x 19
 y 11
 end
@@ -1873,7 +1861,6 @@ y 13
 end
 arch dog
 name test dog
-name_pl test dog
 x 19
 y 13
 end
@@ -1949,7 +1936,7 @@ y 6
 end
 arch bookshelf
 name heavy bookshelf
-name_pl heavy bookshelf
+name_pl heavy bookshelves
 x 20
 y 6
 arch random_reading
@@ -2116,7 +2103,6 @@ y 11
 end
 arch dog
 name test dog
-name_pl test dog
 x 21
 y 11
 end
@@ -2256,7 +2242,6 @@ y 14
 end
 arch pup
 name test pup
-name_pl test pup
 x 22
 y 14
 end
@@ -2361,7 +2346,6 @@ y 9
 end
 arch water
 name Concentrated Nerve Agent
-name_pl Concentrated Nerve Agent
 x 23
 y 9
 value 40
@@ -2376,7 +2360,6 @@ y 10
 end
 arch water
 name Concentrated Nerve Agent
-name_pl Concentrated Nerve Agent
 x 23
 y 10
 value 40
@@ -2391,7 +2374,6 @@ y 11
 end
 arch water
 name Concentrated Nerve Agent
-name_pl Concentrated Nerve Agent
 x 23
 y 11
 value 40
diff --git a/navar_city/spyhouse b/navar_city/spyhouse
index 1d51c70bb..c392794cd 100644
--- a/navar_city/spyhouse
+++ b/navar_city/spyhouse
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 8
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-09-21 Rick Tanner
+Modified: 2011-11-12 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -667,7 +667,6 @@ y 10
 end
 arch sage
 name spy of Azumauindo
-name_pl spy of Azumauindo
 msg
 @match *
 We have gathered up these Navarians
@@ -770,7 +769,7 @@ y 4
 carrying 100
 arch key2
 name antarctic castle key
-name_pl antarctic castle key
+name_pl antarctic castle keys
 slaying castle1antarctickey1234bb2
 face key_blue.111
 end
@@ -1150,7 +1149,6 @@ y 14
 end
 arch bed_save
 name futon to reality
-name_pl futon to reality
 x 7
 y 14
 end
@@ -1172,7 +1170,6 @@ y 17
 end
 arch bed_save
 name futon to reality
-name_pl futon to reality
 x 7
 y 17
 end