Fix garrison flags on Mauryan buildings + clean up some actors

This was SVN commit r18310.
This commit is contained in:
sanderd17 2016-06-03 14:21:07 +00:00
parent 81eb22d01a
commit 4048c0e03c
20 changed files with 65 additions and 52 deletions

View file

@ -42,12 +42,15 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View file

@ -9,28 +9,27 @@
<mesh>structural/maur_cc_struct.dae</mesh>
<props>
<prop actor="props/structures/mauryans/cc_lions.xml" attachpoint="root"/>
<prop actor="props/structures/mauryans/cc_pillars.xml" attachpoint="root"/>
<prop actor="props/structures/mauryans/cc_pillars.xml" attachpoint="root"/>
<prop actor="props/structures/mauryans/cc_plants.xml" attachpoint="root"/>
<prop actor="props/structures/mauryans/cc_struct_b.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/structures/mauryans/cc_struct_b.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
<texture file="structural/ao/maur_civic_ao.png" name="aoTex"/>
</textures>
<textures>
<texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
<texture file="structural/ao/maur_civic_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>

View file

@ -16,7 +16,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>

View file

@ -19,7 +19,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>

View file

@ -29,12 +29,15 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
@ -46,4 +49,4 @@
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
</actor>

View file

@ -2,49 +2,38 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="House A">
<mesh>structural/maur_house_a.dae</mesh>
<props>
<prop actor="props/structures/mauryans/house_a_struct_b.xml" attachpoint="root"/>
</props>
<variant name="base" frequency="1">
<textures>
<texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="House A">
<mesh>structural/maur_house_a.dae</mesh>
<props>
<prop actor="props/structures/mauryans/house_a_struct_b.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="1" name="House B">
<mesh>structural/maur_house_b.dae</mesh>
<props>
<prop actor="props/structures/mauryans/house_b_struct_b.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="House C">
<mesh>structural/maur_house_c.dae</mesh>
<props>
<prop actor="props/structures/mauryans/house_c_struct_b.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="House D">
<mesh>structural/maur_house_d.dae</mesh>
<props>
<prop actor="props/structures/mauryans/house_d_struct_b.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>

View file

@ -10,9 +10,10 @@
<prop actor="props/structures/mauryans/market_struct_b.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
</props>
<textures><texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
<textures>
<texture file="structural/maur_struct.png" name="baseTex"/>
<texture file="structural/maur_struct_spec.png" name="specTex"/>
<texture file="structural/maur_struct_norm.png" name="normTex"/>
<texture file="structural/ao/maur_market_ao.png" name="aoTex"/>
</textures>
</variant>

View file

@ -15,12 +15,15 @@
</variant>
</group>
<group>
<variant name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View file

@ -16,12 +16,15 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View file

@ -26,12 +26,15 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View file

@ -27,12 +27,15 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View file

@ -17,7 +17,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>

View file

@ -16,12 +16,15 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View file

@ -8,7 +8,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>

View file

@ -22,7 +22,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>

View file

@ -17,7 +17,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>

View file

@ -17,7 +17,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>

View file

@ -17,7 +17,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>

View file

@ -19,12 +19,15 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>

View file

@ -20,7 +20,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_mauryans.xml" attachpoint="garrisoned"/>