Fix a minor error with a bottle of wine in brest.inn

Fix an inventory error with Zorn's Pet in brest.scrolls
Fix the lighting, block dimdoor and fix an interaction error in the tavern


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4828 282e977c-c81d-0410-88c4-b93c2d0d6712

brest/brest.inn

@@ -4495,7 +4495,6 @@ A strong wine.
 endmsg
 x 24
 y 14
-unpaid 1
 no_pick 1
 end
 arch woodfloor

brest/brest.scrolls

@@ -1,19 +1,19 @@
 arch map
 name brest.scrolls
 region brest
+shopitems scroll:95;armour improver:95;weapon improver:95;skillscroll:95;spellbook:-50;*:-100
+shopgreed 0.95
+shopmin 5
+shopmax 150000
+shoprace human
+width 20
+height 40
 msg
 Creator: Gene Alexander
 Editor: CF Java Map Editor
 Date:    5/23/2005
 endmsg
-width 20
-height 40
 outdoor 1
-shopitems scroll:95;armour improver:95;weapon improver:95;skillscroll:95;spellbook:-50;*:-100
-shopmin 5
-shopmax 150000
-shoprace human
-shopgreed 0.95
 tile_path_2 brest.scrolls.right
 end
 arch brush
@@ -32,9 +32,9 @@ y 2
 end
 arch lamppost
 name Lighted fence post
+y 2
 glow_radius 5
 no_pass 1
-y 2
 end
 arch brush
 y 3
@@ -134,9 +134,9 @@ y 18
 end
 arch lamppost
 name Lighted fence post
+y 18
 glow_radius 5
 no_pass 1
-y 18
 end
 arch brush
 y 19
@@ -242,9 +242,9 @@ y 35
 end
 arch lamppost
 name Lighted fence post
+y 35
 glow_radius 5
 no_pass 1
-y 35
 end
 arch brush
 y 36
@@ -404,33 +404,33 @@ x 1
 y 29
 end
 arch tree
-no_pass 1
-no_magic 1
-damned 1
 x 1
 y 29
+no_pass 1
+no_magic 1
+damned 1
 end
 arch brush
 x 1
 y 30
 end
 arch tree
+x 1
+y 30
 no_pass 1
 no_magic 1
 damned 1
-x 1
-y 30
 end
 arch brush
 x 1
 y 31
 end
 arch tree
+x 1
+y 31
 no_pass 1
 no_magic 1
 damned 1
-x 1
-y 31
 end
 arch brush
 x 1
@@ -617,33 +617,33 @@ x 2
 y 29
 end
 arch tree
-no_pass 1
-no_magic 1
-damned 1
 x 2
 y 29
+no_pass 1
+no_magic 1
+damned 1
 end
 arch brush
 x 2
 y 30
 end
 arch tree
+x 2
+y 30
 no_pass 1
 no_magic 1
 damned 1
-x 2
-y 30
 end
 arch brush
 x 2
 y 31
 end
 arch tree
+x 2
+y 31
 no_pass 1
 no_magic 1
 damned 1
-x 2
-y 31
 end
 arch brush
 x 2
@@ -787,10 +787,10 @@ y 18
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 3
 y 18
+glow_radius 5
+no_pass 1
 end
 arch brush
 x 3
@@ -869,11 +869,11 @@ x 3
 y 30
 end
 arch tree
+x 3
+y 30
 no_pass 1
 no_magic 1
 damned 1
-x 3
-y 30
 end
 arch brush
 x 3
@@ -1176,10 +1176,10 @@ y 39
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 4
 y 39
+glow_radius 5
+no_pass 1
 end
 arch brush
 x 5
@@ -1419,10 +1419,10 @@ y 2
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 6
 y 2
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_2
 x 6
@@ -1433,40 +1433,40 @@ x 6
 y 3
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 3
+no_magic 1
+damned 1
 end
 arch brush
 x 6
 y 4
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 4
+no_magic 1
+damned 1
 end
 arch brush
 x 6
 y 5
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 5
+no_magic 1
+damned 1
 end
 arch brush
 x 6
 y 6
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 6
 y 6
+no_magic 1
+damned 1
 end
 arch brush
 x 6
@@ -1474,10 +1474,10 @@ y 7
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 6
 y 7
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_1
 x 6
@@ -1633,10 +1633,10 @@ y 35
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 6
 y 35
+glow_radius 5
+no_pass 1
 end
 arch brush
 x 6
