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

Move a few unit actors and icons.

Browse Source 
- move infantry_crossbowman_c.xml from athenians/ to macedonians/
- renames kushites/camelry_* to kushites/camel_*
- renames kushites/infantry_clubman_* to kushites/infantry_maceman_*
- renames persians/cavalry_swordsman_* to persians/cavalry_axeman_*
- renames ptolemies/camelry_* to ptolemies/camel_*

Patch by: @Nescio
Differential Revision: D2688
This was SVN commit r24391.
This commit is contained in:
Freagarach 2020-12-14 08:07:44 +00:00
parent 2e27ece0a0
commit 21fa835cff
31 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_m.xml → binaries/data/mods/public/art/actors/units/kushites/camel_javelinist_b_m.xml
View File

@ -5,7 +5,7 @@
<variant>
<mesh>skeletal/camel.dae</mesh>
<props>
<prop actor="units/kushites/camelry_javelinist_b_r.xml" attachpoint="rider"/>
<prop actor="units/kushites/camel_javelinist_b_r.xml" attachpoint="rider"/>
<prop actor="props/camel/camel_rein.xml" attachpoint="root"/>
<prop actor="props/camel/camel_blanket.xml" attachpoint="root"/>
<prop actor="props/camel/teeths.xml" attachpoint="mouth_bot"/>
@ -36,7 +36,7 @@
<variant file="quadraped/base_camel_death.xml" />
<variant file="quadraped/base_camel_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/kushites/camelry_javelinist_b_r.xml" attachpoint="rider_L"/>
<prop actor="units/kushites/camel_javelinist_b_r.xml" attachpoint="rider_L"/>
</props>
</variant>
</group>

0
binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_r.xml → binaries/data/mods/public/art/actors/units/kushites/camel_javelinist_b_r.xml
View File

0
binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_a.xml → binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_a.xml
View File

0
binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_b.xml → binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_b.xml
View File

0
binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_e.xml → binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_e.xml
View File

0
binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml → binaries/data/mods/public/art/actors/units/macedonians/infantry_crossbowman_c.xml
View File

68
binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
View File

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>skeletal/horse_persian.dae</mesh>
<props>
<prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
<prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group>
<group>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider_R"/>
</props>
</variant>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>
<?xml version="1.0" encoding="UTF-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>skeletal/horse_persian.dae</mesh>
<props>
<prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider"/>
<prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group>
<group>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider_R"/>
</props>
</variant>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>

0
binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_r.xml
View File

68
binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
View File

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>skeletal/horse_persian.dae</mesh>
<props>
<prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
<prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group>
<group>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider_R"/>
</props>
</variant>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>
<?xml version="1.0" encoding="UTF-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>skeletal/horse_persian.dae</mesh>
<props>
<prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider"/>
<prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
<prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group>
<group>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider_R"/>
</props>
</variant>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>

0
binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_r.xml
View File

70
binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
View File

@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>skeletal/horse_persian.dae</mesh>
<props>
<prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
<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_blanket_pers.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group>
<group>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider_R"/>
</props>
</variant>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>
<?xml version="1.0" encoding="UTF-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>skeletal/horse_persian.dae</mesh>
<props>
<prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider"/>
<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_blanket_pers.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
<variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
<variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
<variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
<variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
<variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
<variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
</group>
<group>
<variant file="quadraped/base_horse_trot.xml" name="Horse-Trot" frequency="1"/>
<variant file="quadraped/base_horse_death.xml"/>
<variant file="quadraped/base_horse_run.xml"/>
<variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider_R"/>
</props>
</variant>
</group>
<material>no_trans_parallax_spec.xml</material>
</actor>

0
binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml → binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_r.xml
View File

4
binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_m.xml → binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_m.xml
View File

@ -5,7 +5,7 @@
<variant>
<mesh>skeletal/camel.dae</mesh>
<props>
<prop actor="units/ptolemies/camelry_archer_b_r.xml" attachpoint="rider"/>
<prop actor="units/ptolemies/camel_archer_a_r.xml" attachpoint="rider"/>
<prop actor="props/camel/camel_rein.xml" attachpoint="root"/>
<prop actor="props/camel/camel_blanket.xml" attachpoint="root"/>
<prop actor="props/camel/teeths.xml" attachpoint="mouth_bot"/>
@ -36,7 +36,7 @@
<variant file="quadraped/base_camel_death.xml" />
<variant file="quadraped/base_camel_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/ptolemies/camelry_archer_b_r.xml" attachpoint="rider_L"/>
<prop actor="units/ptolemies/camel_archer_a_r.xml" attachpoint="rider_L"/>
</props>
</variant>
</group>

0
binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_r.xml → binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml
View File

4
binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_m.xml → binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_m.xml
View File

@ -5,7 +5,7 @@
<variant>
<mesh>skeletal/camel.dae</mesh>
<props>
<prop actor="units/ptolemies/camelry_archer_e_r.xml" attachpoint="rider"/>
<prop actor="units/ptolemies/camel_archer_b_r.xml" attachpoint="rider"/>
<prop actor="props/camel/camel_rein.xml" attachpoint="root"/>
<prop actor="props/camel/camel_blanket.xml" attachpoint="root"/>
<prop actor="props/camel/teeths.xml" attachpoint="mouth_bot"/>
@ -36,7 +36,7 @@
<variant file="quadraped/base_camel_death.xml" />
<variant file="quadraped/base_camel_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/ptolemies/camelry_archer_e_r.xml" attachpoint="rider_L"/>
<prop actor="units/ptolemies/camel_archer_b_r.xml" attachpoint="rider_L"/>
</props>
</variant>
</group>

