From 7fbb3b0caabeccb4808cdb6ae9ad35ecd6e811bd Mon Sep 17 00:00:00 2001
From: salathar <salathar@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 9 Nov 2004 00:46:14 +0000
Subject: [PATCH] - Commit several patches:  1055076 Takuse lair map exit
 teleports player into wall  1055091 MwizardG locks out players  1055870
 MwizardT added an exit to the map  1056891 Updated NPC quest location hint
 for Valley of the three sisters - Add a new hut to Wolfsburg worldmap

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2985 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 lake_country/Mwizard/MwizardG      | 53 ++++++++++++-----
 lake_country/Mwizard/MwizardT      | 94 ++++++++++++++++++++++--------
 lake_country/snake_pit/Takuse_lair | 56 +++++++++---------
 scorn/taverns/goths                |  8 +--
 world/world_122_116                |  4 +-
 world/world_128_109                | 11 ++++
 6 files changed, 152 insertions(+), 74 deletions(-)

diff --git a/lake_country/Mwizard/MwizardG b/lake_country/Mwizard/MwizardG
index 7718948de..e3ed9ed81 100644
--- a/lake_country/Mwizard/MwizardG
+++ b/lake_country/Mwizard/MwizardG
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Apr 26 06:07:03 1995
 endmsg
-x 37
-y 20
+width 37
+height 20
 end
 arch flagstone
 end
@@ -1650,6 +1650,13 @@ arch cwall_2_1_2
 x 16
 y 17
 end
+arch check_floor
+slaying nine
+last_sp 0
+connected 999
+x 16
+y 18
+end
 arch flagstone
 x 16
 y 18
@@ -1658,6 +1665,16 @@ arch potion_magic
 x 16
 y 18
 end
+arch magic_mouth
+msg
+You get a strange feeling that a key is mising...
+endmsg
+connected 999
+walk_on 0
+fly_on 0
+x 16
+y 19
+end
 arch flagstone
 x 16
 y 19
@@ -1744,6 +1761,12 @@ arch cwall_2_1_2
 x 17
 y 17
 end
+arch check_floor
+slaying nine
+no_pass 1
+x 17
+y 18
+end
 arch flagstone
 x 17
 y 18
@@ -3602,9 +3625,9 @@ y 19
 end
 arch big_wiz
 name Grey Wizard
+carrying 100
 x 2
 y 7
-carrying 100
 arch key2
 name Number 4
 slaying four
@@ -3612,9 +3635,9 @@ end
 end
 arch big_wiz
 name Grey Wizard
+carrying 100
 x 3
 y 11
-carrying 100
 arch key2
 name Number 5
 slaying five
@@ -3622,9 +3645,9 @@ end
 end
 arch big_wiz
 name White Wizard
+carrying 100
 x 5
 y 3
-carrying 100
 arch key2
 name Number 3
 slaying three
@@ -3632,9 +3655,9 @@ end
 end
 arch big_wiz
 name Grey Wizard
+carrying 100
 x 6
 y 14
-carrying 100
 arch key2
 name Number 6
 slaying six
@@ -3642,9 +3665,9 @@ end
 end
 arch big_wiz
 name White Wizard
+carrying 100
 x 9
 y 2
-carrying 100
 arch key2
 name Number 2
 slaying two
@@ -3652,9 +3675,9 @@ end
 end
 arch big_wiz
 name Black Wizard
+carrying 100
 x 10
 y 14
-carrying 100
 arch key2
 name Number 7
 slaying seven
@@ -3662,9 +3685,9 @@ end
 end
 arch big_wiz
 name White Wizard
+carrying 100
 x 13
 y 3
-carrying 100
 arch key2
 name Number 1
 slaying one
@@ -3672,9 +3695,9 @@ end
 end
 arch big_wiz
 name Black Wizard
+carrying 100
 x 13
 y 11
-carrying 100
 arch key2
 name Number 8
 slaying eight
@@ -3682,9 +3705,9 @@ end
 end
 arch big_wiz
 name Black Wizard
+carrying 100
 x 15
 y 7
-carrying 100
 arch key2
 name Number 9
 slaying nine
@@ -3695,18 +3718,18 @@ name Grand Master
 hp 32500
 sp 2000
 maxsp 2000
-x 28
-y 7
 level 30
 carrying 200
+x 28
+y 7
 arch key2
 name Golden Bug
-slaying gbug
 face ant.111
+slaying gbug
 end
 arch key2
 name a strange smelling flower
-slaying gmaster
 face flowers.111
+slaying gmaster
 end
 end
diff --git a/lake_country/Mwizard/MwizardT b/lake_country/Mwizard/MwizardT
index 5ee241b4f..7902d97a1 100644
--- a/lake_country/Mwizard/MwizardT
+++ b/lake_country/Mwizard/MwizardT
@@ -1,16 +1,16 @@
 arch map
 name MwizardT
-reset_timeout 7200
-difficulty 20
-width 21
-height 21
-enter_x 1
-enter_y 1
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Apr 26 06:58:40 1995
 endmsg
