Skip to content

Commit

Permalink
Sprite work (#5417)
Browse files Browse the repository at this point in the history
* units - north facing bowman and troll whelp

* units - north facing standing and defense frames for dunefolk skirmisher

* units - defense and (half-hearted) dagger attack anims (SE) for poacher

* units - update footpad sprite (SE-only)

* ran wmlindent
  • Loading branch information
doofus-01 committed Jan 25, 2021
1 parent 454bed9 commit 9229600
Show file tree
Hide file tree
Showing 47 changed files with 95 additions and 52 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.
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.
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/bowman.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-outlaws/footpad+female-attack1.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-outlaws/footpad+female-attack2.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-outlaws/footpad+female-defend.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-outlaws/footpad+female-melee-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-outlaws/footpad+female-melee-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-outlaws/footpad+female-melee-3.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-outlaws/footpad+female-melee-4.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-outlaws/footpad+female.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-outlaws/footpad-attack1.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-outlaws/footpad-attack2.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-outlaws/footpad-defend.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-outlaws/footpad-melee-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-outlaws/footpad-melee-2.png
Binary file modified data/core/images/units/human-outlaws/footpad-melee-3.png
Binary file modified data/core/images/units/human-outlaws/footpad-melee-4.png
Binary file modified data/core/images/units/human-outlaws/footpad.png
Binary file modified data/core/images/units/human-outlaws/poacher-attack.png
Binary file added data/core/images/units/trolls/whelp-ne-defend.png
Binary file added data/core/images/units/trolls/whelp-ne-idle-2.png
Binary file added data/core/images/units/trolls/whelp-ne-idle-3.png
Binary file added data/core/images/units/trolls/whelp-ne-idle-4.png
Binary file added data/core/images/units/trolls/whelp-ne-idle-5.png
Binary file added data/core/images/units/trolls/whelp-ne-idle-6.png
Binary file added data/core/images/units/trolls/whelp-ne.png
35 changes: 25 additions & 10 deletions data/core/units/dunefolk/Skirmisher.cfg
Expand Up @@ -25,7 +25,9 @@ units/dunefolk/skirmisher/#enddef
{ABILITY_SKIRMISHER}
[/abilities]
die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
{DEFENSE_ANIM "{PATH_TEMP}skirmisher-defend2.png" "{PATH_TEMP}skirmisher-defend1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
{STANDING_ANIM_DIRECTIONAL "{PATH_TEMP}skirmisher.png" "{PATH_TEMP}skirmisher-ne.png"}
{DEFENSE_ANIM_DIRECTIONAL_FILTERED "{PATH_TEMP}skirmisher-defend2.png" "{PATH_TEMP}skirmisher-defend1.png" "{PATH_TEMP}skirmisher-ne-defend2.png" "{PATH_TEMP}skirmisher-ne-defend1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} ()}
# {DEFENSE_ANIM "{PATH_TEMP}skirmisher-defend2.png" "{PATH_TEMP}skirmisher-defend1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }

[attack]
name=spear
Expand All @@ -48,15 +50,23 @@ units/dunefolk/skirmisher/#enddef
number=1
icon=attacks/sling.png
[/attack]

[attack_anim]
[filter_attack]
name=spear
[/filter_attack]
start_time=-250
[frame]
image="{PATH_TEMP}skirmisher.png:300"
[/frame]
[if]
direction=s,se,sw
[frame]
image="{PATH_TEMP}skirmisher.png:300"
[/frame]
[/if]
[else]
direction=n,ne,nw
[frame]
image="{PATH_TEMP}skirmisher-ne.png:300"
[/frame]
[/else]
{SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100}
[/attack_anim]
[attack_anim]
Expand All @@ -73,10 +83,6 @@ units/dunefolk/skirmisher/#enddef
image_diagonal="projectiles/bolas-ne.png"
offset=0~0.8
[/missile_frame]
[frame]
image="{PATH_TEMP}skirmisher.png:300"
sound=sling.ogg
[/frame]
[/if]
[else]
hits=no
Expand All @@ -85,9 +91,18 @@ units/dunefolk/skirmisher/#enddef
image="projectiles/bolas-n.png"
image_diagonal="projectiles/bolas-ne.png"
[/missile_frame]
[/else]
{SOUND:HIT_AND_MISS sling.ogg sling-miss.ogg -100}
[if]
direction=s,se,sw
[frame]
image="{PATH_TEMP}skirmisher.png:300"
sound=sling-miss.ogg
[/frame]
[/if]
[else]
direction=n,ne,nw
[frame]
image="{PATH_TEMP}skirmisher-ne.png:300"
[/frame]
[/else]
[/attack_anim]
Expand Down
32 changes: 24 additions & 8 deletions data/core/units/humans/Loyalist_Bowman.cfg
Expand Up @@ -17,6 +17,7 @@
usage=archer
description= _ "The use of archery in shooting something other than game was seen from its inception, and archers have been indispensable in warfare since time immemorial. Usually of humble origins, hailing from the peasantry or woodsmen, military bowmen are trained to competence with both a bow and a short sword, and are very common on the battlefield."
die_sound={SOUND_LIST:HUMAN_DIE}
{STANDING_ANIM_DIRECTIONAL "units/human-loyalists/bowman.png" "units/human-loyalists/bowman-ne.png"}
[attack]
name=short sword
description=_"short sword"
Expand All @@ -34,8 +35,8 @@
damage=6
number=3
[/attack]
{DEFENSE_ANIM_RANGE "units/human-loyalists/bowman-melee-defend-2.png" "units/human-loyalists/bowman-melee-defend-1.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_RANGE "units/human-loyalists/bowman-bow-defend.png" "units/human-loyalists/bowman-bow.png" {SOUND_LIST:HUMAN_HIT} ranged}
{DEFENSE_ANIM_DIRECTIONAL_RANGE "units/human-loyalists/bowman-melee-defend-2.png" "units/human-loyalists/bowman-melee-defend-1.png" "units/human-loyalists/bowman-ne-melee-defend-2.png" "units/human-loyalists/bowman-ne-melee-defend-1.png" {SOUND_LIST:HUMAN_HIT} melee}
{DEFENSE_ANIM_DIRECTIONAL_RANGE "units/human-loyalists/bowman-bow-defend.png" "units/human-loyalists/bowman-bow.png" "units/human-loyalists/bowman-ne-bow-defend.png" "units/human-loyalists/bowman-ne-bow.png" {SOUND_LIST:HUMAN_HIT} ranged}
[attack_anim]
[filter_attack]
name=bow
Expand All @@ -47,12 +48,27 @@
image="projectiles/missile-n.png"
image_diagonal="projectiles/missile-ne.png"
[/missile_frame]
[frame]
image="units/human-loyalists/bowman-bow.png:65"
[/frame]
[frame]
image="units/human-loyalists/bowman-bow-attack-[1~4,1].png:[75*2,100,130,65]"
[/frame]
[if]
direction=s,se,sw
[frame]
image="units/human-loyalists/bowman-bow.png:65"
[/frame]
[frame]
image="units/human-loyalists/bowman-bow-attack-[1~4,1].png:[75*2,100,130,65]"
[/frame]
[/if]
[else]
direction=n,ne,nw
[frame]
image="units/human-loyalists/bowman-ne-bow.png:65"
[/frame]
[frame]
image="units/human-loyalists/bowman-ne-bow-attack-[1~4,1].png:[75*2,100,130,65]"
[/frame]
[frame]
image="units/human-loyalists/bowman-ne-bow.png:35"
[/frame]
[/else]
{SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -230}
[/attack_anim]
[attack_anim]
Expand Down
50 changes: 26 additions & 24 deletions data/core/units/humans/Outlaw_Footpad.cfg
Expand Up @@ -59,30 +59,32 @@
[/frame]
[/else]
[frame]
image="units/human-outlaws/footpad-attack2.png:200"
image="units/human-outlaws/footpad-attack2.png:100"
[/frame]
[frame]
image="units/human-outlaws/footpad.png:100"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
name=club
[/filter_attack]
start_time=-250
[frame]
image="units/human-outlaws/footpad.png:50"
[/frame]
start_time=-300
offset=0.0:150,0.0~0.6:150,0.6~0.0:200
[frame]
image="units/human-outlaws/footpad-melee-[1~4].png:100"
image="units/human-outlaws/footpad-melee-[1~4].png:[80,90,130,200]"
[/frame]
{SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
[/attack_anim]
[idle_anim]
{STANDARD_IDLE_FILTER}
start_time=0
[frame]
duration=100
image="units/human-outlaws/footpad-idle-[1~4,3,2,3,4~1].png:[100*3,200,100*3,200,100*3]"
[/frame]
[/idle_anim]
# need to update the sprite frames for this
# [idle_anim]
# {STANDARD_IDLE_FILTER}
# start_time=0
# [frame]
# duration=100 # this had broken the animation anyway
# image="units/human-outlaws/footpad-idle-[1~4,3,2,3,4~1].png:[100*3,200,100*3,200,100*3]"
# [/frame]
# [/idle_anim]
[female]
name= _ "female^Footpad"
gender=female
Expand All @@ -107,24 +109,24 @@
[/frame]
[/else]
[frame]
image="units/human-outlaws/footpad+female-attack2.png:200"
image="units/human-outlaws/footpad+female-attack2.png:100"
[/frame]
[frame]
image="units/human-outlaws/footpad+female.png:100"
[/frame]
[/attack_anim]
[attack_anim]
[filter_attack]
name=club
[/filter_attack]
[frame]
image="units/human-outlaws/footpad+female.png:50"
[/frame]
[frame]
image="units/human-outlaws/footpad+female-melee-[1~4].png:100"
image="units/human-outlaws/footpad+female-melee-[1~4].png:[80,90,130,200]"
[/frame]
[/attack_anim]
[idle_anim]
[frame]
image="units/human-outlaws/footpad+female-idle-[1~4,3,2,3,4~1].png:[100*3,200,100*3,200,100*3]"
[/frame]
[/idle_anim]
# [idle_anim]
# [frame]
# image="units/human-outlaws/footpad+female-idle-[1~4,3,2,3,4~1].png:[100*3,200,100*3,200,100*3]"
# [/frame]
# [/idle_anim]
[/female]
[/unit_type]
12 changes: 6 additions & 6 deletions data/core/units/humans/Woodsman_Poacher.cfg
Expand Up @@ -19,7 +19,7 @@
Because of their experience, these hunters are unusually capable at night, and in forests and swamps."
#Poachers are better than normal units at woods and swamps
die_sound={SOUND_LIST:HUMAN_DIE}
{DEFENSE_ANIM_RANGE "units/human-outlaws/poacher-dagger.png" "units/human-outlaws/poacher-dagger.png" {SOUND_LIST:HUMAN_HIT} melee }
{DEFENSE_ANIM_RANGE "units/human-outlaws/poacher-dagger-defend2.png" "units/human-outlaws/poacher-dagger-defend1.png" {SOUND_LIST:HUMAN_HIT} melee }
{DEFENSE_ANIM_RANGE "units/human-outlaws/poacher-bow-defend.png" "units/human-outlaws/poacher-bow-attack1.png" {SOUND_LIST:HUMAN_HIT} ranged }
[movement_costs]
swamp_water=2
Expand Down Expand Up @@ -68,16 +68,16 @@ Because of their experience, these hunters are unusually capable at night, and i
[filter_attack]
name=dagger
[/filter_attack]
start_time=-250
start_time=-220
[frame]
image="units/human-outlaws/poacher-dagger.png:100"
image="units/human-outlaws/poacher-dagger-defend1.png:70"
[/frame]
{SOUND:HIT_AND_MISS dagger-swish.wav {SOUND_LIST:MISS} -150}
{SOUND:HIT_AND_MISS dagger-swish.wav {SOUND_LIST:MISS} -100}
[frame]
image="units/human-outlaws/poacher-dagger.png:200"
image="units/human-outlaws/poacher-attack.png:180"
[/frame]
[frame]
image="units/human-outlaws/poacher-dagger.png:100"
image="units/human-outlaws/poacher-dagger.png:250"
[/frame]
[/attack_anim]
[/unit_type]
18 changes: 14 additions & 4 deletions data/core/units/trolls/Whelp.cfg
Expand Up @@ -29,7 +29,8 @@
damage=7
number=2
[/attack]
{DEFENSE_ANIM "units/trolls/whelp-defend.png" "units/trolls/whelp-defend-2.png" {SOUND_LIST:TROLL_HIT} }
{DEFENSE_ANIM_DIRECTIONAL "units/trolls/whelp-defend.png" "units/trolls/whelp-defend-2.png" "units/trolls/whelp-ne-defend-2.png:50,units/trolls/whelp-ne-defend-3.png" "units/trolls/whelp-ne-defend.png" {SOUND_LIST:TROLL_HIT} }
{STANDING_ANIM_DIRECTIONAL "units/trolls/whelp.png" "units/trolls/whelp-ne.png"}
# images for death are still based on the old, green baseframe
# commenting out till the images are updated
# [death]
Expand All @@ -47,9 +48,18 @@
[idle_anim]
{STANDARD_IDLE_FILTER}
start_time=0
[frame]
image="units/trolls/whelp-idle-[1~7,6,7~1].png:[100*6,150,175,150,100*6]"
[/frame]
[if]
direction=s,se,sw
[frame]
image="units/trolls/whelp-idle-[1~7,6,7~1].png:[100*6,150,175,150,100*6]"
[/frame]
[/if]
[else]
direction=n,ne,nw
[frame]
image="units/trolls/whelp-ne-idle-[1~6,5,6~1].png:[100*5,150,175,150,100*5]"
[/frame]
[/else]
[/idle_anim]
[attack_anim]
[filter_attack]
Expand Down

0 comments on commit 9229600

Please sign in to comment.