0
binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_r.xml → binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml
View File

4
binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_m.xml → binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_m.xml
View File

@ -5,7 +5,7 @@
<variant>
<mesh>skeletal/camel.dae</mesh>
<props>
<prop actor="units/ptolemies/camelry_archer_a_r.xml" attachpoint="rider"/>
<prop actor="units/ptolemies/camel_archer_e_r.xml" attachpoint="rider"/>
<prop actor="props/camel/camel_rein.xml" attachpoint="root"/>
<prop actor="props/camel/camel_blanket.xml" attachpoint="root"/>
<prop actor="props/camel/teeths.xml" attachpoint="mouth_bot"/>
@ -36,7 +36,7 @@
<variant file="quadraped/base_camel_death.xml" />
<variant file="quadraped/base_camel_gather_meat.xml" name="gather_meat">
<props>
<prop actor="units/ptolemies/camelry_archer_a_r.xml" attachpoint="rider_L"/>
<prop actor="units/ptolemies/camel_archer_e_r.xml" attachpoint="rider_L"/>
</props>
</variant>
</group>

0
binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_r.xml → binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_r.xml
View File

0
binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_clubman.png → binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_maceman.png
View File

0
binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_swordsman.png → binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_axeman.png
View File

2
binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
View File

@ -27,6 +27,6 @@
<HeightOffset>8.5</HeightOffset>
</StatusBars>
<VisualActor>
<Actor>units/kushites/camelry_javelinist_b_m.xml</Actor>
<Actor>units/kushites/camel_javelinist_b_m.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_a.xml
View File

@ -7,6 +7,6 @@
<Entity>units/kush/infantry_maceman_merc_e</Entity>
</Promotion>
<VisualActor>
<Actor>units/kushites/infantry_clubman_a.xml</Actor>
<Actor>units/kushites/infantry_maceman_a.xml</Actor>
</VisualActor>
</Entity>

4
binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
View File

@ -25,7 +25,7 @@
<GenericName>Noba Maceman</GenericName>
<SpecificName>nhw Noba</SpecificName>
<VisibleClasses datatype="tokens">-Swordsman Maceman Mercenary</VisibleClasses>
<Icon>units/kush_infantry_clubman.png</Icon>
<Icon>units/kush_infantry_maceman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>
<Promotion>
@ -39,6 +39,6 @@
</Entity>
</Resistance>
<VisualActor>
<Actor>units/kushites/infantry_clubman_b.xml</Actor>
<Actor>units/kushites/infantry_maceman_b.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_e.xml
View File

@ -5,6 +5,6 @@
</Identity>
<Promotion disable=""/>
<VisualActor>
<Actor>units/kushites/infantry_clubman_e.xml</Actor>
<Actor>units/kushites/infantry_maceman_e.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
View File

@ -27,6 +27,6 @@
<Icon>units/mace_champion_infantry_crossbowman.png</Icon>
</Identity>
<VisualActor>
<Actor>units/athenians/infantry_crossbowman_c.xml</Actor>
<Actor>units/macedonians/infantry_crossbowman_c.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml
View File

@ -7,6 +7,6 @@
<Entity>units/pers/cavalry_axeman_e</Entity>
</Promotion>
<VisualActor>
<Actor>units/persians/cavalry_swordsman_a_m.xml</Actor>
<Actor>units/persians/cavalry_axeman_a_m.xml</Actor>
</VisualActor>
</Entity>

4
binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
View File

@ -6,13 +6,13 @@
<SelectionGroupName>units/pers/cavalry_axeman_b</SelectionGroupName>
<GenericName>Hyrcanian Cavalry</GenericName>
<SpecificName>Asabāra Varkaniya</SpecificName>
<Icon>units/pers_cavalry_swordsman.png</Icon>
<Icon>units/pers_cavalry_axeman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>
<Promotion>
<Entity>units/pers/cavalry_axeman_a</Entity>
</Promotion>
<VisualActor>
<Actor>units/persians/cavalry_swordsman_b_m.xml</Actor>
<Actor>units/persians/cavalry_axeman_b_m.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml
View File

@ -5,6 +5,6 @@
</Identity>
<Promotion disable=""/>
<VisualActor>
<Actor>units/persians/cavalry_swordsman_e_m.xml</Actor>
<Actor>units/persians/cavalry_axeman_e_m.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_a.xml
View File

@ -7,6 +7,6 @@
<Entity>units/ptol/cavalry_archer_e</Entity>
</Promotion>
<VisualActor>
<Actor>units/ptolemies/camelry_archer_a_m.xml</Actor>
<Actor>units/ptolemies/camel_archer_a_m.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml
View File

@ -26,6 +26,6 @@
<HeightOffset>8.5</HeightOffset>
</StatusBars>
<VisualActor>
<Actor>units/ptolemies/camelry_archer_b_m.xml</Actor>
<Actor>units/ptolemies/camel_archer_b_m.xml</Actor>
</VisualActor>
</Entity>

2
binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_e.xml
View File

@ -5,6 +5,6 @@
</Identity>
<Promotion disable=""/>
<VisualActor>
<Actor>units/ptolemies/camelry_archer_e_m.xml</Actor>
<Actor>units/ptolemies/camel_archer_e_m.xml</Actor>
</VisualActor>
</Entity>