From 07292180d05d1e75ccbc957e7a6e564a40dfab7c Mon Sep 17 00:00:00 2001
From: temitchell <temitchell@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 21 Sep 2003 07:03:53 +0000
Subject: [PATCH] - changes to the sylvan styles and minor changes to the wall
 styles that are not 'autojoining' type.  For some reason these walls do not
 retain some of their properties (e.g. blocks view).  The code should probably
 also be tweeked to handle single arch wall objects better (or at least for
 simple walls - escape the wall joining routine and not to send out all those
 log errors for non-existant arches). Walls for random maps should not have
 smoothing either...

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2335 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 styles/decorstyles/outdoor_lush       |  20 +--
 styles/monsterstyles/sylvan/sylvan_1  |  16 ++
 styles/monsterstyles/sylvan/sylvan_10 | 193 +++++++++++++++++++++
 styles/monsterstyles/sylvan/sylvan_2  |  21 ++-
 styles/monsterstyles/sylvan/sylvan_3  | 179 ++++++++++++++++++--
 styles/monsterstyles/sylvan/sylvan_4  | 161 +++++++++++++++---
 styles/monsterstyles/sylvan/sylvan_5  | 201 ++++++++++++++++++----
 styles/monsterstyles/sylvan/sylvan_6  | 154 +++++++++++++++--
 styles/monsterstyles/sylvan/sylvan_7  | 177 ++++++++++++++++---
 styles/monsterstyles/sylvan/sylvan_8  | 151 +++++++++++++++--
 styles/monsterstyles/sylvan/sylvan_9  | 233 ++++++++++++++++++++++++++
 styles/wallstyles/hedge               |   1 +
 styles/wallstyles/trees               |  16 +-
 styles/wallstyles/water               |   3 -
 14 files changed, 1387 insertions(+), 139 deletions(-)
 create mode 100644 styles/monsterstyles/sylvan/sylvan_10
 create mode 100644 styles/monsterstyles/sylvan/sylvan_9

diff --git a/styles/decorstyles/outdoor_lush b/styles/decorstyles/outdoor_lush
index a5ae9e314..a49199876 100644
--- a/styles/decorstyles/outdoor_lush
+++ b/styles/decorstyles/outdoor_lush
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 26 17:10:45 1998
 endmsg
-x 6
-y 10
+width 6
+height 10
 end
 arch tree3
 end
@@ -22,16 +22,16 @@ end
 arch mushroom_1
 y 4
 end
-arch evergreens
+arch marsh
 y 5
 end
 arch brush
 y 6
 end
-arch woods_2
+arch hills
 y 7
 end
-arch woods
+arch woods4
 y 8
 end
 arch jungle_1
@@ -68,7 +68,7 @@ arch woods_2
 x 1
 y 7
 end
-arch woods
+arch woods4
 x 1
 y 8
 end
@@ -107,7 +107,7 @@ arch woods_2
 x 2
 y 7
 end
-arch woods
+arch woods4
 x 2
 y 8
 end
@@ -146,11 +146,11 @@ arch woods_2
 x 3
 y 7
 end
-arch woods
+arch woods4
 x 3
 y 8
 end
-arch woods_3
+arch treed_hills
 x 3
 y 9
 end
@@ -220,7 +220,7 @@ arch jungle_2
 x 5
 y 6
 end
-arch woods_2
+arch deep_swamp
 x 5
 y 7
 end
diff --git a/styles/monsterstyles/sylvan/sylvan_1 b/styles/monsterstyles/sylvan/sylvan_1
index 9fd26f5fb..fd6768c22 100755
--- a/styles/monsterstyles/sylvan/sylvan_1
+++ b/styles/monsterstyles/sylvan/sylvan_1
@@ -9,8 +9,16 @@ width 6
 height 6
 end
 arch elf_man
+msg
+@match *
+Good Tidings.
+endmsg
 end
 arch elf_lass
+msg
+@match *
+I greet thee.
+endmsg
 y 1
 end
 arch bird
@@ -20,6 +28,14 @@ arch bee
 x 1
 y 1
 end
+arch bee
+x 1
+y 2
+end
+arch bat
+x 1
+y 4
+end
 arch bird
 x 2
 end
diff --git a/styles/monsterstyles/sylvan/sylvan_10 b/styles/monsterstyles/sylvan/sylvan_10
new file mode 100644
index 000000000..e02df6989
--- /dev/null
+++ b/styles/monsterstyles/sylvan/sylvan_10
@@ -0,0 +1,193 @@
+arch map
+name <untitled>
+msg
+Creator: Gnat the Gnu
+Email: gnu@foo.bar
+Date: Tue Dec 22 20:37:46 1998
+endmsg
+width 6
+height 20
+end
+arch banshee
+end
+arch dire_wolf
+y 18
+end
+arch dire_wolf
+y 19
+end
+arch fire_witch
+x 1
+end
+arch faerie_dragon
+x 1
+y 5
+end
+arch broo
+x 2
+y 6
+end
+arch earth_witch
+x 2
+y 11
+end
+arch elec_dragon
+x 2
+y 17
+end
+arch fire_dragon
+x 2
+y 18
+end
+arch cold_dragon
+x 2
+y 19
+end
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
+x 3
+y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
+end
+arch air_witch
+x 3
+y 4
+end
+arch water_witch
+x 3
+y 5
+end
+arch chaos_witch
+x 3
+y 11
+end
+arch fungus
+x 4
+y 1
+end
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
+x 4
+y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
+end
+arch deathtree
+x 4
+y 6
+end
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 20
+maxsp 20
+can_use_ring 1
+can_use_rod 1
+x 5
+y 2
+arch abil_poison_cloud
+end
+arch spell_summon_fog
+end
+end
+arch broo
+x 5
+y 4
+end
+arch deathtree
+x 5
+y 6
+end
+arch deathtree
+x 5
+y 7
+end
+arch shadow
+x 5
+y 13
+end
+arch gaelotroll
+y 1
+end
+arch gaelotroll
+y 6
+end
+arch cyclops
+y 10
+end
+arch troll
+y 14
+end
+arch dragon
+x 2
+y 1
+end
+arch unicorn
+x 3
+end
+arch baslic
+x 3
+y 8
+end
+arch bear
+x 3
+y 14
+end
+arch serpent
+x 4
+y 3
+end
+arch giant
+x 4
+y 11
+end
+arch bear
+x 4
+y 14
+end
+arch behemoth
+x 4
+y 18
+end
diff --git a/styles/monsterstyles/sylvan/sylvan_2 b/styles/monsterstyles/sylvan/sylvan_2
index c4cfd98b5..c44961741 100755
--- a/styles/monsterstyles/sylvan/sylvan_2
+++ b/styles/monsterstyles/sylvan/sylvan_2
@@ -9,20 +9,27 @@ width 6
 height 6
 end
 arch elf_man
+hp 130
+maxhp 130
 sp 15
 maxsp 15
-arch ability_invisible
+arch spell_invisible
 end
 end
 arch elf_lass
+hp 130
+maxhp 130
 sp 20
 maxsp 20
 y 1
-arch ability_thorn_wall
+arch spell_invisible
 end
-arch ability_invisible
+arch spell_magic_missile
 end
 end
+arch ogre
+y 5
+end
 arch bird
 unaggressive 1
 sleep 0
@@ -32,6 +39,10 @@ arch bee
 x 1
 y 1
 end
+arch ogre
+x 1
+y 5
+end
 arch bird
 unaggressive 1
 sleep 0
@@ -60,3 +71,7 @@ end
 arch pixie
 x 5
 end
+arch small_troll
+x 5
+y 5
+end
diff --git a/styles/monsterstyles/sylvan/sylvan_3 b/styles/monsterstyles/sylvan/sylvan_3
index 9edd8e9f6..b628a38a9 100755
--- a/styles/monsterstyles/sylvan/sylvan_3
+++ b/styles/monsterstyles/sylvan/sylvan_3
@@ -6,36 +6,60 @@ Email: gnu@foo.bar
 Date: Tue Dec 22 20:37:46 1998
 endmsg
 width 6
-height 6
+height 20
 end
 arch elf_man
 level 8
+hp 200
+maxhp 200
 sp 15
 maxsp 15
-arch ability_invisible
+arch spell_invisible
 end
 end
 arch elf_lass
 level 12
 exp 90
 dam 9
+hp 200
+maxhp 200
 sp 20
 maxsp 20
 y 1
-arch ability_thorn_wall
+arch spell_invisible
 end
-arch ability_invisible
+arch spell_summon_pet_monster
 end
 end
 arch elf_1
 level 10
 exp 300
+hp 200
+maxhp 200
 y 2
 end
+arch elf_1
+level 10
+exp 300
+hp 200
+maxhp 200
+y 3
+end
 arch bird
 unaggressive 1
 sleep 0