+width 21
+height 21
+enter_x 1
+enter_y 1
+reset_timeout 7200
+difficulty 20
 end
 arch flagstone
 end
@@ -115,13 +115,21 @@ end
 arch flagstone
 y 17
 end
+arch goldbar
+slaying goldenkey
+y 17
+end
 arch cwall_2_1_1
+name fake wall
+no_pass 0
 y 17
 end
 arch flagstone
 y 18
 end
 arch cwall_2_1_1
+name fake wall
+no_pass 0
 y 18
 end
 arch flagstone
@@ -291,6 +299,8 @@ x 1
 y 19
 end
 arch wall_2_2_1
+name fake wall
+no_pass 0
 x 1
 y 19
 end
@@ -448,6 +458,13 @@ arch flagstone
 x 2
 y 18
 end
+arch magic_mouth
+msg
+You feel breeze ...
+endmsg
+x 2
+y 18
+end
 arch random_wealth
 x 2
 y 18
@@ -717,8 +734,8 @@ x 4
 y 10
 end
 arch horn2
-title of efreet
 face horn3.111
+title of efreet
 hp 100
 maxhp 100
 sp 10
@@ -1108,15 +1125,15 @@ x 6
 y 16
 end
 arch amulet
-title of the Magi
 face amulet_lif.111
+title of the Magi
 Wis 2
 Int 2
 sp 5
-x 6
-y 16
 resist_magic 30
 value 1250000
+x 6
+y 16
 end
 arch flagstone
 x 6
@@ -1670,15 +1687,15 @@ end
 arch dragon_shield
 name Dragon Shield
 msg
-This Dragon Shield has both red 
-and green scales carefully 
-smithed in. It will protect 
+This Dragon Shield has both red
+and green scales carefully
+smithed in. It will protect
 you well from fire and cold alike.
 endmsg
-x 10
-y 2
 resist_cold 30
 magic 4
+x 10
+y 2
 end
 arch flagstone
 x 10
@@ -1700,7 +1717,27 @@ arch flagstone
 x 10
 y 5
 end
-arch random_wealth
+arch magic_mouth
+msg
+The floor here is missing something made of gold
+endmsg
+x 10
+y 5
+end
+arch pit_closed
+splaying Mwizard0
+invisible 1
+connected 10
+hp 20
+sp 0
+x 10
+y 5
+end
+arch altar
+invisible 1
+slaying goldenkey
+food 1
+connected 10
 x 10
 y 5
 end
@@ -1717,10 +1754,10 @@ x 10
 y 7
 end
 arch uw_sword
-x 10
-y 7
 weight 15000
 magic 7
+x 10
+y 7
 end
 arch flagstone
 x 10
@@ -1768,20 +1805,20 @@ y 13
 end
 arch uw_shield
 msg
-This shield is renowned throughout 
-time, a fairy tale item for the 
-wizard and warrior alike. 
-The last time this was seen was 
+This shield is renowned throughout
+time, a fairy tale item for the
+wizard and warrior alike.
+The last time this was seen was
 on the mighty demon Belzebub.
 endmsg
-x 10
-y 13
 resist_fire 20
 resist_acid 40
 value 40000
 weight 14
 magic 4
 reflect_missile 1
+x 10
+y 13
 end
 arch flagstone
 x 10
@@ -2709,9 +2746,9 @@ y 4
 end
 arch power_crystal
 sp 1000
+value 100000
 x 16
 y 4
-value 100000
 end
 arch flagstone
 x 16
@@ -3352,6 +3389,13 @@ arch flagstone
 x 20
 end
 arch cwall_2_2_3
+no_pass 0
+x 20
+end
+arch perm_magic_portal
+slaying Mwizard0
+hp 12
+sp 10
 x 20
 end
 arch flagstone
diff --git a/lake_country/snake_pit/Takuse_lair b/lake_country/snake_pit/Takuse_lair
index 66a6c0c7a..f69c9ea0a 100644
--- a/lake_country/snake_pit/Takuse_lair
+++ b/lake_country/snake_pit/Takuse_lair
@@ -5,8 +5,8 @@ Creator: Kundi, Xue
 Email: xkd@soda.berkeley.edu
 Date: Thu Mar 23 07:55:49 1995
 endmsg
-x 36
-y 28
+width 36
+height 28
 end
 arch rough_wall_2_2_2
 end
@@ -1139,9 +1139,9 @@ x 7
 y 26
 end
 arch baby_dragon
+speed_left -0.900000
 x 7
 y 26
-speed_left -0.900000
 end
 arch jungle_2
 x 7
@@ -1275,9 +1275,9 @@ x 8
 y 24
 end
 arch baby_dragon
+speed_left -0.900000
 x 8
 y 24
-speed_left -0.900000
 end
 arch grass
 x 8
@@ -1427,9 +1427,9 @@ x 9
 y 24
 end
 arch baby_dragon
+speed_left -0.900000
 x 9
 y 24
-speed_left -0.900000
 end
 arch grass
 x 9
@@ -2457,9 +2457,9 @@ x 16
 y 24
 end
 arch baby_dragon