@@ -1674,10 +1674,10 @@ x 7
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 7
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 7
@@ -1716,10 +1716,10 @@ x 7
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 7
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 7
@@ -1899,10 +1899,10 @@ x 8
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 8
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 8
@@ -1941,10 +1941,10 @@ x 8
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 8
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 8
@@ -2122,10 +2122,10 @@ x 9
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 9
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 9
@@ -2164,10 +2164,10 @@ x 9
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 9
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 9
@@ -2311,10 +2311,10 @@ x 9
 y 32
 end
 arch swall_2_2_2
-no_magic 1
-damned 1
 x 9
 y 32
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 9
@@ -2325,10 +2325,10 @@ x 9
 y 33
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 9
 y 33
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 9
@@ -2339,10 +2339,10 @@ x 9
 y 34
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 9
 y 34
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 9
@@ -2396,10 +2396,10 @@ x 10
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 10
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 10
@@ -2438,10 +2438,10 @@ x 10
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 10
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 10
@@ -2597,10 +2597,10 @@ x 10
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 10
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 10
@@ -2670,10 +2670,10 @@ x 11
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 11
 y 2
+no_magic 1
+damned 1
 end
 arch brush
 x 11
@@ -2688,10 +2688,10 @@ x 11
 y 5
 end
 arch button_small
-invisible 1
-connected 3
 x 11
 y 6
+invisible 1
+connected 3
 end
 arch brush
 x 11
@@ -2706,17 +2706,17 @@ x 11
 y 7
 end
 arch ggate_closed
+x 11
+y 7
 connected 3
 no_magic 1
 damned 1
-x 11
-y 7
 end
 arch button_small
-invisible 1
-connected 3
 x 11
 y 8
+invisible 1
+connected 3
 end
 arch brush
 x 11
@@ -2875,10 +2875,10 @@ x 11
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 11
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 11
@@ -2889,10 +2889,10 @@ x 11
 y 33
 end
 arch button_small
-invisible 1
-connected 1
 x 11
 y 34
+invisible 1
+connected 1
 end
 arch stonefloor2
 x 11
@@ -2903,15 +2903,15 @@ x 11
 y 35
 end
 arch mdoor_closed_2
-connected 1
 x 11
 y 35
+connected 1
 end
 arch button_small
-invisible 1
-connected 1
 x 11
 y 36
+invisible 1
+connected 1
 end
 arch footpath_3_2
 x 11
@@ -2949,10 +2949,10 @@ x 12
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 12
 y 2
+no_magic 1
+damned 1
 end
 arch brush
 x 12
@@ -2972,10 +2972,10 @@ y 6
 end
 arch wagon
 name Zorn's wagon
+slaying /world/world_107_123
 msg
 The spirit of Zorn expels you ...
 endmsg
-slaying /world/world_107_123
 hp 38
 sp 17
 x 12
@@ -2986,10 +2986,10 @@ x 12
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 12
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 12
@@ -3152,20 +3152,20 @@ x 12
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 12
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 12
 y 33
 end
 arch button_small
-invisible 1
-connected 1
 x 12
 y 34
+invisible 1
+connected 1
 end
 arch stonefloor2
 x 12
@@ -3176,15 +3176,15 @@ x 12
 y 35
 end
 arch mdoor_closed_2
-connected 1
 x 12
 y 35
+connected 1
 end
 arch button_small
-invisible 1
-connected 1
 x 12
 y 36
+invisible 1
+connected 1
 end
 arch footpath_3_4
 x 12
@@ -3230,10 +3230,10 @@ x 13
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 13
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 13
@@ -3272,10 +3272,10 @@ x 13
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 13
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 13
@@ -3435,10 +3435,10 @@ x 13
 y 32
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 13
 y 32
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 13
@@ -3500,10 +3500,10 @@ x 14
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 14
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 14
@@ -3542,10 +3542,10 @@ x 14
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 14
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 14
@@ -3693,10 +3693,10 @@ x 14
 y 32
 end
 arch swall_2_2_3
-no_magic 1
-damned 1
 x 14
 y 32
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 14
@@ -3707,10 +3707,10 @@ x 14
 y 33
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 14
 y 33
+no_magic 1
+damned 1
 end
 arch dungeon_magic
 x 14
@@ -3721,10 +3721,10 @@ x 14
 y 34
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 14
 y 34
+no_magic 1
+damned 1
 end
 arch stonefloor2
 x 14
@@ -3778,10 +3778,10 @@ x 15
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 15
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 15
@@ -3820,10 +3820,10 @@ x 15
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 15
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 15
@@ -4005,10 +4005,10 @@ x 16
 y 2
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 16
 y 2
