From cedc674ef774a0e90a42381eb7eaef8ab4644a72 Mon Sep 17 00:00:00 2001 From: wowgetoffyourcellphone Date: Mon, 7 Feb 2022 08:12:19 +0000 Subject: [PATCH] - Move Arab skeletal textures to their own sub-folder (an on-going project for all unit textures). - Renamed them to the new texture naming standards. - Adjust unit actor refs for these textures (and improve the look of the actors while I'm at it). - Fix texture refs for some spart textures noticed by @Stan. This was SVN commit r26314. --- .../units/macedonians/infantry_slinger_a.xml | 21 +++-- .../units/ptolemies/camel_archer_a_r.xml | 6 +- .../units/ptolemies/camel_archer_b_r.xml | 20 ++--- .../units/ptolemies/cavalry_spearman_e_r.xml | 77 ++++++++----------- .../actors/units/seleucids/elephantry_c_d.xml | 47 +++++++++-- .../actors/units/seleucids/elephantry_c_r.xml | 59 ++++++-------- .../hero_elephantry_seleucus_victor_d.xml | 59 +++++++++++++- .../hero_elephantry_seleucus_victor_r.xml | 12 +-- .../units/seleucids/infantry_javelinist_b.xml | 12 +-- .../units/seleucids/infantry_javelinist_e.xml | 41 +--------- .../spartans/infantry_spearman_c_300.xml | 4 +- .../padded_01_01.png} | 0 .../padded_01_02.png} | 0 .../padded_01_03.png} | 0 .../skins/skeletal/arab/robes_01_01.png | 3 + .../skins/skeletal/arab/robes_01_02.png | 3 + .../skins/skeletal/arab/robes_02_01.png | 3 + .../skins/skeletal/arab/robes_02_02.png | 3 + .../skins/skeletal/arab/robes_02_03.png | 3 + .../skins/skeletal/arab/robes_02_04.png | 3 + .../skins/skeletal/arab/robes_03_01.png | 3 + .../skins/skeletal/arab/robes_03_02.png | 3 + .../skins/skeletal/arab/robes_03_03.png | 3 + .../skirt_01_01.png} | 0 .../skirt_01_02.png} | 0 .../skirt_01_03.png} | 0 .../skins/skeletal/arab/tunic_01_01.png | 3 + .../skins/skeletal/arab/tunic_01_02.png | 3 + .../skins/skeletal/arab/tunic_01_03.png | 3 + 29 files changed, 227 insertions(+), 167 deletions(-) rename binaries/data/mods/public/art/textures/skins/skeletal/{arab_padded_1_a.png => arab/padded_01_01.png} (100%) rename binaries/data/mods/public/art/textures/skins/skeletal/{arab_padded_1_b.png => arab/padded_01_02.png} (100%) rename binaries/data/mods/public/art/textures/skins/skeletal/{arab_padded_1_c.png => arab/padded_01_03.png} (100%) create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_01.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_02.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_01.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_02.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_03.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_04.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_01.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_02.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_03.png rename binaries/data/mods/public/art/textures/skins/skeletal/{arab_tunic_1_a.png => arab/skirt_01_01.png} (100%) rename binaries/data/mods/public/art/textures/skins/skeletal/{arab_tunic_1_b.png => arab/skirt_01_02.png} (100%) rename binaries/data/mods/public/art/textures/skins/skeletal/{arab_tunic_1_c.png => arab/skirt_01_03.png} (100%) create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_01.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_02.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_03.png diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_a.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_a.xml index feac0758d9..dab0a78ade 100644 --- a/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_a.xml +++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_slinger_a.xml @@ -9,40 +9,37 @@ - - - - + - + - + - + - + - + - + - + - + diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml index 639c81c874..e8a3975bd8 100644 --- a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml +++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_a_r.xml @@ -20,17 +20,17 @@ - + - + - + diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml index 020963f422..f7f0ec1af8 100644 --- a/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml +++ b/binaries/data/mods/public/art/actors/units/ptolemies/camel_archer_b_r.xml @@ -18,37 +18,37 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/cavalry_spearman_e_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/cavalry_spearman_e_r.xml index 2770f0a3a7..f414f5c4f9 100644 --- a/binaries/data/mods/public/art/actors/units/ptolemies/cavalry_spearman_e_r.xml +++ b/binaries/data/mods/public/art/actors/units/ptolemies/cavalry_spearman_e_r.xml @@ -1,68 +1,55 @@ - + - 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/seleucids/elephantry_c_d.xml b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_d.xml index 3bdeac7caa..79aefdc0f4 100644 --- a/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_d.xml +++ b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_d.xml @@ -1,22 +1,55 @@ - + skeletal/new/m_tunic_short.dae + + + + - - - + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + - player_trans.xml + player_trans_spec.xml diff --git a/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml index 28963ea732..359ae69fe9 100644 --- a/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml +++ b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml @@ -11,61 +11,46 @@ - - - - - - - - - - - + + + + + + - + - + + - + - + + - + - + + - + - + + - + - - - - - - - - - - - - - - - - + + @@ -74,5 +59,5 @@ - player_trans.xml + player_trans_spec.xml diff --git a/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_d.xml b/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_d.xml index 5cfee9fee5..816d5b103a 100644 --- a/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_d.xml +++ b/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_d.xml @@ -3,17 +3,70 @@ - skeletal/new/m_tunic_short.dae + skeletal/new/m_armor_tunic_short.dae + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - player_trans.xml + player_trans_spec.xml diff --git a/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml index 08ce83a965..5de8030db9 100644 --- a/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml +++ b/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml @@ -3,15 +3,17 @@ - skeletal/new/m_tunic_long.dae + skeletal/new/m_armor_tunic_short.dae - + - + + - + + @@ -24,5 +26,5 @@ - player_trans.xml + player_trans_spec.xml diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml index 569f86c8ff..103d7c9bc5 100644 --- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml +++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_b.xml @@ -19,19 +19,19 @@ - + - + - + - + - + - + diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml index ec344a699f..0adc00eb6e 100644 --- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml +++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_javelinist_e.xml @@ -3,7 +3,7 @@ - skeletal/new/m_armor_tunic_short.dae + skeletal/new/m_armor_tunic_long.dae @@ -23,52 +23,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - skeletal/new/m_armor_tunic_long.dae - + - skeletal/new/m_armor_tunic_long.dae - + - skeletal/new/m_armor_tunic_long.dae - + diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_c_300.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_c_300.xml index 1ffa178eb0..2dbd00bf70 100644 --- a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_c_300.xml +++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_c_300.xml @@ -11,8 +11,8 @@ - - + + diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab_padded_1_a.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/padded_01_01.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/skeletal/arab_padded_1_a.png rename to binaries/data/mods/public/art/textures/skins/skeletal/arab/padded_01_01.png diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab_padded_1_b.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/padded_01_02.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/skeletal/arab_padded_1_b.png rename to binaries/data/mods/public/art/textures/skins/skeletal/arab/padded_01_02.png diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab_padded_1_c.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/padded_01_03.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/skeletal/arab_padded_1_c.png rename to binaries/data/mods/public/art/textures/skins/skeletal/arab/padded_01_03.png diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_01.png new file mode 100644 index 0000000000..2e77aba899 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_01.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dd12c5095aab5df8a9926f51f26efd48be828e125c32424b4c7192d2f552023 +size 142328 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_02.png new file mode 100644 index 0000000000..15c1fcea86 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_01_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5d0167ef755bc0434d3ea3ee9380400f6c5baa932797679cf1e8ac4ae49125e +size 127799 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_01.png new file mode 100644 index 0000000000..b258c7a8cb --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_01.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5792c2dfbaf03a3c4ed8e576197c0fe8ae2ffd5728d8a47cc2f5ee48b835ec1f +size 195445 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_02.png new file mode 100644 index 0000000000..5a7fb55f25 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:772b74ee94d45494ab516a5cea2e897fd10131b228b8d2ac6e36f0c684d53426 +size 182147 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_03.png new file mode 100644 index 0000000000..dd14eaa5b7 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_03.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40ddc1a699b6a251b94b71d72dfb8bcdac25f91ed33ee921f15d6f61b5a8846d +size 186884 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_04.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_04.png new file mode 100644 index 0000000000..eaf615e059 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_02_04.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67f23436450bc67595c001a498c328788171a0735ba10d14d0c2736879586fdf +size 169175 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_01.png new file mode 100644 index 0000000000..51fe0e66bc --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_01.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45f935c96a57dedeb456af0b759521d68a5912f57c1c0d6e87cafd44b23d0695 +size 143032 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_02.png new file mode 100644 index 0000000000..27c8bed132 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:871f98d8b2d8578003db534e03bdcdbd7ace23a5329d98052866f4ae0cc6aa2d +size 128026 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_03.png new file mode 100644 index 0000000000..2b39672168 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/robes_03_03.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40738af08ae291741ee3d40a9af6b7690429959ea7fdf241198a3b4accabcc02 +size 135861 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab_tunic_1_a.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/skirt_01_01.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/skeletal/arab_tunic_1_a.png rename to binaries/data/mods/public/art/textures/skins/skeletal/arab/skirt_01_01.png diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab_tunic_1_b.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/skirt_01_02.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/skeletal/arab_tunic_1_b.png rename to binaries/data/mods/public/art/textures/skins/skeletal/arab/skirt_01_02.png diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab_tunic_1_c.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/skirt_01_03.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/skeletal/arab_tunic_1_c.png rename to binaries/data/mods/public/art/textures/skins/skeletal/arab/skirt_01_03.png diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_01.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_01.png new file mode 100644 index 0000000000..ea9665475e --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_01.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167b29cc8f625a75eab65713880992d2d1376631a689c03b14648c505a5f9727 +size 91085 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_02.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_02.png new file mode 100644 index 0000000000..f17487fba9 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f48bd35d72fcf0ba5c0e52f26923d24d2c68c017b7b80424cc1b2aae60c56cf8 +size 114265 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_03.png b/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_03.png new file mode 100644 index 0000000000..edf687bdd4 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/arab/tunic_01_03.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:465bdf0d958242a0c5a341e50a512aba704ca69baf2ac358955b518cd158a074 +size 113628