From f5833cf9b681e40abf78af040418db5a12386a30 Mon Sep 17 00:00:00 2001
From: temitchell <temitchell@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 23 Dec 2003 05:30:08 +0000
Subject: [PATCH] - Added Mr White's house.  Fixed broken dressers.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2493 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/houses/breezy_acres    | 356 ++++++++++++++++++++++++++++++-----
 scorn/houses/riverside_manor | 118 +++++++-----
 2 files changed, 387 insertions(+), 87 deletions(-)

diff --git a/scorn/houses/breezy_acres b/scorn/houses/breezy_acres
index 31e52e6f6..eb7191ab6 100644
--- a/scorn/houses/breezy_acres
+++ b/scorn/houses/breezy_acres
@@ -179,6 +179,14 @@ arch wwall_2_2_2
 x 1
 y 1
 end
+arch dungeon_magic
+x 1
+y 1
+end
+arch dungeon_magic
+x 1
+y 1
+end
 arch woodfloor
 x 1
 y 2
@@ -187,6 +195,10 @@ arch wwall_2_1_1
 x 1
 y 2
 end
+arch dungeon_magic
+x 1
+y 2
+end
 arch woodfloor
 x 1
 y 3
@@ -195,6 +207,18 @@ arch wwall_2_1_1
 x 1
 y 3
 end
+arch firewall_3
+invisible 1
+dam 0
+level 3
+connected 10
+speed 0.0
+x 1
+y 3
+arch spell_poison_cloud
+level 5
+end
+end
 arch woodfloor
 x 1
 y 4
@@ -203,6 +227,10 @@ arch wwall_2_1_1
 x 1
 y 4
 end
+arch dungeon_magic
+x 1
+y 4
+end
 arch woodfloor
 x 1
 y 5
@@ -211,6 +239,10 @@ arch wwall_3_2
 x 1
 y 5
 end
+arch dungeon_magic
+x 1
+y 5
+end
 arch woodfloor
 x 1
 y 6
@@ -219,6 +251,10 @@ arch wwall_2_1_1
 x 1
 y 6
 end
+arch dungeon_magic
+x 1
+y 6
+end
 arch woodfloor
 x 1
 y 7
@@ -227,6 +263,10 @@ arch wwall_2_1_1
 x 1
 y 7
 end
+arch dungeon_magic
+x 1
+y 7
+end
 arch woodfloor
 x 1
 y 8
@@ -235,6 +275,10 @@ arch wwall_2_1_1
 x 1
 y 8
 end
+arch dungeon_magic
+x 1
+y 8
+end
 arch woodfloor
 x 1
 y 9
@@ -243,6 +287,10 @@ arch wwall_2_1_1
 x 1
 y 9
 end
+arch dungeon_magic
+x 1
+y 9
+end
 arch woodfloor
 x 1
 y 10
@@ -251,6 +299,10 @@ arch wwall_2_2_1
 x 1
 y 10
 end
+arch dungeon_magic
+x 1
+y 10
+end
 arch grass
 x 1
 y 11
@@ -368,6 +420,10 @@ arch wwall_2_1_2
 x 2
 y 1
 end
+arch dungeon_magic
+x 2
+y 1
+end
 arch woodfloor
 x 2
 y 2
@@ -388,7 +444,7 @@ arch woodfloor
 x 2
 y 5
 end
-arch wwall_2_1_2
+arch wwall_weak_2
 x 2
 y 5
 end
@@ -397,6 +453,7 @@ x 2
 y 6
 end
 arch fireplace
+glow_radius 1
 x 2
 y 6
 end
@@ -421,7 +478,7 @@ x 2
 y 9
 end
 arch book_clasp
-name Study
+name White's Study
 msg
 Read now of the superstitious animal cults
 which were commonly worshiped before
@@ -433,6 +490,7 @@ and the cult of the <page is torn here>
 Great nations were formed based on the
 worship of these creatures.
 Nations now mostly fallen and forgotten.