-x 1
+y 5
+end
+arch bird
+unaggressive 1
+sleep 0
+y 6
+end
+arch dark_elf
+y 15
+end
+arch earth_elemental
+y 19
 end
 arch bee
 x 1
@@ -48,7 +72,22 @@ end
 arch bird
 unaggressive 1
 sleep 0
-x 2
+x 1
+y 5
+end
+arch bird
+unaggressive 1
+sleep 0
+x 1
+y 6
+end
+arch dark_elf
+x 1
+y 15
+end
+arch fire_elemental
+x 1
+y 19
 end
 arch wolf
 x 2
@@ -59,15 +98,40 @@ x 2
 y 2
 end
 arch bird
-x 3
+x 2
+y 5
 end
-arch wolf
-x 3
-y 1
+arch bird
+x 2
+y 6
 end
-arch wolf
+arch dire_wolf
+x 2
+y 8
+end
+arch dark_elf
+x 2
+y 15
+end
+arch ogre
+x 2
+y 16
+end
+arch water_elemental
+x 2
+y 19
+end
+arch small_troll
 x 3
-y 2
+y 13
+end
+arch ogre
+x 3
+y 16
+end
+arch air_elemental
+x 3
+y 19
 end
 arch generate_bird
 x 4
@@ -77,17 +141,100 @@ x 4
 y 1
 end
 arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
 x 4
-y 2
+y 5
+arch spell_curse
+end
 end
 arch pixie
-x 5
-y 2
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
+x 4
+y 6
+arch spell_curse
+end
+end
+arch wolf
+x 4
+y 7
+end
+arch wolf
+x 4
+y 8
+end
+arch small_troll
+x 4
+y 13
+end
+arch ogre
+x 4
+y 16
 end
 arch generate_pixie
 x 5
 y 3
 end
-arch bear
+arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
 x 5
+y 5
+arch spell_magic_missile
+end
+end
+arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
+x 5
+y 6
+arch spell_magic_missile
+end
+end
+arch wolf
+x 5
+y 7
+end
+arch wolf
+x 5
+y 8
+end
+arch gnome
+x 5
+y 10
+end
+arch small_troll
+x 5
+y 13
+end
+arch ogre
+x 5
+y 16
+end
+arch bear
+y 9
+end
+arch bear
+y 11
 end
diff --git a/styles/monsterstyles/sylvan/sylvan_4 b/styles/monsterstyles/sylvan/sylvan_4
index 17cb7f409..c29f914d3 100755
--- a/styles/monsterstyles/sylvan/sylvan_4
+++ b/styles/monsterstyles/sylvan/sylvan_4
@@ -6,41 +6,62 @@ Email: gnu@foo.bar
 Date: Tue Dec 22 20:37:46 1998
 endmsg
 width 6
-height 6
+height 20
 end
 arch elf_man
 level 8
+hp 300
+maxhp 300
 sp 15
 maxsp 15
-arch ability_invisible
+arch spell_invisible
+end
+arch spell_summon_fog
 end
 end
 arch elf_lass
 level 12
 exp 90
 dam 9
+hp 300
+maxhp 300
 sp 20
 maxsp 20
 y 1
-arch ability_thorn_wall
+arch spell_invisible
 end
-arch ability_invisible
+arch spell_wall_of_thorns
+end
+arch spell_summon_pet_monster
 end
 end
 arch elf_1
 level 10
 exp 300
+hp 300
+maxhp 300
+sp 15
+maxsp 15
 y 2
 arch compositebow
 end
 arch arrow
 nrof 100
 end
+arch spell_magic_missile
 end
-arch bird
-unaggressive 1
-sleep 0
-x 1
+end
+arch wolf
+y 6
+end
+arch wolf
+y 7
+end
+arch deathtree
+y 15
+end
+arch dark_elf
+y 19
 end
 arch bee
 x 1
@@ -50,37 +71,82 @@ arch bee
 x 1
 y 2
 end
-arch bird
-unaggressive 1
-sleep 0
-x 2
+arch wolf
+x 1
+y 6
 end
 arch wolf
-x 2
-y 1
+x 1
+y 7
+end
+arch deathtree
+x 1
+y 15
+end
+arch dark_elf
+x 1
+y 19
 end
 arch generate_bee
 x 2
 y 2
 end
-arch bird
+arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
+x 2
+y 4
+arch spell_curse
+end
+end
+arch deathtree
+x 2
+y 15
+end
+arch small_troll
+x 2
+y 17
+end
+arch dark_elf
+x 2
+y 19
+end
+arch generate_bird
 x 3
 end
