From e59fb5cc4828a7fcae0652e425cd8ef0beb49c51 Mon Sep 17 00:00:00 2001
From: eracc <eracc@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 15 Mar 2007 17:44:49 +0000
Subject: [PATCH] More tweaks to Zorn Castle. If the generator abuse on floor
 two does not stop with this fix I will (reluctantly) remove the generators.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5767 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 brest/zorn/castle.mainfloor       | 487 ++++++++++++++++++++----------
 brest/zorn/castle.upper.floor.one | 170 ++++++-----
 brest/zorn/castle.upper.floor.two |   8 +
 3 files changed, 438 insertions(+), 227 deletions(-)

diff --git a/brest/zorn/castle.mainfloor b/brest/zorn/castle.mainfloor
index ac0c5df52..e7c550b0c 100644
--- a/brest/zorn/castle.mainfloor
+++ b/brest/zorn/castle.mainfloor
@@ -4223,32 +4223,36 @@ x 10
 y 33
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 10
 y 33
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -4265,38 +4269,59 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_white_floor
 x 10
 y 34
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 10
 y 34
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -4313,6 +4338,23 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_floor
 x 10
@@ -11425,32 +11467,36 @@ x 24
 y 12
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 24
 y 12
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -11467,38 +11513,59 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_floor
 x 24
 y 13
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 24
 y 13
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -11515,6 +11582,23 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_floor
 x 24
@@ -13153,6 +13237,7 @@ msg
 Move along.
 endmsg
 Con 20
+Int 25
 hp 700
 maxhp 700
 exp 20000
@@ -13161,7 +13246,7 @@ wc -5
 ac -10
 x 28
 y 11
-speed 0.1
+speed 0.25
 level 70
 attacktype 1
 resist_fire 30
@@ -13174,6 +13259,8 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -13632,6 +13719,7 @@ msg
 Move along.
 endmsg
 Con 20
+Int 25
 hp 700
 maxhp 700
 exp 20000
@@ -13640,7 +13728,7 @@ wc -5
 ac -10
 x 29
 y 11
-speed 0.1
+speed 0.25
 level 70
 attacktype 1
 resist_fire 30
@@ -13653,6 +13741,8 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -14112,6 +14202,7 @@ msg
 Move along.
 endmsg
 Con 20
+Int 25
 hp 700
 maxhp 700
 exp 20000
@@ -14120,7 +14211,7 @@ wc -5
 ac -10
 x 30
 y 11
-speed 0.1
+speed 0.25
 level 70
 attacktype 1
 resist_fire 30
@@ -14133,6 +14224,8 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -15888,32 +15981,36 @@ x 34
 y 12
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 34
 y 12
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -15930,38 +16027,59 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_white_floor
 x 34
 y 13
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 34
 y 13
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -15978,6 +16096,23 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_white_floor
 x 34
@@ -23293,32 +23428,36 @@ x 48
 y 33
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 48
 y 33
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -23335,38 +23474,59 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_floor
 x 48
 y 34
 end
 arch guard
-name fearless zorn guard
+name fearless zorn guard sergeant
 msg
 @match *
-...
+Move along.
 endmsg
-hp 500
-maxhp 500
-exp 12000
-dam 35
-wc 10
-ac -5
+Con 20
+Int 25
+hp 700
+maxhp 700
+exp 20000
+dam 45
+wc -5
+ac -10
 x 48
 y 34
-speed 0.09
-level 50
+speed 0.25
+level 70
 attacktype 1
-resist_fire 25
-resist_electricity 25
-resist_cold 25
-resist_acid 25
-resist_weaponmagic 25
-resist_poison 25
-resist_paralyze 25
+resist_fire 30
+resist_electricity 30
+resist_cold 30
+resist_acid 30
+resist_weaponmagic 30
+resist_poison 30
+resist_paralyze 30
 resist_fear 100
-resist_blind 25
-randomitems guard_h
+resist_blind 30
+carrying 28000
+will_apply 4
+unaggressive 0
 run_away 5
 pick_up 24
 can_use_bow 1
