dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Batch of patches from Stanislas69

Browse source 
Fixes #3813
Refs #2524 and #4440

-Fixes stoyas foundations
-Fixes walls foundations
-Fixes carth superdock foundation
-Fixes cape_chariot variant
-Fixes missing referenced files in #2524

This was SVN commit r19131.
This commit is contained in:
Enrique 2017-01-10 19:22:54 +00:00
parent 0a68ace52d
commit ef7fcd4674
25 changed files with 132 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
binaries/data/mods/public/art/actors/props/units/cape_animated_bow_chariot_rider.xml
View file

@ -3,20 +3,15 @@
<castshadow/>
<group>
<variant frequency="1" name="Cape">
<textures><texture file="props/cape_hd.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="3" name="Cape-hd">
<mesh>props/new/capes/cape_hd_long.dae</mesh>
</variant>
</group>
<group>
<textures>
<texture file="props/cape_hd.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/base_archer_chariot_ready.xml">
<variant file="biped/base_archer_chariot_ready.xml"/>
<variant file="biped/attack_ranged_archer.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/gather_praise.xml"/>

15
binaries/data/mods/public/art/actors/structures/fndn_dock_super.xml
View file

@ -3,8 +3,15 @@
<castshadow/>
<float/>
<group>
<variant frequency="1" name="Idle">
<variant frequency="100" name="Super Dock Foundation">
<mesh>structural/found_dock_super.dae</mesh>
<textures>
<texture file="structural/foundation.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle">
<props>
<prop actor="props/structures/construction/found_dock_super_chains.xml" attachpoint="root"/>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
@ -18,9 +25,5 @@
</props>
</variant>
</group>
<group>
<variant frequency="1">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

27
binaries/data/mods/public/art/actors/structures/fndn_wall.xml
View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="foundation wall">
<mesh>structural/found_wall_long_a.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Idle">
<props>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
</props>
</variant>
<variant name="scaffold">
<props>
<prop actor="props/structures/construction/scaffold.xml" attachpoint="root"/>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant frequency="1">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>

44
binaries/data/mods/public/art/actors/structures/fndn_wall_long.xml Normal file
View file

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Long Wall Foundation">
<mesh>structural/found_wall_long_a.dae</mesh>
<props>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator002" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator003" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator004" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick.xml" attachpoint="brick001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick.xml" attachpoint="brick002" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/wood_pile.xml" attachpoint="woodpile001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Box.xml" attachpoint="box001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big3.xml" attachpoint="brickpile001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big1.xml" attachpoint="brickpile002" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big2.xml" attachpoint="brickpile003" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big4.xml" attachpoint="brickpile004" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big2.xml" attachpoint="brickpile005" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big3.xml" attachpoint="brickpile006" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big3.xml" attachpoint="brickpile007" maxheight="20" minheight="-20"/>
</props>
<textures>
<texture file="structural/foundation.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle">
<props>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
</props>
</variant>
<variant name="scaffold">
<props>
<prop actor="props/structures/construction/scaffold.xml" attachpoint="root"/>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

39
binaries/data/mods/public/art/actors/structures/fndn_wall_medium.xml Normal file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Medium Wall Foundation">
<mesh>structural/found_wall_short_a.dae</mesh>
<props>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
<prop actor="props/special/eyecandy/Box.xml" attachpoint="box001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator002" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator003" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Delimitator.xml" attachpoint="delimitator004" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/wood_pile.xml" attachpoint="woodpile001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile1.xml" attachpoint="brickpile001" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile4.xml" attachpoint="brickpile002" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile3.xml" attachpoint="brickpile003" maxheight="20" minheight="-20"/>
<prop actor="props/special/eyecandy/Brick_Pile_Big2.xml" attachpoint="brickpile004" maxheight="20" minheight="-20"/>
</props>
<textures>
<texture file="structural/foundation.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle">
<props>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
</props>
</variant>
<variant name="scaffold">
<props>
<prop actor="props/structures/construction/scaffold.xml" attachpoint="root"/>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

16
binaries/data/mods/public/art/actors/structures/fndn_wall_short.xml
View file

@ -2,8 +2,14 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="foundation wall short">
<mesh>structural/found_wall_med_a.dae</mesh>
<variant frequency="100" name="Short Wall Foundation">
<mesh>structural/found_wall_short_a.dae</mesh>
<props>
<prop actor="particle/construction_dust.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/foundation.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
@ -19,9 +25,5 @@
</props>
</variant>
</group>
<group>
<variant frequency="1">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

1
binaries/data/mods/public/art/actors/structures/gauls/storehouse.xml
View file

@ -14,7 +14,6 @@
<texture file="structural/celt_struct.dds" name="baseTex"/>
<texture file="structural/celt_struct_norm.png" name="normTex"/>
<texture file="structural/celt_struct_spec.png" name="specTex"/>
<texture file="structural/ao/gaul_storehouse_ao.png" name="aoTex"/>
</textures>
</variant>
</group>

2
binaries/data/mods/public/art/actors/units/celts/vercingetorix.xml
View file