+- B.Z.White
 endmsg
 title of ancient cult religions
 x 2
@@ -446,6 +504,10 @@ arch wwall_2_1_2
 x 2
 y 10
 end
+arch dungeon_magic
+x 2
+y 10
+end
 arch grass
 x 2
 y 11
@@ -494,9 +556,11 @@ arch woodfloor
 x 2
 y 19
 end
-arch close_dresser
+arch dresser
 x 2
 y 19
+arch tunic
+end
 end
 arch woodfloor
 x 2
@@ -540,6 +604,10 @@ arch wwall_2_1_2
 x 3
 y 1
 end
+arch dungeon_magic
+x 3
+y 1
+end
 arch woodfloor
 x 3
 y 2
@@ -556,7 +624,7 @@ arch woodfloor
 x 3
 y 5
 end
-arch wwall_weak_2
+arch wwall_2_1_2
 x 3
 y 5
 end
@@ -576,6 +644,12 @@ arch woodfloor
 x 3
 y 9
 end
+arch creator
+other_arch dog
+connected 11
+x 3
+y 9
+end
 arch woodfloor
 x 3
 y 10
@@ -584,6 +658,10 @@ arch wwall_2_1_2
 x 3
 y 10
 end
+arch dungeon_magic
+x 3
+y 10
+end
 arch grass
 x 3
 y 11
@@ -670,6 +748,10 @@ arch wwall_weak_2
 x 4
 y 1
 end
+arch dungeon_magic
+x 4
+y 1
+end
 arch woodfloor
 x 4
 y 2
@@ -683,11 +765,16 @@ I told Hermes to watch his step.
 He laughed and said no one would ever know.
 I thought I should tell you this
 If you tell the old man then it's not my concern.
+We never spoke of this...
 Aza
 endmsg
 level 2
 end
 end
+arch light3
+x 4
+y 2
+end
 arch woodfloor
 x 4
 y 3
@@ -732,6 +819,10 @@ arch wwall_2_1_2
 x 4
 y 10
 end
+arch dungeon_magic
+x 4
+y 10
+end
 arch grass
 x 4
 y 11
@@ -818,6 +909,10 @@ arch wwall_2_1_2
 x 5
 y 1
 end
+arch dungeon_magic
+x 5
+y 1
+end
 arch woodfloor
 x 5
 y 2
@@ -825,6 +920,8 @@ end
 arch bookshelf
 x 5
 y 2
+arch random_reading
+end
 end
 arch woodfloor
 x 5
@@ -839,10 +936,17 @@ x 5
 y 5
 end
 arch door_2
+randomitems none
 x 5
 y 5
 end
-arch light3
+arch grate_open_1
+connected 10
+x 5
+y 5
+end
+arch grate_open_1
+connected 11
 x 5
 y 5
 end
@@ -850,6 +954,18 @@ arch woodfloor
 x 5
 y 6
 end
+arch trap
+msg
+WARNING!
+Intruder!
+Intruder!
+endmsg
+level 5
+dam 0
+connected 11
+x 5
+y 6
+end
 arch woodfloor
 x 5
 y 7
@@ -870,6 +986,10 @@ arch wwall_win2
 x 5
 y 10
 end
+arch dungeon_magic
+x 5
+y 10
+end
 arch grass
 x 5
 y 11
@@ -976,6 +1096,10 @@ arch wwall_2_1_2
 x 6
 y 1
 end
+arch dungeon_magic
+x 6
+y 1
+end
 arch woodfloor
 x 6
 y 2
@@ -983,6 +1107,8 @@ end
 arch bookshelf
 x 6
 y 2
+arch random_reading
+end
 end
 arch woodfloor
 x 6
@@ -1024,6 +1150,10 @@ arch wwall_2_1_2
 x 6
 y 10
 end
+arch dungeon_magic
+x 6
+y 10
+end
 arch grass
 x 6
 y 11
