Skip to content

Commit

Permalink
1.17 Loyalist sprite updates (#6803)
Browse files Browse the repository at this point in the history
* update swordsman sprite and anims

* update royal guard sprite and anims

* update pikeman sprite and anims

* update lieutenant sprite and anims

* update sergeant sprite and anims

* update halberdier sprite and anims
  • Loading branch information
doofus-01 committed Jul 11, 2022
1 parent 09fe5a1 commit be14c5a
Show file tree
Hide file tree
Showing 105 changed files with 69 additions and 97 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified data/core/images/units/human-loyalists/halberdier-pierce-n.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/halberdier-pierce-ne.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/halberdier-pierce-s.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified data/core/images/units/human-loyalists/halberdier-slash-se-1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/halberdier-slash-se-2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/halberdier.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/lieutenant-crossbow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-3.png
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-4.png
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-5.png
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-6.png
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-7.png
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-8.png
Binary file modified data/core/images/units/human-loyalists/lieutenant-die-9.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified data/core/images/units/human-loyalists/lieutenant-lead-1.png
Binary file modified data/core/images/units/human-loyalists/lieutenant-lead-2.png
Binary file modified data/core/images/units/human-loyalists/lieutenant.png
Binary file modified data/core/images/units/human-loyalists/pikeman-attack-n.png
Binary file modified data/core/images/units/human-loyalists/pikeman-attack-ne.png
Binary file modified data/core/images/units/human-loyalists/pikeman-attack-s.png
Binary file modified data/core/images/units/human-loyalists/pikeman-attack-se.png
Binary file modified data/core/images/units/human-loyalists/pikeman.png
Binary file modified data/core/images/units/human-loyalists/royalguard-defend-1.png
Binary file modified data/core/images/units/human-loyalists/royalguard-defend-2.png
Binary file modified data/core/images/units/human-loyalists/royalguard.png
Binary file modified data/core/images/units/human-loyalists/sergeant-attack-sword-2.png
Binary file modified data/core/images/units/human-loyalists/sergeant-attack-sword-3.png
Binary file modified data/core/images/units/human-loyalists/sergeant-crossbow.png
Binary file modified data/core/images/units/human-loyalists/sergeant-lead-1.png
Binary file modified data/core/images/units/human-loyalists/sergeant-lead-2.png
Binary file modified data/core/images/units/human-loyalists/sergeant.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified data/core/images/units/human-loyalists/swordsman.png
57 changes: 20 additions & 37 deletions data/core/units/humans/Loyalist_Halberdier.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ However, a halberd is notably more expensive to craft than a spear, and in the h
note= _ "Compared to other loyalists, Halberdiers have a higher resistance to ‘pierce’ attacks."
[/special_note]
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/human-loyalists/halberdier-defend.png" "units/human-loyalists/halberdier.png" {SOUND_LIST:HUMAN_HIT} }
{DEFENSE_ANIM "units/human-loyalists/halberdier-defend-2.png" "units/human-loyalists/halberdier-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
[resistance]
pierce=60
[/resistance]
Expand All @@ -47,52 +47,44 @@ However, a halberd is notably more expensive to craft than a spear, and in the h
damage=19
number=2
[/attack]
[idle_anim]
{STANDARD_IDLE_FILTER}
start_time=0
[frame]
image="units/human-loyalists/halberdier-idle-[1~12,2,1].png:100"
[/frame]
[/idle_anim]
# [idle_anim]
# {STANDARD_IDLE_FILTER}
# start_time=0
# [frame]
# image="units/human-loyalists/halberdier-idle-[1~12,2,1].png:100"
# [/frame]
# [/idle_anim]
[attack_anim]
[filter_attack]
name=halberd
type=blade
[/filter_attack]
start_time=-250
start_time=-380
offset=0.0:210,0.0~0.65:150,0.65:70,0.65~0.0:200
[frame]
image="units/human-loyalists/halberdier-defend.png:50"
image="units/human-loyalists/halberdier-slash-se-[1~4,1].png:[130,100,100,125,100]"
[/frame]
[frame]
image="units/human-loyalists/halberdier-slash-se-[1~2].png:[100,200]"
image="units/human-loyalists/halberdier.png:75"
[/frame]
{SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50}
[frame]
image="units/human-loyalists/halberdier-pierce-se.png:100"
[/frame]
[frame]
image="units/human-loyalists/halberdier-defend.png:50"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
name=halberd
type=pierce
[/filter_attack]
direction=ne,nw
start_time=-250
start_time=-200
[frame]
image="units/human-loyalists/halberdier.png:50"
[/frame]
[frame]
image="units/human-loyalists/halberdier-defend.png:100"
[/frame]
{SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
[frame]
image="units/human-loyalists/halberdier-pierce-ne.png:200"
[/frame]
[frame]
image="units/human-loyalists/halberdier-defend.png:75"
image="units/human-loyalists/halberdier.png:100"
[/frame]
[/attack_anim]
[attack_anim]
Expand All @@ -101,20 +93,14 @@ However, a halberd is notably more expensive to craft than a spear, and in the h
type=pierce
[/filter_attack]
direction=se,sw
start_time=-250
start_time=-200
[frame]
image="units/human-loyalists/halberdier.png:50"
image="units/human-loyalists/halberdier-pierce-se-[1,2,1].png:[100*3]"
[/frame]
[frame]
image="units/human-loyalists/halberdier-defend.png:100"
image="units/human-loyalists/halberdier.png:100"
[/frame]
{SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
[frame]
image="units/human-loyalists/halberdier-pierce-se.png:200"
[/frame]
[frame]
image="units/human-loyalists/halberdier-defend.png:75"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
Expand All @@ -131,7 +117,7 @@ However, a halberd is notably more expensive to craft than a spear, and in the h
[/frame]
{SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
[frame]
image="units/human-loyalists/halberdier-defend.png:25"
image="units/human-loyalists/halberdier.png:25"
[/frame]
[/attack_anim]
[attack_anim]
Expand All @@ -144,15 +130,12 @@ However, a halberd is notably more expensive to craft than a spear, and in the h
[frame]
image="units/human-loyalists/halberdier.png:50"
[/frame]
[frame]
image="units/human-loyalists/halberdier-defend.png:50"
[/frame]
{SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
[frame]
image="units/human-loyalists/halberdier-pierce-[s,se].png:[250,50]"
image="units/human-loyalists/halberdier-pierce-[se-1,s,se-1].png:[50,250,50]"
[/frame]
[frame]
image="units/human-loyalists/halberdier-defend.png:25"
image="units/human-loyalists/halberdier.png:25"
[/frame]
[/attack_anim]
[/unit_type]
16 changes: 8 additions & 8 deletions data/core/units/humans/Loyalist_Lieutenant.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
usage=fighter
description= _ "Lieutenants are some of the more respected commanding officers among humans and are often seen leading smaller-scale incursions and managing the battlefield. Trained both with sword and crossbow, they excel at neither, and are somewhat less resilient than the warlords of other races — this is more than made up for by their superior knowledge and training in military strategy."
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-defend.png" "units/human-loyalists/lieutenant.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-defend-2.png" "units/human-loyalists/lieutenant-defend-1.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/lieutenant-crossbow-defend.png" "units/human-loyalists/lieutenant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP}
Expand All @@ -40,13 +40,13 @@
damage=5
number=3
[/attack]
[idle_anim]
{STANDARD_IDLE_FILTER}
start_time=0
[frame]
image="units/human-loyalists/lieutenant-idle-[1~8,7~5,9,1].png:[100*2,300,50*4,500,100*5]"
[/frame]
[/idle_anim]
# [idle_anim]
# {STANDARD_IDLE_FILTER}
# start_time=0
# [frame]
# image="units/human-loyalists/lieutenant-idle-[1~8,7~5,9,1].png:[100*2,300,50*4,500,100*5]"
# [/frame]
# [/idle_anim]

[death]
start_time=0
Expand Down
28 changes: 14 additions & 14 deletions data/core/units/humans/Loyalist_Pikeman.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
note= _ "Compared to other loyalists, Pikemen have a higher resistance to ‘pierce’ attacks."
[/special_note]
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM "units/human-loyalists/pikeman-defend.png" "units/human-loyalists/pikeman.png" {SOUND_LIST:HUMAN_HIT} }
{DEFENSE_ANIM "units/human-loyalists/pikeman-defend-2.png" "units/human-loyalists/pikeman-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
[resistance]
pierce=60
[/resistance]
[death]
start_time=0
[frame]
image="units/human-loyalists/pikeman-die-[1~5].png:80"
[/frame]
[/death]
# [death]
# start_time=0
# [frame]
# image="units/human-loyalists/pikeman-die-[1~5].png:80"
# [/frame]
# [/death]
[attack]
name=pike
description=_"pike"
Expand All @@ -40,13 +40,13 @@
{WEAPON_SPECIAL_FIRSTSTRIKE}
[/specials]
[/attack]
[idle_anim]
{STANDARD_IDLE_FILTER}
start_time=0
[frame]
image="units/human-loyalists/pikeman-idle-[1~4,3~1].png:[100*3,1000,100*3]"
[/frame]
[/idle_anim]
# [idle_anim]
# {STANDARD_IDLE_FILTER}
# start_time=0
# [frame]
# image="units/human-loyalists/pikeman-idle-[1~4,3~1].png:[100*3,1000,100*3]"
# [/frame]
# [/idle_anim]
[attack_anim]
[filter_attack]
name=pike
Expand Down
17 changes: 4 additions & 13 deletions data/core/units/humans/Loyalist_Royal_Guard.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,14 @@
[filter_attack]
name=sword
[/filter_attack]
start_time=-300
start_time=-350
offset=0.0:200,0.0~0.65:180,0.65~0.0:250
[frame]
image="units/human-loyalists/royalguard.png:50"
offset=0.0~0.1
[/frame]
[frame]
image="units/human-loyalists/royalguard-defend-1.png:50"
offset=0.1~0.15
[/frame]
[frame]
image="units/human-loyalists/royalguard-attack-sword[1~5].png:[100,75,100,50,75]"
offset=0.15~0.35:100,0.35~0.45:75,0.45~0.5:100,0.5:20,0.5~0.4:30,0.4~0.2:75
image="units/human-loyalists/royalguard-attack-sword[1~5].png:[90,90,100,100,130]"
[/frame]
{SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
[frame]
image="units/human-loyalists/royalguard.png:75"
offset=0.2~0.0
image="units/human-loyalists/royalguard.png:120"
[/frame]
[/attack_anim]
[/unit_type]
25 changes: 11 additions & 14 deletions data/core/units/humans/Loyalist_Sergeant.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
race=human
image="units/human-loyalists/sergeant.png"
profile="portraits/humans/sergeant.webp"
{LEADING_ANIM "units/human-loyalists/sergeant-lead-2.png" "units/human-loyalists/sergeant-lead-1.png" -5,-25}
{LEADING_ANIM "units/human-loyalists/sergeant-lead-2.png" "units/human-loyalists/sergeant-lead-1.png" -10,-30}
hitpoints=32
movement_type=smallfoot
movement=6
Expand All @@ -17,7 +17,7 @@
usage=fighter
description= _ "Sergeants are low-ranking officers of human armies. Though academically trained, they need some experience in the field before their leadership is sound and acknowledged. Still, their diligent bearing and basic insight of combat means they can more effectively rouse civilians and peasants in trying situations."
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM_RANGE "units/human-loyalists/sergeant-defend.png" "units/human-loyalists/sergeant.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/sergeant-defend-2.png" "units/human-loyalists/sergeant-defend-1.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/sergeant-crossbow-defend.png" "units/human-loyalists/sergeant-crossbow.png" {SOUND_LIST:HUMAN_HIT} ranged}
[abilities]
{ABILITY_LEADERSHIP}
Expand All @@ -40,13 +40,13 @@
damage=4
number=3
[/attack]
[idle_anim]
{STANDARD_IDLE_FILTER}
start_time=0
[frame]
image="units/human-loyalists/sergeant-idle-[1~11,2,1].png:[100*4,200,100*3,300,100*4]"
[/frame]
[/idle_anim]
# [idle_anim]
# {STANDARD_IDLE_FILTER}
# start_time=0
# [frame]
# image="units/human-loyalists/sergeant-idle-[1~11,2,1].png:[100*4,200,100*3,300,100*4]"
# [/frame]
# [/idle_anim]
[attack_anim]
[filter_attack]
name=crossbow
Expand All @@ -70,12 +70,9 @@
[filter_attack]
name=sword
[/filter_attack]
start_time=-200
[frame]
image="units/human-loyalists/sergeant.png:25"
[/frame]
start_time=-250
[frame]
image="units/human-loyalists/sergeant-attack-sword-[1~3].png:[75,150,100]"
image="units/human-loyalists/sergeant-attack-sword-[1~4].png:[75,150,100,75]"
[/frame]
{SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
[frame]
Expand Down
23 changes: 12 additions & 11 deletions data/core/units/humans/Loyalist_Swordsman.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
usage=fighter
description= _ "An experienced soldier will often save enough to equip himself with a suit of scale or chain armor, 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} }
[special_note]
note= _ "Compared to other loyalists, Swordsmen have a higher resistance to ‘blade’ and ‘impact’ attacks."
[/special_note]
Expand All @@ -33,23 +33,24 @@
damage=8
number=4
[/attack]
[idle_anim]
{STANDARD_IDLE_FILTER}
start_time=0
[frame]
image="units/human-loyalists/swordsman-idle-[1~12,4,12,3~1].png:[100*12,400,100*4]"
[/frame]
[/idle_anim]
# [idle_anim]
# {STANDARD_IDLE_FILTER}
# start_time=0
# [frame]
# image="units/human-loyalists/swordsman-idle-[1~12,4,12,3~1].png:[100*12,400,100*4]"
# [/frame]
# [/idle_anim]
[attack_anim]
[filter_attack]
name=sword
[/filter_attack]
start_time=-200
start_time=-600
offset=0.0:300,0.0~0.6:200,0.6:50,0.6~0.0:300
[frame]
image="units/human-loyalists/swordsman.png:25"
image="units/human-loyalists/swordsman-attack-se-[1~8].png:[100*8]"
[/frame]
[frame]
image="units/human-loyalists/swordsman-attack-[1~3].png:[100,150,125]"
image="units/human-loyalists/swordsman.png:50"
[/frame]
{SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75}
[/attack_anim]
Expand Down

0 comments on commit be14c5a

Please sign in to comment.