sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Shield tweaks.

Browse Source 
This was SVN commit r11467.
This commit is contained in:
Michael D. Hafer 2012-04-10 01:25:03 +00:00
parent b3e519c278
commit 764b173f6e
32 changed files with 114 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/data/mods/internal/art/actors/campaigns/units/mace_alexander.xml
View File

@ -7,4 +7,5 @@
<texture>campaigns/units/mace_alexander.png</texture>
</variant>
</group>
<material>basic_spec.xml</material>
</actor>

2
binaries/data/mods/internal/art/actors/campaigns/units/mace_soldier.xml
View File

@ -7,5 +7,5 @@
<texture>campaigns/units/mace_soldier.png</texture>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_spec.xml</material>
</actor>

47
binaries/data/mods/internal/art/actors/props/units/heads/mace_hetairoi.xml Normal file
View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Helmet-Boeotian-Plume">
<mesh>props/helmet/hele_helmet_u.dae</mesh>
<texture>props/helmet/hele_a1.dds</texture>
</variant>
<variant frequency="1" name="Helmet-Boeotian-NoPlume">
<mesh>props/helmet/hele_helmet_t.dae</mesh>
<texture>props/helmet/hele_a1.dds</texture>
</variant>
<variant frequency="2" name="Helmet-Boeotian-Tinned-Wreath">
<mesh>props/helmet/hele_helmet_u.dae</mesh>
<texture>props/helmet/hele_a2.dds</texture>
</variant>
<variant frequency="1" name="Helmet-Boeotian-Plume-Tinned">
<mesh>props/helmet/hele_helmet_u.dae</mesh>
<texture>props/helmet/hele_a4.dds</texture>
</variant>
<variant frequency="1" name="Helmet-Thracian-Early">
<mesh>props/helmet/mace_helmet_g.dae</mesh>
<texture>props/helmet/mace_c.dds</texture>
</variant>
<variant frequency="1" name="Helmet-Thracian-Early-Plume">
<mesh>props/helmet/mace_helmet_h.dae</mesh>
<texture>props/helmet/mace_c.dds</texture>
</variant>
<variant frequency="2" name="Helmet-Thracian-Crested">
<mesh>props/helmet/helmet_thracian_4.dae</mesh>
<texture>props/helmet/mace_c.dds</texture>
</variant>
<variant frequency="1" name="Helmet-Chalcidean-Crested">
<mesh>props/helmet/mace_helmet_o.dae</mesh>
<texture>props/helmet/mace-g.dds</texture>
</variant>
<variant frequency="1" name="Helmet-Attic-Crested">
<mesh>props/helmet/hele_helmet_s.dae</mesh>
<texture>props/helmet/hele_h1.dds</texture>
</variant>
<variant frequency="2" name="Helmet-UnknownStyle-Crested">
<mesh>props/helmet/mace_helmet_m.dae</mesh>
<texture>props/helmet/mace-h.dds</texture>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>

4
binaries/data/mods/internal/art/actors/props/units/shields/mace_argyraspides.xml
View File

@ -5,7 +5,7 @@
<variant frequency="1" name="base">
<mesh>props/shield/aspis_f.dae</mesh>
<props>
<prop actor="props/units/shields/mace_aspis_back_purple.xml" attachpoint="root"/>
<prop actor="props/units/shields/mace_aspis_back_red.xml" attachpoint="root"/>
</props>
</variant>
</group>
@ -14,5 +14,5 @@
<texture>props/shield/mace_round_c_silver.png</texture>
</variant>
</group>
<material>playercolor_spec.xml</material>
<material>basic_spec.xml</material>
</actor>

10
binaries/data/mods/internal/art/actors/props/units/shields/mace_aspis_back_red.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/shield/aspis_b.dae</mesh>
<texture>props/shield/mace_round_back_a.png</texture>
</variant>
</group>
</actor>

2
binaries/data/mods/internal/art/actors/props/units/shields/mace_hypaspist.xml
View File

@ -4,7 +4,7 @@
<variant frequency="1" name="base">
<mesh>props/shield/aspis_sm_f.dae</mesh>
<props>
<prop actor="props/units/shields/mace_round_back_purple.xml" attachpoint="root"/>
<prop actor="props/units/shields/mace_round_back_red.xml" attachpoint="root"/>
</props>
</variant>
</group>

2
binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_adv.xml
View File

@ -4,7 +4,7 @@
<variant frequency="1" name="base">
<mesh>props/shield/round_m_f.dae</mesh>
<props>
<prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
<prop actor="props/units/shields/mace_pez_back.xml" attachpoint="back"/>
</props>
<texture>props/shield/mace_round_e.png</texture>
</variant>

2
binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_basic.xml
View File

@ -5,7 +5,7 @@
<variant frequency="1" name="base">
<mesh>props/shield/round_m_f.dae</mesh>
<props>
<prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
<prop actor="props/units/shields/mace_pez_back.xml" attachpoint="back"/>
</props>
<texture>props/shield/mace_round_f.png</texture>
</variant>

2
binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_elite.xml
View File