@@ -23383,6 +23543,23 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
+arch falchion
+applied 1
+end
+arch mithril_chainmail
+applied 1
+end
+arch rod_light
+hp 25
+maxhp 25
+sp 21
+level 20
+applied 1
+end
+arch skill_one_handed_weapon
+end
+arch skill_use_magic_item
+end
 end
 arch tile_white_floor
 x 48
diff --git a/brest/zorn/castle.upper.floor.one b/brest/zorn/castle.upper.floor.one
index 3d6c94c56..7bf293671 100644
--- a/brest/zorn/castle.upper.floor.one
+++ b/brest/zorn/castle.upper.floor.one
@@ -10079,12 +10079,6 @@ arch cobblestones2
 x 22
 y 48
 end
-arch rune_large_fireball
-Cha 200
-x 22
-y 49
-level 35
-end
 arch cobblestones2
 x 22
 y 49
@@ -11443,6 +11437,7 @@ wc 10
 ac -10
 x 25
 y 15
+speed 0.25
 level 45
 resist_magic 50
 resist_fire 50
@@ -11463,6 +11458,7 @@ resist_death 50
 resist_chaos 50
 resist_blind 50
 path_attuned 4
+unaggressive 0
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11720,6 +11716,7 @@ wc 10
 ac -10
 x 25
 y 42
+speed 0.25
 level 45
 resist_magic 50
 resist_fire 50
@@ -11740,6 +11737,7 @@ resist_death 50
 resist_chaos 50
 resist_blind 50
 path_attuned 4
+unaggressive 0
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -12474,39 +12472,48 @@ x 27
 y 9
 end
 arch medium_guard
-name Room Attendant
-Con 25
-Int 5
-hp 2000
-maxhp 2000
+name Senior Room Attendant
+Con 35
+Pow 20
+Int 10
+hp 2500
+maxhp 2500
 sp 200
 maxsp 200
-exp 20000
-dam 20
-wc 9
-ac -9
+exp 25000
+dam 25
+wc 10
+ac -10
 x 27
 y 9
-level 35
-resist_fire 30
-resist_electricity 30
-resist_cold 30
-resist_confusion 30
-resist_acid 30
-resist_drain 30
-resist_weaponmagic 30
-resist_ghosthit 30
-resist_poison 30
-resist_slow 30
-resist_paralyze 30
+speed 0.25
+level 45
+resist_magic 50
+resist_fire 50
+resist_electricity 50
+resist_cold 50
+resist_confusion 100
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_ghosthit 50
+resist_poison 50
+resist_slow 100
+resist_paralyze 50
+resist_turn_undead 50
 resist_fear 100
-resist_deplete 30
-resist_death 30
-resist_chaos 30
-resist_blind 30
+resist_deplete 50
+resist_death 50
+resist_chaos 50
+resist_blind 50
 path_attuned 4
-pick_up 24
+unaggressive 0
+can_use_bow 1
+can_use_armour 1
+can_use_weapon 1
 stand_still 0
+can_use_skill 1
+can_use_rod 1
 arch shadow
 name Attendant shadow
 sp 100
@@ -12516,7 +12523,7 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
-arch darkblade
+arch mournblade
 applied 1
 end
 arch mithril_chainmail
@@ -12525,13 +12532,19 @@ end
 arch high_boots
 applied 1
 end
-arch reflector
-applied 1
-end
 arch skill_two_handed_weapon
 end
 arch skill_one_handed_weapon
 end
+arch helmet
+name helmet of reflect spells
+name_pl helmets of reflect spells
+ac 2
+resist_magic 30
+magic 1
+applied 1
+reflect_spell 1
+end
 end
 arch cobblestones2
 x 27
@@ -15901,39 +15914,48 @@ x 31
 y 9
 end
 arch medium_guard
-name Room Attendant
-Con 25
-Int 5
-hp 2000
-maxhp 2000
+name Senior Room Attendant
+Con 35
+Pow 20
+Int 10
+hp 2500
+maxhp 2500
 sp 200
 maxsp 200