@@ -1126,10 +1256,44 @@ arch wwall_2_1_2
 x 7
 y 1
 end
+arch dungeon_magic
+x 7
+y 1
+end
 arch woodfloor
 x 7
 y 2
 end
+arch chest
+type 122
+x 7
+y 2
+arch claypipe
+name Mr. White's pipe
+msg
+A truely superior pipe.
+endmsg
+type 21
+value 150
+slaying white_pipe
+end
+arch lantern2_unlit
+end
+arch random_treasure
+end
+end
+arch trap
+msg
+Breep! Breep!
+Intruder!
+Breep!
+endmsg
+dam 0
+connected 10
+level 4
+x 7
+y 2
+end
 arch woodfloor
 x 7
 y 3
@@ -1162,11 +1326,21 @@ arch woodfloor
 x 7
 y 9
 end
+arch creator
+other_arch dog
+connected 10
+x 7
+y 9
+end
 arch woodfloor
 x 7
 y 10
 end
-arch wwall_weak_2
+arch wwall_2_1_2
+x 7
+y 10
+end
+arch dungeon_magic
 x 7
 y 10
 end
@@ -1256,11 +1430,11 @@ arch wwall_2_1_2
 x 8
 y 1
 end
-arch woodfloor
+arch dungeon_magic
 x 8
-y 2
+y 1
 end
-arch bed_1
+arch woodfloor
 x 8
 y 2
 end
@@ -1276,7 +1450,7 @@ arch woodfloor
 x 8
 y 5
 end
-arch wwall_weak_2
+arch wwall_2_1_2
 x 8
 y 5
 end
@@ -1312,6 +1486,10 @@ arch wwall_2_1_2
 x 8
 y 10
 end
+arch dungeon_magic
+x 8
+y 10
+end
 arch grass
 x 8
 y 11
@@ -1425,6 +1603,10 @@ arch wwall_2_2_3
 x 9
 y 1
 end
+arch dungeon_magic
+x 9
+y 1
+end
 arch woodfloor
 x 9
 y 2
@@ -1433,6 +1615,10 @@ arch wwall_2_1_1
 x 9
 y 2
 end
+arch dungeon_magic
+x 9
+y 2
+end
 arch woodfloor
 x 9
 y 3
@@ -1441,11 +1627,19 @@ arch wwall_2_1_1
 x 9
 y 3
 end
+arch dungeon_magic
+x 9
+y 3
+end
 arch woodfloor
 x 9
 y 4
 end
-arch wwall_win1
+arch wwall_2_1_1
+x 9
+y 4
+end
+arch dungeon_magic
 x 9
 y 4
 end
@@ -1457,6 +1651,10 @@ arch wwall_3_4
 x 9
 y 5
 end
+arch dungeon_magic
+x 9
+y 5
+end
 arch woodfloor
 x 9
 y 6
@@ -1465,6 +1663,10 @@ arch wwall_2_1_1
 x 9
 y 6
 end
+arch dungeon_magic
+x 9
+y 6
+end
 arch woodfloor
 x 9
 y 7
@@ -1473,11 +1675,20 @@ arch wwall_1_2
 x 9
 y 7
 end
+arch dungeon_magic
+x 9
+y 7
+end
 arch woodfloor
 x 9
 y 8
 end
-arch door_look_2
+arch locked_door2
+face ldoor_white2.111
+msg
+This home is protetected by an InfernalSecure home security system.
+endmsg
+slaying BZA_whitedoor
 x 9
 y 8
 end
@@ -1485,6 +1696,10 @@ arch light3
 x 9
 y 8
 end
+arch dungeon_magic
+x 9
+y 8
+end
 arch woodfloor
 x 9
 y 9
@@ -1493,6 +1708,10 @@ arch wwall_1_1
 x 9
 y 9
 end
+arch dungeon_magic
+x 9
+y 9
+end
 arch woodfloor
 x 9
 y 10
