From 65007fd4b3c768ecab9177f84bd43b25b7db8fd1 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Sun, 11 Apr 2010 08:36:29 +0000
Subject: [PATCH] Create effects for shrub type landmass with no or little
 height. Add a new shrub texture contributed by Yves

---
 materials.xml | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/materials.xml b/materials.xml
index 4b424312d..decb81e17 100644
--- a/materials.xml
+++ b/materials.xml
@@ -680,10 +680,34 @@ Shared parameters for various materials.
   </condition>
   <name>Landmass</name>
   <name>SomeSort</name>
-  <name>EvergreenBroadCover</name>
-  <name>EvergreenForest</name>
   <name>Island</name>
   <name>Default</name>
+  <effect>Effects/landmass-nowood</effect>
+  <texture>Terrain/forest1a.png</texture>
+  <texture>Terrain/forest1b.png</texture>
+  <texture>Terrain/forest1c.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <light-coverage>10000000.0</light-coverage>
+  <wood-coverage>4000.0</wood-coverage>
+  <tree-texture>Textures/Trees/coniferous-summer.png</tree-texture>
+  <tree-varieties>8</tree-varieties>
+  <tree-range-m alias="/params/forest/tree-range-m"/>
+  <tree-height-m>25.0</tree-height-m>
+  <tree-width-m>15.0</tree-width-m>
+  <rolling-friction>1</rolling-friction>
+  <bumpiness>1</bumpiness>
+ </material>
+
+ <material>
+  <condition>
+   <equals>
+    <property>sim/startup/season</property>
+    <value>summer</value>
+   </equals>
+  </condition>
+  <name>EvergreenBroadCover</name>
+  <name>EvergreenForest</name>
   <effect>Effects/landmass</effect>
   <texture>Terrain/forest1a.png</texture>
   <texture>Terrain/forest1b.png</texture>
@@ -829,13 +853,16 @@ Shared parameters for various materials.
     <value>summer</value>
    </equals>
   </condition>
-  <effect>Effects/landmass</effect>
+  <effect>Effects/landmass-scrub</effect>
   <name>ShrubCover</name>
   <name>ShrubGrassCover</name>
   <name>ScrubCover</name>
+  <texture>Terrain/shrub1.png</texture>
+<!--
   <texture>Terrain/shrub.png</texture>
   <texture>Terrain/shrub2.png</texture>
   <texture>Terrain/shrub3.png</texture>
+-->
   <xsize>2000</xsize>
   <ysize>2000</ysize>
   <diffuse>
@@ -1173,7 +1200,7 @@ Shared parameters for various materials.
    </equals>
   </condition>
   <name>HerbTundraCover</name>
-  <effect>Effects/landmass</effect>
+  <effect>Effects/landmass-nowood</effect>
   <texture>Terrain/herbtundra.png</texture>
   <texture>Terrain/herbtundra2.png</texture>
   <texture>Terrain/herbtundra3.png</texture>