From 114015f4e913ea8d989aa399cd9543a4c519299d Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Mon, 1 Apr 2019 07:19:01 +0000
Subject: [PATCH] New berry bushes by BigTiger Reviewed by: @Stan Comments by:
 @borg Thread:
 https://wildfiregames.com/forum/index.php?/topic/25431-task-trees/

This was SVN commit r22151.
---
 .../art/actors/props/flora/berry_bush.xml     | 24 +++++++++++++++----
 .../public/art/meshes/gaia/berry_bush_01.dae  |  3 +++
 .../mods/public/art/meshes/gaia/berrybush.dae |  3 ---
 .../art/textures/skins/gaia/berry_bush_01.png |  3 +++
 .../art/textures/skins/gaia/berry_bush_02.png |  3 +++
 .../art/textures/skins/gaia/berry_bushes.png  |  3 ---
 .../mods/public/gui/credits/texts/art.json    |  4 +++-
 7 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/berry_bush_01.dae
 delete mode 100644 binaries/data/mods/public/art/meshes/gaia/berrybush.dae
 create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/berry_bush_01.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/berry_bush_02.png
 delete mode 100644 binaries/data/mods/public/art/textures/skins/gaia/berry_bushes.png

diff --git a/binaries/data/mods/public/art/actors/props/flora/berry_bush.xml b/binaries/data/mods/public/art/actors/props/flora/berry_bush.xml
index 545b164788..7384e0ab03 100644
--- a/binaries/data/mods/public/art/actors/props/flora/berry_bush.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/berry_bush.xml
@@ -2,16 +2,30 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="Berries">
-      <mesh>gaia/berrybush.dae</mesh>
+    <variant frequency="1" name="Berry Bush Base">
       <props>
-        <prop actor="props/flora/berries.xml" attachpoint="root"/>
+        <prop actor="particle/sparks_blacksmith.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="green">
-      <textures><texture file="gaia/berry_bushes.png" name="baseTex"/></textures>
+    <variant frequency="1" name="Berry Bush Mesh 01">
+      <mesh>gaia/berry_bush_01.dae</mesh>
+    </variant>
+    <variant frequency="1" name="Berry Bush Mesh 02">
+      <mesh>gaia/berry_bush_02.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Berry Bush Texture 01">
+      <textures>
+        <texture file="gaia/berry_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Berry Bush Texture 02">
+      <textures>
+        <texture file="gaia/berry_bush_02.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <material>basic_trans.xml</material>
diff --git a/binaries/data/mods/public/art/meshes/gaia/berry_bush_01.dae b/binaries/data/mods/public/art/meshes/gaia/berry_bush_01.dae
new file mode 100644
index 0000000000..f81443997e
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/berry_bush_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e578aff1ba9aa45c591864257459c6884605d63d8fe04ebdc71dd93980989785
+size 73340
diff --git a/binaries/data/mods/public/art/meshes/gaia/berrybush.dae b/binaries/data/mods/public/art/meshes/gaia/berrybush.dae
deleted file mode 100644
index 3ebb03a77d..0000000000
--- a/binaries/data/mods/public/art/meshes/gaia/berrybush.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed62625bbbf2098851d0ddf0c8cf117ea3bf3af3041b195b64c957522ce35539
-size 11165
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/berry_bush_01.png b/binaries/data/mods/public/art/textures/skins/gaia/berry_bush_01.png
new file mode 100644
index 0000000000..7503424ab9
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/berry_bush_01.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:026c60016eccb1edaef3e3cf142663334b8929def312877304d54e626c04570a
+size 69470
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/berry_bush_02.png b/binaries/data/mods/public/art/textures/skins/gaia/berry_bush_02.png
new file mode 100644
index 0000000000..cc62a1e234
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/berry_bush_02.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb4065756a16c44ea3f8dd91a5ecf3d71c69788f0b39e89aebc5dee14f378b9c
+size 67318
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/berry_bushes.png b/binaries/data/mods/public/art/textures/skins/gaia/berry_bushes.png
deleted file mode 100644
index d5f03f1b35..0000000000
--- a/binaries/data/mods/public/art/textures/skins/gaia/berry_bushes.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f9cc223d482baa152ea88929007b8d653be75d9ca063be369869e42241c76c0
-size 119906
diff --git a/binaries/data/mods/public/gui/credits/texts/art.json b/binaries/data/mods/public/gui/credits/texts/art.json
index 87ef91143c..63697154d2 100644
--- a/binaries/data/mods/public/gui/credits/texts/art.json
+++ b/binaries/data/mods/public/gui/credits/texts/art.json
@@ -59,6 +59,7 @@
 		"List": [
 			{"nick": "Annatar", "name": "Kenneth Branch"},
 			{"nick": "b.w.keough", "name": "Brendan Keough"},
+			{"nick": "BigTiger", "name": "Nathanael P. Moore"},
 			{"nick": "Brownboot", "name": "Allen White"},
 			{"nick": "CDmir", "name": "Čestmír Dammer"},
 			{"nick": "Centurion_13", "name": "Shan Coster"},
@@ -103,6 +104,7 @@
 		"List": [
 			{"nick": "Alexandermb", "name": "Daniel Morgado"},
 			{"nick": "Athos"},
+			{"nick": "BigTiger", "name": "Nathanael P. Moore"},
 			{"nick": "Brightgalrs", "name": "Robert D. Schultz"},
 			{"nick": "Eggbird", "name": "Egbert Tigelaar"},
 			{"nick": "EmjeR", "name": "Matthijs de Rijk"},
@@ -224,7 +226,7 @@
 				{"name": "Bahare Abasian"},
 				{"nick": "dMZeroCold", "name": "Mostafa Lotfi"}
 			]
-		}		
+		}
 		]
 	}
 	]