From 0a9049c31a85dd970ae958c4ebfaf1075dc5c3d4 Mon Sep 17 00:00:00 2001 From: white-haired-uncle <135195815+white-haired-uncle@users.noreply.github.com> Date: Fri, 10 May 2024 19:07:03 -0400 Subject: [PATCH 1/3] 1.17+ animations for demon spear/sword Fixed spearman/swordsman and provides an example for fixing others Ref #686 --- units/demon_infiltrators.cfg | 49 +++++++++++++++++------ units/demon_infiltrators_unidentified.cfg | 49 +++++++++++++++++------ 2 files changed, 74 insertions(+), 24 deletions(-) diff --git a/units/demon_infiltrators.cfg b/units/demon_infiltrators.cfg index c5aecf4d..79ce46f6 100644 --- a/units/demon_infiltrators.cfg +++ b/units/demon_infiltrators.cfg @@ -1751,7 +1751,7 @@ Following a strict code of piety and honor, these men and women work tirelessly direction=s offset="0~0.5,0.5~0" [frame] - image="units/human-loyalists/spearman-attack-s-[1~14].png:25" + image="units/human-loyalists/spearman-attack-s-[2~3].png:175" [/frame] {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100} [/attack_anim] @@ -1779,7 +1779,7 @@ Following a strict code of piety and honor, these men and women work tirelessly [/frame] {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100} [frame] - image="units/human-loyalists/spearman-attack-ne.png:200" + image="units/human-loyalists/spearman-attack-ne-[1~3].png:66" [/frame] [frame] image="units/human-loyalists/spearman.png:50" @@ -1793,7 +1793,7 @@ Following a strict code of piety and honor, these men and women work tirelessly direction=se,sw offset="0~0.4,0.4~0" [frame] - image="units/human-loyalists/spearman-attack-se-[1~12].png:32" + image="units/human-loyalists/spearman-attack-se-[1~3].png:128" [/frame] {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -64} [/attack_anim] @@ -1823,7 +1823,7 @@ Following a strict code of piety and honor, these men and women work tirelessly [/resistance] description= _ "An experienced soldier will often save enough to equip himself with a suit of scale or chain armour, and a sturdy broadsword. Though trading their spears for swords can be a jarring change, most spearmen will leap at the chance, knowing all too well the limitations of the weapon they are leaving behind. A sword is not without its own drawbacks, but is more versatile than a spear, and much better in close quarters." die_sound={SOUND_LIST:HUMAN_DIE} - {DEFENSE_ANIM "units/human-loyalists/swordsman-defend.png" "units/human-loyalists/swordsman.png" {SOUND_LIST:HUMAN_HIT} } + {DEFENSE_ANIM "units/human-loyalists/swordsman-defend-2.png" "units/human-loyalists/swordsman-defend-1.png" {SOUND_LIST:HUMAN_HIT} } [portrait] size=400 side="left" @@ -1860,31 +1860,56 @@ Following a strict code of piety and honor, these men and women work tirelessly [/frame] [frame] begin=-175 + end=-125 + image="units/human-loyalists/swordsman-attack-se-1.png" + [/frame] + [frame] + begin=-125 end=-75 - image="units/human-loyalists/swordsman-attack-1.png" + image="units/human-loyalists/swordsman-attack-se-2.png" + [/frame] + [frame] + begin=-75 + end=-25 + image="units/human-loyalists/swordsman-attack-se-3.png" [/frame] [if] hits=yes [frame] - begin=-75 - end=75 - image="units/human-loyalists/swordsman-attack-2.png" + begin=-25 + end=25 + image="units/human-loyalists/swordsman-attack-se-4.png" sound={SOUND_LIST:SWORD_SWISH} [/frame] [/if] [else] hits=no [frame] - begin=-75 - end=75 - image="units/human-loyalists/swordsman-attack-2.png" + begin=-25 + end=25 + image="units/human-loyalists/swordsman-attack-se-4.png" sound={SOUND_LIST:MISS} [/frame] [/else] + [frame] + begin=25 + end=75 + image="units/human-loyalists/swordsman-attack-se-5.png" + [/frame] [frame] begin=75 + end=125 + image="units/human-loyalists/swordsman-attack-se-6.png" + [/frame] + [frame] + begin=125 + end=175 + image="units/human-loyalists/swordsman-attack-se-7.png" + [/frame] + [frame] + begin=175 end=200 - image="units/human-loyalists/swordsman-attack-3.png" + image="units/human-loyalists/swordsman-attack-se-8.png" [/frame] [/attack_anim] {DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman-idle-2.png} diff --git a/units/demon_infiltrators_unidentified.cfg b/units/demon_infiltrators_unidentified.cfg index daf9bac5..e6e4d882 100644 --- a/units/demon_infiltrators_unidentified.cfg +++ b/units/demon_infiltrators_unidentified.cfg @@ -580,7 +580,7 @@ direction=s offset="0~0.5,0.5~0" [frame] - image="units/human-loyalists/spearman-attack-s-[1~14].png:25" + image="units/human-loyalists/spearman-attack-s-[2~3].png:175" [/frame] {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100} [/attack_anim] @@ -608,7 +608,7 @@ [/frame] {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100} [frame] - image="units/human-loyalists/spearman-attack-ne.png:200" + image="units/human-loyalists/spearman-attack-ne-[1~3].png:66" [/frame] [frame] image="units/human-loyalists/spearman.png:50" @@ -622,7 +622,7 @@ direction=se,sw offset="0~0.4,0.4~0" [frame] - image="units/human-loyalists/spearman-attack-se-[1~12].png:32" + image="units/human-loyalists/spearman-attack-se-[1~3].png:128" [/frame] {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -64} [/attack_anim] @@ -796,7 +796,7 @@ [/resistance] description= _ "An experienced soldier will often save enough to equip himself with a suit of scale or chain armour, and a sturdy broadsword. Though trading their spears for swords can be a jarring change, most spearmen will leap at the chance, knowing all too well the limitations of the weapon they are leaving behind. A sword is not without its own drawbacks, but is more versatile than a spear, and much better in close quarters." die_sound={SOUND_LIST:HUMAN_DIE} - {DEFENSE_ANIM "units/human-loyalists/swordsman-defend.png" "units/human-loyalists/swordsman.png" {SOUND_LIST:HUMAN_HIT} } + {DEFENSE_ANIM "units/human-loyalists/swordsman-defend-2.png" "units/human-loyalists/swordsman-defend-1.png" {SOUND_LIST:HUMAN_HIT} } [portrait] size=400 side="left" @@ -833,31 +833,56 @@ [/frame] [frame] begin=-175 + end=-125 + image="units/human-loyalists/swordsman-attack-se-1.png" + [/frame] + [frame] + begin=-125 end=-75 - image="units/human-loyalists/swordsman-attack-1.png" + image="units/human-loyalists/swordsman-attack-se-2.png" + [/frame] + [frame] + begin=-75 + end=-25 + image="units/human-loyalists/swordsman-attack-se-3.png" [/frame] [if] hits=yes [frame] - begin=-75 - end=75 - image="units/human-loyalists/swordsman-attack-2.png" + begin=-25 + end=25 + image="units/human-loyalists/swordsman-attack-se-4.png" sound={SOUND_LIST:SWORD_SWISH} [/frame] [/if] [else] hits=no [frame] - begin=-75 - end=75 - image="units/human-loyalists/swordsman-attack-2.png" + begin=-25 + end=25 + image="units/human-loyalists/swordsman-attack-se-4.png" sound={SOUND_LIST:MISS} [/frame] [/else] + [frame] + begin=25 + end=75 + image="units/human-loyalists/swordsman-attack-se-5.png" + [/frame] [frame] begin=75 + end=125 + image="units/human-loyalists/swordsman-attack-se-6.png" + [/frame] + [frame] + begin=125 + end=175 + image="units/human-loyalists/swordsman-attack-se-7.png" + [/frame] + [frame] + begin=175 end=200 - image="units/human-loyalists/swordsman-attack-3.png" + image="units/human-loyalists/swordsman-attack-se-8.png" [/frame] [/attack_anim] {DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman-idle-2.png} From 8d2a3256ae43a1e97242058984fa9b659d564144 Mon Sep 17 00:00:00 2001 From: white-haired-uncle <135195815+white-haired-uncle@users.noreply.github.com> Date: Fri, 10 May 2024 19:20:07 -0400 Subject: [PATCH 2/3] update spearman ranged attack anim for 1.17+ --- units/demon_infiltrators.cfg | 4 ++-- units/demon_infiltrators_unidentified.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/units/demon_infiltrators.cfg b/units/demon_infiltrators.cfg index 79ce46f6..67b73fb8 100644 --- a/units/demon_infiltrators.cfg +++ b/units/demon_infiltrators.cfg @@ -1735,11 +1735,11 @@ Following a strict code of piety and honor, these men and women work tirelessly image="units/human-loyalists/spearman-death1.png:100" [/frame] [frame] - image="units/human-loyalists/spearman-attack-ranged.png:50" + image="units/human-loyalists/spearman-attack-ranged1.png:50" sound={SOUND_LIST:THROW} [/frame] [frame] - image="units/human-loyalists/spearman-attack-[ranged,ranged2].png:[50,100]" + image="units/human-loyalists/spearman-attack-[ranged2,ranged3].png:[50,100]" [/frame] {SOUND:HIT spear.ogg 0} [/attack_anim] diff --git a/units/demon_infiltrators_unidentified.cfg b/units/demon_infiltrators_unidentified.cfg index e6e4d882..416df43c 100644 --- a/units/demon_infiltrators_unidentified.cfg +++ b/units/demon_infiltrators_unidentified.cfg @@ -564,11 +564,11 @@ image="units/human-loyalists/spearman-death1.png:100" [/frame] [frame] - image="units/human-loyalists/spearman-attack-ranged.png:50" + image="units/human-loyalists/spearman-attack-ranged1.png:50" sound={SOUND_LIST:THROW} [/frame] [frame] - image="units/human-loyalists/spearman-attack-[ranged,ranged2].png:[50,100]" + image="units/human-loyalists/spearman-attack-[ranged2,ranged3].png:[50,100]" [/frame] {SOUND:HIT spear.ogg 0} [/attack_anim] From c7420b99fe07d31e24153b2cc619585a6638de2d Mon Sep 17 00:00:00 2001 From: white-haired-uncle <135195815+white-haired-uncle@users.noreply.github.com> Date: Fri, 10 May 2024 19:37:24 -0400 Subject: [PATCH 3/3] swordsman-idle-2.png removed in 1.17 --- units/demon_infiltrators.cfg | 2 +- units/demon_infiltrators_unidentified.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/units/demon_infiltrators.cfg b/units/demon_infiltrators.cfg index 67b73fb8..3aaf600e 100644 --- a/units/demon_infiltrators.cfg +++ b/units/demon_infiltrators.cfg @@ -1912,7 +1912,7 @@ Following a strict code of piety and honor, these men and women work tirelessly image="units/human-loyalists/swordsman-attack-se-8.png" [/frame] [/attack_anim] - {DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman-idle-2.png} + {DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman.png} [/unit_type] [unit_type] id=Demon Infiltrator Royal Guard diff --git a/units/demon_infiltrators_unidentified.cfg b/units/demon_infiltrators_unidentified.cfg index 416df43c..49bb2ce4 100644 --- a/units/demon_infiltrators_unidentified.cfg +++ b/units/demon_infiltrators_unidentified.cfg @@ -885,7 +885,7 @@ image="units/human-loyalists/swordsman-attack-se-8.png" [/frame] [/attack_anim] - {DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman-idle-2.png} + {DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman.png} [/unit_type] [unit_type] id=Bewitched Wolf