+speed_left -0.900000
 x 16
 y 24
-speed_left -0.900000
 end
 arch grass
 x 16
@@ -2719,10 +2719,10 @@ y 19
 end
 arch stair_3_down
 name stalagmite pillar going down
-slaying snakepit_2
 face cave21.111
-hp 17
-sp 15
+slaying snakepit_2
+hp 18
+sp 27
 x 18
 y 19
 end
@@ -3656,9 +3656,9 @@ y 15
 end
 arch rough_wall_2_1_1
 name low wall
+no_pass 0
 x 24
 y 16
-no_pass 0
 end
 arch rough_wall_3_2
 x 24
@@ -4003,9 +4003,9 @@ x 26
 y 24
 end
 arch baby_dragon
+speed_left -0.900000
 x 26
 y 24
-speed_left -0.900000
 end
 arch grass
 x 26
@@ -4040,9 +4040,9 @@ y 3
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 27
 y 4
-no_pass 0
 end
 arch dungeon_floor
 x 27
@@ -4185,9 +4185,9 @@ y 3
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 28
 y 4
-no_pass 0
 end
 arch dungeon_floor
 x 28
@@ -4223,9 +4223,9 @@ y 12
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 28
 y 13
-no_pass 0
 end
 arch dungeon_floor
 x 28
@@ -4332,9 +4332,9 @@ y 3
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 29
 y 4
-no_pass 0
 end
 arch dungeon_floor
 x 29
@@ -4370,9 +4370,9 @@ y 12
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 29
 y 13
-no_pass 0
 end
 arch dungeon_floor
 x 29
@@ -4479,9 +4479,9 @@ y 3
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 30
 y 4
-no_pass 0
 end
 arch dungeon_floor
 x 30
@@ -4517,9 +4517,9 @@ y 12
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 30
 y 13
-no_pass 0
 end
 arch dungeon_floor
 x 30
@@ -4618,9 +4618,9 @@ y 3
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 31
 y 4
-no_pass 0
 end
 arch dungeon_floor
 x 31
@@ -4656,9 +4656,9 @@ y 12
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 31
 y 13
-no_pass 0
 end
 arch dungeon_floor
 x 31
@@ -4765,9 +4765,9 @@ y 3
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 32
 y 4
-no_pass 0
 end
 arch dungeon_floor
 x 32
@@ -4803,9 +4803,9 @@ y 12
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 32
 y 13
-no_pass 0
 end
 arch dungeon_floor
 x 32
@@ -4868,9 +4868,9 @@ x 32
 y 23
 end
 arch baby_dragon
-x 32
-y 23
 speed_left -0.900000
+x 32
+y 23
 end
 arch grass
 x 32
@@ -4909,9 +4909,9 @@ y 3
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 33
 y 4
-no_pass 0
 end
 arch dungeon_floor
 x 33
@@ -4947,9 +4947,9 @@ y 12
 end
 arch rough_wall_2_1_2
 name low wall
+no_pass 0
 x 33
 y 13
-no_pass 0
 end
 arch dungeon_floor
 x 33
@@ -5282,11 +5282,11 @@ exp 200000
 dam 30
 wc -25
 ac -11
-x 7
-y 4
 speed -0.500000
 level 20
 carrying 25000
+x 7
+y 4
 arch spell_mass_confusion
 end
 arch dragon_scale
diff --git a/scorn/taverns/goths b/scorn/taverns/goths
index 0530a54e8..30cda34ab 100644
--- a/scorn/taverns/goths
+++ b/scorn/taverns/goths
@@ -2615,13 +2615,13 @@ wander in, maybe a bit less if you
 have some friends.  Do you want to
 know where it is located?
 @match located|Located|location|Location
-It is in the southern mountain range, a
-east of Brest.  The mountains flatten out
-some.
+It is in the mountain range south of Darcap.
+The mountains flatten out some to reveal
+a small lake.
 endmsg
 hp 300
-friendly 1
 unaggressive 0
+friendly 1
 x 11
 y 4
 end
diff --git a/world/world_122_116 b/world/world_122_116
index 99798d8b1..59a193789 100644
--- a/world/world_122_116
+++ b/world/world_122_116
@@ -13362,11 +13362,11 @@ x 21
 y 40
 end
 arch big_galleon
-name To Dtabb Land
-name_pl To Dtabb Land
+name To Darcap
 slaying /world/world_116_102
 hp 32
 sp 37
+name_pl To Darcap
 x 21
 y 42
 end
diff --git a/world/world_128_109 b/world/world_128_109
index 6b0a5eace..8dc2bd589 100644
--- a/world/world_128_109
+++ b/world/world_128_109
@@ -6480,6 +6480,17 @@ elevation 1408
 x 26
 y 37
 end
+arch hut
+name lonely hut
+msg
+You see an angry motionless man at the back of the garden
+endmsg
+slaying /wolfsburg/hut/hut
+hp 2
+sp 17
+x 26
+y 37
+end
 arch woods_3
 elevation 1469
 x 26