diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_a.xml deleted file mode 100644 index ad6e070b00..0000000000 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_a.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - skeletal/new/m_tunic_short.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_b.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_b.xml deleted file mode 100644 index 8bcac885d3..0000000000 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_b.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - skeletal/new/m_tunic_short.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_e.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_e.xml deleted file mode 100644 index 7e1d8efefa..0000000000 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_slinger_e.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - skeletal/new/m_armor_tunic_short.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_a.xml deleted file mode 100644 index 7caad43ec9..0000000000 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_a.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - skeletal/new/m_tunic_short.dae - - - - - - skeletal/new/m_tunic_short.dae - - - - - - skeletal/new/m_tunic_short.dae - - - - - - skeletal/new/m_armor_tunic_short.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_b.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_b.xml deleted file mode 100644 index fa22ba21dd..0000000000 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_b.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - skeletal/new/m_tunic_short.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_e.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_e.xml deleted file mode 100644 index 79e08ab8e0..0000000000 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_e.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - skeletal/new/m_armor_tunic_short.dae - - - - - - skeletal/new/m_tunic_short.dae - - - - - - skeletal/new/m_tunic_short.dae - - - - - - skeletal/new/m_armor_tunic_short.dae - - - - - - skeletal/new/m_armor_tunic_long.dae - - - - - - skeletal/new/m_tunic_short.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_a.xml index 89a8e3ffc3..7caad43ec9 100644 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_a.xml +++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_a.xml @@ -4,54 +4,62 @@ - - - - + + + - - skeletal/new/m_naked.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + + + skeletal/new/m_tunic_short.dae - + - - skeletal/new/m_naked.dae + + skeletal/new/m_tunic_short.dae - + - - skeletal/new/m_naked.dae + + skeletal/new/m_tunic_short.dae - + - - skeletal/new/m_naked.dae + + skeletal/new/m_armor_tunic_short.dae - - - - - skeletal/new/m_pants.dae - - - - - - skeletal/new/m_pants.dae - - - - - - skeletal/new/m_pants.dae - - + @@ -77,11 +85,7 @@ - - - - - + player_trans.xml diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_b.xml index 5f293105bb..fa22ba21dd 100644 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_b.xml +++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_b.xml @@ -2,35 +2,61 @@ - - skeletal/new/m_pants.dae + + skeletal/new/m_tunic_short.dae - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + @@ -56,11 +82,7 @@ - - - - - + player_trans.xml diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_e.xml index eeaab8deeb..79e08ab8e0 100644 --- a/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_e.xml +++ b/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_e.xml @@ -1,176 +1,83 @@ - + - - skeletal/new/m_armor_pants_tunic_long.dae + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + - - - - - - - + skeletal/new/m_armor_tunic_short.dae - - + - + + skeletal/new/m_tunic_short.dae + + + + + + skeletal/new/m_tunic_short.dae + + + + + skeletal/new/m_armor_tunic_short.dae - - + - - skeletal/new/m_armor_tunic_short.dae + + skeletal/new/m_armor_tunic_long.dae - - + - - skeletal/new/m_armor_pants.dae + + skeletal/new/m_tunic_short.dae - - - - - - skeletal/new/m_armor_pants.dae - - - - - - - skeletal/new/m_armor_pants.dae - - - - - - - - - - - - - - - - - - - - - - - - - skeletal/new/m_armor_tunic_short.dae - - - - - - - skeletal/new/m_armor_tunic_short.dae - - - - - - - skeletal/new/m_armor_tunic_short.dae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -196,11 +103,7 @@ - - - - - + - player_trans_spec.xml + player_trans.xml diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shieldsmall.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shieldsmall.dae index 6dd37427e1..0b4d4a39a8 100644 --- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shieldsmall.dae +++ b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shieldsmall.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f0861d24334299a363f489836013c2fe947be26c6f248c83c5237b049b46e5b -size 1345827 +oid sha256:3d5d48ebf535a37487d17cad38d263375bc19e373480a7a9a42407f82a403760 +size 1347801 diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_a.xml index 3fd98ec582..4fcdbb6dfb 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_a.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_a.xml @@ -7,6 +7,6 @@ units/cart_infantry_slinger_iber_e - units/carthaginians/infantry_slinger_a.xml + units/iberians/infantry_slinger_a.xml diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml index b82475b9dd..d69fe078c7 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml @@ -28,6 +28,6 @@ units/cart_infantry_slinger_iber_a - units/carthaginians/infantry_slinger_b.xml + units/iberians/infantry_slinger_b.xml diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_e.xml index 22ff79c235..43102d4fe7 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_e.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_e.xml @@ -5,6 +5,6 @@ - units/carthaginians/infantry_slinger_e.xml + units/iberians/infantry_slinger_e.xml diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_a.xml index ea0680fb70..3b8bbd2ff1 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_a.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_a.xml @@ -7,6 +7,6 @@ units/cart_infantry_swordsman_ital_e - units/carthaginians/infantry_swordsman_2_a.xml + units/carthaginians/infantry_swordsman_a.xml diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml index d6edd5ccf2..2bf9727bd8 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml @@ -18,7 +18,7 @@ cart Italian Samnite Swordsman - units/cart_infantry_swordsman_2.png + units/cart_infantry_swordsman.png phase_town units/cart_infantry_swordsman_ital_b Seḫīr Romaḥ @@ -28,6 +28,6 @@ units/cart_infantry_swordsman_ital_a - units/carthaginians/infantry_swordsman_2_b.xml + units/carthaginians/infantry_swordsman_b.xml diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_e.xml index 4beaecf8bb..347fa43730 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_e.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_e.xml @@ -5,6 +5,6 @@ - units/carthaginians/infantry_swordsman_2_e.xml + units/carthaginians/infantry_swordsman_e.xml