@ -5,7 +5,7 @@
<variant file="biped/base_swordsman_shield_ready.xml">
<mesh>skeletal/new/m_armor_pants_tunic_long.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_vercingentorix.xml" attachpoint="head"/>
<prop actor="props/units/heads/new/head_vercingetorix.xml" attachpoint="head"/>
<prop actor="props/units/shields/celt_vercingetorix.xml" attachpoint="shield"/>
<prop actor="props/units/weapons/csword.xml" attachpoint="weapon_R"/>
<prop actor="props/temp/l_sheath.xml" attachpoint="sheath_L"/>

3
binaries/data/mods/public/art/meshes/structural/found_wall_med_a.dae
View file

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:07858413a693385c5f8b77c895c7a00ebc4818200c5283ae8b7c67be5b7331e6
size 137161

4
binaries/data/mods/public/art/meshes/structural/kart_superdock.dae
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dba8d1a9e502da289e957e451645a8022ae66d79ce66993a05e4afb8fc41cc2e
size 634527
oid sha256:d7dc87ec8e3984913763d3220dd3964f9478f8e3028dc7fec70df96a1f3b6b97
size 630436

3
binaries/data/mods/public/art/textures/skins/skeletal/imp_cavalry_javelinist_1.png Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:872f55a0dbdd71206d661196365d8f5bcfb7327378556c75ffcc561188dc6085
size 133175

3
binaries/data/mods/public/art/textures/skins/skeletal/imp_infantry_swordsman_b_spec.png Normal file
View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d53d5db89659506abf6d0c01a9f9702ebd1b09a20184be505589d8e1ca278e5
size 100339

4
binaries/data/mods/public/art/textures/skins/structural/ao/kart_superdock.png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db25a1926601370560f6e4d2589777c337bfe6662b04fc00123e5096de899566
size 539808
oid sha256:25a945f880acac817ed4affadca5cf0bc569a839a980fb4aefc02e4e5f93840a
size 437979

2
binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml
View file

@ -46,6 +46,6 @@
</Vision>
<VisualActor>
<Actor>special/greek_stoa.xml</Actor>
<FoundationActor>structures/fndn_wall.xml</FoundationActor>
<FoundationActor>structures/fndn_6x4.xml</FoundationActor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_rubble">
<VisualActor>
<Actor>structures/fndn_wall.xml</Actor>
<Actor>structures/fndn_wall_long.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
View file

@ -49,6 +49,6 @@
</TerritoryInfluence>
<VisualActor>
<Actor>special/pers_ishtar_gate.xml</Actor>
<FoundationActor>structures/fndn_wall.xml</FoundationActor>
<FoundationActor>structures/fndn_wall_long.xml</FoundationActor>
</VisualActor>
</Entity>

1
binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
View file

@ -41,7 +41,6 @@
<TerritoryInfluence disable=""/>
<VisualActor>
<Actor>structures/romans/siege_wall_gate.xml</Actor>
<FoundationActor>structures/fndn_wall.xml</FoundationActor>
</VisualActor>
<WallPiece>
<Length>36.0</Length>

1
binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
View file

@ -73,7 +73,6 @@
</Upgrade>
<VisualActor>
<Actor>structures/romans/siege_wall_long.xml</Actor>
<FoundationActor>structures/fndn_wall.xml</FoundationActor>
</VisualActor>
<WallPiece>
<Length>36.0</Length>

1
binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
View file

@ -58,7 +58,6 @@
<TerritoryInfluence disable=""/>
<VisualActor>
<Actor>structures/romans/siege_wall_medium.xml</Actor>
<FoundationActor>structures/fndn_wall_short.xml</FoundationActor>
</VisualActor>
<WallPiece>
<Length>24.0</Length>

2
binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
View file

@ -63,6 +63,6 @@
</Vision>
<VisualActor>
<Actor>special/greek_stoa_great.xml</Actor>
<FoundationActor>structures/fndn_wall.xml</FoundationActor>
<FoundationActor>structures/fndn_6x4.xml</FoundationActor>
</VisualActor>
</Entity>

3
binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
View file

@ -53,7 +53,4 @@
<Vision>
<Range>20</Range>
</Vision>
<VisualActor>
<FoundationActor>structures/fndn_wall.xml</FoundationActor>
</VisualActor>
</Entity>

3
binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
View file

@ -32,4 +32,7 @@
</SoundGroups>
</Sound>
<Upgrade disable=""/>
<VisualActor>
<FoundationActor>structures/template_structure_defense_wall_long.xml</FoundationActor>
</VisualActor>
</Entity>

3
binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
View file

@ -49,4 +49,7 @@
<Time>10</Time>
</Gate>
</Upgrade>
<VisualActor>
<FoundationActor>structures/fndn_wall_long.xml</FoundationActor>
</VisualActor>
</Entity>

3
binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
View file

@ -30,4 +30,7 @@
<Max>2000</Max>
<SpawnEntityOnDeath>rubble/rubble_stone_wall_medium</SpawnEntityOnDeath>
</Health>
<VisualActor>
<FoundationActor>structures/fndn_wall_medium.xml</FoundationActor>
</VisualActor>
</Entity>

3
binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml
View file

@ -10,4 +10,7 @@
<Max>1000</Max>
<SpawnEntityOnDeath>rubble/rubble_stone_wall_short</SpawnEntityOnDeath>
</Health>
<VisualActor>
<FoundationActor>structures/fndn_wall_short.xml</FoundationActor>
</VisualActor>
</Entity>