-arch wolf
+arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
 x 3
-y 1
+y 4
+arch spell_curse
 end
-arch wolf
-x 3
-y 2
 end
 arch small_troll
 x 3
-y 3
+y 9
 end
 arch fungus
 x 3
-y 4
+y 10
+end
+arch small_troll
+x 3
+y 17
+end
+arch dark_elf
+x 3
+y 19
 end
 arch generate_bird
 x 4
@@ -90,24 +156,69 @@ x 4
 y 1
 end
 arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
 x 4
 y 2
+arch spell_curse
+end
+end
+arch small_troll
+x 4
+y 17
 end
 arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
 x 5
 y 2
+arch spell_curse
+end
+end
+arch sandy
+x 5
+y 12
+end
+arch sandy
+x 5
+y 13
+end
+arch small_troll
+x 5
+y 17
 end
 arch ent
-y 3
+y 10
+end
+arch ent
+y 12
 end
 arch giant
 x 2
-y 3
+y 9
 end
 arch serpent
 x 4
-y 3
+y 9
 end
 arch bear
 x 5
 end
+arch bear
+x 5
+y 3
+end
+arch bear
+x 5
+y 5
+end
diff --git a/styles/monsterstyles/sylvan/sylvan_5 b/styles/monsterstyles/sylvan/sylvan_5
index 5cf5bcda6..14d198908 100755
--- a/styles/monsterstyles/sylvan/sylvan_5
+++ b/styles/monsterstyles/sylvan/sylvan_5
@@ -6,39 +6,89 @@ Email: gnu@foo.bar
 Date: Tue Dec 22 20:37:46 1998
 endmsg
 width 6
-height 6
+height 20
 end
 arch elf_man
 level 8
+hp 300
+maxhp 300
 sp 15
 maxsp 15
-arch ability_invisible
-end
 arch light_sword
 end
+arch spell_invisible
+end
+arch spell_summon_fog
+end
 end
 arch elf_lass
 level 12
 exp 90
 dam 9
-sp 20
-maxsp 20
+hp 300
+maxhp 300
+sp 30
+maxsp 30
 y 1
-arch ability_thorn_wall
+arch spell_invisible
 end
-arch ability_invisible
+arch spell_summon_pet_monster
+end
+arch spell_magic_missile
 end
 end
 arch elf_1
 level 10
 exp 300
 dam 15
+sp 10
+maxsp 10
 y 2
 arch elven_bow
 end
 arch arrow
 nrof 100
 end
+arch spell_wall_of_thorns
+end
+end
+arch elf_1
+level 10
+exp 300
+dam 15
+sp 10
+maxsp 10
+y 3
+arch elven_bow
+end
+arch arrow
+nrof 100
+end
+arch spell_wall_of_thorns
+end
+end
+arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
+y 8
+arch spell_curse
+end
+end
+arch bird
+unaggressive 1
+sleep 0
+y 10
+end
+arch dark_elf
+y 16
+end
+arch earth_elemental
+y 19
 end
 arch bird
 unaggressive 1
@@ -53,12 +103,39 @@ arch bee
 x 1
 y 2
 end
+arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
+x 1
+y 8
+arch spell_curse
+end
+end
+arch bird
+unaggressive 1
+sleep 0
+x 1
+y 10
+end
+arch dark_elf
+x 1
+y 16
+end
+arch fire_elemental
+x 1
+y 19
+end
 arch bird
 unaggressive 1
 sleep 0
 x 2
 end
-arch wolf
+arch bee
 x 2
 y 1
 end
@@ -66,25 +143,37 @@ arch generate_bee
 x 2
 y 2
 end
+arch small_troll
+x 2
+y 6
+end
+arch bird
+x 2
+y 10
+end
+arch water_elemental
+x 2
+y 19
+end
 arch bird
 x 3
 end
-arch wolf
+arch generate_bird
 x 3
 y 1
 end
-arch wolf
-x 3
-y 2
-end
-arch small_troll
-x 3
-y 3
-end
 arch fungus
 x 3
 y 4
 end
+arch small_troll
+x 3
+y 6
+end
+arch air_elemental
+x 3
+y 19
+end
 arch generate_bird
 x 4
 end
@@ -92,36 +181,92 @@ arch fungus
 x 4
 y 1
 end
-arch pixie
-x 4
-y 2
-end
 arch generate_pixie
 x 4
 y 4
 end
