mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-07-04 05:55:47 -07:00
Fix garrison flags on Ptolemaeic buildings + clean up some actors
This was SVN commit r18319.
This commit is contained in:
parent
6377670543
commit
c0f0f6fb53
26 changed files with 75 additions and 71 deletions
|
|
@ -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_ptol.xml" attachpoint="garrisoned"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -18,12 +18,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_ptol.xml" attachpoint="garrisoned"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -30,13 +30,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_ptol.xml" attachpoint="garrisoned"/>
|
||||
<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned2"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -18,12 +18,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 actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -21,12 +21,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_ptol.xml" attachpoint="garrisoned"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="ungarrisoned" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
|
|
|
|||
|
|
@ -18,12 +18,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"/>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
<actor version="1">
|
||||
<castshadow/>
|
||||
<group>
|
||||
<variant frequency="1" name="House A">
|
||||
<mesh>structural/ptol_house_a.dae</mesh>
|
||||
<variant name="base" frequency="1">
|
||||
<props>
|
||||
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
|
||||
</props>
|
||||
|
|
@ -11,72 +10,49 @@
|
|||
<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"/>
|
||||
</textures>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="1" name="House A">
|
||||
<mesh>structural/ptol_house_a.dae</mesh>
|
||||
<textures>
|
||||
<texture file="structural/ao/ptol_house_a.png" name="aoTex"/>
|
||||
</textures>
|
||||
</variant>
|
||||
<variant frequency="1" name="House B">
|
||||
<mesh>structural/ptol_house_b.dae</mesh>
|
||||
<props>
|
||||
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
|
||||
</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/ptol_house_b.png" name="aoTex"/>
|
||||
</textures>
|
||||
</variant>
|
||||
<variant frequency="1" name="House C">
|
||||
<mesh>structural/ptol_house_c.dae</mesh>
|
||||
<props>
|
||||
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
|
||||
</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/ptol_house_c.png" name="aoTex"/>
|
||||
</textures>
|
||||
</variant>
|
||||
<variant frequency="1" name="House D">
|
||||
<mesh>structural/ptol_house_d.dae</mesh>
|
||||
<props>
|
||||
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
|
||||
</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/ptol_house_d.png" name="aoTex"/>
|
||||
</textures>
|
||||
</variant>
|
||||
<variant frequency="1" name="House E">
|
||||
<mesh>structural/ptol_house_e.dae</mesh>
|
||||
<props>
|
||||
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
|
||||
</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/ptol_house_e.png" name="aoTex"/>
|
||||
</textures>
|
||||
</variant>
|
||||
<variant frequency="1" name="House F">
|
||||
<mesh>structural/ptol_house_f.dae</mesh>
|
||||
<props>
|
||||
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
|
||||
</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/ptol_house_f.png" name="aoTex"/>
|
||||
</textures>
|
||||
</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"/>
|
||||
|
|
|
|||
|
|
@ -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_ptol.xml" attachpoint="garrisoned"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<actor version="1">
|
||||
<castshadow/>
|
||||
<group>
|
||||
<variant frequency="100" name="Roman Army Camp">
|
||||
<variant frequency="100" name="Settlement">
|
||||
<animations>
|
||||
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
|
||||
</animations>
|
||||
|
|
@ -29,24 +29,22 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="ungarrisoned" frequency="1"/>
|
||||
<variant name="garrisoned">
|
||||
<props>
|
||||
<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
<prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
|
||||
<prop actor="props/structures/ptolemies/settlement_campfire.xml" attachpoint="campfire" minheight="-20" maxheight="20"/>
|
||||
<prop actor="props/structures/ptolemies/settlement_outpost.xml" attachpoint="outpost" minheight="-20" maxheight="20"/>
|
||||
<prop actor="props/structures/ptolemies/settlement_greektent.xml" attachpoint="greektent" minheight="-20" maxheight="20"/>
|
||||
<prop actor="props/structures/ptolemies/settlement_arabtent.xml" attachpoint="arabtent" minheight="-20" maxheight="20"/>
|
||||
<prop actor="props/structures/ptolemies/settlement_bigtent.xml" attachpoint="bigtent" minheight="-20" maxheight="20"/>
|
||||
<prop actor="props/structures/ptolemies/settlement_entrance.xml" attachpoint="root" minheight="-20" maxheight="20"/>
|
||||
<prop actor="props/structures/ptolemies/settlement_entrance.xml" attachpoint="root"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant frequency="100" name="Idle"/>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
|
||||
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
|
||||
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<actor version="1">
|
||||
<castshadow/>
|
||||
<group>
|
||||
<variant frequency="100" name="Ptolemaic Fortress">
|
||||
<variant frequency="100" name="Ptolemaic Temple">
|
||||
<mesh>structural/ptol_temple.dae</mesh>
|
||||
<props>
|
||||
<prop actor="props/structures/ptolemies/temple_paintings.xml" attachpoint="root"/>
|
||||
|
|
@ -18,12 +18,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_ptol.xml" attachpoint="garrisoned"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,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"/>
|
||||
|
|
|
|||
|
|
@ -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_dust_small.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -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_dust_small.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -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_dust_small.xml" attachpoint="root"/>
|
||||
|
|
|
|||
|
|
@ -17,12 +17,15 @@
|
|||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="Idle"/>
|
||||
<variant name="ungarrisoned" frequency="1"/>
|
||||
<variant name="garrisoned">
|
||||
<props>
|
||||
<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<actor version="1">
|
||||
<castshadow/>
|
||||
<group>
|
||||
<variant frequency="100" name="Ptolemaic Fortress">
|
||||
<variant frequency="100" name="Edfu">
|
||||
<mesh>structural/ptol_edfu_struct.dae</mesh>
|
||||
<props>
|
||||
<prop actor="props/structures/ptolemies/edfu_paintings.xml" attachpoint="root"/>
|
||||
|
|
@ -19,7 +19,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_ptol.xml" attachpoint="garrisoned"/>
|
||||
|
|
@ -28,6 +28,9 @@
|
|||
<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned4"/>
|
||||
</props>
|
||||
</variant>
|
||||
</group>
|
||||
<group>
|
||||
<variant name="alive" frequency="1"/>
|
||||
<variant name="death">
|
||||
<props>
|
||||
<prop attachpoint="garrisoned"/>
|
||||
|
|
|
|||
|
|
@ -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_ptol.xml" attachpoint="garrisoned"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue