From d86bb7cf7317b63f433534fbd32032598f8538f8 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sat, 16 Jul 2011 02:57:58 +0000
Subject: [PATCH] Gallic Fields, final (I think).

A few more Pine Tree variants.

This was SVN commit r9838.
---
 .../data/mods/public/art/actors/flora/trees/pine.xml     | 9 +++++++++
 .../data/mods/public/art/meshes/gaia/tree_pine_04.dae    | 3 +++
 .../data/mods/public/art/meshes/gaia/tree_pine_05.dae    | 3 +++
 .../data/mods/public/art/meshes/gaia/tree_pine_06.dae    | 3 +++
 .../data/mods/public/maps/scenarios/Gallic Fields.pmp    | 2 +-
 .../data/mods/public/maps/scenarios/Gallic Fields.xml    | 4 ++--
 binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp  | 2 +-
 binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml  | 4 ++--
 8 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/tree_pine_04.dae
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/tree_pine_05.dae
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/tree_pine_06.dae

diff --git a/binaries/data/mods/public/art/actors/flora/trees/pine.xml b/binaries/data/mods/public/art/actors/flora/trees/pine.xml
index 820658aa98..99db8f3a11 100644
--- a/binaries/data/mods/public/art/actors/flora/trees/pine.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/pine.xml
@@ -58,6 +58,15 @@
     <variant frequency="2" name="mr3">
       <mesh>gaia/tree_pine_03.dae</mesh>
     </variant>
+    <variant frequency="2" name="mr4">
+      <mesh>gaia/tree_pine_04.dae</mesh>
+    </variant>
+    <variant frequency="2" name="mr5">
+      <mesh>gaia/tree_pine_05.dae</mesh>
+    </variant>
+    <variant frequency="2" name="mr6-tall">
+      <mesh>gaia/tree_pine_06.dae</mesh>
+    </variant>
   </group>
   <material>basic_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_pine_04.dae b/binaries/data/mods/public/art/meshes/gaia/tree_pine_04.dae
new file mode 100644
index 0000000000..34c6e21303
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/tree_pine_04.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:170fce5f3557412a7f7c6532a0d34294c32c50eec1ba86d78ff2a75a74d8b30a
+size 41690
diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_pine_05.dae b/binaries/data/mods/public/art/meshes/gaia/tree_pine_05.dae
new file mode 100644
index 0000000000..54767ba48e
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/tree_pine_05.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4060eb99014196c3121e42965d9a4c6daf33ddbd461991395aac44ce7465c3d
+size 46685
diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_pine_06.dae b/binaries/data/mods/public/art/meshes/gaia/tree_pine_06.dae
new file mode 100644
index 0000000000..607c26c1c1
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/tree_pine_06.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f0227006e13379f712b345af3d4cb72e9bb67c9aeef228ee72036a285ea7abf
+size 20047
diff --git a/binaries/data/mods/public/maps/scenarios/Gallic Fields.pmp b/binaries/data/mods/public/maps/scenarios/Gallic Fields.pmp
index 2faaa765d3..1fdc69b232 100644
--- a/binaries/data/mods/public/maps/scenarios/Gallic Fields.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Gallic Fields.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7903072216c33bf8156a16609887b8bbecd4d6a9e36c36c41720327a1bf7fd66
+oid sha256:e029254745b7aabd13c6b1e234494e8ccd1131391b5680b51b0d18559e82d9f5
 size 656928
diff --git a/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml b/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml
index 6e0a40d393..7565475a2f 100644
--- a/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a93581a351c98251838a2cfcabf6aeb4e2914b2937e0b6b1280bbbfed0dc59d
-size 208146
+oid sha256:a85e84eb06ea758bc565f195e68048b495fe08abde8fe35f7ee0f59f64f23b60
+size 492350
diff --git a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp
index b713dd9e3f..2d87b7ddeb 100644
--- a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8175ca69d0162fd0ab29af83400641a5d04e6cc803ac94e53e62a08025ca5c00
+oid sha256:8b7a911392109426ce75e9fd196b29314b63eb70f98ca48d339bc7a3d38fcfd3
 size 657147
diff --git a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml
index 2f720ef92c..a6635b340e 100644
--- a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ae96a3cb75a3deb77a6cc6c27ed7272fc917a698d6c7e711389b2f15a41d3fc
-size 474283
+oid sha256:ca1e7e3cb7861685bc88dc3b35924df3d5353a523cfc63403a482ccfeb3331cf
+size 474291