real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fix garrison flags on Persian buildings + clean up some actors

Browse Source 
This was SVN commit r18311.
This commit is contained in:
sanderd17 2016-06-03 15:12:07 +00:00
parent 4048c0e03c
commit 3cf766126b
26 changed files with 110 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/art/actors/structures/persians/pers_tower_test.xml → binaries/data/mods/public/art/actors/special/old/pers_tower_test.xml
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_small.xml" attachpoint="root"/>

5
binaries/data/mods/public/art/actors/structures/mercenaries/camp_egyptian.xml
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_ptol.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

5
binaries/data/mods/public/art/actors/structures/persians/barracks.xml
View File

@ -24,12 +24,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"/>

5
binaries/data/mods/public/art/actors/structures/persians/civil_centre.xml
View File

@ -26,12 +26,15 @@
</variant>
</group>
<group>
<variant frequency="1" 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"/>

2
binaries/data/mods/public/art/actors/structures/persians/corral.xml
View File

@ -14,7 +14,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
binaries/data/mods/public/art/actors/structures/persians/farmstead.xml
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"/>

5
binaries/data/mods/public/art/actors/structures/persians/fortress.xml
View File

@ -36,12 +36,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"/>

23
binaries/data/mods/public/art/actors/structures/persians/house.xml
View File

@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="base" frequency="1">
<textures>
<texture file="structural/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="House A">
<mesh>structural/pers_house_a.dae</mesh>
@ -9,9 +18,6 @@
<prop actor="props/structures/persians/house_a_plants.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
<texture file="structural/ao/pers_house_a.png" name="aoTex"/>
</textures>
</variant>
@ -21,9 +27,6 @@
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
<texture file="structural/ao/pers_house_b.png" name="aoTex"/>
</textures>
</variant>
@ -34,9 +37,6 @@
<prop actor="props/structures/persians/house_c_plants.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
<texture file="structural/ao/pers_house_c.png" name="aoTex"/>
</textures>
</variant>
@ -47,15 +47,12 @@
<prop actor="props/structures/persians/house_d_plants.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
<texture file="structural/ao/pers_house_d.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"/>

8
binaries/data/mods/public/art/actors/structures/persians/market.xml
View File

@ -26,9 +26,6 @@
<prop actor="props/structures/persians/market_a_stall7.xml" attachpoint="stall7" minheight="-20" maxheight="2"/>
</props>
<textures>
<texture file="structural/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
<texture file="structural/ao/pers_market_a.png" name="aoTex"/>
</textures>
</variant>
@ -44,15 +41,12 @@
<prop actor="props/structures/persians/market_b_stall7.xml" attachpoint="stall7" minheight="-20" maxheight="2"/>
</props>
<textures>
<texture file="structural/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
<texture file="structural/ao/pers_market_b.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_med.xml" attachpoint="root"/>

5
binaries/data/mods/public/art/actors/structures/persians/outpost.xml
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"/>

2
binaries/data/mods/public/art/actors/structures/persians/palace.xml
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_large.xml" attachpoint="root"/>

5
binaries/data/mods/public/art/actors/structures/persians/sb1_new.xml
View File

@ -11,12 +11,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"/>

2
binaries/data/mods/public/art/actors/structures/persians/sb2.xml
View File

@ -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_large.xml" attachpoint="root"/>

32
binaries/data/mods/public/art/actors/structures/persians/scout_tower.xml
View File

@ -2,27 +2,10 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="scouttowera">
<variant name="base" frequency="1">
<animations>
<animation event="0.5" load="0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/pers_scout_tower_a.dae</mesh>
<props>
<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/pers_struct.png" name="baseTex"/>
<texture file="structural/pers_struct_norm.png" name="normTex"/>
<texture file="structural/pers_struct_spec.png" name="specTex"/>
<texture file="structural/ao/pers_defense_tower.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="scouttowerb">
<animations>
<animation event="0.5" load="0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/pers_scout_tower_a.dae</mesh>
<props>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
@ -36,12 +19,23 @@
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant frequency="1" name="scouttowera">
<mesh>structural/pers_scout_tower_a.dae</mesh>
</variant>
<variant frequency="1" name="scouttowerb">
<mesh>structural/pers_scout_tower_a.dae</mesh>
</variant>
</group>
<group>
<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"/>

5
binaries/data/mods/public/art/actors/structures/persians/stables.xml
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_persians.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>

2
binaries/data/mods/public/art/actors/structures/persians/storehouse.xml
View File

@ -15,7 +15,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"/>

5
binaries/data/mods/public/art/actors/structures/persians/temple.xml
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"/>

2
binaries/data/mods/public/art/actors/structures/persians/wall.xml
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"/>

2
binaries/data/mods/public/art/actors/structures/persians/wall_gate.xml
View File

@ -14,7 +14,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"/>

2
binaries/data/mods/public/art/actors/structures/persians/wall_long.xml
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"/>

2
binaries/data/mods/public/art/actors/structures/persians/wall_medium.xml
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"/>

2
binaries/data/mods/public/art/actors/structures/persians/wall_short.xml
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"/>

5
binaries/data/mods/public/art/actors/structures/persians/wall_tower.xml
View File

@ -13,12 +13,15 @@
</variant>
</group>
<group>
<variant frequency="1" 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"/>

2
binaries/data/mods/public/art/actors/structures/persians/wooden_tower.xml
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_persians.xml" attachpoint="garrisoned"/>