-arch deathtree
+arch small_troll
 x 4
-y 5
+y 6
 end
 arch pixie
-x 5
-y 2
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
+x 4
+y 8
+arch spell_curse
+end
+end
+arch deathtree
+x 4
+y 11
+end
+arch deathtree
+x 4
+y 12
+end
+arch wolf
+x 4
+y 14
+end
+arch wolf
+x 4
+y 15
 end
 arch broo
 x 5
 y 4
 end
+arch small_troll
+x 5
+y 6
+end
+arch pixie
+name burly pixie
+hp 30
+maxhp 40
+ac 0
+sp 10
+maxsp 10
+Wis 10
+x 5
+y 8
+arch spell_curse
+end
+end
 arch deathtree
 x 5
+y 11
+end
+arch deathtree
+x 5
+y 12
+end
+arch wolf
+x 5
+y 14
+end
+arch wolf
+x 5
+y 15
+end
+arch giant
 y 5
 end
 arch ent
-y 3
+y 11
+end
+arch ent
+y 13
 end
 arch giant
-x 2
-y 3
+x 1
+y 5
 end
 arch serpent
 x 4
diff --git a/styles/monsterstyles/sylvan/sylvan_6 b/styles/monsterstyles/sylvan/sylvan_6
index 5b0b93929..28ed844c3 100755
--- a/styles/monsterstyles/sylvan/sylvan_6
+++ b/styles/monsterstyles/sylvan/sylvan_6
@@ -6,39 +6,55 @@ Email: gnu@foo.bar
 Date: Tue Dec 22 20:37:46 1998
 endmsg
 width 6
-height 6
+height 20
 end
 arch elf_man
 level 8
-sp 15
-maxsp 15
-arch ability_invisible
-end
+hp 300
+maxhp 300
+sp 30
+maxsp 60
 arch light_sword
 end
+arch spell_invisible
+end
+arch spell_summon_pet_monster
+end
+arch spell_magic_missile
+end
 end
 arch elf_lass
 level 12
 exp 90
 dam 9
-sp 20
-maxsp 20
+hp 300
+maxhp 300
+sp 60
+maxsp 60
 y 1
-arch ability_thorn_wall
+arch spell_invisible
 end
-arch ability_invisible
+arch spell_summon_pet_monster
+end
+arch spell_wall_of_thorns
 end
 end
 arch elf_1
 level 10
 exp 300
 dam 15
+sp 30
+maxsp 30
 y 2
 arch elven_bow
 end
 arch arrow
 nrof 100
 end
+arch spell_magic_missile
+end
+arch spell_wall_of_thorns
+end
 end
 arch wolf
 name large wolf
@@ -48,7 +64,10 @@ wc -1
 ac -1
 Con 3
 Wis 10
-y 5
+y 11
+end
+arch earth_elemental
+y 19
 end
 arch bird
 unaggressive 1
@@ -63,6 +82,10 @@ arch killer_bee
 x 1
 y 2
 end
+arch bee
+x 1
+y 3
+end
 arch wolf
 name large wolf
 level 10
@@ -72,18 +95,42 @@ ac -1
 Con 3
 Wis 10
 x 1
-y 5
+y 11
+end
+arch fire_elemental
+x 1
+y 19
 end
 arch xan
 x 2
 end
+arch killer_bee
+x 2
+y 2
+end
 arch generate_bee
 x 2
-y 5
+y 11
+end
+arch small_troll
+x 2
+y 13
+end
+arch small_troll
+x 2
+y 14
+end
+arch water_elemental
+x 2
+y 19
 end
 arch bird
 x 3
 end
+arch bird
+x 3
+y 1
+end
 arch small_troll
 x 3
 y 3
@@ -101,7 +148,15 @@ ac -1
 Con 3
 Wis 10
 x 3
-y 5
+y 11
+end
+arch small_troll
+x 3
+y 13
+end
+arch air_elemental
+x 3
+y 19
 end
 arch generate_bird
 x 4
@@ -122,17 +177,29 @@ hp 80
 maxhp 80
 ac 3
 Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
 x 4
 y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
 end
 arch generate_pixie
 x 4
 y 4
 end
-arch deathtree
+arch generate_pixie
 x 4
 y 5
 end
+arch deathtree
+x 4
+y 11
+end
 arch pixie
 name wilds pixie
 weight 1000
@@ -145,32 +212,83 @@ hp 80
 maxhp 80
 ac 3
 Con 1
