From 024a8337211f6fb9a2160eb36b95bb0321063ede Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Tue, 21 Sep 2010 23:11:59 +0000
Subject: [PATCH] New: Pegasus, freestanding column, edited the maps a bit,
 testing out an Aphrodite high-poly statue (it needs a proper texture though).

This was SVN commit r8150.
---
 .../props/special/eyecandy/column_doric.xml   | 13 ++++++
 .../special/eyecandy/column_doric_top.xml     | 10 +++++
 .../eyecandy/statue_aphrodite_huge.xml        | 10 +++++
 .../eyecandy/statue_aphrodite_small.xml       | 10 +++++
 .../actors/props/special/pegasus_wings.xml    | 11 +++++
 .../public/art/actors/special/pegasus.xml     | 22 ++++++++++
 .../public/art/meshes/props/column_doric.dae  |  3 ++
 .../art/meshes/props/column_doric_top.dae     |  3 ++
 .../art/meshes/props/hele_stoa_props_b.dae    |  4 +-
 .../meshes/props/special/pegasus_wings.dae    |  3 ++
 .../meshes/props/statue_aphrodite_huge.dae    |  3 ++
 .../meshes/props/statue_aphrodite_small.dae   |  3 ++
 .../skins/gaia/grass_field_savanna.dds        |  2 +-
 .../art/textures/skins/gaia/tree_acacia_a.dds |  3 ++
 .../art/textures/skins/props/marble.png       |  3 ++
 .../public/art/textures/skins/props/wings.dds |  2 +-
 .../textures/skins/skeletal/horse_white_a.dds |  3 ++
 .../mods/public/maps/scenarios/Arcadia II.xml |  4 +-
 .../maps/scenarios/Sahel Watering Holes.pmp   |  2 +-
 .../maps/scenarios/Sahel Watering Holes.xml   |  4 +-
 .../gaia/special_treasure_pegasus.xml         | 20 ++++++++++
 .../templates/other/column_doric.xml          | 40 +++++++++++++++++++
 22 files changed, 169 insertions(+), 9 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric_top.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_huge.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_small.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/special/pegasus_wings.xml
 create mode 100644 binaries/data/mods/public/art/actors/special/pegasus.xml
 create mode 100644 binaries/data/mods/public/art/meshes/props/column_doric.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/column_doric_top.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/special/pegasus_wings.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/statue_aphrodite_huge.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/statue_aphrodite_small.dae
 create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/tree_acacia_a.dds
 create mode 100644 binaries/data/mods/public/art/textures/skins/props/marble.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/horse_white_a.dds
 create mode 100644 binaries/data/mods/public/simulation/templates/gaia/special_treasure_pegasus.xml
 create mode 100644 binaries/data/mods/public/simulation/templates/other/column_doric.xml

diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric.xml
new file mode 100644
index 0000000000..db6b81232d
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/column_doric.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/column_doric_top.xml" attachpoint="root"/>
+      </props>
+      <texture>props/hele_props_a.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric_top.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric_top.xml
new file mode 100644
index 0000000000..680001e28a
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/column_doric_top.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/column_doric_top.dae</mesh>
+      <texture>props/hele_tile_c.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_huge.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_huge.xml
new file mode 100644
index 0000000000..441c8212b4
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_huge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/statue_aphrodite_huge.dae</mesh>
+      <texture>props/marble.png</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_small.xml b/binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_small.xml
new file mode 100644
index 0000000000..6e60be7fda
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/eyecandy/statue_aphrodite_small.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/statue_aphrodite_small.dae</mesh>
+      <texture>props/marble.png</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/special/pegasus_wings.xml b/binaries/data/mods/public/art/actors/props/special/pegasus_wings.xml
new file mode 100644
index 0000000000..a8d9b34365
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/special/pegasus_wings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/special/pegasus_wings.dae</mesh>
+      <texture>props/wings.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/special/pegasus.xml b/binaries/data/mods/public/art/actors/special/pegasus.xml
new file mode 100644
index 0000000000..fbbfaa3953
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/special/pegasus.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="700"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="700"/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="props/special/pegasus_wings.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="white">
+      <texture>skeletal/horse_white_a.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/meshes/props/column_doric.dae b/binaries/data/mods/public/art/meshes/props/column_doric.dae
new file mode 100644
index 0000000000..d85f5f7ae4
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/column_doric.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c81c1aaf2e6b08867aae348dd9b95b764dd660cc7332391a294625a74b3025cf
+size 8521
diff --git a/binaries/data/mods/public/art/meshes/props/column_doric_top.dae b/binaries/data/mods/public/art/meshes/props/column_doric_top.dae
new file mode 100644
index 0000000000..72aa2ef8c9
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/column_doric_top.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ade78a7f43c9a92457e1734ee686601006cd05706a2b5feec2f3db5742f70358
+size 7517
diff --git a/binaries/data/mods/public/art/meshes/props/hele_stoa_props_b.dae b/binaries/data/mods/public/art/meshes/props/hele_stoa_props_b.dae
index 32ae9200e0..c578ec269e 100644
--- a/binaries/data/mods/public/art/meshes/props/hele_stoa_props_b.dae
+++ b/binaries/data/mods/public/art/meshes/props/hele_stoa_props_b.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:264c5bc56bc6cfb43d1cf0d73be9f1d2e43431f487cb0f53bf2a6c7747df83ff
-size 30148
+oid sha256:fe147993721826023d8362352e2447d186cc75928417328f5b46eaa5d4a440d5
+size 30146
diff --git a/binaries/data/mods/public/art/meshes/props/special/pegasus_wings.dae b/binaries/data/mods/public/art/meshes/props/special/pegasus_wings.dae
new file mode 100644
index 0000000000..a78daf0257
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/special/pegasus_wings.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66ca015950fddb3ccdec04840024f5a4514e69592216b47153eeaff9580c4a1c
+size 42616
diff --git a/binaries/data/mods/public/art/meshes/props/statue_aphrodite_huge.dae b/binaries/data/mods/public/art/meshes/props/statue_aphrodite_huge.dae
new file mode 100644
index 0000000000..8ec840ee81
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/statue_aphrodite_huge.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91bc81a6033262bd8798a3657b4ed75d5a0cc9909650ac1b502815ca67e44cc4
+size 1701331
diff --git a/binaries/data/mods/public/art/meshes/props/statue_aphrodite_small.dae b/binaries/data/mods/public/art/meshes/props/statue_aphrodite_small.dae
new file mode 100644
index 0000000000..ed7442be43
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/statue_aphrodite_small.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e824f20ea682c5687a7231615779e1628139e4eea2dbfdcb0e97804aeb8f14e1
+size 1701414
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/grass_field_savanna.dds b/binaries/data/mods/public/art/textures/skins/gaia/grass_field_savanna.dds
index d3ca66f5e1..f9a4709dbc 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/grass_field_savanna.dds
+++ b/binaries/data/mods/public/art/textures/skins/gaia/grass_field_savanna.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3b5442b2dc7e50d492f280da980811c3b28f5a7f98b4b9e2d9298c08a85a454
+oid sha256:b9e9fbf31e4f774e447fb591261fab2ddc6e32a3173d019bee446bb936b65a47
 size 11088
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/tree_acacia_a.dds b/binaries/data/mods/public/art/textures/skins/gaia/tree_acacia_a.dds
new file mode 100644
index 0000000000..6272d208f8
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/tree_acacia_a.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77871e77dae6a767e3989e70f80fdd9358ce821dcca43807695f6ad022c8b7bb
+size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/props/marble.png b/binaries/data/mods/public/art/textures/skins/props/marble.png
new file mode 100644
index 0000000000..d73429e3a7
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/marble.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4db54fc3b0ec3527189ee6fca36b99e3890499e845499b7ef393977086e76bdf
+size 1183255
diff --git a/binaries/data/mods/public/art/textures/skins/props/wings.dds b/binaries/data/mods/public/art/textures/skins/props/wings.dds
index 64d2238151..dfd7eb238a 100644
--- a/binaries/data/mods/public/art/textures/skins/props/wings.dds
+++ b/binaries/data/mods/public/art/textures/skins/props/wings.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dea171f9e9815eee0c9a99d584b6e57e1a296c4ba1ca5dbb54fc306cc2f8fe94
+oid sha256:f97637988987286489006a89c91027ce8b535c85144f890e501d4301d3542655
 size 11088
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_white_a.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_white_a.dds
new file mode 100644
index 0000000000..302fbecd20
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_white_a.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20deb6d1bf30918ad7c3d477caef758ad383f8242ede895dfd61adb466bae3c0
+size 22000
diff --git a/binaries/data/mods/public/maps/scenarios/Arcadia II.xml b/binaries/data/mods/public/maps/scenarios/Arcadia II.xml
index a15a44ab3d..879ac5996c 100644
--- a/binaries/data/mods/public/maps/scenarios/Arcadia II.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Arcadia II.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:345498cfcfc3c9594b8d8d47eb344098f44aacb8fcfba8ee0c7839b9a371018b
-size 706140
+oid sha256:d86a6a9cdbcc7898870f974a18ec3040bcc8520cca45343045bb3236e48dd4fa
+size 706504
diff --git a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.pmp b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.pmp
index 8217b73c07..024122a14b 100644
--- a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ac3df1b76cce262be03b05e8e4ba1ef090b5e9173286d40e170ab09b81cf865
+oid sha256:e3e78d6f88cbf0535e69f2764b6ed1cd22604d3e2b012e2b5ad116d28e7f6b4d
 size 369737
