1.17 fauna work (#6768)

* add level 2 caribe

* update the fluff for caribes

* make caribes more different-looking

* remove Giant Stoat

* alternative cuttlefish melee attack anim

* sea serpent defend anim

data/core/units/monsters/Caribe.cfg

@@ -7,7 +7,7 @@ units/monsters/caribe#enddef
     id=Caribe
     name= _ "Caribe"
     race=monster
-    image="{CARIBE_IMAGE_PATH}/caribe-shadow.png~BLIT("{CARIBE_IMAGE_PATH}/caribe-default.png")"
+    image="{CARIBE_IMAGE_PATH}/caribe-shadow.png~BLIT("{CARIBE_IMAGE_PATH}/caribe-small-default.png")"
     profile="portraits/monsters/caribe.webp"
     hitpoints=38
     # needs some adjustment
@@ -21,12 +21,11 @@ units/monsters/caribe#enddef
     experience=40
     level=1
     alignment=neutral
-    advances_to=null
-    {AMLA_DEFAULT}
+    advances_to=Hunter Caribe
     cost=16
     undead_variation=serpent
     usage=fighter
-    description= _ "The giant caribe are seldom encountered in the inland rivers near Weldyn, but tales of their ferocious attacks have spread far and wide. Their angry red eyes are embedded in an armored face. While it is their teeth that are a dangerous weapon, they do posses small, bony arms and claws, which they can use to extricate themselves from situations dire to most other fish. The giant caribe can climb over land and untie fishing nets, some have said they even commune with the saurian augers. Whatever the truth, these fish are unusually clever and should not be underestimated."
+    description= _ "The giant caribe are seldom encountered in the inland rivers near Weldyn, but tales of their ferocious attacks have spread far and wide.  Their angry red eyes are embedded in an armored face.  While it is their teeth that are a dangerous weapon, they do posses small, bony arms and claws, which they can use to extricate themselves from situations dire to most other fish.  These fish are unusually clever and should not be underestimated."
     die_sound=water-blast.wav
     [abilities]
         {ABILITY_SKIRMISHER}
@@ -36,7 +35,7 @@ units/monsters/caribe#enddef
         terrain_type=W*,W*^Wkf
         offset=0:110,0~-0.2:42,-0.2~0:100
         [frame]
-            image={CARIBE_IMAGE_PATH}/caribe-defend-[1,2,1].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[1,250,1]
+            image={CARIBE_IMAGE_PATH}/caribe-small-defend-[1,2,1].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[1,250,1]
         [/frame]
         [if]
             hit_sound_start_time=-25
@@ -51,7 +50,7 @@ units/monsters/caribe#enddef
         terrain_type=!,W*,W*^Wkf
         offset=0:110,0~-0.1:42,-0.1~0:100
         [frame]
-            image={CARIBE_IMAGE_PATH}/caribe-land.png
+            image={CARIBE_IMAGE_PATH}/caribe-small-land.png
         [/frame]
         [if]
             hit_sound_start_time=-25
@@ -69,7 +68,7 @@ units/monsters/caribe#enddef
         terrain_type=W*,W*^Wkf
         alpha=0.3
         [fish_frame]
-            image={CARIBE_IMAGE_PATH}/caribe-[hi,default,lo,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[400*4]
+            image={CARIBE_IMAGE_PATH}/caribe-small-[hi,default,lo,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[400*4]
             auto_vflip=no
             # submerge=0.45
         [/fish_frame]
@@ -82,7 +81,7 @@ units/monsters/caribe#enddef
         start_time=0
         terrain_type=!,W*,W*^Wkf
         [frame]
-            image={CARIBE_IMAGE_PATH}/caribe-land.png
+            image={CARIBE_IMAGE_PATH}/caribe-small-land.png
         [/frame]
     [/movement_anim]
     [standing_anim]
@@ -92,7 +91,7 @@ units/monsters/caribe#enddef
         terrain_type=W*,W*^Wkf
         alpha=0.3
         [fish_frame]
-            image={CARIBE_IMAGE_PATH}/caribe-[hi,default,lo,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[400*4]
+            image={CARIBE_IMAGE_PATH}/caribe-small-[hi,default,lo,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[400*4]
             auto_vflip=no
             # submerge=0.45
         [/fish_frame]
@@ -105,13 +104,13 @@ units/monsters/caribe#enddef
         start_time=0
         terrain_type=!,W*,W*^Wkf
         [frame]
-            image={CARIBE_IMAGE_PATH}/caribe-land.png
+            image={CARIBE_IMAGE_PATH}/caribe-small-land.png
         [/frame]
     [/standing_anim]
     [attack]
         name=fangs
         description=_"fangs"
-        icon=attacks/fangs-angler.png
+        icon=attacks/fangs.png
         type=pierce
         range=melee
         damage=6
@@ -125,7 +124,7 @@ units/monsters/caribe#enddef
         start_time=-250
         offset=0~-0.1:75,-0.1~0.65:175,0.65~0:250
         [frame]
-            image={CARIBE_IMAGE_PATH}/caribe-[default,attack-1,attack-2,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[50,125,150,175]
+            image={CARIBE_IMAGE_PATH}/caribe-small-[default,attack-1,attack-2,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[50,125,150,175]
         [/frame]
         {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
@@ -137,7 +136,7 @@ units/monsters/caribe#enddef
         start_time=-250
         offset=0~-0.1:75,-0.1~0.65:175,0.65~0:250
         [frame]
-            image={CARIBE_IMAGE_PATH}/caribe-[land,attack-1,attack-2,land].png:[50,125,150,175]
+            image={CARIBE_IMAGE_PATH}/caribe-small-[land,attack-1,attack-2,land].png:[50,125,150,175]
         [/frame]
         {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]

data/core/units/monsters/Caribe_Hunter.cfg

@@ -0,0 +1,177 @@
+#textdomain wesnoth-units
+
+#define CARIBE_IMAGE_PATH
+units/monsters/caribe#enddef
+
+[unit_type]
+    id=Hunter Caribe
+    name= _ "Hunter Caribe"
+    race=monster
+    image="{CARIBE_IMAGE_PATH}/caribe-shadow.png~BLIT("{CARIBE_IMAGE_PATH}/caribe-default.png")"
+    profile="portraits/monsters/caribe-hunter.webp"
+    hitpoints=46
+    # needs some adjustment
+    movement_type=deepsea
+    [resistance]
+        arcane=100
+        pierce=90
+        impact=80
+    [/resistance]
+    movement=8
+    experience=40
+    level=2
+    alignment=neutral
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=25
+    undead_variation=serpent
+    usage=fighter
+    description= _ "As they age, the giant caribe become bigger and more dangerous.  They also learn to use seaweed to ensnare prey or enemies."
+    die_sound=water-blast.wav
+    [abilities]
+        {ABILITY_SKIRMISHER}
+    [/abilities]
+    [defend]
+        start_time=-126
+        terrain_type=W*,W*^Wkf
+        offset=0:110,0~-0.2:42,-0.2~0:100
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-defend-[1,2,1].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[1,250,1]
+        [/frame]
+        [if]
+            hit_sound_start_time=-25
+            hits=hit
+            [hit_sound_frame]
+                sound=hiss-hit.wav
+            [/hit_sound_frame]
+        [/if]
+    [/defend]
+    [defend]
+        start_time=-126
+        terrain_type=!,W*,W*^Wkf
+        offset=0:110,0~-0.1:42,-0.1~0:100
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-land.png
+        [/frame]
+        [if]
+            hit_sound_start_time=-25
+            hits=hit
+            [hit_sound_frame]
+                sound=hiss-hit.wav
+            [/hit_sound_frame]
+        [/if]
+    [/defend]
+    [movement_anim]
+        start_time=0
+        fish_start_time=0
+        fish_y=1:250,1~3:600,3:150,3~1:600
+        fish_offset="0~1:200,0~1:200,0~1:200,0~1:200,0~1:200,0~1:200,0~1:200,0~1:200,0~1:200,0~1:200"
+        terrain_type=W*,W*^Wkf
+        alpha=0.3
+        [fish_frame]
+            image={CARIBE_IMAGE_PATH}/caribe-[hi,default,lo,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[400*4]
+            auto_vflip=no
+            # submerge=0.45
+        [/fish_frame]
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-shadow.png:1600
+            layer=2
+        [/frame]
+    [/movement_anim]
+    [movement_anim]
+        start_time=0
+        terrain_type=!,W*,W*^Wkf
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-land.png
+        [/frame]
+    [/movement_anim]
+    [standing_anim]
+        start_time=0
+        fish_start_time=0
+        fish_y=1:250,1~3:600,3:150,3~1:600
+        terrain_type=W*,W*^Wkf
+        alpha=0.3
+        [fish_frame]
+            image={CARIBE_IMAGE_PATH}/caribe-[hi,default,lo,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[400*4]
+            auto_vflip=no
+            # submerge=0.45
+        [/fish_frame]
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-shadow.png:1600
+            layer=2
+        [/frame]
+    [/standing_anim]
+    [standing_anim]
+        start_time=0
+        terrain_type=!,W*,W*^Wkf
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-land.png
+        [/frame]
+    [/standing_anim]
+    [attack]
+        name=fangs
+        description=_"fangs"
+        icon=attacks/fangs.png
+        type=pierce
+        range=melee
+        damage=8
+        number=4
+    [/attack]
+    [attack]
+        name=kelp
+        description=_"entangle"
+        icon=attacks/kelp.png
+        type=impact
+        [specials]
+            {WEAPON_SPECIAL_SLOW}
+        [/specials]
+        damage=4
+        number=2
+        range=ranged
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=fangs
+        [/filter_attack]
+        terrain_type=W*,W*^Wkf
+        start_time=-350
+        offset=0~-0.1:175,-0.1~0.65:175,0.65~0:250
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-[attack-2,attack-1,attack-2,attack-3,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[70,80,125,150,175]
+        [/frame]
+        {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=fangs
+        [/filter_attack]
+        terrain_type=!,W*,W*^Wkf
+        start_time=-325
+        offset=0~-0.1:150,-0.1~0.65:175,0.65~0:250
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-[attack-2,attack-1,attack-2,attack-3,land].png:[60,65,125,150,175]
+        [/frame]
+        {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=kelp
+        [/filter_attack]
+        start_time=-450
+        missile_start_time=-200
+        offset=0.0~-0.05:300,-0.05~0.05:200,0.05~0.0:120
+        y=0:300,0~-5:150,-5~0:170
+        missile_y=0~-4:80,-4:40,-4~0:80
+        [missile_frame]
+            duration=200
+            image="projectiles/kelp.png"
+            image_diagonal="projectiles/kelp.png"
+        [/missile_frame]
+        [frame]
+            image={CARIBE_IMAGE_PATH}/caribe-sling[1~5].png:[100*3,200,120]
+        [/frame]
+        {SOUND:HIT_AND_MISS entangle.wav {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+[/unit_type]
+
+#undef CARIBE_IMAGE_PATH

data/core/units/monsters/Caribe_Nibbler.cfg

@@ -123,7 +123,7 @@ units/monsters/caribe#enddef
     [attack]
         name=fangs
         description=_"fangs"
-        icon=attacks/fangs-angler.png
+        icon=attacks/fangs.png
         type=pierce
         range=melee
         damage=5

data/core/units/monsters/Cuttle_Fish.cfg

@@ -66,10 +66,22 @@
         [filter_attack]
             name=tentacle
         [/filter_attack]
-        start_time=-300
+        start_time=-400
+        offset=0.0~-0.05:200,-0.05~0.6:150,0.6~0.0:250
         [frame]
             image="units/monsters/cuttlefish-melee-[1~6].png:100"
         [/frame]
         {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} 0}
     [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=tentacle
+        [/filter_attack]
+        start_time=-400
+        offset=0.0~-0.05:320,-0.05~0.6:100,0.6~0.0:180
+        [frame]
+            image="units/monsters/cuttlefish-melee-a[1~5].png:100"
+        [/frame]
+        {SOUND:HIT_AND_MISS squishy-hit.wav {SOUND_LIST:MISS} 0}
+    [/attack_anim]
 [/unit_type]

data/core/units/monsters/Frost_Stoat.cfg

@@ -162,14 +162,3 @@
 
 #undef FS_STANDING_FOG_TEMP
 #undef FS_STANDING_FOG
-
-# Temporary unit to not break anything someone might have in 1.15.x, but should be removed eventually.
-[unit_type]
-    id=Giant Stoat # wmllint: noconvert
-    name= _ "Giant Stoat" # wmllint: noconvert
-    description= _ "Giant Stoats are obsolete, use Frost Stoat." # wmllint: noconvert
-    [base_unit]
-        id=Frost Stoat
-    [/base_unit]
-    {DEPRECATED_UNIT "Giant Stoat" "Frost Stoat" 1.17} # wmllint: noconvert
-[/unit_type]

data/core/units/monsters/Sea_Serpent.cfg

@@ -21,7 +21,7 @@
     usage=fighter
     description= _ "Sea Serpents incite fear and awe in fishermen and sailors, figuring often in folklore as wrathful deities of the sea. Capable of destroying ships effortlessly, and possessed of seemingly endless strength and vitality, these elusive leviathans are destructive and relentless to any who try to combat them. Generally living in the deep seas, Sea Serpents are imposing even to the elite merfolk warriors, and are the reason they seldom inhabit waters far from the shore."
     die_sound=water-blast.wav
-    {DEFENSE_ANIM "units/monsters/seaserpent.png" "units/monsters/seaserpent.png" hiss-hit.wav }
+    {DEFENSE_ANIM "units/monsters/seaserpent-defend2.png" "units/monsters/seaserpent-defend1.png" hiss-hit.wav }
     [attack]
         name=fangs
         description=_"fangs"