+sp 20
+maxsp 20
+can_use_ring 1
+can_use_rod 1
 x 5
 y 2
+arch abil_poison_cloud
+end
+arch spell_summon_fog
+end
 end
 arch broo
 x 5
 y 4
 end
+arch xan
+x 5
+y 6
+end
 arch deathtree
 x 5
+y 11
+end
+arch elf_1
+level 10
+exp 300
+dam 15
+sp 30
+maxsp 30
+x 5
+y 13
+arch elven_bow
+end
+arch arrow
+nrof 100
+end
+arch spell_magic_missile
+end
+arch spell_wall_of_thorns
+end
+end
+arch dire_wolf
+x 5
+y 15
+end
+arch dire_wolf
+x 5
+y 16
+end
+arch bear
 y 5
 end
 arch ent
-y 3
+y 8
 end
-arch troll
-x 2
-y 1
+arch bear
+y 13
+end
+arch ent
+y 16
 end
 arch giant
 x 2
 y 3
 end
+arch giant
+x 2
+y 5
+end
 arch serpent
 x 4
 y 3
 end
+arch troll
+x 4
+y 8
+end
 arch bear
 x 5
 end
diff --git a/styles/monsterstyles/sylvan/sylvan_7 b/styles/monsterstyles/sylvan/sylvan_7
index 46a3de40f..504acf5b8 100644
--- a/styles/monsterstyles/sylvan/sylvan_7
+++ b/styles/monsterstyles/sylvan/sylvan_7
@@ -6,7 +6,7 @@ Email: gnu@foo.bar
 Date: Tue Dec 22 20:37:46 1998
 endmsg
 width 6
-height 6
+height 20
 end
 arch knight
 name Elf Guard
@@ -18,6 +18,10 @@ arch arrow
 nrof 99
 magic 1
 end
+arch spell_magic_missile
+end
+arch spell_summon_pet_monster
+end
 end
 arch wolf
 name large wolf
@@ -27,13 +31,25 @@ wc -1
 ac -1
 Con 3
 Wis 10
-y 5
+y 9
+end
+arch dire_wolf
+y 18
+end
+arch dire_wolf
+y 19
 end
 arch bird
 unaggressive 1
 sleep 0
 x 1
 end
+arch bird
+unaggressive 1
+sleep 0
+x 1
+y 1
+end
 arch wolf
 name large wolf
 level 10
@@ -43,22 +59,76 @@ ac -1
 Con 3
 Wis 10
 x 1
-y 5
+y 9
 end
 arch generate_bird
 x 2
 end
-arch dark_elf
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
 x 2
 y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
 end
 arch faerie_dragon
 x 2
-y 5
+y 9
 end
-arch dark_elf
+arch small_troll
+x 2
+y 11
+end
+arch bird
+unaggressive 1
+sleep 0
+x 2
+y 12
+end
+arch bird
+unaggressive 1
+sleep 0
+x 2
+y 13
+end
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 20
+maxsp 20
+can_use_ring 1
+can_use_rod 1
 x 3
 y 2
+arch abil_poison_cloud
+end
+arch spell_summon_fog
+end
 end
 arch small_troll
 x 3
@@ -77,7 +147,11 @@ ac -1
 Con 3
 Wis 10
 x 3
-y 5
+y 9
+end
+arch small_troll
+x 3
+y 11
 end
 arch fungus
 x 4
@@ -95,17 +169,41 @@ hp 80
 maxhp 80
 ac 3
 Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
 x 4
 y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
 end
 arch generate_pixie
 x 4
 y 4
 end
-arch deathtree
+arch generate_pixie
 x 4
 y 5
 end
+arch deathtree
+x 4
+y 9
+end
+arch small_troll
+x 4
+y 11
+end
+arch dark_elf
+x 4
+y 12
+end
+arch dark_elf
+x 4
+y 13
+end
 arch pixie
 name wilds pixie
 weight 1000
@@ -118,38 +216,77 @@ hp 80
 maxhp 80
 ac 3
 Con 1
+sp 20
+maxsp 20
+can_use_ring 1
+can_use_rod 1
 x 5
 y 2
+arch abil_poison_cloud
+end
+arch spell_summon_fog
+end
 end
 arch broo
 x 5
 y 4
 end
-arch deathtree
+arch broo
 x 5
 y 5
 end
-arch troll
-y 1
+arch deathtree
+x 5
+y 9
 end
-arch ent
-y 3
+arch dark_elf
+x 5
+y 12
 end
