1
0
forked from 0ad/0ad

Fix garrison flags on Roman buildings + clean up some actors

This was SVN commit r18320.
This commit is contained in:
sanderd17 2016-06-04 11:58:10 +00:00
parent c0f0f6fb53
commit 9a38ae6455
25 changed files with 87 additions and 69 deletions

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_rome.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View File

@ -6,26 +6,25 @@
<mesh>structural/rome_blacksmith_struct_b.dae</mesh>
<props>
<prop actor="props/structures/romans/blacksmith_armorlegion.xml" attachpoint="root"/>
<prop actor="props/structures/romans/blacksmith_armorstand_armor.xml" attachpoint="rome-armorstand"/>
<prop actor="props/structures/romans/blacksmith_armorstand_wood.xml" attachpoint="rome-armorstand"/>
<prop actor="props/structures/romans/blacksmith_barrel.xml" attachpoint="barrel"/>
<prop actor="props/structures/romans/blacksmith_armorstand_armor.xml" attachpoint="rome-armorstand"/>
<prop actor="props/structures/romans/blacksmith_armorstand_wood.xml" attachpoint="rome-armorstand"/>
<prop actor="props/structures/romans/blacksmith_barrel.xml" attachpoint="barrel" minheight="-20" maxheight="20"/>
<prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
<prop actor="particle/flame.xml" attachpoint="fire"/>
<prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
<prop actor="props/structures/romans/blacksmith_barrels.xml" attachpoint="romebarrels"/>
<prop actor="props/structures/romans/blacksmith_bucket_water.xml" attachpoint="bucket"/>
<prop actor="props/structures/romans/blacksmith_bucket.xml" attachpoint="bucket"/>
<prop actor="props/structures/romans/blacksmith_shields.xml" attachpoint="romeshields"/>
<prop actor="props/units/heads/rome_monte_e.xml" attachpoint="rome_helmet_b"/>
<prop actor="props/units/heads/rome_monte_simple.xml" attachpoint="rome_helmet_b1"/>
<prop actor="props/units/heads/rome_helmet_hero.xml" attachpoint="rome_helmet_c"/>
<prop actor="props/units/heads/rome_monte_simple.xml" attachpoint="rome_helmet_c1"/>
<prop actor="props/units/heads/rome_imp_gallic_g_cent.xml" attachpoint="rome_helmet_c2"/>
<prop actor="props/units/heads/rome_monte_e.xml" attachpoint="rome_helmet_c_3"/>
<prop actor="props/structures/romans/blacksmith_barrels.xml" attachpoint="romebarrels" minheight="-20" maxheight="20"/>
<prop actor="props/structures/romans/blacksmith_bucket_water.xml" attachpoint="bucket" minheight="-20" maxheight="20"/>
<prop actor="props/structures/romans/blacksmith_bucket.xml" attachpoint="bucket" minheight="-20" maxheight="20"/>
<prop actor="props/structures/romans/blacksmith_shields.xml" attachpoint="romeshields" minheight="-20" maxheight="20"/>
<prop actor="props/units/heads/rome_monte_e.xml" attachpoint="rome_helmet_b"/>
<prop actor="props/units/heads/rome_monte_simple.xml" attachpoint="rome_helmet_b1"/>
<prop actor="props/units/heads/rome_helmet_hero.xml" attachpoint="rome_helmet_c"/>
<prop actor="props/units/heads/rome_monte_simple.xml" attachpoint="rome_helmet_c1"/>
<prop actor="props/units/heads/rome_imp_gallic_g_cent.xml" attachpoint="rome_helmet_c2"/>
<prop actor="props/units/heads/rome_monte_e.xml" attachpoint="rome_helmet_c_3"/>
</props>
<textures>
<texture file="structural/rome_struct_2.png" name="baseTex"/>

View File

@ -28,7 +28,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_rome.xml" attachpoint="garrisoned"/>
@ -37,6 +37,9 @@
<prop actor="props/special/common/garrison_flag_rome.xml" attachpoint="garrisoned4"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View File

@ -22,12 +22,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_rome.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View File

@ -18,7 +18,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

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

View File

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

View File

@ -4,22 +4,15 @@
<group>
<variant frequency="1" name="House A">
<mesh>structural/roman_house_a.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures><texture file="structural/ao/rome_house_a.png" name="aoTex"/></textures>
</variant>
<variant frequency="1" name="House B">
<mesh>structural/roman_house_b.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures><texture file="structural/ao/rome_house_b.png" name="aoTex"/></textures>
</variant>
<variant frequency="1" name="House C">
<mesh>structural/roman_house_c.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
<prop actor="props/flora/plant_medit_artichoke.xml" attachpoint="plant_a"/>
<prop actor="props/flora/bush_tempe_sm.xml" attachpoint="plant_b"/>
</props>
@ -28,7 +21,6 @@
<variant frequency="1" name="House D">
<mesh>structural/roman_house_d.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
<prop actor="props/flora/plant_medit_artichoke.xml" attachpoint="plant_b"/>
<prop actor="props/flora/bush_tempe_sm.xml" attachpoint="plant_a"/>
</props>
@ -37,6 +29,9 @@
</group>
<group>
<variant>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/rome_struct_2.png" name="baseTex"/>
<texture file="structural/rome_struct_2_norm.png" name="normTex"/>
@ -45,7 +40,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

@ -18,7 +18,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_smoke_large.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_rome.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View File

@ -10,29 +10,6 @@
<props>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
<prop actor="props/structures/romans/rome_tower_wood.xml" attachpoint="root"/>
<prop actor="props/structures/romans/tower_nature.xml" attachpoint="root"/>
<prop actor="props/flora/bush_tempe_underbrush.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/rome_struct_2.png" name="baseTex"/>
<texture file="structural/rome_struct_2_norm.png" name="normTex"/>
<texture file="structural/rome_struct_2_spec.png" name="specTex"/>
<texture file="structural/ao/rome_tower.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="no ivy">
<animations>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/rome_tower.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="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
<prop actor="props/structures/romans/rome_tower_wood.xml" attachpoint="root"/>
<prop actor="props/flora/bush_tempe_underbrush.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/rome_struct_2.png" name="baseTex"/>
@ -43,12 +20,32 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ivy" frequency="1">
<props>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
<prop actor="props/structures/romans/rome_tower_wood.xml" attachpoint="root"/>
<prop actor="props/flora/bush_tempe_underbrush.xml" attachpoint="root"/>
<prop actor="props/structures/romans/tower_nature.xml" attachpoint="root"/>
</props>
</variant>
<variant name="no ivy" frequency="1">
<props>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
<prop actor="props/structures/romans/rome_tower_wood.xml" attachpoint="root"/>
<prop actor="props/flora/bush_tempe_underbrush.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_rome.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_smoke_med.xml" attachpoint="root"/>

View File

@ -21,7 +21,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_rome.xml" attachpoint="garrisoned"/>

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

@ -25,12 +25,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_rome.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View File

@ -14,7 +14,7 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="ungarrisoned" frequency="1"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/waypoint_flag_0ad.xml" 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_rome.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

View File

@ -17,12 +17,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_rome.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -20,12 +20,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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

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_rome.xml" attachpoint="garrisoned"/>