From ccb831cf849ee8dddfd9ddf27700b815f8d7a7dd Mon Sep 17 00:00:00 2001 From: Stan Date: Tue, 13 Feb 2018 00:45:45 +0000 Subject: [PATCH] Cleanup of the units PART II Delete unused variants as they were superseeded when using the new carry idle animation by wraitii. Add different variant anims per civ. Hele civs use mainly the same ones This was SVN commit r21188. --- .../mods/public/art/meshes/props/kush_scabbard.dae | 4 ++-- .../art/variants/biped/attack_melee_pikeman.xml | 5 ----- .../biped/attack_slaughter_spear_shield_cavalry.xml | 2 +- .../biped/base_cavalry_spearman_relax_shield.xml | 6 ------ .../variants/biped/base_cavalry_swordsman_relax.xml | 6 ------ .../public/art/variants/biped/carry_food_idle.xml | 13 ------------- .../public/art/variants/biped/carry_meat_idle.xml | 13 ------------- .../public/art/variants/biped/carry_metal_idle.xml | 13 ------------- .../public/art/variants/biped/carry_stone_idle.xml | 13 ------------- .../public/art/variants/biped/carry_wood_idle.xml | 13 ------------- .../art/variants/biped/rider/attack_capture.xml | 5 +++++ .../attack_slaughter.xml} | 2 +- .../variants/biped/rider/attack_slaughter_hele.xml | 5 +++++ .../variants/biped/rider/attack_slaughter_pers.xml | 5 +++++ .../attack_slaughter_shield.xml} | 2 +- .../biped/rider/attack_slaughter_shield_cart.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_celt.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_hele.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_iber.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_kush.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_maur.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_pers.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_rome.xml | 5 +++++ .../biped/rider/attack_slaughter_shield_spart.xml | 5 +++++ .../art/variants/biped/rider/base_carry_meat.xml | 6 ++++++ .../public/art/variants/biped/rider/carry_meat.xml | 7 +++++++ .../mods/public/art/variants/biped/rider/death.xml | 6 ++++++ .../public/art/variants/biped/rider/gather_meat.xml | 9 +++++++++ .../art/variants/biped/rider/gather_meat_cart.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_celt.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_hele.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_iber.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_kush.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_maur.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_pers.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_rome.xml | 5 +++++ .../art/variants/biped/rider/gather_meat_spart.xml | 5 +++++ .../{rider_promotion.xml => rider/promotion.xml} | 0 .../promotion_shield.xml} | 0 .../data/mods/public/art/variants/capes/base.xml | 7 +++++++ 40 files changed, 145 insertions(+), 87 deletions(-) delete mode 100644 binaries/data/mods/public/art/variants/biped/attack_melee_pikeman.xml delete mode 100644 binaries/data/mods/public/art/variants/biped/carry_food_idle.xml delete mode 100644 binaries/data/mods/public/art/variants/biped/carry_meat_idle.xml delete mode 100644 binaries/data/mods/public/art/variants/biped/carry_metal_idle.xml delete mode 100644 binaries/data/mods/public/art/variants/biped/carry_stone_idle.xml delete mode 100644 binaries/data/mods/public/art/variants/biped/carry_wood_idle.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_capture.xml rename binaries/data/mods/public/art/variants/biped/{attack_slaughter_cavalry.xml => rider/attack_slaughter.xml} (88%) create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_hele.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_pers.xml rename binaries/data/mods/public/art/variants/biped/{attack_slaughter_shield_cavalry.xml => rider/attack_slaughter_shield.xml} (89%) create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_cart.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_celt.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_hele.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_iber.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_kush.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_maur.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_pers.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_rome.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_spart.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/base_carry_meat.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/carry_meat.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/death.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml create mode 100644 binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml rename binaries/data/mods/public/art/variants/biped/{rider_promotion.xml => rider/promotion.xml} (100%) rename binaries/data/mods/public/art/variants/biped/{rider_promotion_shield.xml => rider/promotion_shield.xml} (100%) create mode 100644 binaries/data/mods/public/art/variants/capes/base.xml diff --git a/binaries/data/mods/public/art/meshes/props/kush_scabbard.dae b/binaries/data/mods/public/art/meshes/props/kush_scabbard.dae index 45e10a2431..bc53fc5926 100644 --- a/binaries/data/mods/public/art/meshes/props/kush_scabbard.dae +++ b/binaries/data/mods/public/art/meshes/props/kush_scabbard.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a6cc129370644624c1c35b7284ea5b4af338856f93e9333afd80a48944b1ab0 -size 21826 +oid sha256:4814e6a49ba942c133f82610128c5bbba3a2c69afc97bb215424e93900ac7abd +size 21815 diff --git a/binaries/data/mods/public/art/variants/biped/attack_melee_pikeman.xml b/binaries/data/mods/public/art/variants/biped/attack_melee_pikeman.xml deleted file mode 100644 index f69736f5d8..0000000000 --- a/binaries/data/mods/public/art/variants/biped/attack_melee_pikeman.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/attack_slaughter_spear_shield_cavalry.xml b/binaries/data/mods/public/art/variants/biped/attack_slaughter_spear_shield_cavalry.xml index 6724724251..9a8a6654dd 100644 --- a/binaries/data/mods/public/art/variants/biped/attack_slaughter_spear_shield_cavalry.xml +++ b/binaries/data/mods/public/art/variants/biped/attack_slaughter_spear_shield_cavalry.xml @@ -1,4 +1,4 @@ - + diff --git a/binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield.xml b/binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield.xml index 95c83f2f9a..06e46ef19f 100644 --- a/binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield.xml +++ b/binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield.xml @@ -1,16 +1,10 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/base_cavalry_swordsman_relax.xml b/binaries/data/mods/public/art/variants/biped/base_cavalry_swordsman_relax.xml index d2cefe5af0..4b094218e7 100644 --- a/binaries/data/mods/public/art/variants/biped/base_cavalry_swordsman_relax.xml +++ b/binaries/data/mods/public/art/variants/biped/base_cavalry_swordsman_relax.xml @@ -1,16 +1,10 @@ - - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/carry_food_idle.xml b/binaries/data/mods/public/art/variants/biped/carry_food_idle.xml deleted file mode 100644 index fe4376a403..0000000000 --- a/binaries/data/mods/public/art/variants/biped/carry_food_idle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/carry_meat_idle.xml b/binaries/data/mods/public/art/variants/biped/carry_meat_idle.xml deleted file mode 100644 index 5ba638964c..0000000000 --- a/binaries/data/mods/public/art/variants/biped/carry_meat_idle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/carry_metal_idle.xml b/binaries/data/mods/public/art/variants/biped/carry_metal_idle.xml deleted file mode 100644 index 87096ed49c..0000000000 --- a/binaries/data/mods/public/art/variants/biped/carry_metal_idle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/carry_stone_idle.xml b/binaries/data/mods/public/art/variants/biped/carry_stone_idle.xml deleted file mode 100644 index 6ad2bcf60a..0000000000 --- a/binaries/data/mods/public/art/variants/biped/carry_stone_idle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/carry_wood_idle.xml b/binaries/data/mods/public/art/variants/biped/carry_wood_idle.xml deleted file mode 100644 index 8530674f50..0000000000 --- a/binaries/data/mods/public/art/variants/biped/carry_wood_idle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_capture.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_capture.xml new file mode 100644 index 0000000000..0b53188ea7 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_capture.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/attack_slaughter_cavalry.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter.xml similarity index 88% rename from binaries/data/mods/public/art/variants/biped/attack_slaughter_cavalry.xml rename to binaries/data/mods/public/art/variants/biped/rider/attack_slaughter.xml index 834deee2d8..da3b0789fb 100644 --- a/binaries/data/mods/public/art/variants/biped/attack_slaughter_cavalry.xml +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter.xml @@ -1,4 +1,4 @@ - + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_hele.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_hele.xml new file mode 100644 index 0000000000..e8f11f8f11 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_hele.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_pers.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_pers.xml new file mode 100644 index 0000000000..e8f11f8f11 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_pers.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/attack_slaughter_shield_cavalry.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield.xml similarity index 89% rename from binaries/data/mods/public/art/variants/biped/attack_slaughter_shield_cavalry.xml rename to binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield.xml index fb3e5dba70..69c05540a7 100644 --- a/binaries/data/mods/public/art/variants/biped/attack_slaughter_shield_cavalry.xml +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield.xml @@ -1,4 +1,4 @@ - + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_cart.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_cart.xml new file mode 100644 index 0000000000..73b1bc53ae --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_cart.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_celt.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_celt.xml new file mode 100644 index 0000000000..7dfabcd5d7 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_celt.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_hele.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_hele.xml new file mode 100644 index 0000000000..d38646d85c --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_hele.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_iber.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_iber.xml new file mode 100644 index 0000000000..73b1bc53ae --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_iber.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_kush.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_kush.xml new file mode 100644 index 0000000000..c9f22749fb --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_kush.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_maur.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_maur.xml new file mode 100644 index 0000000000..9453944555 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_maur.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_pers.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_pers.xml new file mode 100644 index 0000000000..73b1bc53ae --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_pers.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_rome.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_rome.xml new file mode 100644 index 0000000000..1fddf07395 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_rome.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_spart.xml b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_spart.xml new file mode 100644 index 0000000000..c1b19bde43 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/attack_slaughter_shield_spart.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/base_carry_meat.xml b/binaries/data/mods/public/art/variants/biped/rider/base_carry_meat.xml new file mode 100644 index 0000000000..dc35eef9ba --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/base_carry_meat.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/carry_meat.xml b/binaries/data/mods/public/art/variants/biped/rider/carry_meat.xml new file mode 100644 index 0000000000..343eb95a04 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/carry_meat.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/death.xml b/binaries/data/mods/public/art/variants/biped/rider/death.xml new file mode 100644 index 0000000000..e4d590bcc1 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/death.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat.xml new file mode 100644 index 0000000000..723545eaba --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml new file mode 100644 index 0000000000..8e778df4a2 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml new file mode 100644 index 0000000000..3c28371cc4 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml new file mode 100644 index 0000000000..ddfd23b903 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml new file mode 100644 index 0000000000..8e778df4a2 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml new file mode 100644 index 0000000000..d5ac7b42ba --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml new file mode 100644 index 0000000000..074828b16f --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml new file mode 100644 index 0000000000..8e778df4a2 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml new file mode 100644 index 0000000000..c15ca6c48c --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml new file mode 100644 index 0000000000..88ddb99a01 --- /dev/null +++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/binaries/data/mods/public/art/variants/biped/rider_promotion.xml b/binaries/data/mods/public/art/variants/biped/rider/promotion.xml similarity index 100% rename from binaries/data/mods/public/art/variants/biped/rider_promotion.xml rename to binaries/data/mods/public/art/variants/biped/rider/promotion.xml diff --git a/binaries/data/mods/public/art/variants/biped/rider_promotion_shield.xml b/binaries/data/mods/public/art/variants/biped/rider/promotion_shield.xml similarity index 100% rename from binaries/data/mods/public/art/variants/biped/rider_promotion_shield.xml rename to binaries/data/mods/public/art/variants/biped/rider/promotion_shield.xml diff --git a/binaries/data/mods/public/art/variants/capes/base.xml b/binaries/data/mods/public/art/variants/capes/base.xml new file mode 100644 index 0000000000..d3d20bd8a0 --- /dev/null +++ b/binaries/data/mods/public/art/variants/capes/base.xml @@ -0,0 +1,7 @@ + + + props/new/capes/cape_hd_medium.dae + + + +