-arch dragon
-x 2
-y 1
+arch dark_elf
+x 5
+y 13
 end
 arch giant
-x 2
 y 3
 end
-arch unicorn
-x 3
+arch ent
+y 6
+end
+arch troll
+y 12
+end
+arch dragon
+y 15
+end
+arch dragon
+y 16
+end
+arch giant
+x 1
+y 3
+end
+arch ent
+x 2
+y 6
+end
+arch behemoth
+x 2
+y 18
 end
 arch serpent
 x 4
 y 3
 end
 arch bear
-x 5
+x 4
+y 15
+end
+arch bear
+x 5
+y 15
+end
+arch bear
+x 5
+y 17
 end
diff --git a/styles/monsterstyles/sylvan/sylvan_8 b/styles/monsterstyles/sylvan/sylvan_8
index 4ca88687b..ae5e03f7a 100755
--- a/styles/monsterstyles/sylvan/sylvan_8
+++ b/styles/monsterstyles/sylvan/sylvan_8
@@ -6,10 +6,13 @@ Email: gnu@foo.bar
 Date: Tue Dec 22 20:37:46 1998
 endmsg
 width 6
-height 6
+height 20
 end
 arch banshee
 end
+arch dark_elf
+y 6
+end
 arch wolf
 name large wolf
 level 10
@@ -18,13 +21,35 @@ wc -1
 ac -1
 Con 3
 Wis 10
-y 5
+y 8
 end
 arch bird
 unaggressive 1
 sleep 0
 x 1
 end
+arch bird
+unaggressive 1
+sleep 0
+x 1
+y 1
+end
+arch bird
+unaggressive 1
+sleep 0
+x 1
+y 2
+end
+arch bird
+unaggressive 1
+sleep 0
+x 1
+y 3
+end
+arch dark_elf
+x 1
+y 6
+end
 arch wolf
 name large wolf
 level 10
@@ -34,22 +59,64 @@ ac -1
 Con 3
 Wis 10
 x 1
-y 5
+y 8
 end
 arch generate_bird
 x 2
 end
-arch dark_elf
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
 x 2
 y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
+end
+arch dark_elf
+x 2
+y 6
 end
 arch faerie_dragon
 x 2
-y 5
+y 8
 end
-arch dark_elf
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 20
+maxsp 20
+can_use_ring 1
+can_use_rod 1
 x 3
 y 2
+arch abil_poison_cloud
+end
+arch spell_summon_fog
+end
 end
 arch small_troll
 x 3
@@ -59,6 +126,10 @@ arch fungus
 x 3
 y 4
 end
+arch dark_elf
+x 3
+y 6
+end
 arch wolf
 name large wolf
 level 10
@@ -68,7 +139,7 @@ ac -1
 Con 3
 Wis 10
 x 3
-y 5
+y 8
 end
 arch fungus
 x 4
@@ -86,8 +157,16 @@ hp 80
 maxhp 80
 ac 3
 Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
 x 4
 y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
 end
 arch generate_pixie
 x 4
@@ -97,6 +176,14 @@ arch deathtree
 x 4
 y 5
 end
+arch deathtree
+x 4
+y 6
+end
+arch deathtree
+x 4
+y 7
+end
 arch pixie
 name wilds pixie
 weight 1000
@@ -109,8 +196,16 @@ hp 80
 maxhp 80
 ac 3
 Con 1
+sp 20
+maxsp 20
+can_use_ring 1
+can_use_rod 1
 x 5
 y 2
+arch abil_poison_cloud
+end
+arch spell_summon_fog
+end
 end
 arch broo
 x 5
@@ -120,19 +215,38 @@ arch deathtree
 x 5
 y 5
 end
-arch troll
-y 1
+arch dire_wolf
+x 5
+y 14
+end
+arch dire_wolf
+x 5
+y 15
 end
 arch ent
-y 3
+y 10
+end
+arch troll
+y 13
+end
+arch giant
+y 16
+end
+arch giant
+x 1
+y 16
 end
 arch dragon
 x 2
 y 1
 end
-arch giant
+arch ent
 x 2
-y 3
+y 10
+end
+arch troll
+x 2
+y 13
 end
 arch unicorn
 x 3
@@ -141,6 +255,19 @@ arch serpent
 x 4
 y 3
 end
+arch behemoth
+x 4
+y 18
+end
 arch bear
 x 5
+y 6
+end
+arch bear
+x 5
+y 8
+end
+arch bear
+x 5
+y 10
 end
