added illuminated cave hills terrain,

and partially added illuminated mushrooms (commented out because i
couldn't get the terrain-graphics part to work).  Also added swamp
village to the 'village' group.

data/terrain-graphics.cfg

@@ -222,9 +222,9 @@
 
 #Single hex Cave lit by Beam of Light
 #33% 33% 33%
-{SHEX Uui         overlay 33  cave/beam3}
-{SHEX Uui         overlay 50  cave/beam2}
-{SHEX Uui         overlay 100 cave/beam1}
+{SHEX (Uui,Uhi)    overlay 33  cave/beam3}
+{SHEX (Uui,Uhi)    overlay 50  cave/beam2}
+{SHEX (Uui,Uhi)    overlay 100 cave/beam1}
 
 {SHEX (Ss,Vs,Chs) overlay 10  swamp/reed3}
 {SHEX (Ss,Vs,Chs) overlay 20  swamp/reed1}
@@ -385,9 +385,9 @@
 {TERRAIN_BASE       Xu                cave/wall-rough}
 
 #33% 33% 33%
-{TERRAIN_BASE_PROB  Uh                cave/hills-variation1    33}
-{TERRAIN_BASE_PROB  Uh                cave/hills-variation2    50}
-{TERRAIN_BASE       Uh                cave/hills-variation3}
+{TERRAIN_BASE_PROB  Uh*               cave/hills-variation1    33}
+{TERRAIN_BASE_PROB  Uh*               cave/hills-variation2    50}
+{TERRAIN_BASE       Uh*               cave/hills-variation3}
 
 #33% 33% 33%
 {TERRAIN_BASE_PROB  Hh                hills-variation1         33}

data/terrain.cfg

@@ -637,26 +637,6 @@ editor_group=water
 # Underground
 #
 
-[terrain]
-symbol_image=mushrooms-tile
-id=fungus
-name= _ "Mushroom Grove"
-string=Uf
-char=]
-editor_group=cave
-[/terrain]
-
-[terrain]
-symbol_image=cave/hills-variation1
-id=rocky_cave
-name= _ "Rockbound Cave"
-string=Uh
-char=[
-aliasof=Uu, Hh
-mvt_alias=-,Uu, Hh
-editor_group=cave, rough
-[/terrain]
-
 [terrain]
 symbol_image=cave/floor6
 id=cave
@@ -677,6 +657,48 @@ light=25
 editor_group=cave
 [/terrain]
 
+[terrain]
+symbol_image=mushrooms-tile
+id=fungus
+name= _ "Mushroom Grove"
+string=Uf
+char=]
+editor_group=cave
+[/terrain]
+
+# haven't figured out the WML for this one
+#[terrain]
+#symbol_image=mushrooms-tile
+#id=fungus_beam
+#name= _ "Mushroom Grove Lit"
+#string=Ufi
+#aliasof=Uf
+#light=25
+#editor_group=cave
+#[/terrain]
+
+[terrain]
+symbol_image=cave/hills-variation1
+id=rocky_cave
+name= _ "Rockbound Cave"
+string=Uh
+char=[
+aliasof=Uu, Hh
+mvt_alias=-,Uu, Hh
+editor_group=cave, rough
+[/terrain]
+
+[terrain]
+symbol_image=cave/hills-beam-tile
+id=rocky_cave_beam
+name= _ "Rockbound Cave Lit"
+string=Uhi
+aliasof=Uu, Hh
+mvt_alias=-,Uu, Hh
+light=25
+editor_group=cave, rough
+[/terrain]
+
 
 #
 # Villages
@@ -862,7 +884,7 @@ char=Y
 aliasof=Vhg, Ss
 heals=8
 gives_income=true
-editor_group=water
+editor_group=water, village
 [/terrain]
 
 #