@@ -1501,6 +1720,10 @@ arch wwall_2_2_4
 x 9
 y 10
 end
+arch dungeon_magic
+x 9
+y 10
+end
 arch flagstone
 x 9
 y 11
@@ -1509,6 +1732,13 @@ arch flagstone
 x 9
 y 12
 end
+arch sign
+msg
+Number Three, Breezy Acres.
+endmsg
+x 9
+y 12
+end
 arch woodfloor
 x 9
 y 13
@@ -1598,7 +1828,7 @@ arch flagstone
 x 10
 y 2
 end
-arch sign_w
+arch sign
 msg
 **Breezy Acres**
 Very Ventilated Condominimums at
@@ -1635,6 +1865,13 @@ arch flagstone
 x 10
 y 9
 end
+arch sign_w
+msg
+Number One, Breezy Acres.
+endmsg
+x 10
+y 9
+end
 arch flagstone
 x 10
 y 10
@@ -1652,6 +1889,9 @@ x 10
 y 13
 end
 arch door_2
+msg
+Number Three, Breezy Acres.
+endmsg
 x 10
 y 13
 end
@@ -2021,6 +2261,13 @@ arch flagstone
 x 13
 y 4
 end
+arch sign_e
+msg
+Number Two, Breezy Acres.
+endmsg
+x 13
+y 4
+end
 arch flagstone
 x 13
 y 5
@@ -2179,6 +2426,9 @@ x 14
 y 5
 end
 arch door_look_2
+msg
+Number Two, Breezy Acres.
+endmsg
 x 14
 y 5
 end
@@ -2250,6 +2500,12 @@ arch woodfloor
 x 14
 y 14
 end
+arch dresser
+x 14
+y 14
+arch random_reading
+end
+end
 arch woodfloor
 x 14
 y 15
@@ -2258,6 +2514,10 @@ arch woodfloor
 x 14
 y 16
 end
+arch ghost
+x 14
+y 16
+end
 arch woodfloor
 x 14
 y 17
@@ -2347,7 +2607,7 @@ arch woodfloor
 x 15
 y 7
 end
-arch wwall_2_1_2
+arch wwall_1_3
 x 15
 y 7
 end
@@ -2355,7 +2615,7 @@ arch woodfloor
 x 15
 y 8
 end
-arch desk
+arch table_3
 x 15
 y 8
 end
@@ -2395,10 +2655,6 @@ arch woodfloor
 x 15
 y 14
 end
-arch close_dresser
-x 15
-y 14
-end
 arch woodfloor
 x 15
 y 15
@@ -2465,7 +2721,7 @@ arch woodfloor
 x 16
 y 2
 end
-arch wwall_2_1_2
+arch wwall_win2
 x 16
 y 2
 end
@@ -2489,7 +2745,11 @@ arch woodfloor
 x 16
 y 7
 end
-arch wwall_2_1_2
+arch door_2
+x 16
+y 7
+end
+arch light3
 x 16
 y 7
 end
@@ -2623,7 +2883,7 @@ arch woodfloor
 x 17
 y 7
 end
-arch wwall_weak_2
+arch wwall_1_4
 x 17
 y 7
 end
@@ -2769,7 +3029,7 @@ arch woodfloor
 x 18
 y 4
 end
-arch wwall_2_2_1
+arch wwall_2_1_1
 x 18
 y 4
 end
@@ -2777,11 +3037,7 @@ arch woodfloor
 x 18
 y 5
 end
-arch door_1
-x 18
-y 5
-end
-arch light3
+arch wwall_2_1_1
 x 18
 y 5
 end
@@ -2789,7 +3045,7 @@ arch woodfloor
 x 18
 y 6
 end
-arch wwall_1_1
+arch wwall_2_1_1
 x 18
 y 6
 end
@@ -2943,14 +3199,14 @@ arch woodfloor
 x 19
 y 4
 end