diff --git a/styles/monsterstyles/sylvan/sylvan_9 b/styles/monsterstyles/sylvan/sylvan_9
new file mode 100644
index 000000000..9126fdfaf
--- /dev/null
+++ b/styles/monsterstyles/sylvan/sylvan_9
@@ -0,0 +1,233 @@
+arch map
+name <untitled>
+msg
+Creator: Gnat the Gnu
+Email: gnu@foo.bar
+Date: Tue Dec 22 20:37:46 1998
+endmsg
+width 6
+height 20
+end
+arch banshee
+end
+arch wolf
+name large wolf
+level 10
+exp 300
+wc -1
+ac -1
+Con 3
+Wis 10
+y 2
+end
+arch wolf
+name large wolf
+level 10
+exp 300
+wc -1
+ac -1
+Con 3
+Wis 10
+y 3
+end
+arch wolf
+name large wolf
+level 10
+exp 300
+wc -1
+ac -1
+Con 3
+Wis 10
+y 4
+end
+arch earth_witch
+y 7
+end
+arch generate_pixie
+y 11
+end
+arch generate_pixie
+y 12
+end
+arch dire_wolf
+y 18
+end
+arch dire_wolf
+y 19
+end
+arch fire_witch
+x 1
+end
+arch dark_elf
+x 1
+y 3
+end
+arch faerie_dragon
+x 1
+y 5
+end
+arch generate_bird
+x 2
+end
+arch dark_elf
+x 2
+y 3
+end
+arch broo
+x 2
+y 6
+end
+arch elec_dragon
+x 2
+y 17
+end
+arch fire_dragon
+x 2
+y 18
+end
+arch cold_dragon
+x 2
+y 19
+end
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
+x 3
+y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
+end
+arch dark_elf
+x 3
+y 3
+end
+arch air_witch
+x 3
+y 4
+end
+arch water_witch
+x 3
+y 5
+end
+arch fungus
+x 4
+y 1
+end
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 25
+maxsp 25
+can_use_ring 1
+can_use_rod 1
+x 4
+y 2
+arch spell_curse
+end
+arch spell_missile_swarm
+end
+end
+arch deathtree
+x 4
+y 6
+end
+arch pixie
+name wilds pixie
+weight 1000
+level 8
+exp 100
+attacktype 3
+dam 10
+wc 0
+hp 80
+maxhp 80
+ac 3
+Con 1
+sp 20
+maxsp 20
+can_use_ring 1
+can_use_rod 1
+x 5
+y 2
+arch abil_poison_cloud
+end
+arch spell_summon_fog
+end
+end
+arch broo
+x 5
+y 4
+end
+arch deathtree
+x 5
+y 6
+end
+arch deathtree
+x 5
+y 7
+end
+arch troll
+y 8
+end
+arch troll
+y 14
+end
+arch dragon
+x 2
+y 1
+end
+arch giant
+x 2
+y 11
+end
+arch unicorn
+x 3
+end
+arch baslic
+x 3
+y 8
+end
+arch bear
+x 3
+y 14
+end
+arch serpent
+x 4
+y 3
+end
+arch giant
+x 4
+y 11
+end
+arch bear
+x 4
+y 14
+end
+arch behemoth
+x 4
+y 18
+end
diff --git a/styles/wallstyles/hedge b/styles/wallstyles/hedge
index 1362fd13b..4f1514365 100644
--- a/styles/wallstyles/hedge
+++ b/styles/wallstyles/hedge
@@ -9,4 +9,5 @@ width 6
 height 6
 end
 arch hedge_0
+no_pass 1
 end
diff --git a/styles/wallstyles/trees b/styles/wallstyles/trees
index 4b7842284..e19ebc93c 100644
--- a/styles/wallstyles/trees
+++ b/styles/wallstyles/trees
@@ -5,17 +5,25 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 19 20:36:16 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch tree4
+blocksview 1
 no_pass 1
 end
 arch tree3
-x 1
+blocksview 1
 no_pass 1
+x 1
 end
 arch tree5
-x 2
+blocksview 1
 no_pass 1
+x 2
+end
+arch fernsdense
+blocksview 1
+no_pass 1
+x 4
 end
diff --git a/styles/wallstyles/water b/styles/wallstyles/water
index dc136f2e8..2f8680f1d 100644
--- a/styles/wallstyles/water
+++ b/styles/wallstyles/water
@@ -10,6 +10,3 @@ height 6
 end
 arch biglake_0
 end
-arch shallow_sea
-x 1
-end