diff --git a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml
index db4c04dc5d..d1ca8b9e88 100644
--- a/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sahel Watering Holes.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b27a94e7248cfd39721f7b64c67ccef5045aa3caf703d86ffc625e7307e086c
-size 189478
+oid sha256:f208b7ed69e838c7c22d0c726ff8e4cc8753589c9993c1dd49f854ff61b8e3fc
+size 429015
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_pegasus.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_pegasus.xml
new file mode 100644
index 0000000000..2277d042cf
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_pegasus.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_geo_mineral">
+  <Identity>
+    <Civ>gaia</Civ>
+    <SpecificName>Pegasus</SpecificName>
+	<IconSheet>snPortraitSheetRockGaia</IconSheet>
+	<IconCell>1</IconCell>
+  </Identity>
+  <ResourceSupply>
+    <Amount>1000</Amount>
+    <Type>metal.treasure</Type>
+  </ResourceSupply>
+  <VisualActor>
+    <Actor>special/pegasus.xml</Actor>
+  </VisualActor>
+  <Footprint>
+    <Circle radius="2.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/other/column_doric.xml b/binaries/data/mods/public/simulation/templates/other/column_doric.xml
new file mode 100644
index 0000000000..ab12ac700b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/other/column_doric.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure">
+  <Identity>
+	<IconSheet>snPortraitSheetSpecialGaia</IconSheet>
+    <IconCell>4</IconCell>
+    <Civ>hele</Civ>
+    <GenericName>Column</GenericName>
+    <SpecificName>Doric Column</SpecificName>
+    <History>A column of the understated Greek Doric Order.</History>
+  </Identity>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <Loot>
+    <xp>1</xp>
+    <food>0</food>
+    <wood>0</wood>
+    <stone>20</stone>
+    <metal>0</metal>
+  </Loot>
+  <VisualActor>
+    <Actor>props/special/eyecandy/column_doric.xml</Actor>
+  </VisualActor>
+  <Footprint>
+    <Square width="2.5" depth="2.5"/>
+    <Height>4.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="2.0" depth="2.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>4</Range>
+    <RetainInFog>true</RetainInFog>
+  </Vision>
+</Entity>