-arch wwall_2_1_2
-x 19
-y 4
-end
 arch woodfloor
 x 19
 y 5
 end
+arch spider
+x 19
+y 5
+end
 arch woodfloor
 x 19
 y 6
@@ -3085,10 +3341,6 @@ arch woodfloor
 x 20
 y 4
 end
-arch wwall_1_3
-x 20
-y 4
-end
 arch woodfloor
 x 20
 y 5
@@ -3101,7 +3353,7 @@ arch woodfloor
 x 20
 y 7
 end
-arch wwall_1_3
+arch wwall_2_1_2
 x 20
 y 7
 end
@@ -3215,7 +3467,7 @@ arch woodfloor
 x 21
 y 2
 end
-arch wwall_weak_2
+arch wwall_2_1_2
 x 21
 y 2
 end
@@ -3223,6 +3475,10 @@ arch woodfloor
 x 21
 y 3
 end
+arch spider
+x 21
+y 3
+end
 arch woodfloor
 x 21
 y 4
@@ -3231,6 +3487,10 @@ arch woodfloor
 x 21
 y 5
 end
+arch spider
+x 21
+y 5
+end
 arch woodfloor
 x 21
 y 6
@@ -3271,7 +3531,7 @@ arch woodfloor
 x 21
 y 11
 end
-arch wwall_2_1_2
+arch wwall_win2
 x 21
 y 11
 end
@@ -3385,7 +3645,7 @@ arch woodfloor
 x 22
 y 5
 end
-arch table_3
+arch clock
 x 22
 y 5
 end
@@ -3393,10 +3653,6 @@ arch woodfloor
 x 22
 y 6
 end
-arch chair_1.3
-x 22
-y 6
-end
 arch woodfloor
 x 22
 y 7
@@ -3490,6 +3746,9 @@ x 22
 y 20
 end
 arch door_1
+msg
+Number four, Breezy Acres.
+endmsg
 no_pass 0
 x 22
 y 20
@@ -3664,6 +3923,13 @@ arch flagstone
 x 23
 y 21
 end
+arch sign_w
+msg
+Number four, Breezy Acres.
+endmsg
+x 23
+y 21
+end
 arch flagstone
 x 23
 y 22
diff --git a/scorn/houses/riverside_manor b/scorn/houses/riverside_manor
index 0d04cd4b1..436025ef1 100644
--- a/scorn/houses/riverside_manor
+++ b/scorn/houses/riverside_manor
@@ -251,11 +251,15 @@ arch wwall_2_2_1
 x 1
 y 10
 end
-arch grass
+arch tree
+blocksview 1
+no_pass 1
 x 1
 y 11
 end
-arch grassdark
+arch tree
+blocksview 1
+no_pass 1
 x 1
 y 12
 end
@@ -568,10 +572,6 @@ arch woodfloor
 x 3
 y 4
 end
-arch mouse
-x 3
-y 4
-end
 arch woodfloor
 x 3
 y 5
@@ -626,6 +626,9 @@ x 3
 y 13
 end
 arch door_2
+msg
+#3 Riverside Manor
+endmsg
 x 3
 y 13
 end
@@ -711,10 +714,6 @@ arch woodfloor
 x 4
 y 3
 end
-arch mouse
-x 4
-y 3
-end
 arch woodfloor
 x 4
 y 4
@@ -909,6 +908,13 @@ arch dirtfloor
 x 5
 y 12
 end
+arch sign
+msg
+#3 Riverside Manor
+endmsg
+x 5
+y 12
+end
 arch woodfloor
 x 5
 y 13
@@ -1007,10 +1013,6 @@ arch woodfloor
 x 6
 y 4
 end
-arch mouse
-x 6
-y 4
-end
 arch woodfloor
 x 6
 y 5
@@ -1169,10 +1171,6 @@ arch woodfloor
 x 7
 y 3
 end
-arch mouse
-x 7
-y 3
-end
 arch woodfloor
 x 7
 y 4
