mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-26 12:28:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix garrison flags on Athenian structures + clean up the Athenian structure actors

Browse Source 
This was SVN commit r18291.
This commit is contained in:
sanderd17
2016-06-02 19:35:59 +00:00
parent 5be948019b
commit d4fa905cb1
24 changed files with 95 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/actors/structures/athenians/barracks.xml
+8 -5
View File
@@ -13,19 +13,22 @@
<prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/hele_struct.dds" name="baseTex"/>
<texture file="structural/hele_struct_norm.png" name="normTex"/>
<texture file="structural/hele_struct_spec.png" name="specTex"/>
<texture file="structural/ao/athen_barracks.png" name="aoTex"/></textures>
<texture file="structural/hele_struct.dds" name="baseTex"/>
<texture file="structural/hele_struct_norm.png" name="normTex"/>
<texture file="structural/hele_struct_spec.png" name="specTex"/>
<texture file="structural/ao/athen_barracks.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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
binaries/data/mods/public/art/actors/structures/athenians/civic_centre_new.xml
+4 -1
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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
binaries/data/mods/public/art/actors/structures/athenians/corral.xml
+1 -1
View File
@@ -21,7 +21,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"/>
binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
+1 -1
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"/>
binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
+4 -1
View File
@@ -15,12 +15,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"/>
binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
+4 -1
View File
@@ -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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml
+1 -1
View File
@@ -21,7 +21,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"/>
binaries/data/mods/public/art/actors/structures/athenians/house.xml
+29 -35
View File
@@ -1,38 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="base" frequency="1">
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="3" name="Hellenes House A">
<mesh>structural/hele_house_a.dae</mesh>
<props>
<prop actor="props/structures/hellenes/house_a_shields.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_a_nature.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_a_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_a_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_a_decor.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_a_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_a_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_a_decor.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_house_a.png" name="aoTex"/>
</textures>
</textures>
</variant>
<variant frequency="2" name="Hellenes House B">
<mesh>structural/hele_house_b.dae</mesh>
<props>
<prop actor="props/structures/hellenes/house_b_shields.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_b_nature.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_b_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_b_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_b_decor.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_b_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_b_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_b_decor.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_house_b.png" name="aoTex"/></textures>
</variant>
<variant frequency="2" name="Hellenes House C">
@@ -40,52 +43,43 @@
<props>
<prop actor="props/structures/hellenes/house_c_shields.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_c_nature.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_c_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_c_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_c_decor.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_c_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_c_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_c_decor.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_house_c.png" name="aoTex"/></textures>
</variant>
<variant frequency="4" name="Hellenes House d">
<variant frequency="4" name="Hellenes House D">
<mesh>structural/hele_house_d.dae</mesh>
<props>
<prop actor="props/structures/hellenes/house_d_shields.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_d_nature.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_d_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_d_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_d_decor.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_d_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_d_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_d_decor.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_house_d.png" name="aoTex"/>
</textures>
</textures>
</variant>
<variant frequency="4" name="Hellenes House 3">
<variant frequency="4" name="Hellenes House E">
<mesh>structural/hele_house_e.dae</mesh>
<props>
<prop actor="props/structures/hellenes/house_e_shields.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_e_nature.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_e_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_e_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_e_struct.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/house_e_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_house_e.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="dust"/>
binaries/data/mods/public/art/actors/structures/athenians/market.xml
+1 -2
View File
@@ -12,10 +12,9 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
<prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
binaries/data/mods/public/art/actors/structures/athenians/outpost.xml
+4 -1
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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml
+1 -1
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_med.xml" attachpoint="root"/>
binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml
+4 -1
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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="" attachpoint="garrisoned"/>
binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
+4 -1
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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml
+6 -6
View File
@@ -12,15 +12,15 @@
<prop actor="props/structures/decals/celt_sb1_mud.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_storehouse.png" name="aoTex"/>
</textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_storehouse.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"/>
binaries/data/mods/public/art/actors/structures/athenians/temple.xml
+1 -2
View File
@@ -18,10 +18,9 @@
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
<prop actor="particle/destruction_smoke_med.xml" attachpoint="smoke"/>
<prop actor="particle/destruction_dust_med.xml" attachpoint="smoke"/>
<prop actor="particle/destruction_dust_med_gray.xml" attachpoint="smoke"/>
binaries/data/mods/public/art/actors/structures/athenians/temple_b.xml
+4 -1
View File
@@ -12,12 +12,15 @@
</variant>
</group>
<group>
<variant 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"/>
binaries/data/mods/public/art/actors/structures/athenians/temple_c.xml
+4 -1
View File
@@ -12,12 +12,15 @@
</variant>
</group>
<group>
<variant 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"/>
binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml
+4 -1
View File
@@ -15,12 +15,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"/>
binaries/data/mods/public/art/actors/structures/athenians/wall.xml
+2 -2
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"/>
@@ -18,4 +18,4 @@
</variant>
</group>
<material>player_trans.xml</material>
</actor>
</actor>
binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml
+1 -1
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_med.xml" attachpoint="root"/>
binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml
+1 -1
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"/>
binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml
+1 -1
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"/>
binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml
+1 -1
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"/>
binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml
+4 -1
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_hele.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>