Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.17+ animations for demon spear/sword #793

Merged
merged 3 commits into from
May 11, 2024
Merged

1.17+ animations for demon spear/sword #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a9049c
1.17+ animations for demon spear/sword
white-haired-uncle May 10, 2024
8d2a325
update spearman ranged attack anim for 1.17+
white-haired-uncle May 10, 2024
c7420b9
swordsman-idle-2.png removed in 1.17
white-haired-uncle May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 40 additions & 15 deletions units/demon_infiltrators.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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"
Expand All @@ -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]
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -1860,34 +1860,59 @@ 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}
{DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman.png}
[/unit_type]
[unit_type]
id=Demon Infiltrator Royal Guard
Expand Down
55 changes: 40 additions & 15 deletions units/demon_infiltrators_unidentified.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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"
Expand All @@ -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]
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -833,34 +833,59 @@
[/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}
{DEMON_INFILTRATOR_ATTACK_ANIM units/human-loyalists/swordsman.png units/human-loyalists/swordsman.png}
[/unit_type]
[unit_type]
id=Bewitched Wolf
Expand Down