@@ -1324,10 +1322,6 @@ arch woodfloor
 x 8
 y 2
 end
-arch mouse
-x 8
-y 2
-end
 arch woodfloor
 x 8
 y 3
@@ -1558,6 +1552,9 @@ x 9
 y 8
 end
 arch door_1
+msg
+#1 Riverside Manor
+endmsg
 x 9
 y 8
 end
@@ -1581,7 +1578,9 @@ arch grass
 x 9
 y 11
 end
-arch dirtfloor
+arch tree
+blocksview 1
+no_pass 1
 x 9
 y 12
 end
@@ -1668,7 +1667,9 @@ arch dirtfloor
 x 10
 y 1
 end
-arch dirtfloor
+arch tree
+blocksview 1
+no_pass 1
 x 10
 y 2
 end
@@ -1692,6 +1693,11 @@ arch stonefloor2
 x 10
 y 7
 end
+arch brazier
+glow_radius 0
+x 10
+y 7
+end
 arch stonefloor2
 x 10
 y 8
@@ -1700,7 +1706,10 @@ arch stonefloor2
 x 10
 y 9
 end
-arch brazier
+arch sign_w
+msg
+#1 Riverside Manor
+endmsg
 x 10
 y 9
 end
@@ -2252,7 +2261,7 @@ arch grass
 x 14
 y 2
 end
-arch sign_w
+arch sign
 msg
 **Riverside Manor**
 Lucksury Condominimums at
@@ -2286,8 +2295,10 @@ arch stonefloor2
 x 14
 y 7
 end
-arch sign
+arch sign_e
 msg
+#2 Riverside Manor
+
 For Rent - see Amy
 endmsg
 x 14
@@ -2315,6 +2326,8 @@ y 12
 end
 arch sign_w
 msg
+#4 Riverside Manor
+
 Amy Barrnes
 Caretaker
 Please knock
@@ -2467,7 +2480,7 @@ y 6
 end
 arch locked_door2
 msg
-You need the special key to open this door.
+You'll need the key to open this door.
 Although, judging by the smell,
 why you'd want to go in is a mystery...
 endmsg
@@ -3319,11 +3332,15 @@ arch grass
 x 20
 y 16
 end
-arch grass
+arch tree
+blocksview 1
+no_pass 1
 x 20
 y 17
 end
-arch grass
+arch tree
+blocksview 1
+no_pass 1
 x 20
 y 18
 end
@@ -3331,13 +3348,8 @@ arch grass
 x 20
 y 19
 end
-arch grass
-x 20
-y 20
-end
-arch fernsdense
+arch tree
 blocksview 1
-is_floor 1
 x 20
 y 20
 end
@@ -3362,6 +3374,20 @@ type 122
 no_pick 1
 x 20
 y 23
+arch card
+face card_skull.111
+msg
+special delivery for Mr. White...
+endmsg
+end
+arch key2
+name key
+face key_blue.111
+msg
+B.A.  #1
+endmsg
+slaying BZA_whitedoor
+end
 end
 arch grass
 x 20
@@ -3488,11 +3514,15 @@ arch grass
 x 21
 y 18
 end
-arch grass
+arch tree
+blocksview 1
+no_pass 1
 x 21
 y 19
 end
-arch grass
+arch tree
+blocksview 1
+no_pass 1
 x 21
 y 20
 end
@@ -3504,13 +3534,15 @@ arch grass
 x 21
 y 22
 end
-arch fernsdense
+arch tree
 blocksview 1
-is_floor 1
+no_pass 1
 x 21
 y 22
 end
-arch grass
+arch tree
+blocksview 1
+no_pass 1
 x 21
 y 23
 end
@@ -3607,7 +3639,9 @@ arch wwall_2_1_2
 x 22
 y 10
 end
-arch grass
+arch tree
+blocksview 1
+no_pass 1
 x 22
 y 11
 end