From b88e7d8368cbc7d2f340fa01ae6ff9ca7e60a7e7 Mon Sep 17 00:00:00 2001 From: Alexandermb Date: Wed, 18 Sep 2019 19:57:34 +0000 Subject: [PATCH] Following dd2a75b630 fix latest issues mentioned by @Stan in the hellenic helmets thread. Removing some crest's done by me and replacing old crest's on iron corinthian helmets. Thread: https://wildfiregames.com/forum/index.php?/topic/25179-committed-hellenic-helmets/page/15/&tab=comments#comment-385266 This was SVN commit r22930. --- .../units/helmets/hele_corinthian_i1.xml | 18 ++++++++++++++---- .../units/helmets/hele_corinthian_i2.xml | 18 ++++++++++++++---- .../units/helmets/hele_corinthian_i3.xml | 18 ++++++++++++++---- .../units/helmets/hele_corinthian_i4.xml | 18 ++++++++++++++---- .../hele_corinthian_crest_transversal.xml | 13 ------------- .../units/helmets/props/hele_snake_crest.xml | 19 ------------------- ...fantry_swordsman_c_thracian_blackcloak.xml | 2 +- .../macedonians/cavalry_javelinist_a_r.xml | 2 +- .../hero_infantry_pikeman_philip.xml | 6 ------ .../hero_infantry_swordsman_demetrius.xml | 3 +-- .../macedonians/infantry_javelinist_e.xml | 2 +- .../props/helmet/props/hele_snake_crest.dae | 3 --- .../variants/helmets/hele_phrygian_base.xml | 8 -------- .../helmets/hele_phrygian_bronze_base.xml | 7 ------- .../hele_phrygian_masked_bronze_01.xml | 6 ------ .../hele_phrygian_masked_bronze_02.xml | 6 ------ .../hele_phrygian_masked_bronze_03.xml | 6 ------ .../hele_phrygian_masked_bronze_04.xml | 7 ------- .../hele_phrygian_masked_bronze_05.xml | 8 -------- .../hele_phrygian_masked_bronze_base.xml | 6 ------ .../hele_phrygian_masked_silver_01.xml | 6 ------ .../hele_phrygian_masked_silver_02.xml | 6 ------ .../hele_phrygian_masked_silver_03.xml | 6 ------ .../hele_phrygian_masked_silver_04.xml | 7 ------- .../hele_phrygian_masked_silver_05.xml | 8 -------- .../hele_phrygian_masked_silver_base.xml | 6 ------ .../helmets/hele_phrygian_silver_base.xml | 6 ------ 27 files changed, 60 insertions(+), 161 deletions(-) delete mode 100644 binaries/data/mods/public/art/actors/props/units/helmets/props/hele_corinthian_crest_transversal.xml delete mode 100644 binaries/data/mods/public/art/actors/props/units/helmets/props/hele_snake_crest.xml delete mode 100644 binaries/data/mods/public/art/meshes/props/helmet/props/hele_snake_crest.dae delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_base.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_bronze_base.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_01.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_02.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_03.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_04.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_05.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_base.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_01.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_02.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_03.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_04.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_05.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_base.xml delete mode 100644 binaries/data/mods/public/art/variants/helmets/hele_phrygian_silver_base.xml diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i1.xml b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i1.xml index 844c4181a7..8642abbc6f 100644 --- a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i1.xml +++ b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i1.xml @@ -16,14 +16,24 @@ - + - + - + - + + + + + + + + + + + diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i2.xml b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i2.xml index d69e2bf692..891aeca3df 100644 --- a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i2.xml +++ b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i2.xml @@ -16,14 +16,24 @@ - + - + - + - + + + + + + + + + + + diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i3.xml b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i3.xml index 07249f42d3..d4134fa4aa 100644 --- a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i3.xml +++ b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i3.xml @@ -16,14 +16,24 @@ - + - + - + - + + + + + + + + + + + diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i4.xml b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i4.xml index d44deaf07e..0d3d92b7b3 100644 --- a/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i4.xml +++ b/binaries/data/mods/public/art/actors/props/units/helmets/hele_corinthian_i4.xml @@ -16,14 +16,24 @@ - + - + - + - + + + + + + + + + + + diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/props/hele_corinthian_crest_transversal.xml b/binaries/data/mods/public/art/actors/props/units/helmets/props/hele_corinthian_crest_transversal.xml deleted file mode 100644 index 98315795c7..0000000000 --- a/binaries/data/mods/public/art/actors/props/units/helmets/props/hele_corinthian_crest_transversal.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - props/helmet/props/hele_corinthian_crest_transversal.dae - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/props/units/helmets/props/hele_snake_crest.xml b/binaries/data/mods/public/art/actors/props/units/helmets/props/hele_snake_crest.xml deleted file mode 100644 index 05f1f91344..0000000000 --- a/binaries/data/mods/public/art/actors/props/units/helmets/props/hele_snake_crest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - props/helmet/props/hele_snake_crest.dae - - - - - - - - - - - - player_trans_parallax_spec.xml - diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml index 26d4b5e545..f684aa5913 100644 --- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml +++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml @@ -30,7 +30,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/macedonians/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/macedonians/cavalry_javelinist_a_r.xml index c88a366cbe..e67fb58167 100644 --- a/binaries/data/mods/public/art/actors/units/macedonians/cavalry_javelinist_a_r.xml +++ b/binaries/data/mods/public/art/actors/units/macedonians/cavalry_javelinist_a_r.xml @@ -17,7 +17,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_pikeman_philip.xml b/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_pikeman_philip.xml index a499507f7e..4ecb088ced 100644 --- a/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_pikeman_philip.xml +++ b/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_pikeman_philip.xml @@ -14,9 +14,6 @@ skeletal/new/m_armor_tunic_short.dae - - - @@ -24,9 +21,6 @@ skeletal/new/m_armor_tunic_short.dae - - - diff --git a/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_swordsman_demetrius.xml b/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_swordsman_demetrius.xml index bb73422140..11bf23804e 100644 --- a/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_swordsman_demetrius.xml +++ b/binaries/data/mods/public/art/actors/units/macedonians/hero_infantry_swordsman_demetrius.xml @@ -7,7 +7,6 @@ - @@ -21,7 +20,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml index bcf41aad35..7729799f08 100644 --- a/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml +++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml @@ -42,7 +42,7 @@ - + diff --git a/binaries/data/mods/public/art/meshes/props/helmet/props/hele_snake_crest.dae b/binaries/data/mods/public/art/meshes/props/helmet/props/hele_snake_crest.dae deleted file mode 100644 index c380741ac2..0000000000 --- a/binaries/data/mods/public/art/meshes/props/helmet/props/hele_snake_crest.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:540195bb587aec3abd98d8a09766ab7fc759d6f8a493fbcd1f3d8d0f7245138e -size 34185 diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_base.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_base.xml deleted file mode 100644 index c1e842dd3a..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_base.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - props/helmet/hele_phrygian_a.dae - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_bronze_base.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_bronze_base.xml deleted file mode 100644 index cd5727e37c..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_bronze_base.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_01.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_01.xml deleted file mode 100644 index d464d2ed67..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_01.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_02.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_02.xml deleted file mode 100644 index 4679912d3f..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_02.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_03.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_03.xml deleted file mode 100644 index 8cf4f610d8..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_03.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_04.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_04.xml deleted file mode 100644 index 6be0eabb07..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_04.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_05.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_05.xml deleted file mode 100644 index d254952776..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_05.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_base.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_base.xml deleted file mode 100644 index be32f3d506..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_bronze_base.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_01.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_01.xml deleted file mode 100644 index 05cfec4cbc..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_01.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_02.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_02.xml deleted file mode 100644 index 293efb27f6..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_02.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_03.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_03.xml deleted file mode 100644 index 0402fac19f..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_03.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_04.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_04.xml deleted file mode 100644 index e09319ca70..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_04.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_05.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_05.xml deleted file mode 100644 index 513dda9238..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_05.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_base.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_base.xml deleted file mode 100644 index 4aaac74d33..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_masked_silver_base.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_silver_base.xml b/binaries/data/mods/public/art/variants/helmets/hele_phrygian_silver_base.xml deleted file mode 100644 index a45de8e350..0000000000 --- a/binaries/data/mods/public/art/variants/helmets/hele_phrygian_silver_base.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -