diff --git a/data/core/images/attacks/kelp.png b/data/core/images/attacks/kelp.png new file mode 100644 index 00000000000..b5bed33dc91 Binary files /dev/null and b/data/core/images/attacks/kelp.png differ diff --git a/data/core/images/portraits/monsters/caribe-hunter.webp b/data/core/images/portraits/monsters/caribe-hunter.webp new file mode 100644 index 00000000000..07e5f760a0d Binary files /dev/null and b/data/core/images/portraits/monsters/caribe-hunter.webp differ diff --git a/data/core/images/portraits/monsters/caribe.webp b/data/core/images/portraits/monsters/caribe.webp index 007c8ab4044..9ee21e75bb5 100644 Binary files a/data/core/images/portraits/monsters/caribe.webp and b/data/core/images/portraits/monsters/caribe.webp differ diff --git a/data/core/images/projectiles/kelp.png b/data/core/images/projectiles/kelp.png new file mode 100644 index 00000000000..5c0ca723a98 Binary files /dev/null and b/data/core/images/projectiles/kelp.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-attack-1.png b/data/core/images/units/monsters/caribe/caribe-attack-1.png index d31715e7247..15e702269d4 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-attack-1.png and b/data/core/images/units/monsters/caribe/caribe-attack-1.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-attack-2.png b/data/core/images/units/monsters/caribe/caribe-attack-2.png index 4f0d8eeb54a..d94932b39a2 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-attack-2.png and b/data/core/images/units/monsters/caribe/caribe-attack-2.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-attack-3.png b/data/core/images/units/monsters/caribe/caribe-attack-3.png new file mode 100644 index 00000000000..06b3f1b8da8 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-attack-3.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-default.png b/data/core/images/units/monsters/caribe/caribe-default.png index 04610efee34..f2785c83a40 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-default.png and b/data/core/images/units/monsters/caribe/caribe-default.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-defend-1.png b/data/core/images/units/monsters/caribe/caribe-defend-1.png index 23bc0977ed7..bd3dbf4fad5 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-defend-1.png and b/data/core/images/units/monsters/caribe/caribe-defend-1.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-defend-2.png b/data/core/images/units/monsters/caribe/caribe-defend-2.png index e2ac54cdb0c..2a97eb42221 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-defend-2.png and b/data/core/images/units/monsters/caribe/caribe-defend-2.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-hi.png b/data/core/images/units/monsters/caribe/caribe-hi.png index f89fa3e4c27..a0f6ce751ac 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-hi.png and b/data/core/images/units/monsters/caribe/caribe-hi.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-land.png b/data/core/images/units/monsters/caribe/caribe-land.png index 041905cb479..7122cdb0122 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-land.png and b/data/core/images/units/monsters/caribe/caribe-land.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-lo.png b/data/core/images/units/monsters/caribe/caribe-lo.png index 84297ddd77c..72e4a00bf46 100644 Binary files a/data/core/images/units/monsters/caribe/caribe-lo.png and b/data/core/images/units/monsters/caribe/caribe-lo.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-sling1.png b/data/core/images/units/monsters/caribe/caribe-sling1.png new file mode 100644 index 00000000000..9aeea634708 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-sling1.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-sling2.png b/data/core/images/units/monsters/caribe/caribe-sling2.png new file mode 100644 index 00000000000..e989680b402 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-sling2.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-sling3.png b/data/core/images/units/monsters/caribe/caribe-sling3.png new file mode 100644 index 00000000000..bd457ffe860 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-sling3.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-sling4.png b/data/core/images/units/monsters/caribe/caribe-sling4.png new file mode 100644 index 00000000000..50983b25c90 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-sling4.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-sling5.png b/data/core/images/units/monsters/caribe/caribe-sling5.png new file mode 100644 index 00000000000..e9b04d5043e Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-sling5.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-attack-1.png b/data/core/images/units/monsters/caribe/caribe-small-attack-1.png new file mode 100644 index 00000000000..7a9f8d71c2f Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-attack-1.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-attack-2.png b/data/core/images/units/monsters/caribe/caribe-small-attack-2.png new file mode 100644 index 00000000000..057db9fd08e Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-attack-2.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-default.png b/data/core/images/units/monsters/caribe/caribe-small-default.png new file mode 100644 index 00000000000..d642215883d Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-default.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-defend-1.png b/data/core/images/units/monsters/caribe/caribe-small-defend-1.png new file mode 100644 index 00000000000..41af9219fa9 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-defend-1.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-defend-2.png b/data/core/images/units/monsters/caribe/caribe-small-defend-2.png new file mode 100644 index 00000000000..77b20748d50 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-defend-2.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-hi.png b/data/core/images/units/monsters/caribe/caribe-small-hi.png new file mode 100644 index 00000000000..dcfa2c72b20 Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-hi.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-land.png b/data/core/images/units/monsters/caribe/caribe-small-land.png new file mode 100644 index 00000000000..33ae8bfb70e Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-land.png differ diff --git a/data/core/images/units/monsters/caribe/caribe-small-lo.png b/data/core/images/units/monsters/caribe/caribe-small-lo.png new file mode 100644 index 00000000000..dfc313aa83d Binary files /dev/null and b/data/core/images/units/monsters/caribe/caribe-small-lo.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler-attack-1.png b/data/core/images/units/monsters/caribe/nibbler-attack-1.png index 598d948363e..fe4692b6ac5 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler-attack-1.png and b/data/core/images/units/monsters/caribe/nibbler-attack-1.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler-default.png b/data/core/images/units/monsters/caribe/nibbler-default.png index ed9478a861b..bcc983cbaa6 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler-default.png and b/data/core/images/units/monsters/caribe/nibbler-default.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler-defend-1.png b/data/core/images/units/monsters/caribe/nibbler-defend-1.png index 7ba5595c4f7..605e2cc5a8a 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler-defend-1.png and b/data/core/images/units/monsters/caribe/nibbler-defend-1.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler-defend-2.png b/data/core/images/units/monsters/caribe/nibbler-defend-2.png index c32f6ec37c3..243ae5b9e0a 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler-defend-2.png and b/data/core/images/units/monsters/caribe/nibbler-defend-2.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler-hi.png b/data/core/images/units/monsters/caribe/nibbler-hi.png index da4ba993736..8e85fe7adc8 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler-hi.png and b/data/core/images/units/monsters/caribe/nibbler-hi.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler-land.png b/data/core/images/units/monsters/caribe/nibbler-land.png index 83dc2f0b1df..dba42f36281 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler-land.png and b/data/core/images/units/monsters/caribe/nibbler-land.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler-lo.png b/data/core/images/units/monsters/caribe/nibbler-lo.png index 770c0f387e9..a7a127f1aac 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler-lo.png and b/data/core/images/units/monsters/caribe/nibbler-lo.png differ diff --git a/data/core/images/units/monsters/caribe/nibbler.png b/data/core/images/units/monsters/caribe/nibbler.png index ac026b7bb4a..9e0d52d5b77 100644 Binary files a/data/core/images/units/monsters/caribe/nibbler.png and b/data/core/images/units/monsters/caribe/nibbler.png differ diff --git a/data/core/images/units/monsters/cuttlefish-melee-a1.png b/data/core/images/units/monsters/cuttlefish-melee-a1.png new file mode 100644 index 00000000000..99d02a9db86 Binary files /dev/null and b/data/core/images/units/monsters/cuttlefish-melee-a1.png differ diff --git a/data/core/images/units/monsters/cuttlefish-melee-a2.png b/data/core/images/units/monsters/cuttlefish-melee-a2.png new file mode 100644 index 00000000000..ed4c5e78763 Binary files /dev/null and b/data/core/images/units/monsters/cuttlefish-melee-a2.png differ diff --git a/data/core/images/units/monsters/cuttlefish-melee-a3.png b/data/core/images/units/monsters/cuttlefish-melee-a3.png new file mode 100644 index 00000000000..c5cb25842a7 Binary files /dev/null and b/data/core/images/units/monsters/cuttlefish-melee-a3.png differ diff --git a/data/core/images/units/monsters/cuttlefish-melee-a4.png b/data/core/images/units/monsters/cuttlefish-melee-a4.png new file mode 100644 index 00000000000..cf7a4eb20d3 Binary files /dev/null and b/data/core/images/units/monsters/cuttlefish-melee-a4.png differ diff --git a/data/core/images/units/monsters/cuttlefish-melee-a5.png b/data/core/images/units/monsters/cuttlefish-melee-a5.png new file mode 100644 index 00000000000..436fd723985 Binary files /dev/null and b/data/core/images/units/monsters/cuttlefish-melee-a5.png differ diff --git a/data/core/images/units/monsters/seaserpent-defend1.png b/data/core/images/units/monsters/seaserpent-defend1.png new file mode 100644 index 00000000000..654d6552c44 Binary files /dev/null and b/data/core/images/units/monsters/seaserpent-defend1.png differ diff --git a/data/core/images/units/monsters/seaserpent-defend2.png b/data/core/images/units/monsters/seaserpent-defend2.png new file mode 100644 index 00000000000..5677d76824c Binary files /dev/null and b/data/core/images/units/monsters/seaserpent-defend2.png differ diff --git a/data/core/units/monsters/Caribe.cfg b/data/core/units/monsters/Caribe.cfg index 7cb28d17c7b..69f6f0c5591 100644 --- a/data/core/units/monsters/Caribe.cfg +++ b/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] diff --git a/data/core/units/monsters/Caribe_Hunter.cfg b/data/core/units/monsters/Caribe_Hunter.cfg new file mode 100644 index 00000000000..dfbdbabf29d --- /dev/null +++ b/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 diff --git a/data/core/units/monsters/Caribe_Nibbler.cfg b/data/core/units/monsters/Caribe_Nibbler.cfg index c5f9e5fd9e7..3d6b8e2283e 100644 --- a/data/core/units/monsters/Caribe_Nibbler.cfg +++ b/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 diff --git a/data/core/units/monsters/Cuttle_Fish.cfg b/data/core/units/monsters/Cuttle_Fish.cfg index d575529056c..797c7dc5adf 100644 --- a/data/core/units/monsters/Cuttle_Fish.cfg +++ b/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] diff --git a/data/core/units/monsters/Frost_Stoat.cfg b/data/core/units/monsters/Frost_Stoat.cfg index ebec422ed5a..7193a25acb0 100644 --- a/data/core/units/monsters/Frost_Stoat.cfg +++ b/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] diff --git a/data/core/units/monsters/Sea_Serpent.cfg b/data/core/units/monsters/Sea_Serpent.cfg index 2fc37757eaa..16cfd4fdd83 100644 --- a/data/core/units/monsters/Sea_Serpent.cfg +++ b/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"