1.17 water-related things (#6695)

* caribe monster unit

* some sea-related terrain overlays

* minor variation of dead oak

* update rubble on the water

data/core/terrain-graphics.cfg

@@ -180,12 +180,16 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:FOREST             (W*^Tf*)        (Wo*)                  forest/mushrooms-water}
 {NEW:FOREST             (*^Uf*,*^Tf*)   {SMALL_FOREST_FILTER}  forest/mushrooms}
 
+{NEW:FOREST             (W*^Wkf)        (Wwr*,!,W*)            water/seaweed/kelp ANIM="-[1~4,3,2]" TIME=":[700*6]"}
+{NEW:FOREST             (*^Wkf)         {SMALL_FOREST_FILTER}  water/seaweed/kelp-dead}
+
 #undef SMALL_FOREST_FILTER
 
 # Great-tree
 {NEW:OVERLAY             *^Fet                                              forest/great-tree}
 {NEW:OVERLAY             *^Feta                                              forest/great-tree-snowy}
 {NEW:OVERLAY             *^Fetd                                             forest/great-tree-dead}
+{NEW:OVERLAY             W*^Feth                                            forest/great-oak-tree-dead-water}
 {NEW:OVERLAY             *^Feth                                             forest/great-oak-tree-dead}
 
 # Oasis
@@ -401,6 +405,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:WALL_FLAMES_OVERLAY (Xo*^Efs)							walls/stone/flames/sconce}
 {NEW:TORCH_FLAMES_OVERLAY (!,X*^Efs,!,*^Efs)							walls/stone/flames/torch}
 
+# seashells
+{NEW:OVERLAY        *^Ewsh                                                         embellishments/seashells LAYER=-86}
+
 #Farmland
 {NEW:OVERLAY             *^Gvs                                                     embellishments/farm-veg-spring LAYER=-81}
 
@@ -426,6 +433,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:OVERLAY             (!,Xof^Efm,!,*^Efm)                                       embellishments/flowers-mixed LAYER=-500}
 
 #Rubble
+{NEW:OVERLAY             W*^Dr                                                     misc/rubble-water FLAG=rubble LAYER=-1}
 {NEW:OVERLAY             *^Dr                                                      misc/rubble FLAG=rubble LAYER=-1}
 
 {NEW:OVERLAY             *^Es                                                      embellishments/stones-small}
@@ -936,7 +944,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 # Default layer is -500, so anything layering above should be higher.
 
 
-{NEW:TRANSITION_INTRA   (*^Dr)           -158     misc/rubble FLAG=intra}
+{NEW:TRANSITION_INTRA   (!,W*^Dr,!,*^Dr)           -158     misc/rubble FLAG=intra}
 {NEW:TRANSITION_INTRA   (*^Esd)           -158    embellishments/rocks  FLAG=intra}
 {NEW:TRANSITION            (Md,Mv)          (!,Md,Hhd,Mv,W*,S*)                -166     mountains/dry}
 

data/core/terrain-graphics/new-macros.cfg

@@ -2061,6 +2061,15 @@ corner#endarg
     # causes problems; this is why the rules for setting the flag for a small
     # forest and placing the actual image are separate.
 
+#arg LAYER
+0#endarg
+
+#arg ANIM
+#endarg
+
+#arg TIME
+#endarg
+
     [terrain_graphics]
         map="
 ,  2
@@ -2096,9 +2105,9 @@ corner#endarg
         [/tile]
 
         [image]
-            name={IMAGESTEM}-small@V.png
+            name={IMAGESTEM}-small@V{ANIM}.png{TIME}
             variations=";2;3;4;5;6;7;8;9;10;11"
-            layer=0
+            layer={LAYER}
             base=90,161
             center=90,144
         [/image]
@@ -2118,9 +2127,9 @@ corner#endarg
         [/tile]
 
         [image]
-            name={IMAGESTEM}@V.png
+            name={IMAGESTEM}@V{ANIM}.png{TIME}
             variations=";2;3;4;5;6;7;8;9;10;11"
-            layer=0
+            layer={LAYER}
             base=90,161
             center=90,144
         [/image]

data/core/terrain.cfg

@@ -128,6 +128,19 @@
     editor_group=water
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=water/seaweed/kelp-tile
+    id=sea_kelp
+    name= _ "Swamp"
+    editor_name= _ "Kelp Forest"
+    string=^Wkf
+    aliasof=_bas, St
+    submerge=0.45
+    default_base=Ww
+    mvt_alias=-,_bas,St
+    editor_group=water
+[/terrain_type]
+
 #    ## Swamp ##
 
 [terrain_type]
