From a1bf7d5d23db2eacb94ab19111f2a96d2a4e8c8b Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Sat, 10 Aug 2024 15:05:08 +0000
Subject: [PATCH] Move files which were badly moved in 7cd980f2e1 Also take
 into account changed made by @wowgetoffyourcellphone Noticed by:
 @vladislavbelov @sera This was SVN commit r28189.

---
 .../art/materials/terrain_normstrong_spec.xml |  2 +-
 .../art/materials/terrain_normweak_spec.xml   |  2 +-
 .../public/art/materials/terrain_base.xml     |  5 --
 .../art/materials/terrain_norm_spec.xml       |  9 ---
 .../art/materials/terrain_normstrong_spec.xml |  9 ---
 .../art/materials/terrain_normweak_spec.xml   |  9 ---
 .../art/materials/terrain_triplanar.xml       |  8 ---
 .../materials/terrain_triplanar_norm_spec.xml | 10 ---
 .../data/mods/public/art/textures/texture.rng | 72 -------------------
 9 files changed, 2 insertions(+), 124 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/materials/terrain_base.xml
 delete mode 100644 binaries/data/mods/public/art/materials/terrain_norm_spec.xml
 delete mode 100644 binaries/data/mods/public/art/materials/terrain_normstrong_spec.xml
 delete mode 100644 binaries/data/mods/public/art/materials/terrain_normweak_spec.xml
 delete mode 100644 binaries/data/mods/public/art/materials/terrain_triplanar.xml
 delete mode 100644 binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
 delete mode 100644 binaries/data/mods/public/art/textures/texture.rng

diff --git a/binaries/data/mods/mod/art/materials/terrain_normstrong_spec.xml b/binaries/data/mods/mod/art/materials/terrain_normstrong_spec.xml
index abafc3562e..2c313612f2 100644
--- a/binaries/data/mods/mod/art/materials/terrain_normstrong_spec.xml
+++ b/binaries/data/mods/mod/art/materials/terrain_normstrong_spec.xml
@@ -5,5 +5,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.5 15.0 0.0"/>
+  <uniform name="effectSettings" value="1.2 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/mod/art/materials/terrain_normweak_spec.xml b/binaries/data/mods/mod/art/materials/terrain_normweak_spec.xml
index 6727dd0aa4..7cda529c08 100644
--- a/binaries/data/mods/mod/art/materials/terrain_normweak_spec.xml
+++ b/binaries/data/mods/mod/art/materials/terrain_normweak_spec.xml
@@ -5,5 +5,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="0.25 15.0 0.0"/>
+  <uniform name="effectSettings" value="0.8 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_base.xml b/binaries/data/mods/public/art/materials/terrain_base.xml
deleted file mode 100644
index 6eb1412de0..0000000000
--- a/binaries/data/mods/public/art/materials/terrain_base.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-  <shader effect="terrain_base"/>
-  <required_texture name="baseTex"/>
-</material>
diff --git a/binaries/data/mods/public/art/materials/terrain_norm_spec.xml b/binaries/data/mods/public/art/materials/terrain_norm_spec.xml
deleted file mode 100644
index c791dfc35b..0000000000
--- a/binaries/data/mods/public/art/materials/terrain_norm_spec.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-  <alternative material="terrain_base.xml" quality="4"/>
-  <required_texture name="baseTex"/>
-  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
-  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-  <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
-</material>
diff --git a/binaries/data/mods/public/art/materials/terrain_normstrong_spec.xml b/binaries/data/mods/public/art/materials/terrain_normstrong_spec.xml
deleted file mode 100644
index 2c313612f2..0000000000
--- a/binaries/data/mods/public/art/materials/terrain_normstrong_spec.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-  <alternative material="terrain_base.xml" quality="4"/>
-  <required_texture name="baseTex"/>
-  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
-  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-  <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.2 15.0 0.0"/>
-</material>
diff --git a/binaries/data/mods/public/art/materials/terrain_normweak_spec.xml b/binaries/data/mods/public/art/materials/terrain_normweak_spec.xml
deleted file mode 100644
index 7cda529c08..0000000000
--- a/binaries/data/mods/public/art/materials/terrain_normweak_spec.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-  <alternative material="terrain_base.xml" quality="4"/>
-  <required_texture name="baseTex"/>
-  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
-  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-  <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="0.8 15.0 0.0"/>
-</material>
diff --git a/binaries/data/mods/public/art/materials/terrain_triplanar.xml b/binaries/data/mods/public/art/materials/terrain_triplanar.xml
deleted file mode 100644
index 4241a275c4..0000000000
--- a/binaries/data/mods/public/art/materials/terrain_triplanar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-  <alternative material="terrain_base.xml" quality="1"/>
-  <define name="USE_TRIPLANAR" value="1"/>
-  <required_texture name="baseTex"/>
-  <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
-</material>
diff --git a/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml b/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
deleted file mode 100644
index 359cda398b..0000000000
--- a/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-  <alternative material="terrain_triplanar.xml" quality="2"/>
-  <define name="USE_TRIPLANAR" value="1"/>
-  <required_texture name="baseTex"/>
-  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
-  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-  <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
-</material>
diff --git a/binaries/data/mods/public/art/textures/texture.rng b/binaries/data/mods/public/art/textures/texture.rng
deleted file mode 100644
index a3cd2fe06d..0000000000
--- a/binaries/data/mods/public/art/textures/texture.rng
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<element name="Textures" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <zeroOrMore>
-    <element name="File">
-      <interleave>
-        <optional>
-          <attribute name="pattern"/>
-        </optional>
-        <optional>
-          <attribute name="format">
-            <choice>
-              <value>dxt1</value>
-              <value>dxt3</value>
-              <value>dxt5</value>
-              <value>rgba</value>
-              <value>alpha</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="mipmap">
-            <choice>
-              <value>true</value>
-              <value>false</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="normal">
-            <choice>
-              <value>true</value>
-              <value>false</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alpha">
-            <choice>
-              <value>none</value>
-              <value>player</value>
-              <value>transparency</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="filter">
-            <choice>
-              <value>box</value>
-              <value>triangle</value>
-              <value>kaiser</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="kaiserwidth">
-            <data type="float"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="kaiseralpha">
-            <data type="float"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="kaiserstretch">
-            <data type="float"/>
-          </attribute>
-        </optional>
-      </interleave>
-    </element>
-  </zeroOrMore>
-</element>