From 21fa835cffc8564cd997220b31412cbf2e9ab37d Mon Sep 17 00:00:00 2001 From: Freagarach Date: Mon, 14 Dec 2020 08:07:44 +0000 Subject: [PATCH] Move a few unit actors and icons. - 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. --- ...inist_b_m.xml => camel_javelinist_b_m.xml} | 4 +- ...inist_b_r.xml => camel_javelinist_b_r.xml} | 0 ...y_clubman_a.xml => infantry_maceman_a.xml} | 0 ...y_clubman_b.xml => infantry_maceman_b.xml} | 0 ...y_clubman_e.xml => infantry_maceman_e.xml} | 0 .../infantry_crossbowman_c.xml | 0 ...ordsman_a_m.xml => cavalry_axeman_a_m.xml} | 68 +++++++++--------- ...ordsman_a_r.xml => cavalry_axeman_a_r.xml} | 0 ...ordsman_b_m.xml => cavalry_axeman_b_m.xml} | 68 +++++++++--------- ...ordsman_b_r.xml => cavalry_axeman_b_r.xml} | 0 ...ordsman_e_m.xml => cavalry_axeman_e_m.xml} | 70 +++++++++---------- ...ordsman_e_r.xml => cavalry_axeman_e_r.xml} | 0 ...ry_archer_b_m.xml => camel_archer_a_m.xml} | 4 +- ...ry_archer_a_r.xml => camel_archer_a_r.xml} | 0 ...ry_archer_e_m.xml => camel_archer_b_m.xml} | 4 +- ...ry_archer_b_r.xml => camel_archer_b_r.xml} | 0 ...ry_archer_a_m.xml => camel_archer_e_m.xml} | 4 +- ...ry_archer_e_r.xml => camel_archer_e_r.xml} | 0 ..._clubman.png => kush_infantry_maceman.png} | 0 ..._swordsman.png => pers_cavalry_axeman.png} | 0 .../units/kush/cavalry_javelineer_merc_b.xml | 2 +- .../units/kush/infantry_maceman_merc_a.xml | 2 +- .../units/kush/infantry_maceman_merc_b.xml | 4 +- .../units/kush/infantry_maceman_merc_e.xml | 2 +- .../mace/champion_infantry_crossbowman.xml | 2 +- .../templates/units/pers/cavalry_axeman_a.xml | 2 +- .../templates/units/pers/cavalry_axeman_b.xml | 4 +- .../templates/units/pers/cavalry_axeman_e.xml | 2 +- .../templates/units/ptol/cavalry_archer_a.xml | 2 +- .../templates/units/ptol/cavalry_archer_b.xml | 2 +- .../templates/units/ptol/cavalry_archer_e.xml | 2 +- 31 files changed, 124 insertions(+), 124 deletions(-) rename binaries/data/mods/public/art/actors/units/kushites/{camelry_javelinist_b_m.xml => camel_javelinist_b_m.xml} (88%) rename binaries/data/mods/public/art/actors/units/kushites/{camelry_javelinist_b_r.xml => camel_javelinist_b_r.xml} (100%) rename binaries/data/mods/public/art/actors/units/kushites/{infantry_clubman_a.xml => infantry_maceman_a.xml} (100%) rename binaries/data/mods/public/art/actors/units/kushites/{infantry_clubman_b.xml => infantry_maceman_b.xml} (100%) rename binaries/data/mods/public/art/actors/units/kushites/{infantry_clubman_e.xml => infantry_maceman_e.xml} (100%) rename binaries/data/mods/public/art/actors/units/{athenians => macedonians}/infantry_crossbowman_c.xml (100%) rename binaries/data/mods/public/art/actors/units/persians/{cavalry_swordsman_a_m.xml => cavalry_axeman_a_m.xml} (86%) rename binaries/data/mods/public/art/actors/units/persians/{cavalry_swordsman_a_r.xml => cavalry_axeman_a_r.xml} (100%) rename binaries/data/mods/public/art/actors/units/persians/{cavalry_swordsman_b_m.xml => cavalry_axeman_b_m.xml} (86%) rename binaries/data/mods/public/art/actors/units/persians/{cavalry_swordsman_b_r.xml => cavalry_axeman_b_r.xml} (100%) rename binaries/data/mods/public/art/actors/units/persians/{cavalry_swordsman_e_m.xml => cavalry_axeman_e_m.xml} (86%) rename binaries/data/mods/public/art/actors/units/persians/{cavalry_swordsman_e_r.xml => cavalry_axeman_e_r.xml} (100%) rename binaries/data/mods/public/art/actors/units/ptolemies/{camelry_archer_b_m.xml => camel_archer_a_m.xml} (89%) rename binaries/data/mods/public/art/actors/units/ptolemies/{camelry_archer_a_r.xml => camel_archer_a_r.xml} (100%) rename binaries/data/mods/public/art/actors/units/ptolemies/{camelry_archer_e_m.xml => camel_archer_b_m.xml} (89%) rename binaries/data/mods/public/art/actors/units/ptolemies/{camelry_archer_b_r.xml => camel_archer_b_r.xml} (100%) rename binaries/data/mods/public/art/actors/units/ptolemies/{camelry_archer_a_m.xml => camel_archer_e_m.xml} (89%) rename binaries/data/mods/public/art/actors/units/ptolemies/{camelry_archer_e_r.xml => camel_archer_e_r.xml} (100%) rename binaries/data/mods/public/art/textures/ui/session/portraits/units/{kush_infantry_clubman.png => kush_infantry_maceman.png} (100%) rename binaries/data/mods/public/art/textures/ui/session/portraits/units/{pers_cavalry_swordsman.png => pers_cavalry_axeman.png} (100%) diff --git a/binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_m.xml b/binaries/data/mods/public/art/actors/units/kushites/camel_javelinist_b_m.xml similarity index 88% rename from binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_m.xml rename to binaries/data/mods/public/art/actors/units/kushites/camel_javelinist_b_m.xml index 0f73426d16..50c9c5af1e 100644 --- a/binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_m.xml +++ b/binaries/data/mods/public/art/actors/units/kushites/camel_javelinist_b_m.xml @@ -5,7 +5,7 @@ skeletal/camel.dae - + @@ -36,7 +36,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/kushites/camel_javelinist_b_r.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/kushites/camelry_javelinist_b_r.xml rename to binaries/data/mods/public/art/actors/units/kushites/camel_javelinist_b_r.xml diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_a.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_a.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_a.xml rename to binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_a.xml diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_b.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_b.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_b.xml rename to binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_b.xml diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_e.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_e.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/kushites/infantry_clubman_e.xml rename to binaries/data/mods/public/art/actors/units/kushites/infantry_maceman_e.xml diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_crossbowman_c.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/athenians/infantry_crossbowman_c.xml rename to binaries/data/mods/public/art/actors/units/macedonians/infantry_crossbowman_c.xml diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml similarity index 86% rename from binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml rename to binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml index b30637067b..6fc2013d69 100644 --- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml +++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml @@ -1,34 +1,34 @@ - - - - - - skeletal/horse_persian.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - no_trans_parallax_spec.xml - + + + + + + skeletal/horse_persian.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + no_trans_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_r.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml rename to binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_r.xml diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml similarity index 86% rename from binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml rename to binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml index d14dd37399..5f52a243e5 100644 --- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml +++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml @@ -1,34 +1,34 @@ - - - - - - skeletal/horse_persian.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - no_trans_parallax_spec.xml - + + + + + + skeletal/horse_persian.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + no_trans_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_r.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml rename to binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_r.xml diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml similarity index 86% rename from binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml rename to binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml index a6eb398f00..f099b62f96 100644 --- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml +++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml @@ -1,35 +1,35 @@ - - - - - - skeletal/horse_persian.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - no_trans_parallax_spec.xml - + + + + + + skeletal/horse_persian.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + + no_trans_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_r.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml rename to binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_r.xml diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_m.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_m.xml similarity index 89% rename from binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_m.xml rename to binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_m.xml index 9d51c88c2c..5c2061cded 100644 --- a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_m.xml +++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_m.xml @@ -5,7 +5,7 @@ skeletal/camel.dae - + @@ -36,7 +36,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_r.xml rename to binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_m.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_m.xml similarity index 89% rename from binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_m.xml rename to binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_m.xml index 7ea32feefa..7604398d4e 100644 --- a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_m.xml +++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_m.xml @@ -5,7 +5,7 @@ skeletal/camel.dae - + @@ -36,7 +36,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_b_r.xml rename to binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_m.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_m.xml similarity index 89% rename from binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_m.xml rename to binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_m.xml index 257bb75672..fd195f7654 100644 --- a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_a_m.xml +++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_m.xml @@ -5,7 +5,7 @@ skeletal/camel.dae - + @@ -36,7 +36,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_r.xml similarity index 100% rename from binaries/data/mods/public/art/actors/units/ptolemies/camelry_archer_e_r.xml rename to binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_e_r.xml diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_clubman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_maceman.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_clubman.png rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/kush_infantry_maceman.png diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_swordsman.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_axeman.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_swordsman.png rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_axeman.png diff --git a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml index edd7e8aea2..5fe3e8027e 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml @@ -27,6 +27,6 @@ 8.5 - units/kushites/camelry_javelinist_b_m.xml + units/kushites/camel_javelinist_b_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_a.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_a.xml index eb091594bf..684e0f9025 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_a.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_a.xml @@ -7,6 +7,6 @@ units/kush/infantry_maceman_merc_e - units/kushites/infantry_clubman_a.xml + units/kushites/infantry_maceman_a.xml diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml index f55655805b..44725aaf41 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml @@ -25,7 +25,7 @@ Noba Maceman nhw Noba -Swordsman Maceman Mercenary - units/kush_infantry_clubman.png + units/kush_infantry_maceman.png phase_town @@ -39,6 +39,6 @@ - units/kushites/infantry_clubman_b.xml + units/kushites/infantry_maceman_b.xml diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_e.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_e.xml index 1cc125acdf..94853c61e0 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_e.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_e.xml @@ -5,6 +5,6 @@ - units/kushites/infantry_clubman_e.xml + units/kushites/infantry_maceman_e.xml diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml index de77ef5971..cb08415a96 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml @@ -27,6 +27,6 @@ units/mace_champion_infantry_crossbowman.png - units/athenians/infantry_crossbowman_c.xml + units/macedonians/infantry_crossbowman_c.xml diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml index 53a9cfa54a..a6b47a1f57 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a.xml @@ -7,6 +7,6 @@ units/pers/cavalry_axeman_e - units/persians/cavalry_swordsman_a_m.xml + units/persians/cavalry_axeman_a_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml index 557160ef9a..ade4d55298 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml @@ -6,13 +6,13 @@ units/pers/cavalry_axeman_b Hyrcanian Cavalry Asabāra Varkaniya - units/pers_cavalry_swordsman.png + units/pers_cavalry_axeman.png phase_town units/pers/cavalry_axeman_a - units/persians/cavalry_swordsman_b_m.xml + units/persians/cavalry_axeman_b_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml index 46fc77f3b1..b8a673c1c3 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e.xml @@ -5,6 +5,6 @@ - units/persians/cavalry_swordsman_e_m.xml + units/persians/cavalry_axeman_e_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_a.xml index 40af94e067..0aa4a3a9f9 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_a.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_a.xml @@ -7,6 +7,6 @@ units/ptol/cavalry_archer_e - units/ptolemies/camelry_archer_a_m.xml + units/ptolemies/camel_archer_a_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml index 6a30b113cc..931d1f7712 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml @@ -26,6 +26,6 @@ 8.5 - units/ptolemies/camelry_archer_b_m.xml + units/ptolemies/camel_archer_b_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_e.xml index 0ac9f680b5..f2622df220 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_e.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_e.xml @@ -5,6 +5,6 @@ - units/ptolemies/camelry_archer_e_m.xml + units/ptolemies/camel_archer_e_m.xml