From 7165acf9cc98870fc1d2b2992f8960d6fdcafdfe Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Fri, 3 May 2019 22:23:57 +0000
Subject: [PATCH] Add an AO map to the propylaea building. Enable special maps
 for all versions of the building. Add EOL Native to the actors.

This was SVN commit r22243.
---
 .../actors/props/structures/hellenes/propylaea_props.xml | 3 ++-
 .../actors/props/structures/hellenes/propylaea_roof.xml  | 3 ++-
 .../actors/props/structures/hellenes/propylaea_walls.xml | 3 ++-
 .../public/art/actors/structures/athenians/propylaea.xml | 9 +++++++--
 .../public/art/actors/structures/hellenes/propylaea.xml  | 3 ++-
 .../public/art/meshes/props/propylaea_floortiles.dae     | 4 ++--
 .../mods/public/art/meshes/props/propylaea_props.dae     | 4 ++--
 .../mods/public/art/meshes/props/propylaea_rooftiles.dae | 4 ++--
 .../mods/public/art/meshes/props/propylaea_walls.dae     | 4 ++--
 .../data/mods/public/art/meshes/structural/propylaea.dae | 4 ++--
 .../art/textures/skins/structural/ao/athen_propylaea.png | 3 +++
 11 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/skins/structural/ao/athen_propylaea.png

diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_props.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_props.xml
index d3bd9791a3..b1d9686a70 100644
--- a/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_props.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_props.xml
@@ -8,8 +8,9 @@
         <texture file="props/hele_props_a.dds" name="baseTex"/>
         <texture file="props/hele_props_a_norm.png" name="normTex"/>
         <texture file="props/hele_props_a_spec.png" name="specTex"/>
+        <texture file="structural/ao/athen_propylaea.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
-  <material>basic_trans_parallax_spec.xml</material>
+  <material>basic_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_roof.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_roof.xml
index c909dfa997..e7172fda82 100644
--- a/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_roof.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_roof.xml
@@ -8,8 +8,9 @@
         <texture file="props/hele_wonder_rooftile.png" name="baseTex"/>
         <texture file="props/hele_wonder_rooftile_norm.png" name="normTex"/>
         <texture file="props/hele_wonder_rooftile_spec.png" name="specTex"/>
+        <texture file="structural/ao/athen_propylaea.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
-  <material>basic_trans_parallax_spec.xml</material>
+  <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_walls.xml b/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_walls.xml
index 0a3e96cc1b..1402584706 100644
--- a/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_walls.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/hellenes/propylaea_walls.xml
@@ -8,8 +8,9 @@
         <texture file="structural/hele_blocks.png" name="baseTex"/>
         <texture file="structural/hele_blocks_norm.png" name="normTex"/>
         <texture file="structural/hele_blocks_spec.png" name="specTex"/>
+        <texture file="structural/ao/athen_propylaea.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
-  <material>basic_trans_parallax_spec.xml</material>
+  <material>basic_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml b/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml
index 08a432a76e..827a08a6f0 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml
@@ -10,7 +10,12 @@
         <prop actor="props/structures/hellenes/propylaea_roof.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/propylaea_walls.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="structural/hele_struct.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="structural/hele_struct.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/athen_propylaea.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -27,5 +32,5 @@
       </props>
     </variant>
   </group>
-  <material>player_trans.xml</material>
+  <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml b/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml
index 369f609bbf..827a08a6f0 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/propylaea.xml
@@ -14,6 +14,7 @@
         <texture file="structural/hele_struct.dds" name="baseTex"/>
         <texture file="structural/hele_struct_norm.png" name="normTex"/>
         <texture file="structural/hele_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/athen_propylaea.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -31,5 +32,5 @@
       </props>
     </variant>
   </group>
-  <material>player_trans_parallax_spec.xml</material>
+  <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/meshes/props/propylaea_floortiles.dae b/binaries/data/mods/public/art/meshes/props/propylaea_floortiles.dae
index 3c0d689dab..0e0467487b 100644
--- a/binaries/data/mods/public/art/meshes/props/propylaea_floortiles.dae
+++ b/binaries/data/mods/public/art/meshes/props/propylaea_floortiles.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96136d33d2385af8c95bf3d830f289bbbfa228a082ee3fc4a82d521323b8c3de
-size 137167
+oid sha256:84dfad52f7aaeac217a60bc9b78b67faba1865865d6165d083421179b7b1fefc
+size 114754
diff --git a/binaries/data/mods/public/art/meshes/props/propylaea_props.dae b/binaries/data/mods/public/art/meshes/props/propylaea_props.dae
index 1bd4dc25ce..d79cde539c 100644
--- a/binaries/data/mods/public/art/meshes/props/propylaea_props.dae
+++ b/binaries/data/mods/public/art/meshes/props/propylaea_props.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:447876d16787ea495288642c361cb4677e030515bcb6485a77ace428b0c810ba
-size 326555
+oid sha256:39e9c6e65435fbe3884936b5fc53b8b9ce8c6a8daa38acbeed02cf446ab95b14
+size 284496
diff --git a/binaries/data/mods/public/art/meshes/props/propylaea_rooftiles.dae b/binaries/data/mods/public/art/meshes/props/propylaea_rooftiles.dae
index 31d8e24a7b..81a48dea3d 100644
--- a/binaries/data/mods/public/art/meshes/props/propylaea_rooftiles.dae
+++ b/binaries/data/mods/public/art/meshes/props/propylaea_rooftiles.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:415db7cfd5294c01dda3c63259f4162bcb28bbf9d4fde73a2cbce62fde638b76
-size 12633
+oid sha256:46bfdc7a1c494d73c449f71aa5aa1545f69faafbba19a1b5a2c498aa109ab063
+size 6943
diff --git a/binaries/data/mods/public/art/meshes/props/propylaea_walls.dae b/binaries/data/mods/public/art/meshes/props/propylaea_walls.dae
index c1e113da7e..29b61c7449 100644
--- a/binaries/data/mods/public/art/meshes/props/propylaea_walls.dae
+++ b/binaries/data/mods/public/art/meshes/props/propylaea_walls.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff1cba342265d894f4a75c1305a31b6038b380c0484f8b78294d9dd12fc4f7fb
-size 32213
+oid sha256:ad058f4648c4914f47bd37cda14f8fd90649af5848ae20e359ed8ad4cca1af3b
+size 22991
diff --git a/binaries/data/mods/public/art/meshes/structural/propylaea.dae b/binaries/data/mods/public/art/meshes/structural/propylaea.dae
index 91173ee821..9c1786d80d 100644
--- a/binaries/data/mods/public/art/meshes/structural/propylaea.dae
+++ b/binaries/data/mods/public/art/meshes/structural/propylaea.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73481a21b917be08ad440975ec0cf1b5028efe28e7a21fe5cb7ed390fb6925db
-size 38343
+oid sha256:f0e6ac6e3b582272a1f02d72e83f23c649e9695726c1969e9fcc717cd9d8d70f
+size 30764
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/athen_propylaea.png b/binaries/data/mods/public/art/textures/skins/structural/ao/athen_propylaea.png
new file mode 100644
index 0000000000..b69aa93fc8
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/structural/ao/athen_propylaea.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50e78c8501449561327c87333f3a7d71d9b74e740717490835d882d6af25e700
+size 600474