@@ -554,6 +567,16 @@ Most units receive 20 to 40% defense in sand."
     editor_group=water,embellishments
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=embellishments/seashells-tile
+    id=seashells
+    editor_name= _ "Seashells"
+    string=^Ewsh
+    default_base=Ds
+    aliasof=_bas
+    editor_group=water,embellishments
+[/terrain_type]
+
 ## Trash and battlefield litter ##
 [terrain_type]
     symbol_image=misc/detritus/trashC-1

data/core/units/monsters/Caribe.cfg

@@ -0,0 +1,146 @@
+#textdomain wesnoth-units
+
+#define CARIBE_IMAGE_PATH
+units/monsters/caribe#enddef
+
+[unit_type]
+    id=Caribe
+    name= _ "Caribe"
+    race=monster
+    image="{CARIBE_IMAGE_PATH}/caribe-shadow.png~BLIT("{CARIBE_IMAGE_PATH}/caribe-default.png")"
+    profile="portraits/monsters/caribe.webp"
+    hitpoints=38
+    # needs some adjustment
+    movement_type=deepsea
+    [resistance]
+        arcane=100
+        pierce=90
+        impact=80
+    [/resistance]
+    movement=8
+    experience=40
+    level=1
+    alignment=neutral
+    advances_to=null
+    {AMLA_DEFAULT}
+    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 understimated."
+    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-angler.png
+        type=pierce
+        range=melee
+        damage=6
+        number=4
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=fangs
+        [/filter_attack]
+        terrain_type=W*,W*^Wkf
+        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]
+        [/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=-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]
+        [/frame]
+        {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+[/unit_type]
+
+#undef CARIBE_IMAGE_PATH

data/core/units/monsters/Caribe_Nibbler.cfg

@@ -0,0 +1,160 @@
+#textdomain wesnoth-units
+
+#define CARIBE_IMAGE_PATH
+units/monsters/caribe#enddef
+
+[unit_type]
+    id=Nibbler
+    name= _ "Nibbler"
+    race=monster
+    image="{CARIBE_IMAGE_PATH}/nibbler.png"
+    profile="portraits/monsters/nibbler.webp"
+    hitpoints=28
+    # needs some adjustment
+    movement_type=deepsea
+    [resistance]
+        arcane=100
+    [/resistance]
+    [movement_costs]
+        deep_water=1
+        shallow_water=1
+        reef=2
+        swamp_water=2
+        flat=99
+        sand=99
+        forest=99
+        hills=99
+        village=2
+        castle=3
+        cave=99
+        frozen=99
+        fungus=99
+    [/movement_costs]
+    movement=6
+    experience=32
+    level=0
+    alignment=neutral
+    advances_to=Caribe
+    cost=10
+    undead_variation=serpent
+    usage=fighter
+    description= _ "Nibblers are juvenile predator fish, often more curious than dangerous.  A single individual may not be a threat, but these fish seldom travel alone."
+    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}/nibbler-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}/nibbler-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}/nibbler-[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}/nibbler-shadow.png:1600
+            layer=2
+        [/frame]
+    [/movement_anim]
+    [movement_anim]
+        start_time=0
+        terrain_type=!,W*,W*^Wkf
+        [frame]
+            image={CARIBE_IMAGE_PATH}/nibbler-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}/nibbler-[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}/nibbler-shadow.png:1600
+            layer=2
+        [/frame]
+    [/standing_anim]
+    [standing_anim]
+        start_time=0
+        terrain_type=!,W*,W*^Wkf
+        [frame]
+            image={CARIBE_IMAGE_PATH}/nibbler-land.png
+        [/frame]
+    [/standing_anim]
+    [attack]
+        name=fangs
+        description=_"fangs"
+        icon=attacks/fangs-angler.png
+        type=pierce
+        range=melee
+        damage=5
+        number=3
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=fangs
+        [/filter_attack]
+        terrain_type=W*,W*^Wkf
+        # place holder anim
+        start_time=-225
+        offset=0~-0.1:75,-0.1~0.65:150,0.65~0:225
+        [frame]
+            image={CARIBE_IMAGE_PATH}/nibbler-[default,attack-1,default].png~MASK({CARIBE_IMAGE_PATH}/caribe-mask.png):[50,200,200]
+        [/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
+        # place holder anim
+        start_time=-225
+        offset=0~-0.1:75,-0.1~0.65:150,0.65~0:225
+        [frame]
+            image={CARIBE_IMAGE_PATH}/nibbler-[land,attack-1,land].png:[50,200,200]
+        [/frame]
+        {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+[/unit_type]
+
+#undef CARIBE_IMAGE_PATH