Fauna Revisited (#5234)

* stoat - update sprites

* stoat claws attack anim

* stoat portrait

* stoat bite attack animation

* units - add bear portrait

* units - falcon attack anims

* units - icemonax gets a portrait

* units - icemonax attack anim

* units - Greater Icemonax portrait (variation)

* units - rename icemonax sprite files

* units - greater icemonax tail attack anim

data/core/units/monsters/Bear.cfg

@@ -4,8 +4,7 @@
     name= _ "Cave Bear"
     race=monster
     image="units/monsters/bear/bear.png"
-    # not yet
-    #    profile="portraits/monsters/bear.png"
+    profile="portraits/monsters/bear.png"
     {DEFENSE_ANIM "units/monsters/bear/bear-defend2.png" "units/monsters/bear/bear-defend1.png" {SOUND_LIST:DRAKE_HIT} }
     hitpoints=72
     movement_type=mountainfoot

data/core/units/monsters/Falcon.cfg

@@ -4,6 +4,7 @@
     name= _ "Falcon"
     race=falcon
     image="units/monsters/falcon/falcon.png"
+    profile="portraits/monsters/falcon.png"
     {TRAIT_FERAL_MUSTHAVE}
     hitpoints=18
     movement_type=lightfly
@@ -79,17 +80,17 @@
         village=50
     [/defense]
     [attack]
-        name=beak
-        description= _ "beak"
+        name=claws
+        description= _ "claws"
+        icon=attacks/claws-animal.png
         type=pierce
         range=melee
         damage=2
         number=3
     [/attack]
     [attack]
-        name=claws
-        description= _ "claws"
-        icon=attacks/claws-animal.png
+        name=beak
+        description= _ "beak"
         type=blade
         range=melee
         damage=5
@@ -101,27 +102,41 @@
 
     [attack_anim]
         [filter_attack]
-            name=claws
+            name=beak
         [/filter_attack]
 
-        start_time=-200
+        start_time=-500
+        bird_start_time=-500
+        bird_offset=0.0:200,0.0~0.8:250,0.8~0.0:350
+        bird_y=0~-36:200,-36~0:250,0:350
 
         [frame]
-            image="units/monsters/falcon/falcon.png:300"
+            image="units/monsters/falcon/falcon-shadow.png:700"
         [/frame]
+        [bird_frame]
+            image="units/monsters/falcon/falcon-attack-[1,2,beak,end].png:[100,100,250,350]"
+            auto_vflip=no
+        [/bird_frame]
 
         {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
-            name=beak
+            name=claws
         [/filter_attack]
 
-        start_time=-200
+        start_time=-400
+        bird_start_time=-400
+        bird_offset=0.0:200,0.0~0.6:200,0.6~0.0:300
+        bird_y=0~-24:200,-24~0:200,0:300
 
         [frame]
-            image="units/monsters/falcon/falcon.png:300"
+            image="units/monsters/falcon/falcon-shadow.png:700"
         [/frame]
+        [bird_frame]
+            image="units/monsters/falcon/falcon-attack-[1,2,claws,end].png:[100,100,200,300]"
+            auto_vflip=no
+        [/bird_frame]
 
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]

data/core/units/monsters/Giant_Stoat.cfg

@@ -1,11 +1,10 @@
 #textdomain wesnoth-units
 [unit_type]
     id=Giant Stoat
-    name= _ "Giant Stoat"
+    name= _ "Frost Stoat"
     race=monster
     image="units/monsters/stoat/stoat.png"
-    # not yet
-    #    profile="portraits/monsters/stoat.png"
+    profile="portraits/monsters/stoat.png"
     {DEFENSE_ANIM "units/monsters/stoat/stoat-defend2.png" "units/monsters/stoat/stoat-defend1.png" hiss.wav }
     hitpoints=23
     movement_type=elusivefoot
@@ -63,17 +62,41 @@
         icon=attacks/fangs-rodent.png
         type=blade
         range=melee
-        damage=6
+        damage=5
         number=2
     [/attack]
+    [attack]
+        name=claw
+        description= _"ice claw"
+        icon=attacks/blank-attack.png~BLIT(attacks/claws-animal.png~CS(-40,-30,40)~CROP(4,4,50,50),4,4)
+        type=cold
+        range=melee
+        damage=3
+        number=3
+    [/attack]
     [attack_anim]
         [filter_attack]
-            name=fangs
+            name=bite
         [/filter_attack]
-        start_time=-100
+        start_time=-500
+        offset=0.0:300,0.0~0.6:200,0.6~0.0:300
         [frame]
-            image=units/monsters/stoat/stoat-low.png:200
+            image=units/monsters/stoat/stoat-bite[1~6].png:[100,100,180,170,150,100]
         [/frame]
         {SOUND:HIT_AND_MISS bite-small.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=claw
+        [/filter_attack]
+        start_time=-550
+        offset=0.0:350,0.0~0.6:200,0.6~0.0:300
+        [frame]
+            image=units/monsters/stoat/stoat-claws[1~6].png:[140,140,120,100*2,150]
+        [/frame]
+        [frame]
+            image=units/monsters/stoat/stoat-low.png:100
+        [/frame]
+        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
 [/unit_type]

data/core/units/monsters/Icemonax.cfg

@@ -3,11 +3,12 @@
     id=Icemonax
     name= _ "Icemonax"
     race=monster
-    image="units/monsters/glypto/young-glypto.png"
+    image="units/monsters/icemonax/young-icemonax.png"
+    profile="portraits/monsters/small-icemonax.png"
     [standing_anim]
         start_time=-50
         [frame]
-            image="units/monsters/glypto/young-glypto.png"
+            image="units/monsters/icemonax/young-icemonax.png"
             duration=50
         [/frame]
     [/standing_anim]
@@ -15,7 +16,7 @@
     #        start_time=-50
     #        terrain_type=Wo,Ww,Ww^Vm,Chs,Chw,Ss
     #        [frame]
-    #            image="units/monsters/glypto/young-glypto.png"
+    #            image="units/monsters/icemonax/young-icemonax.png"
     #            duration=50
     #        [/frame]
     #    [/standing_anim]
@@ -32,7 +33,7 @@
     usage=fighter
     description=_ "Icemonax are a strange beast of the frozen north, best described as a large, armored ground squirrel. Their armor accumulates frost and snow, even in more temperate climates. Most Icemonax are curious, often wandering into places they do not belong. Despite this, efforts to study and domesticate them have failed, as they die soon after capture."
     die_sound=tusker-die.ogg
-    {DEFENSE_ANIM "units/monsters/glypto/young-glypto-defend2.png" "units/monsters/glypto/young-glypto-defend1.png" tusker-hit.ogg }
+    {DEFENSE_ANIM "units/monsters/icemonax/young-icemonax-defend2.png" "units/monsters/icemonax/young-icemonax-defend1.png" tusker-hit.ogg }
     [defense]
         frozen=50
     [/defense]
@@ -69,24 +70,12 @@
         [filter_attack]
             name=claws
         [/filter_attack]
-        start_time=-250
-        [if]
-            hits=no
-            [frame]
-                image="units/monsters/glypto/young-glypto.png:200"
-                sound=tusker-charge-miss.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=yes
-            [frame]
-                image="units/monsters/glypto/young-glypto.png:200"
-                sound=tusker-charge.ogg
-            [/frame]
-        [/else]
+        start_time=-400
+        offset=0.0:150,0.0~0.6:250,0.6~0.0:200
         [frame]
-            image="units/monsters/glypto/young-glypto.png:100"
+            image="units/monsters/icemonax/young-icemonax-attack[1~4].png:[150*2,100,200]"
         [/frame]
+        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
     [attack_anim]
         [filter_attack]
@@ -104,7 +93,7 @@
                 auto_vflip=no
             [/frost_frame]
             [frame]
-                image="units/monsters/glypto/young-glypto.png:640"
+                image="units/monsters/icemonax/young-icemonax.png:640"
             [/frame]
         [/if]
         [else]
@@ -115,7 +104,7 @@
                 auto_vflip=no
             [/frost_frame]
             [frame]
-                image="units/monsters/glypto/young-glypto.png:640"
+                image="units/monsters/icemonax/young-icemonax.png:640"
             [/frame]
         [/else]
         {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}

data/core/units/monsters/Icemonax_Greater.cfg

@@ -3,11 +3,12 @@
     id=Great Icemonax
     name= _ "Great Icemonax"
     race=monster
-    image="units/monsters/glypto/great-glypto.png"
+    image="units/monsters/icemonax/great-icemonax.png"
+    profile="portraits/monsters/big-icemonax.png"
     [standing_anim]
         start_time=-50
         [frame]
-            image="units/monsters/glypto/great-glypto.png"
+            image="units/monsters/icemonax/great-icemonax.png"
             duration=50
         [/frame]
     [/standing_anim]
@@ -15,7 +16,7 @@
     #        start_time=-50
     #        terrain_type=Wo,Ww,Ww^Vm,Chs,Chw,Ss
     #        [frame]
-    #            image="units/monsters/glypto/great-glypto.png"
+    #            image="units/monsters/icemonax/great-icemonax.png"
     #            duration=50
     #        [/frame]
     #    [/standing_anim]
@@ -40,7 +41,7 @@
     #            image="units/monsters/tusker/tusklet-moving.png"
     #        [/frame]
     #    [/movement_anim]
-    {DEFENSE_ANIM "units/monsters/glypto/great-glypto-defend2.png" "units/monsters/glypto/great-glypto-defend1.png" tusker-hit.ogg }
+    {DEFENSE_ANIM "units/monsters/icemonax/great-icemonax-defend2.png" "units/monsters/icemonax/great-icemonax-defend1.png" tusker-hit.ogg }
     [defense]
         frozen=50
     [/defense]
@@ -90,34 +91,29 @@
         [if]
             hits=no
             [frame]
-                image="units/monsters/glypto/great-glypto.png:200"
+                image="units/monsters/icemonax/great-icemonax.png:200"
                 sound=tusker-charge-miss.ogg
             [/frame]
         [/if]
         [else]
             hits=yes
             [frame]
-                image="units/monsters/glypto/great-glypto.png:200"
+                image="units/monsters/icemonax/great-icemonax.png:200"
                 sound=tusker-charge.ogg
             [/frame]
         [/else]
         [frame]
-            image="units/monsters/glypto/great-glypto.png:100"
+            image="units/monsters/icemonax/great-icemonax.png:100"
         [/frame]
     [/attack_anim]
     [attack_anim]
         [filter_attack]
             name=tail
         [/filter_attack]
-        start_time=-250
+        start_time=-650
+        offset=0.0~-0.05:350,-0.05~0.7:300,0.7~0.0:300
         [frame]
-            image="units/monsters/glypto/great-glypto.png:100"
-        [/frame]
-        [frame]
-            image="units/monsters/glypto/great-glypto.png:100"
-        [/frame]
-        [frame]
-            image="units/monsters/glypto/great-glypto.png:100"
+            image="units/monsters/icemonax/great-icemonax-tail[1~9].png:[100,150,150,100,80,70,80,100,120]"
         [/frame]
         {SOUND:HIT_AND_MISS tail.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
@@ -137,7 +133,7 @@
                 auto_vflip=no
             [/frost_frame]
             [frame]
-                image="units/monsters/glypto/great-glypto.png:640"
+                image="units/monsters/icemonax/great-icemonax.png:640"
             [/frame]
         [/if]
         [else]
@@ -148,7 +144,7 @@
                 auto_vflip=no
             [/frost_frame]
             [frame]
-                image="units/monsters/glypto/great-glypto.png:640"
+                image="units/monsters/icemonax/great-icemonax.png:640"
             [/frame]
         [/else]
         {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}