From c71b521dadfde1e56efe97ecca9d8bee190e92a1 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Mon, 19 Feb 2018 22:35:18 +0000
Subject: [PATCH] New Blemmye camp for Kushites Issue:
 https://github.com/0ADMods/kushites/issues/63

This was SVN commit r21275.
---
 .../props/structures/kushites/tent_props.xml  | 19 +++++++++
 .../structures/mercenaries/camp_blemmye.xml   | 40 +++++++++++++++++++
 .../art/actors/structures/tent_kush.xml       | 19 +++++++++
 .../structural/kush_mercenary_camp_01.dae     |  3 ++
 .../art/meshes/structural/tent_kush_props.dae |  3 ++
 .../structures/kush_blemmye_camp.xml          |  6 +--
 6 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/structures/kushites/tent_props.xml
 create mode 100644 binaries/data/mods/public/art/actors/structures/mercenaries/camp_blemmye.xml
 create mode 100644 binaries/data/mods/public/art/actors/structures/tent_kush.xml
 create mode 100644 binaries/data/mods/public/art/meshes/structural/kush_mercenary_camp_01.dae
 create mode 100644 binaries/data/mods/public/art/meshes/structural/tent_kush_props.dae

diff --git a/binaries/data/mods/public/art/actors/props/structures/kushites/tent_props.xml b/binaries/data/mods/public/art/actors/props/structures/kushites/tent_props.xml
new file mode 100644
index 0000000000..e8f29b9636
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/kushites/tent_props.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <mesh>structural/tent_kush_props.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/kush_nubian_hex_e.xml" attachpoint="shield"/>
+      </props>
+      <textures>
+        <texture file="structural/ptol_struct.png" name="baseTex"/>
+        <texture file="structural/ptol_struct_norm.png" name="normTex"/>
+        <texture file="structural/ptol_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/tent_greek.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/mercenaries/camp_blemmye.xml b/binaries/data/mods/public/art/actors/structures/mercenaries/camp_blemmye.xml
new file mode 100644
index 0000000000..284cf561c0
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/mercenaries/camp_blemmye.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/kush_mercenary_camp_01.dae</mesh>
+      <props>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
+        <prop actor="structures/tent_kush.xml" attachpoint="kush_tent_01" minheight="-20" maxheight="20"/>
+        <prop actor="structures/tent_big.xml" attachpoint="kush_tent_03" minheight="-20" maxheight="20"/>
+        <prop actor="structures/tent_arab.xml" attachpoint="kush_tent_02" minheight="-20" maxheight="20"/>
+        <prop actor="structures/tent_arab.xml" attachpoint="kush_tent_04" minheight="-20" maxheight="20"/>
+        <prop actor="props/special/eyecandy/well_woodbit.xml" attachpoint="camel_barrier_01" minheight="-20" maxheight="20"/>
+        <prop actor="props/special/eyecandy/well_woodbit.xml" attachpoint="camel_barrier_02" minheight="-20" maxheight="20"/>
+        <prop actor="units/persians/trader.xml" attachpoint="camel_01" minheight="-20" maxheight="20"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root" minheight="-20" maxheight="20"/>
+        <prop actor="units/persians/trader.xml" attachpoint="camel_02" minheight="-20" maxheight="20"/>
+        <prop actor="fauna/goat.xml" attachpoint="goat_01" minheight="-20" maxheight="20"/>
+        <prop actor="fauna/goat.xml" attachpoint="goat_02" minheight="-20" maxheight="20"/>
+        <prop actor="flora/trees/palm_cretan_date_patch.xml" attachpoint="palm_tree" minheight="-20" maxheight="20"/>
+        <prop actor="props/flora/shrub_tropic_palm.xml" attachpoint="plant" minheight="-20" maxheight="20"/>
+        <prop actor="props/special/eyecandy/campfire_prop.xml" attachpoint="fire_camp" minheight="-20" maxheight="20"/>
+        <prop actor="props/special/eyecandy/campfire_prop.xml" attachpoint="fire_camp" minheight="-20" maxheight="20"/>
+      </props>
+      <textures>
+        <texture file="null_white.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_kush.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/tent_kush.xml b/binaries/data/mods/public/art/actors/structures/tent_kush.xml
new file mode 100644
index 0000000000..7f25073c72
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/tent_kush.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/tent_greek.dae</mesh>
+      <props>
+        <prop actor="props/structures/kushites/tent_props.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/tent_greek.png" name="baseTex"/>
+        <texture file="structural/tent_greek_norm.png" name="normTex"/>
+        <texture file="structural/tent_greek_spec.png" name="specTex"/>
+        <texture file="structural/ao/tent_greek.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/meshes/structural/kush_mercenary_camp_01.dae b/binaries/data/mods/public/art/meshes/structural/kush_mercenary_camp_01.dae
new file mode 100644
index 0000000000..39e461089d
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/kush_mercenary_camp_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5eee026b0b164353f2c82d554f2af85a4f3c89b5fea925194b17f3d101f61a53
+size 7003
diff --git a/binaries/data/mods/public/art/meshes/structural/tent_kush_props.dae b/binaries/data/mods/public/art/meshes/structural/tent_kush_props.dae
new file mode 100644
index 0000000000..ceaf49c629
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/tent_kush_props.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ceb041a9ca00fec9d6a95e54bd2a34593c00923c15973508d32f3c1f7793bd8a
+size 24764
diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml b/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
index 138bbabba1..abf26bc361 100644
--- a/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
@@ -17,7 +17,7 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="25.5" depth="25.5"/>
+    <Square width="29.0" depth="29.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
@@ -34,7 +34,7 @@
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
-    <Static width="23.5" depth="23.5"/>
+    <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
@@ -64,7 +64,7 @@
   </Sound>
   <TerritoryInfluence disable=""/>
   <VisualActor>
-    <Actor>structures/mercenaries/camp_egyptian.xml</Actor>
+    <Actor>structures/mercenaries/camp_blemmye.xml</Actor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>