+no_magic 1
+damned 1
 end
 arch earth
 x 16
@@ -4055,10 +4055,10 @@ x 16
 y 7
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 16
 y 7
+no_magic 1
+damned 1
 end
 arch brush
 x 16
@@ -4243,10 +4243,10 @@ y 2
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 17
 y 2
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_3
 x 17
@@ -4257,40 +4257,40 @@ x 17
 y 3
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 3
+no_magic 1
+damned 1
 end
 arch brush
 x 17
 y 4
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 4
+no_magic 1
+damned 1
 end
 arch brush
 x 17
 y 5
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 5
+no_magic 1
+damned 1
 end
 arch brush
 x 17
 y 6
 end
 arch swall_2_1_1
-no_magic 1
-damned 1
 x 17
 y 6
+no_magic 1
+damned 1
 end
 arch brush
 x 17
@@ -4298,10 +4298,10 @@ y 7
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 17
 y 7
+glow_radius 5
+no_pass 1
 end
 arch swall_2_2_4
 x 17
@@ -4575,17 +4575,17 @@ x 18
 y 15
 end
 arch swall_1_4_half
-no_magic 1
-damned 1
 x 18
 y 15
+no_magic 1
+damned 1
 end
 arch lamppost
 name Lighted fence post
-glow_radius 5
-no_pass 1
 x 18
 y 15
+glow_radius 5
+no_pass 1
 end
 arch stonefloor2
 x 18
@@ -4829,10 +4829,10 @@ x 19
 y 15
 end
 arch swall_2_1_2
-no_magic 1
-damned 1
 x 19
 y 15
+no_magic 1
+damned 1
 end
 arch footpath_1_4
 x 19
@@ -5032,89 +5032,93 @@ y 39
 end
 arch unicorn
 name Zorn's pet
-glow_radius 3
+Con 25
-level 150
+Pow 5
-exp 5000
-speed 1.0
-attacktype 1048849
-dam 50
-wc -50
 hp 2000
 maxhp 2000
-ac -50
-Con 25
-reflect_missile 1
-hitback 1
-reflect_spell 1
 sp 250
 maxsp 500
-Pow 5
+exp 5000
-path_attuned 1060
+dam 50
-can_see_in_dark 1
+wc -50
-can_use_skill 1
+ac -50
 x 1
 y 3
-arch spell_paralyze
+speed 1.0
-end
+level 150
-arch spell_fear
+attacktype 1048849
-end
+path_attuned 1060
-arch spell_frostbolt
+glow_radius 3
-end
+hitback 1
-arch spell_large_icestorm
+reflect_missile 1
-end
+reflect_spell 1
-arch spell_regeneration
-arch skill_praying
-skill
 can_use_skill 1
-arch experience_wis
+can_see_in_dark 1
-end
-end
-end
 arch key2
 name Zorn's pet pelt
-face sheepskin.111
 name_pl Zorn's pet pelts
 slaying zorn_pet_pelt
+face sheepskin.111
 material 32
 end
+arch abil_large_icestorm
+end
+arch abil_icestorm
+end
+arch abil_fear
+end
+arch abil_slow
+end
+arch abil_frostbolt
+end
+arch spell_major_healing
+end
+arch spell_bullet_swarm
+end
+arch skill_evocation
+end
+arch skill_praying
+end
+arch skill_meditation
+end
 end
 arch cyclops
 name Orville
 title hyper cyclops
-level 150
-speed 0.5
 dam 80
 wc -25
 ac -30
-can_see_in_dark 1
+x 7
+y 26
+speed 0.5
+level 150
 resist_confusion 50
 resist_weaponmagic 50
 resist_ghosthit 50
+resist_turn_undead 50
 resist_fear 50
 resist_deplete 50
-resist_turn_undead 50
 resist_death 50
 resist_blind 50
-x 7
+can_see_in_dark 1
-y 26
 end
 arch cyclops
 name Wilbur
 title hyper cyclops
-level 150
-speed 0.5
 dam 80
 wc -25
 ac -30
-can_see_in_dark 1
+x 15
+y 26
+speed 0.5
+level 150
 resist_confusion 50
 resist_weaponmagic 50
 resist_ghosthit 50
+resist_turn_undead 50
 resist_fear 50
 resist_deplete 50
-resist_turn_undead 50
 resist_death 50
 resist_blind 50
-x 15
+can_see_in_dark 1
-y 26
 end