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

Move Persian cavalry to the persian folder.

Browse Source 
Use the Persian cavalry for pers as well (Currently only used by
Seleucids)
Move the chariot to an unused unit
Fix the specicif names,
Move the icon from sele_ to pers_

Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2530
This was SVN commit r23553.
This commit is contained in:
Stan
2020-03-27 08:29:39 +00:00
parent 7d6238692c
commit 5063adb30f
15 changed files with 164 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_a_m.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_m.xml
+35 -35
View File
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<actor version="1"> <actor version="1">
<castshadow/> <castshadow/>
<group> <group>
<variant> <variant>
<mesh>skeletal/horse_persian.dae</mesh> <mesh>skeletal/horse_persian.dae</mesh>
<props> <props>
<prop actor="units/seleucids/cavalry_archer_a_r.xml" attachpoint="rider"/> <prop actor="units/persians/cavalry_archer_a_r.xml" attachpoint="rider"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/> <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
<prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/> <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
</props> </props>
</variant> </variant>
</group> </group>
<group> <group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/> <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/> <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/> <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/> <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/> <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/> <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/> <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/> <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group> </group>
<group> <group>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/> <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/> <variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/> <variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat"> <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props> <props>
<prop actor="units/seleucids/cavalry_archer_a_r.xml" attachpoint="rider_R"/> <prop actor="units/persians/cavalry_archer_a_r.xml" attachpoint="rider_R"/>
</props> </props>
</variant> </variant>
</group> </group>
<material>no_trans_parallax_spec.xml</material> <material>no_trans_parallax_spec.xml</material>
</actor> </actor>
binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_a_r.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_r.xml
View File
binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_b_m.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_m.xml
+35 -35
View File
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<actor version="1"> <actor version="1">
<castshadow/> <castshadow/>
<group> <group>
<variant> <variant>
<mesh>skeletal/horse_persian.dae</mesh> <mesh>skeletal/horse_persian.dae</mesh>
<props> <props>
<prop actor="units/seleucids/cavalry_archer_b_r.xml" attachpoint="rider"/> <prop actor="units/persians/cavalry_archer_b_r.xml" attachpoint="rider"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/> <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
<prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/> <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
</props> </props>
</variant> </variant>
</group> </group>
<group> <group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/> <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/> <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/> <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/> <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/> <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/> <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/> <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/> <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group> </group>
<group> <group>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/> <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/> <variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/> <variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat"> <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props> <props>
<prop actor="units/seleucids/cavalry_archer_b_r.xml" attachpoint="rider_R"/> <prop actor="units/persians/cavalry_archer_b_r.xml" attachpoint="rider_R"/>
</props> </props>
</variant> </variant>
</group> </group>
<material>no_trans_parallax_spec.xml</material> <material>no_trans_parallax_spec.xml</material>
</actor> </actor>
binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_b_r.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_r.xml
View File
binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml
+31 -31
View File
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<actor version="1"> <actor version="1">
<castshadow/> <castshadow/>
<group> <group>
<variant> <variant>
<mesh>skeletal/horse_persian.dae</mesh> <mesh>skeletal/horse_persian.dae</mesh>
<props> <props>
<prop actor="units/persians/cavalry_archer_c_r.xml" attachpoint="rider"/> <prop actor="units/persians/cavalry_archer_c_r.xml" attachpoint="rider"/>
<prop actor="props/horse/pers_cav_knot.xml" attachpoint="head"/> <prop actor="props/horse/pers_cav_knot.xml" attachpoint="head"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/> <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
<prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/> <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
<prop actor="props/horse/cav_winged_armor_02.xml" attachpoint="root"/> <prop actor="props/horse/cav_winged_armor_02.xml" attachpoint="root"/>
</props> </props>
</variant> </variant>
</group> </group>
<group> <group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/> <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/> <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/> <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/> <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/> <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/> <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/> <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group> </group>
<group> <group>
<variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/> <variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/> <variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/> <variant file="quadraped/base_horse_run.xml"/>
</group> </group>
<material>no_trans_parallax_spec.xml</material> <material>no_trans_parallax_spec.xml</material>
</actor> </actor>
binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_e_m.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_m.xml
+35 -35
View File
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<actor version="1"> <actor version="1">
<castshadow/> <castshadow/>
<group> <group>
<variant> <variant>
<mesh>skeletal/horse_persian.dae</mesh> <mesh>skeletal/horse_persian.dae</mesh>
<props> <props>
<prop actor="units/seleucids/cavalry_archer_e_r.xml" attachpoint="rider"/> <prop actor="units/persians/cavalry_archer_e_r.xml" attachpoint="rider"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/> <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
<prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/> <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
</props> </props>
</variant> </variant>
</group> </group>
<group> <group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/> <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/> <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/> <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/> <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/> <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/> <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/> <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/> <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group> </group>
<group> <group>
<variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/> <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/> <variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/> <variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat"> <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props> <props>
<prop actor="units/seleucids/cavalry_archer_e_r.xml" attachpoint="rider_R"/> <prop actor="units/persians/cavalry_archer_e_r.xml" attachpoint="rider_R"/>
</props> </props>
</variant> </variant>
</group> </group>
<material>no_trans_parallax_spec.xml</material> <material>no_trans_parallax_spec.xml</material>
</actor> </actor>
binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_e_r.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_r.xml
View File
binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_archer.png → binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
View File
binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml
+1 -1
View File
@@ -7,6 +7,6 @@
<Entity>units/pers_cavalry_archer_e</Entity> <Entity>units/pers_cavalry_archer_e</Entity>
</Promotion> </Promotion>
<VisualActor> <VisualActor>
<Actor>units/persians/chariot_archer_a_m.xml</Actor> <Actor>units/persians/cavalry_archer_a_m.xml</Actor>
</VisualActor> </VisualActor>
</Entity> </Entity>
binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
+4 -8
View File
@@ -1,23 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_ranged_archer"> <Entity parent="template_unit_cavalry_ranged_archer">
<Footprint replace="">
<Square width="5.5" depth="10.0"/>
<Height>5.0</Height>
</Footprint>
<Identity> <Identity>
<Civ>pers</Civ> <Civ>pers</Civ>
<VisibleClasses datatype="tokens">Chariot</VisibleClasses> <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
<Lang>persian</Lang> <Lang>persian</Lang>
<SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName> <SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName>
<GenericName>Babylonian Scythed Chariot</GenericName> <GenericName>Parthian Horse Archer</GenericName>
<SpecificName>Raθa Bābiruviya</SpecificName> <SpecificName>Asabāra Parθava</SpecificName>
<Icon>units/pers_chariot_archer.png</Icon> <Icon>units/pers_cavalry_archer.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology> <RequiredTechnology>phase_town</RequiredTechnology>
</Identity> </Identity>
<Promotion> <Promotion>
<Entity>units/pers_cavalry_archer_a</Entity> <Entity>units/pers_cavalry_archer_a</Entity>
</Promotion> </Promotion>
<VisualActor> <VisualActor>
<Actor>units/persians/chariot_archer_b_m.xml</Actor> <Actor>units/persians/cavalry_archer_b_m.xml</Actor>
</VisualActor> </VisualActor>
</Entity> </Entity>
binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml
+1 -1
View File
@@ -5,6 +5,6 @@
</Identity> </Identity>
<Promotion disable=""/> <Promotion disable=""/>
<VisualActor> <VisualActor>
<Actor>units/persians/chariot_archer_e_m.xml</Actor> <Actor>units/persians/cavalry_archer_e_m.xml</Actor>
</VisualActor> </VisualActor>
</Entity> </Entity>
binaries/data/mods/public/simulation/templates/units/pers_chariot.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_cavalry_archer">
<Footprint replace="">
<Square width="8" depth="16"/>
<Height>6</Height>
</Footprint>
<Identity>
<Civ>pers</Civ>
<VisibleClasses datatype="tokens">Chariot</VisibleClasses>
<Lang>persian</Lang>
<GenericName>Babylonian Scythed Chariot</GenericName>
<SpecificName>Raθa Bābiruviya</SpecificName>
<Icon>units/pers_chariot_archer.png</Icon>
</Identity>
<VisualActor>
<Actor>units/persians/chariot_archer_e_m.xml</Actor>
</VisualActor>
</Entity>
binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml
+1 -1
View File
@@ -7,6 +7,6 @@
<Entity>units/sele_cavalry_archer_e</Entity> <Entity>units/sele_cavalry_archer_e</Entity>
</Promotion> </Promotion>
<VisualActor> <VisualActor>
<Actor>units/seleucids/cavalry_archer_a_m.xml</Actor> <Actor>units/persians/cavalry_archer_a_m.xml</Actor>
</VisualActor> </VisualActor>
</Entity> </Entity>
binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
+2 -2
View File
@@ -6,13 +6,13 @@
<SelectionGroupName>units/sele_cavalry_archer_b</SelectionGroupName> <SelectionGroupName>units/sele_cavalry_archer_b</SelectionGroupName>
<GenericName>Dahae Horse Archer</GenericName> <GenericName>Dahae Horse Archer</GenericName>
<SpecificName>Hippotoxotès Dahae</SpecificName> <SpecificName>Hippotoxotès Dahae</SpecificName>
<Icon>units/sele_cavalry_archer.png</Icon> <Icon>units/pers_cavalry_archer.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology> <RequiredTechnology>phase_town</RequiredTechnology>
</Identity> </Identity>
<Promotion> <Promotion>
<Entity>units/sele_cavalry_archer_a</Entity> <Entity>units/sele_cavalry_archer_a</Entity>
</Promotion> </Promotion>
<VisualActor> <VisualActor>
<Actor>units/seleucids/cavalry_archer_b_m.xml</Actor> <Actor>units/persians/cavalry_archer_b_m.xml</Actor>
</VisualActor> </VisualActor>
</Entity> </Entity>
binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml
+1 -1
View File
@@ -5,6 +5,6 @@
</Identity> </Identity>
<Promotion disable=""/> <Promotion disable=""/>
<VisualActor> <VisualActor>
<Actor>units/seleucids/cavalry_archer_e_m.xml</Actor> <Actor>units/persians/cavalry_archer_e_m.xml</Actor>
</VisualActor> </VisualActor>
</Entity> </Entity>