From 1bbe5a952b2c7649705862c40860d24e8de6b779 Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Mon, 20 Dec 2021 10:00:57 +0100
Subject: [PATCH] Set inland water bodies icing when the icing slider >= 0.05

---
 Environment/environment.xml          |  1 +
 Materials/default/global-summer.xml  |  5 ++++-
 Materials/regions/global-summer.xml  |  5 ++++-
 gui/dialogs/environment-settings.xml | 14 +++++++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Environment/environment.xml b/Environment/environment.xml
index a48fa2bba..6875ab5c7 100644
--- a/Environment/environment.xml
+++ b/Environment/environment.xml
@@ -486,6 +486,7 @@
     <wetness-set type="double" userarchive="y">0.0</wetness-set>
     <wetness type="double" userarchive="n">0.0</wetness>
     <snow-thickness-factor type="double" userarchive="y">1.0</snow-thickness-factor>
+    <ice-cover type="bool" userarchive="n">false</ice-cover>
     <delta-T-soil type="double" userarchive="n">0.0</delta-T-soil>
     <delta-T-vegetation type="double" userarchive="n">0.0</delta-T-vegetation>
     <delta-T-rock type="double" userarchive="n">0.0</delta-T-rock>
diff --git a/Materials/default/global-summer.xml b/Materials/default/global-summer.xml
index cce38c3c1..ed9dedec2 100644
--- a/Materials/default/global-summer.xml
+++ b/Materials/default/global-summer.xml
@@ -279,6 +279,9 @@
   <name>Watercourse</name>
   <name>Saline</name>
   <texture>Terrain/water-lake.png</texture>
+  <parameters>
+    <ice_cover><use>/environment/surface/ice-cover</use></ice_cover>
+  </parameters>
   <xsize>400</xsize>
   <ysize>400</ysize>
   <ambient>
@@ -300,7 +303,7 @@
    <a>1.0</a>
   </specular>
   <shininess>1.2</shininess>
-  <solid>0</solid>
+  <solid><property>/environment/surface/ice-cover</property></solid>
   <rolling-friction>1.5</rolling-friction>
   <bumpiness>0.6</bumpiness>
 </material>
diff --git a/Materials/regions/global-summer.xml b/Materials/regions/global-summer.xml
index a9f493fab..eb1d1a7d7 100644
--- a/Materials/regions/global-summer.xml
+++ b/Materials/regions/global-summer.xml
@@ -432,6 +432,9 @@
     <name>Watercourse</name>
     <name>Saline</name>
     <texture>Terrain/water-lake.png</texture>
+    <parameters>
+      <ice_cover><use>/environment/surface/ice-cover</use></ice_cover>
+    </parameters>
     <xsize>400</xsize>
     <ysize>400</ysize>
     <ambient>
@@ -453,7 +456,7 @@
       <a>1.0</a>
     </specular>
     <shininess>1.2</shininess>
-    <solid>0</solid>
+    <solid><property>/environment/surface/ice-cover</property></solid>
     <rolling-friction>1.5</rolling-friction>
     <bumpiness>0.6</bumpiness>
   </material>
diff --git a/gui/dialogs/environment-settings.xml b/gui/dialogs/environment-settings.xml
index ea6a4b63e..8bc41c6dd 100644
--- a/gui/dialogs/environment-settings.xml
+++ b/gui/dialogs/environment-settings.xml
@@ -64,7 +64,7 @@
         </binding>
         <binding>
           <command>property-toggle</command>
-      </binding>
+        </binding>
       </checkbox>
 
       <checkbox>
@@ -210,6 +210,18 @@
        <command>dialog-apply</command>
        <object-name>ice-cover</object-name>
      </binding>
+     <binding>
+       <command>nasal</command>
+       <script>
+         <![CDATA[
+          if (getprop( "/environment/sea/surface/ice-cover" ) < 0.05 ) {
+            setprop( "/environment/surface/ice-cover", 0 );
+          } else {
+            setprop( "/environment/surface/ice-cover", 1 );
+          }
+        ]]>
+       </script>
+     </binding>
     </slider>
 
     <text>