-exp 20000
-dam 20
-wc 9
-ac -9
+exp 25000
+dam 25
+wc 10
+ac -10
 x 31
 y 9
-level 35
-resist_fire 30
-resist_electricity 30
-resist_cold 30
-resist_confusion 30
-resist_acid 30
-resist_drain 30
-resist_weaponmagic 30
-resist_ghosthit 30
-resist_poison 30
-resist_slow 30
-resist_paralyze 30
+speed 0.25
+level 45
+resist_magic 50
+resist_fire 50
+resist_electricity 50
+resist_cold 50
+resist_confusion 100
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_ghosthit 50
+resist_poison 50
+resist_slow 100
+resist_paralyze 50
+resist_turn_undead 50
 resist_fear 100
-resist_deplete 30
-resist_death 30
-resist_chaos 30
-resist_blind 30
+resist_deplete 50
+resist_death 50
+resist_chaos 50
+resist_blind 50
 path_attuned 4
-pick_up 24
+unaggressive 0
+can_use_bow 1
+can_use_armour 1
+can_use_weapon 1
 stand_still 0
+can_use_skill 1
+can_use_rod 1
 arch shadow
 name Attendant shadow
 sp 100
@@ -15943,7 +15965,7 @@ can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
 end
-arch darkblade
+arch mournblade
 applied 1
 end
 arch mithril_chainmail
@@ -15952,13 +15974,19 @@ end
 arch high_boots
 applied 1
 end
-arch reflector
-applied 1
-end
 arch skill_two_handed_weapon
 end
 arch skill_one_handed_weapon
 end
+arch helmet
+name helmet of reflect spells
+name_pl helmets of reflect spells
+ac 2
+resist_magic 30
+magic 1
+applied 1
+reflect_spell 1
+end
 end
 arch cobblestones2
 x 31
@@ -16981,6 +17009,7 @@ wc 10
 ac -10
 x 33
 y 15
+speed 0.25
 level 45
 resist_magic 50
 resist_fire 50
@@ -17001,6 +17030,7 @@ resist_death 50
 resist_chaos 50
 resist_blind 50
 path_attuned 4
+unaggressive 0
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -17258,6 +17288,7 @@ wc 10
 ac -10
 x 33
 y 42
+speed 0.25
 level 45
 resist_magic 50
 resist_fire 50
@@ -17278,6 +17309,7 @@ resist_death 50
 resist_chaos 50
 resist_blind 50
 path_attuned 4
+unaggressive 0
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19190,12 +19222,6 @@ arch cobblestones2
 x 36
 y 48
 end
-arch rune_large_fireball
-Cha 200
-x 36
-y 49
-level 35
-end
 arch cobblestones2
 x 36
 y 49
diff --git a/brest/zorn/castle.upper.floor.two b/brest/zorn/castle.upper.floor.two
index 93502f243..3f7195997 100644
--- a/brest/zorn/castle.upper.floor.two
+++ b/brest/zorn/castle.upper.floor.two
@@ -8680,7 +8680,9 @@ resist_holyword 85
 resist_blind 85
 path_attuned 16
 randomitems none
+will_apply 7
 see_invisible 1
+unaggressive 0
 sleep 1
 arch shadow
 name Fearless personal guard shadow
@@ -9060,7 +9062,9 @@ resist_holyword 85
 resist_blind 85
 path_attuned 16
 randomitems none
+will_apply 7
 see_invisible 1
+unaggressive 0
 sleep 1
 arch shadow
 name Fearless personal guard shadow
@@ -14356,7 +14360,9 @@ resist_holyword 85
 resist_blind 85
 path_attuned 16
 randomitems none
+will_apply 7
 see_invisible 1
+unaggressive 0
 sleep 1
 arch shadow
 name Fearless personal guard shadow
@@ -14736,7 +14742,9 @@ resist_holyword 85
 resist_blind 85
 path_attuned 16
 randomitems none
+will_apply 7
 see_invisible 1
+unaggressive 0
 sleep 1
 arch shadow
 name Fearless personal guard shadow