@ -5,7 +5,7 @@
<variant frequency="1" name="base">
<mesh>props/shield/round_m_f.dae</mesh>
<props>
<prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
<prop actor="props/units/shields/mace_pez_back.xml" attachpoint="back"/>
</props>
</variant>
</group>

10
binaries/data/mods/internal/art/actors/props/units/shields/mace_round_back_red.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/shield/aspis_sm_b.dae</mesh>
<texture>props/shield/mace_round_back_a.png</texture>
</variant>
</group>
</actor>

2
binaries/data/mods/internal/art/actors/units/macedonians/champion_cavalry_r.xml
View File

@ -13,7 +13,7 @@
<mesh>skeletal/m_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
<prop actor="props/units/heads/hele_cav_e.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/mace_hetairoi.xml" attachpoint="helmet"/>
<prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
<prop actor="props/units/cape_m_med.xml" attachpoint="shoulders"/>
</props>

BIN
binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_back_b.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c1.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c_silver.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_h.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/internal/maps/scenarios/Campaign Test Map.xml (Stored with Git LFS)
View File

Binary file not shown.

5
binaries/data/mods/internal/simulation/templates/units/mace_thureophoros.xml
View File

@ -13,6 +13,11 @@
<MinRange>10.0</MinRange>
</Ranged>
</Attack>
<Cost>
<Resources>
<wood>60</wood>
</Resources>
</Cost>
<Health>
<Max>110</Max>
</Health>

2
binaries/data/mods/public/art/actors/props/units/heads/hele_alexander.xml
View File

@ -7,5 +7,5 @@
<texture>props/helmet/hele_alexander.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/units/heads/hele_demetrius.xml
View File

@ -1,15 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="Base">
<mesh>props/helmet/mace_helmet_k.dae</mesh>
<texture>props/helmet/hele_demetrius.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/units/heads/hele_helmet_csw_e.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Helmet-Illyrian-Early-Crested">
<mesh>props/helmet/hele_helmet_k.dae</mesh>
@ -13,7 +11,5 @@
<texture>props/helmet/hele_c1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

2
binaries/data/mods/public/art/actors/props/units/heads/hele_mace_frontranker.xml
View File

@ -7,5 +7,5 @@
<texture>props/helmet/mace_a.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/units/heads/hele_su3.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="helmet-phrygian-1">
<mesh>props/helmet/mace_helmet_b.dae</mesh>
@ -45,7 +43,5 @@
<texture>props/helmet/mace_d1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

2
binaries/data/mods/public/art/actors/props/units/heads/mace_bronzeshield_a.xml
View File

@ -20,5 +20,5 @@
<texture>props/helmet/mace_c.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/units/heads/mace_philip.xml
View File

@ -1,15 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="Base">
<mesh>props/helmet/mace_helmet_philip_v2.dae</mesh>
<texture>props/helmet/mace_philip.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

2
binaries/data/mods/public/art/actors/props/units/heads/mace_su1.xml
View File

@ -39,5 +39,5 @@
<texture>props/helmet/mace_c2.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/units/heads/spartan_phalangite_helmet.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="2" name="helmet-hellenistic-thracian-crest">
<mesh>props/helmet/mace_helmet_hellenistic_a.dae</mesh>
@ -17,7 +15,5 @@
<texture>props/helmet/mace_d1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

4
binaries/data/mods/public/art/actors/props/units/shields/mace_bronzeshield_a.xml
View File

@ -10,8 +10,8 @@
</variant>
</group>
<group>
<variant frequency="1" name="bronze shield shield-d">
<texture>props/shield/mace_bronze_d.png</texture>
<variant frequency="1" name="mace round h">
<texture>props/shield/mace_round_h.png</texture>
</variant>
</group>
<material>basic_spec.xml</material>

2
binaries/data/mods/public/art/actors/props/units/shields/mace_round_argyraspides.xml
View File

@ -20,5 +20,5 @@
<texture>props/shield/mace_silver_c.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>

6
binaries/data/mods/public/art/actors/props/units/shields/mace_round_back.xml
View File

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/shield/round_m_b.dae</mesh>
<texture>props/shield/hele_round_back.dds</texture>
</variant>
</group>
<material>basic_spec.xml</material>
</actor>

1
binaries/data/mods/public/art/actors/props/units/weapons/falcata.xml
View File

@ -23,4 +23,5 @@
<mesh>props/weap_falcata_e.dae</mesh>
</variant>
</group>
<material>basic_spec.xml</material>
</actor>

2
binaries/data/mods/public/art/particles/dust_cav.xml
View File

@ -5,7 +5,7 @@
<blend mode="over"/>
<constant name="emissionrate" value="6.0"/>
<uniform name="lifetime" min="1.0" max="4.0"/>
<uniform name="lifetime" min="2.0" max="5.0"/>
<constant name="position.y" value="0.0"/>

2
binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
View File

@ -8,7 +8,7 @@
<Attack>
<Ranged>
<Hack>0.0</Hack>
<Pierce>25.0</Pierce>
<Pierce>20.0</Pierce>
<Crush>0.0</Crush>
<MaxRange>36</MaxRange>
<MinRange>10.0</MinRange>