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.

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

various small sprite updates #6459

Merged
merged 1 commit into from
Jan 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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/monsters/croc/crocodile-float.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.
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.
126 changes: 100 additions & 26 deletions data/core/units/monsters/Crocodile.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
#textdomain wesnoth-units

#define CROC_TERRAIN_TEMP
Chs*^*,Chw*^*,Cm*^*,Km*^*,W*^*,S*^*,*^Vm
#enddef

#define CROC_TERRAIN_FILTER_TEMP
terrain_type=!,*^B*,Cme*^*,Kme*^*,Wwr*^*,Wwf*^*,!,Chs*^*,Chw*^*,Cm*^*,Km*^*,W*^*,S*^*,*^Vm
terrain_type=!,*^B*,Cme*^*,Kme*^*,Wwr*^*,Wwf*^*,!,{CROC_TERRAIN_TEMP}
#enddef

[unit_type]
Expand All @@ -14,6 +18,8 @@
[standing_anim]
start_time=-50
tail_start_time=-50
direction=s,sw,se
terrain_type=!,{CROC_TERRAIN_TEMP}
[filter]
[filter_adjacent]
adjacent=ne,nw
Expand All @@ -25,34 +31,76 @@
[tail_frame]
image="units/monsters/croc/crocodile-tail.png:50"
layer=-1 # so the tail doesn't get on top of other sprites to the north
auto_vflip=no
auto_hflip=yes
[/tail_frame]
[/standing_anim]
[standing_anim]
start_time=-50
[frame]
image="units/monsters/croc/crocodile.png:50"
[/frame]
[if]
direction=n,nw,ne
[frame]
image="units/monsters/croc/crocodile-ne.png:50"
[/frame]
[/if]
[else]
[frame]
image="units/monsters/croc/crocodile.png:50"
[/frame]
[/else]
[/standing_anim]
[movement_anim]
start_time=0
direction=s,sw,se
[if]
direction=n,nw,ne
[frame]
image="units/monsters/croc/crocodile-ne.png:50"
[/frame]
[/if]
[else]
[frame]
image="units/monsters/croc/crocodile.png:50"
[/frame]
[/else]
[/movement_anim]
###########################################
# floating in the water
[standing_anim]
start_time=-50
{CROC_TERRAIN_FILTER_TEMP}
[frame]
image="units/monsters/croc/crocodile-float.png:50"
[/frame]
[if]
direction=n,nw,ne
submerge=0.42
[frame]
image="units/monsters/croc/crocodile-float-ne.png:50"
[/frame]
[/if]
[else]
submerge=0.45
[frame]
image="units/monsters/croc/crocodile-float.png:50"
[/frame]
[/else]
[/standing_anim]
[movement_anim]
start_time=0
{CROC_TERRAIN_FILTER_TEMP}
[frame]
image="units/monsters/croc/crocodile-float.png:50"
[/frame]
[/movement_anim]
[movement_anim]
start_time=0
[frame]
image="units/monsters/croc/crocodile.png:50"
[/frame]
[if]
direction=n,nw,ne
submerge=0.42
[frame]
image="units/monsters/croc/crocodile-float-ne.png:50"
[/frame]
[/if]
[else]
submerge=0.45
[frame]
image="units/monsters/croc/crocodile-float.png:50"
[/frame]
[/else]
[/movement_anim]
###########################################
hitpoints=50
movement_type=naga
[resistance]
Expand All @@ -76,8 +124,18 @@
note=_"This unit can move unseen through swamp water, keeping most of its body submerged."
[/special_note]
die_sound=drake-die.ogg
{DEFENSE_ANIM "units/monsters/croc/crocodile-defend2.png" "units/monsters/croc/crocodile-defend1.png" {SOUND_LIST:DRAKE_HIT}}
{DEFENSE_ANIM_FILTERED "units/monsters/croc/crocodile-defend2.png" "units/monsters/croc/crocodile-defend1.png" {SOUND_LIST:DRAKE_HIT} (
direction=s,sw,se
)}
{DEFENSE_ANIM_FILTERED "units/monsters/croc/crocodile-ne-defend2.png" "units/monsters/croc/crocodile-ne-defend1.png" {SOUND_LIST:DRAKE_HIT} (
direction=n,nw,ne
)}
{DEFENSE_ANIM_FILTERED "units/monsters/croc/crocodile-float-defend2.png" "units/monsters/croc/crocodile-float-defend1.png" {SOUND_LIST:DRAKE_HIT} (
direction=s,sw,se
{CROC_TERRAIN_FILTER_TEMP}
)}
{DEFENSE_ANIM_FILTERED "units/monsters/croc/crocodile-float-ne-defend2.png" "units/monsters/croc/crocodile-float-ne-defend1.png" {SOUND_LIST:DRAKE_HIT} (
direction=n,nw,ne
{CROC_TERRAIN_FILTER_TEMP}
)}
[abilities]
Expand Down Expand Up @@ -110,26 +168,42 @@ Enemy units cannot see this unit while it is in swamp, except if they have units
name=bite
[/filter_attack]
{CROC_TERRAIN_FILTER_TEMP}

start_time=-450
offset=0.0:300,0.0~0.6:150,0.6~0.0:400
[frame]
image=units/monsters/croc/crocodile-float-attack[1~6].png:[100,100,100,100,150,300]
[/frame]
[if]
direction=n,nw,ne
[frame] # this eventually needs a NE attack anim, but it doesn't look _that_ egregious as is, unlike the non-floating
image=units/monsters/croc/crocodile-float-attack[1~6].png:[100,100,100,100,150,300]
[/frame]
[/if]
[else]
[frame]
image=units/monsters/croc/crocodile-float-attack[1~6].png:[100,100,100,100,150,300]
[/frame]
[/else]
{SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -50}
[/attack_anim]
[attack_anim]
[filter_attack]
name=bite
[/filter_attack]

start_time=-500
offset=0.0:350,0.0~0.6:150,0.6~0.0:400
[frame]
image=units/monsters/croc/crocodile-attack[1~7].png:[100*5,150,250]
[/frame]
[if]
direction=n,nw,ne
offset=0.0:400,0.0~0.7:100,0.7:150,0.7~0.0:250
[frame]
image=units/monsters/croc/crocodile-ne-attack[1~6].png:[70,100,120,160,100,350]
[/frame]
[/if]
[else]
offset=0.0:350,0.0~0.6:150,0.6~0.0:400
[frame]
image=units/monsters/croc/crocodile-attack[1~7].png:[100*5,150,250]
[/frame]
[/else]
{SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -50}
[/attack_anim]
[/unit_type]

#undef CROC_TERRAIN_FILTER_TEMP
#undef CROC_TERRAIN_TEMP
2 changes: 1 addition & 1 deletion data/core/units/monsters/Sea_Serpent.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[attack]
name=fangs
description=_"fangs"
icon=attacks/fangs-snake.png
icon=attacks/fangs-angler.png
type=pierce
range=melee
damage=18
Expand Down
2 changes: 1 addition & 1 deletion data/core/units/monsters/Water_Serpent.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
usage=fighter
description= _ "Scholars differ as to the ancestry of the Water Serpent. Some hold that they are the immature young, or mature cousins, of Sea Serpents. Others hold them up as a primitive offshoot of the Nagas. What is certain is that it is wise to avoid waters where they are known to congregate."
die_sound=hiss-die.wav
{DEFENSE_ANIM_DIRECTIONAL "units/monsters/water-serpent-attack-se-1.png" "units/monsters/water-serpent-attack-se-2.png" "units/monsters/water-serpent-attack-ne-1.png" "units/monsters/water-serpent-attack-ne-2.png" hiss-hit.wav}
{DEFENSE_ANIM_DIRECTIONAL "units/monsters/water-serpent-attack-se-2.png" "units/monsters/water-serpent-attack-se-1.png" "units/monsters/water-serpent-attack-ne-2.png" "units/monsters/water-serpent-attack-ne-1.png" hiss-hit.wav}
[attack]
name=fangs
description=_ "fangs"
Expand Down