diff --git a/data/core/images/portraits/monsters/wyvern.webp b/data/core/images/portraits/monsters/wyvern.webp new file mode 100644 index 00000000000..452ce01a0ff Binary files /dev/null and b/data/core/images/portraits/monsters/wyvern.webp differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-bite1.png b/data/core/images/units/monsters/wyvern/wild-wyvern-bite1.png new file mode 100644 index 00000000000..0dafa040c75 Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-bite1.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-bite2.png b/data/core/images/units/monsters/wyvern/wild-wyvern-bite2.png new file mode 100644 index 00000000000..bd722604a31 Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-bite2.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-bite3.png b/data/core/images/units/monsters/wyvern/wild-wyvern-bite3.png new file mode 100644 index 00000000000..4d7b44cef92 Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-bite3.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend.png index 7650a04374a..e5f1312ac9b 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend2.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend2.png new file mode 100644 index 00000000000..32ffb553ec9 Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly-defend2.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly1.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly1.png index a22992f6935..08cdc20c9df 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly1.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly1.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly2.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly2.png index b49325994c5..1e0d705f795 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly2.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly2.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly3.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly3.png index e9e358bec46..6128df6fa4d 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly3.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly3.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly4.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly4.png index 7a138990075..67056ff87c6 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly4.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly4.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly5.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly5.png index 44eae9e10e9..b790f018181 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly5.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly5.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly6.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly6.png index 8283ad616f7..8fbe5295e50 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly6.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly6.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-fly7.png b/data/core/images/units/monsters/wyvern/wild-wyvern-fly7.png index 4fe933c9646..e61a2d269a1 100644 Binary files a/data/core/images/units/monsters/wyvern/wild-wyvern-fly7.png and b/data/core/images/units/monsters/wyvern/wild-wyvern-fly7.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-slam1.png b/data/core/images/units/monsters/wyvern/wild-wyvern-slam1.png new file mode 100644 index 00000000000..2810ab4945b Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-slam1.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-slam2.png b/data/core/images/units/monsters/wyvern/wild-wyvern-slam2.png new file mode 100644 index 00000000000..f5a01ceebfb Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-slam2.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-slam3.png b/data/core/images/units/monsters/wyvern/wild-wyvern-slam3.png new file mode 100644 index 00000000000..806702d8cfa Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-slam3.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-slam4.png b/data/core/images/units/monsters/wyvern/wild-wyvern-slam4.png new file mode 100644 index 00000000000..ba058700746 Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-slam4.png differ diff --git a/data/core/images/units/monsters/wyvern/wild-wyvern-slam5.png b/data/core/images/units/monsters/wyvern/wild-wyvern-slam5.png new file mode 100644 index 00000000000..faa7577760a Binary files /dev/null and b/data/core/images/units/monsters/wyvern/wild-wyvern-slam5.png differ diff --git a/data/core/units/monsters/Wild_Wyvern.cfg b/data/core/units/monsters/Wild_Wyvern.cfg index ae296932c20..5a09ac3bf33 100644 --- a/data/core/units/monsters/Wild_Wyvern.cfg +++ b/data/core/units/monsters/Wild_Wyvern.cfg @@ -9,6 +9,7 @@ race=monster num_traits=2 image="units/monsters/wyvern/wild-wyvern.png" + profile="portraits/monsters/wyvern.webp" [standing_anim] [frame] image="units/monsters/wyvern/wild-wyvern.png:50" @@ -18,17 +19,16 @@ start_time=0 wyvern_start_time=0 terrain_type={UNWALKABLE_TERRAINS_TEMP} - submerge=0.01 - wyvern_y=-4~2:300,2~-4:500 + wyvern_y=-4~0:300,0~-10:500,-10~-4:300,-4~-14:500,-14~-4:400 # wmlscope: start ignoring [wyvern_frame] - image="units/monsters/wyvern/wild-wyvern-fly[1~7].png:[100*3,120,130,140,110]" + image="units/monsters/wyvern/wild-wyvern-fly[1~7,1~7,6,5,6].png:[100*3,120,130,140,110,100*3,120,130,140,110,150*2,100]" auto_vflip=no layer=60 # taken from bat, may need adjustment primary=yes [/wyvern_frame] [frame] - image="units/monsters/wyvern/wild-wyvern-fly-shadow.png:800" + image="units/monsters/wyvern/wild-wyvern-fly-shadow.png:2100" [/frame] # wmlscope: stop ignoring [/standing_anim] @@ -47,7 +47,7 @@ Wyverns are social creatures, usually traveling in pairs or small groups. Their hunting patterns and diet are difficult to discern, for they often work with smaller animals that would appear to be potential prey. That odd behavior may be an adaptation to the harsh desert environments they often inhabit." die_sound=drake-die.ogg undead_variation=drake - {DEFENSE_ANIM_FILTERED "units/monsters/wyvern/wild-wyvern-fly-defend.png" "units/monsters/wyvern/wild-wyvern-fly1.png" {SOUND_LIST:DRAKE_HIT} ( + {DEFENSE_ANIM_FILTERED "units/monsters/wyvern/wild-wyvern-fly-defend2.png" "units/monsters/wyvern/wild-wyvern-fly-defend.png" {SOUND_LIST:DRAKE_HIT} ( terrain_type={UNWALKABLE_TERRAINS_TEMP} )} {DEFENSE_ANIM "units/monsters/wyvern/wild-wyvern-defend2.png" "units/monsters/wyvern/wild-wyvern-defend1.png" {SOUND_LIST:DRAKE_HIT}} @@ -111,7 +111,7 @@ Wyverns are social creatures, usually traveling in pairs or small groups. Their start_time=-200 [frame] - image="units/monsters/wyvern/wild-wyvern-fly5.png:300" + image="units/monsters/wyvern/wild-wyvern-fly[5,6,7,6,5].png:[70*2,90*2,80]" [/frame] {SOUND:HIT_AND_MISS fist.ogg {SOUND_LIST:MISS} -100} @@ -125,7 +125,7 @@ Wyverns are social creatures, usually traveling in pairs or small groups. Their start_time=-200 [frame] - image="units/monsters/wyvern/wild-wyvern-fly4.png:300" + image="units/monsters/wyvern/wild-wyvern-fly[4,5,6].png:[100*2,200]" [/frame] {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100} @@ -135,10 +135,14 @@ Wyverns are social creatures, usually traveling in pairs or small groups. Their name=slam [/filter_attack] - start_time=-200 + start_time=-500 + offset=0.0:350,0.0~0.65:130,0.65~0.0:190 [frame] - image="units/monsters/wyvern/wild-wyvern.png:300" + image="units/monsters/wyvern/wild-wyvern-slam[1~5,1].png:[95*4,120,90]" + [/frame] + [frame] + image="units/monsters/wyvern/wild-wyvern.png:80" [/frame] {SOUND:HIT_AND_MISS fist.ogg {SOUND_LIST:MISS} -100} @@ -148,10 +152,14 @@ Wyverns are social creatures, usually traveling in pairs or small groups. Their name=bite [/filter_attack] - start_time=-200 + start_time=-320 + offset=0.0:200,0.0~0.65:110,0.65~0.0:170 [frame] - image="units/monsters/wyvern/wild-wyvern.png:300" + image="units/monsters/wyvern/wild-wyvern-bite[1~3].png:[110,120,140]" + [/frame] + [frame] + image="units/monsters/wyvern/wild-wyvern.png:110" [/frame] {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}