1.17 - Ravens (#7902)

* Add ravens unit line

* Update to Roc

data/core/units.cfg

@@ -348,6 +348,20 @@ Orcs who were not the strongest of their litter tend to specialize in other skil
         {ORCISH_NAMES}
     [/race]
 
+    [race]
+        id=raven
+        male_name= _ "race^Raven"
+        female_name= _ "race+female^Raven"
+        plural_name= _ "race^Ravens"
+        description= _ "Ravens are general scavengers, often associating with hunters or predators in the hope of sharing in the kill.  They do not have the powerful beak or claws of the gryphons or raptors, but can still be a threat because of their intelligence and ability to recognize any advantage.
+
+No predators have the numbers to rival orcs or humans, so these races have constant interaction with ravens.  In the aftermath of a battle, the dead and wounded are a banquet for ravens, thus ravens are a nuisance for allies of the defeated but are seen by some victors as part of martial ceremonies.  As intelligent scavengers, ravens do not need war dead to survive.  Some farmers struggle to keep ravens away from freshly sown seeds, but others are happy to have them around as sentries."
+        num_traits=2
+        undead_variation=falcon
+        markov_chain_size=2
+        {OGRE_NAMES}
+    [/race]
+
     [race]
         id=troll
         male_name= _ "race^Troll"

data/core/units/monsters/Raven.cfg

@@ -0,0 +1,114 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Raven
+    name= _ "Raven"
+    race=raven
+    image="units/monsters/raven/raven.png"
+    profile="portraits/monsters/raven.webp"
+    hitpoints=16
+    movement_type=lightfly
+    movement=8
+    experience=24
+    level=0
+    alignment=chaotic
+    advances_to=Dark Omen
+    undead_variation=falcon
+    cost=10
+    usage=scout
+    description= _ "Ravens follow armies to feast upon the refuse and corpses that are the fruit of war.  For this reason, they are often associated with death, war, and fate.  They are not usually associated with necromancy, as their brazen and vivacious behaviour ties them to the legacy of battles and continuity of life, rather than rot and the finality of the tomb."
+    [movement_anim]
+        direction=s,se,sw
+        start_time=0
+        [frame]
+            image="units/monsters/raven/raven.png"
+        [/frame]
+    [/movement_anim]
+    [movement_anim]
+        direction=n,ne,nw
+        start_time=0
+        [frame]
+            image="units/monsters/raven/raven-ne.png"
+        [/frame]
+    [/movement_anim]
+
+    [standing_anim]
+        layer=60 # taken from bat animation
+        start_time=0
+        bird_start_time=0
+        bird_y=0~-2:600,-2~2:1200,2~0:600,0~-4:1200,-4~0:1200
+        [frame]
+            image="units/monsters/raven/raven-shadow.png:4800"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/raven-soar.png:4800"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+    [/standing_anim]
+    die_sound={SOUND_LIST:GRYPHON_DIE}
+    [defend]
+        hits=hit,kill
+        start_time=-126
+        offset=0.0~-0.1:126,-0.1~0.0:126
+        [frame]
+            image="units/monsters/raven/raven-hit1.png:1"
+        [/frame]
+        [frame]
+            image="units/monsters/raven/raven-hit2.png:250"
+            sound={SOUND_LIST:GRYPHON_HIT}
+        [/frame]
+        [frame]
+            image="units/monsters/raven/raven-hit1.png:1"
+        [/frame]
+    [/defend]
+    [defend]
+        hits=miss
+        start_time=-200
+        bird_start_time=-200
+        bird_y=0~-10:200,-10~0:200
+        offset=0~-0.05:200,-0.05~0:200
+        bird_offset=0~-0.2:200,-0.2~0:200
+        [frame]
+            image="units/monsters/raven/raven-shadow.png:400"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/raven-soar.png:400"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+    [/defend]
+    [defense]
+        village=60
+        forest=70
+    [/defense]
+    [attack]
+        name=beak
+        description= _ "beak"
+        type=pierce
+        range=melee
+        damage=4
+        number=2
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=beak
+        [/filter_attack]
+
+        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/raven/raven-shadow.png:700"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/raven-soar.png:700"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+
+        {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/monsters/Raven_Harbinger.cfg

@@ -0,0 +1,170 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=War Harbinger
+    name= _ "War Harbinger"
+    race=raven
+    image="units/monsters/raven/harbinger.png"
+    profile="portraits/monsters/war-harbinger.webp"
+    hitpoints=26
+    movement_type=lightfly
+    movement=9
+    experience=150
+    level=2
+    alignment=chaotic
+    advances_to=null
+    {AMLA_DEFAULT}
+    undead_variation=falcon
+    cost=50
+    usage=scout
+    description= _ "Ravens follow armies to feast upon the refuse and corpses that are the fruit of war.  This leads to folk wisdom that the dark birds are agents of various war gods or underworld spirits, and the unusual abilities of some of them have only supported this notion."
+    [movement_anim]
+        direction=s,se,sw
+        start_time=0
+        [frame]
+            image="units/monsters/raven/harbinger.png"
+        [/frame]
+    [/movement_anim]
+    [movement_anim]
+        direction=n,ne,nw
+        start_time=0
+        [frame]
+            image="units/monsters/raven/harbinger-ne.png"
+        [/frame]
+    [/movement_anim]
+
+    [standing_anim]
+        layer=60 # taken from bat animation
+        start_time=0
+        bird_start_time=0
+        bird_y=0~-2:600,-2~2:1200,2~0:600,0~-4:1200,-4~0:1200
+        [frame]
+            image="units/monsters/raven/raven-shadow.png:4800"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/harbinger-soar.png:4800"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+    [/standing_anim]
+    die_sound={SOUND_LIST:GRYPHON_DIE}
+    [defend]
+        hits=hit,kill
+        start_time=-126
+        offset=0.0~-0.3:126,-0.3~0.0:126
+        [frame]
+            image="units/monsters/raven/harbinger-hit1.png:1"
+        [/frame]
+        [frame]
+            image="units/monsters/raven/harbinger-hit2.png:250"
+            sound={SOUND_LIST:GRYPHON_HIT}
+        [/frame]
+        [frame]
+            image="units/monsters/raven/harbinger-hit1.png:1"
+        [/frame]
+    [/defend]
+    [defend]
+        hits=miss
+        start_time=-200
+        bird_start_time=-200
+        bird_y=0~-10:200,-10~0:200
+        offset=0~-0.05:200,-0.05~0:200
+        bird_offset=0~-0.2:200,-0.2~0:200
+        [frame]
+            image="units/monsters/raven/raven-shadow.png:400"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/harbinger-soar.png:400"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+    [/defend]
+    [defense]
+        village=60
+        forest=70
+    [/defense]
+    [attack]
+        name=claws
+        description= _ "claws"
+        icon=attacks/claws.png
+        type=blade
+        range=melee
+        damage=7
+        number=3
+    [/attack]
+    [attack]
+        name=beak
+        description= _ "beak"
+        type=pierce
+        range=melee
+        damage=11
+        number=2
+    [/attack]
+    [attack]
+        name=lightning
+        description= _"lightning"
+        icon=attacks/lightning.png
+        type=fire
+        range=ranged
+        [specials]
+            {WEAPON_SPECIAL_MAGICAL}
+        [/specials]
+        damage=23
+        number=1
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=claws
+        [/filter_attack]
+
+        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/raven/raven-shadow.png:700"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/harbinger-soar.png:700"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+
+        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=beak
+        [/filter_attack]
+
+        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/raven/raven-shadow.png:700"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/harbinger-soar.png:700"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+
+        {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=lightning
+        [/filter_attack]
+
+        {LIGHTNING_BOLT 2 }
+
+        start_time=-300
+        {SOUND:HIT_AND_MISS lightning.ogg lightning-miss.ogg -300}
+        [frame]
+            image="units/monsters/raven/harbinger.png:550"
+        [/frame]
+    [/attack_anim]
+[/unit_type]

data/core/units/monsters/Raven_Omen.cfg

@@ -0,0 +1,139 @@
+#textdomain wesnoth-units
+[unit_type]
+    id=Dark Omen
+    name= _ "Dark Omen"
+    race=raven
+    image="units/monsters/raven/herald.png"
+    profile="portraits/monsters/herald.webp"
+    hitpoints=26
+    movement_type=lightfly
+    movement=9
+    experience=80
+    level=1
+    alignment=chaotic
+    advances_to=War Harbinger
+    undead_variation=falcon
+    cost=20
+    usage=scout
+    description= _ "Ravens follow armies to feast upon the refuse and corpses that are the fruit of war.  This leads to folk wisdom that the dark birds are agents of various war gods or underworld spirits, and the unusual abilities of some of them have only supported this notion."
+    [movement_anim]
+        direction=s,se,sw
+        start_time=0
+        [frame]
+            image="units/monsters/raven/herald.png"
+        [/frame]
+    [/movement_anim]
+    [movement_anim]
+        direction=n,ne,nw
+        start_time=0
+        [frame]
+            image="units/monsters/raven/herald-ne.png"
+        [/frame]
+    [/movement_anim]
+
+    [standing_anim]
+        layer=60 # taken from bat animation
+        start_time=0
+        bird_start_time=0
+        bird_y=0~-2:600,-2~2:1200,2~0:600,0~-4:1200,-4~0:1200
+        [frame]
+            image="units/monsters/raven/raven-shadow.png:4800"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/herald-soar.png:4800"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+    [/standing_anim]
+    die_sound={SOUND_LIST:GRYPHON_DIE}
+    [defend]
+        hits=hit,kill
+        start_time=-126
+        offset=0.0~-0.1:126,-0.1~0.0:126
+        [frame]
+            image="units/monsters/raven/herald-hit1.png:1"
+        [/frame]
+        [frame]
+            image="units/monsters/raven/herald-hit2.png:250"
+            sound={SOUND_LIST:GRYPHON_HIT}
+        [/frame]
+        [frame]
+            image="units/monsters/raven/herald-hit1.png:1"
+        [/frame]
+    [/defend]
+    [defend]
+        hits=miss
+        start_time=-200
+        bird_start_time=-200
+        bird_y=0~-10:200,-10~0:200
+        offset=0~-0.05:200,-0.05~0:200
+        bird_offset=0~-0.2:200,-0.2~0:200
+        [frame]
+            image="units/monsters/raven/raven-shadow.png:400"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/herald-soar.png:400"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+    [/defend]
+    [defense]
+        village=60
+        forest=70
+    [/defense]
+    [attack]
+        name=beak
+        description= _ "beak"
+        type=pierce
+        range=melee
+        damage=7
+        number=2
+    [/attack]
+    [attack]
+        name=lightning
+        description= _"lightning"
+        icon=attacks/lightning.png
+        type=fire
+        range=ranged
+        [specials]
+            {WEAPON_SPECIAL_MAGICAL}
+        [/specials]
+        damage=13
+        number=1
+    [/attack]
+
+    [attack_anim]
+        [filter_attack]
+            name=beak
+        [/filter_attack]
+
+        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/raven/raven-shadow.png:700"
+        [/frame]
+        [bird_frame]
+            image="units/monsters/raven/herald-soar.png:700"
+            auto_vflip=no
+            primary=yes
+        [/bird_frame]
+
+        {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=lightning
+        [/filter_attack]
+
+        {LIGHTNING_BOLT 2 }
+
+        start_time=-300
+        {SOUND:HIT_AND_MISS lightning.ogg lightning-miss.ogg -300}
+        [frame]
+            image="units/monsters/raven/herald.png:550"
+        [/frame]
+    [/attack_anim]
+[/unit_type]

data/core/units/monsters/Roc.cfg

@@ -6,44 +6,79 @@
     num_traits=2
     undead_variation=gryphon
     image="units/monsters/roc.png"
-    hitpoints=44
+    profile="portraits/monsters/roc.webp"
+    hitpoints=76
     movement_type=fly
     movement=10
     experience=100
-    level=2
+    level=3
     alignment=neutral
     advances_to=null
     {AMLA_DEFAULT}
     cost=36
     usage=scout
-    description= _ "Far from human cities in the great desert mountains, the large birds of prey known as Rocs can sometimes be found rapidly scouring the sands on their hunts. Despite their large size, Rocs tend to be reclusive and are only rarely encountered by other sapient races. Their elusive nature has raised them to near mythological status, particularly among the nomads of the deserts.
+    description= _ "In remote desert mountains, far from any city or settlement, enormous raptors are rumoured to nest in the lofty crags.  Travellers and nomads claim to have witnessed livestock and grown men snatched into the sky without warning by these monsters.  While one should not place much faith in the accounts of the desert roamers, they are less fantastical than the drunken lies of sailors who claim to have witnessed full-rigged ships, attempting to navigate the narrow straights between the sheer cliffs where nothing can grow, sunk by giant eagles dropping large rocks.
 
-Unlike other avians, such as falcons or hawks, the individualistic and intelligent Rocs are nearly untamable. Only on occasion, a Roc may offer its aid to a traveler in need, usually in exchange for a small trinket or shiny bauble."
+Whatever kernel of truth is in these tall tales, there is no denying that the desert is a dangerous place, and both traders and armies do sometimes disappear when trying to cross the harsh ranges.  If you must traverse the great deserts, keep an eye to the sky."
     die_sound={SOUND_LIST:GRYPHON_DIE}
-    {DEFENSE_ANIM "units/monsters/roc.png" "units/monsters/roc.png" {SOUND_LIST:GRYPHON_HIT} }
+    [standing_anim]
+        start_time=0
+        bird_start_time=0
+        bird_y=0~-4:600,-4~2:1200,2~0:600
+        [frame]
+            image=units/monsters/roc-shadow[2,1,2,3,2].png:[400,400,750,500,350]
+        [/frame]
+        [bird_frame]
+            image=units/monsters/roc-soar.png:2400
+            auto_vflip=no
+        [/bird_frame]
+    [/standing_anim]
+    [movement_anim]
+        start_time=0
+        bird_start_time=0
+        bird_y=0~-4:1000,-4~0:1000
+        bird_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"
+        [frame]
+            image=units/monsters/roc-shadow2.png:2000
+        [/frame]
+        [bird_frame]
+            image=units/monsters/roc-soar.png:2000
+            auto_vflip=no
+        [/bird_frame]
+    [/movement_anim]
+    {DEFENSE_ANIM "units/monsters/roc-defend2.png" "units/monsters/roc-defend1.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
         village=50
     [/defense]
-    [attack]
-        name=beak
-        description= _ "beak"
-        type=pierce
-        range=melee
-        damage=6
-        number=4
-    [/attack]
     [attack]
         name=claws
         description= _ "claws"
-        icon=attacks/claws-animal.png
+        icon=attacks/claws.png
+        type=pierce
+        range=melee
+        damage=12
+        number=3
+    [/attack]
+    [attack]
+        name=beak
+        description= _ "beak"
         type=blade
         range=melee
-        damage=10
+        damage=12
         number=2
         [specials]
             {WEAPON_SPECIAL_CHARGE}
         [/specials]
     [/attack]
+    [attack]
+        name=rock
+        description= _ "rock"
+        type=impact
+        icon=attacks/rock_thrown.png
+        range=ranged
+        damage=14
+        number=1
+    [/attack]
 
     [attack_anim]
         [filter_attack]
@@ -71,4 +106,33 @@ Unlike other avians, such as falcons or hawks, the individualistic and intellige
 
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=rock
+        [/filter_attack]
+
+        start_time=-1000
+        bird_start_time=-1000
+        stone_start_time=-800
+        bird_y=0~-4:150,-4~4:100,4~0:250,0:500
+
+        # the halo_x/y values were simply lifted from the troll rocklobber, but seem OK for now
+        [stone_frame]
+            halo="projectiles/stone-large.png:800"
+            halo_x=24~0
+            halo_y=0~-10,-10~-18,-18~-22,-22~-24,-24~-25,-25~-24,-24~-22,-22~-18,-18~-10,-10~-0
+            offset=0.0~1.0
+        [/stone_frame]
+        [bird_frame]
+            image="units/monsters/roc-soar.png:1000"
+            auto_vflip=no
+            offset=0.0
+        [/bird_frame]
+        [frame]
+            image=units/monsters/roc-shadow2.png:1000
+            offset=0.0
+        [/frame]
+
+        {SOUND:HIT_AND_MISS sling-big.ogg sling-big-miss -100}
+    [/attack_anim]
 [/unit_type]