horse things (#5738)

* some basic cataphract frames for all attacks

* horse unit

* zombie horse variation

* horse soulless

* White Horse variation

* Dark Horse variation

* horse-related attack icons

* adding seahorse unit

* wmlindent corrections

data/core/units.cfg

@@ -178,6 +178,18 @@ The means by which gryphons are able to fly despite their great weight has been
         {GRYPHON_NAMES}
     [/race]
 
+    [race]
+        id=horse
+        male_name= _ "race^Horse"
+        female_name= _ "race+female^Horse"
+        plural_name= _ "race^Horses"
+        description= _ "Domesticated horses come in many shapes and sizes, from mighty war chargers, to sturdy draught horses or agile stock horses.  While they are more fragile than many beasts, their speed and cunning allow feral horses to thrive in the wild, alongside their wild bretheren.
+
+Horses have been an important part of many civilizations, so it is not surprising that there are many myths and stories centered around them.  Winged horses, man-horse hybrids, and ghost horses have made their way into written history, though few can honestly claim to have seen such things."
+        num_traits=2
+        undead_variation=horse
+    [/race]
+
     # wmllint: general spellings Wesnoth Wesnothian Wesnothians Elensefar Elense
     # wmllint: general spellings Soradoc Tath Dulatus Estmark Estmarks Dan'Tonk
     # wmllint: general spellings Abez Alduin Tahn Parthyn Halstead Weldyn Carcyn

data/core/units/dunefolk/Cataphract.cfg

@@ -23,13 +23,17 @@ units/dunefolk/rider/#enddef
     description= _ "Cataphracts are eminent horsemen, riders of mounts that are possessed less of speed or endurance but tremendous power instead. Bearing a lance along with their signature maces, these warriors are most often the secondary strike force after a primary assault. After enemy forces are already occupied and weakened by a flank of swordsmen, a terrifying sight is a group of cataphracts lining up, lances pitched at the ready. A gap is made amongst the Dunefolk ranks, and in a single charge, these mighty horsemen pierce straight through enemy formations, dealing a lethal blow in a single stroke. Those who try to flee swiftly discover that neither sand nor hills deter these riders in the slightest, and the displaced air of a descending mace is the last sound they hear."
     {NOTE_CHARGE}
     die_sound=horse-die.ogg
-    {DEFENSE_ANIM_FILTERED "{PATH_TEMP}cataphract-lance-defend2.png" "{PATH_TEMP}cataphract-lance-defend1.png" {SOUND_LIST:HORSE_HIT} (
+    {DEFENSE_ANIM "{PATH_TEMP}cataphract-lance-defend2.png" "{PATH_TEMP}cataphract-lance-defend1.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM_FILTERED "{PATH_TEMP}cataphract-defend2.png" "{PATH_TEMP}cataphract-defend1.png" {SOUND_LIST:HORSE_HIT} (
         [filter_second_attack]
-            name=lance
+            name=mace
+        [/filter_second_attack]
+    )}
+    {DEFENSE_ANIM_FILTERED "{PATH_TEMP}cataphract-bow.png" "{PATH_TEMP}cataphract-bow.png" {SOUND_LIST:HORSE_HIT} (
+        [filter_second_attack]
+            name=composite bow
         [/filter_second_attack]
     )}
-    {DEFENSE_ANIM "{PATH_TEMP}cataphract-defend2.png" "{PATH_TEMP}cataphract-defend1.png" {SOUND_LIST:HORSE_HIT} }
-
     [resistance]
         blade=70
         impact=70
@@ -73,7 +77,7 @@ units/dunefolk/rider/#enddef
         start_time=-250
         horse_sound_start_time=-250
         [frame]
-            image="{PATH_TEMP}cataphract.png:300"
+            image="{PATH_TEMP}cataphract-mace.png:300"
         [/frame]
         [horse_sound_frame]
             sound=horse-canter.wav
@@ -106,7 +110,7 @@ units/dunefolk/rider/#enddef
             image_diagonal="projectiles/missile-ne.png"
         [/missile_frame]
         [frame]
-            image="{PATH_TEMP}cataphract.png:300"
+            image="{PATH_TEMP}cataphract-bow.png:300"
         [/frame]
         {SOUND:HIT_AND_MISS bow-puny.ogg bow-puny-miss.ogg -225}
     [/attack_anim]

data/core/units/monsters/Horse.cfg

@@ -0,0 +1,215 @@
+#textdomain wesnoth-units
+
+[unit_type]
+    id=Bay Horse
+    name= _ "Bay Horse"
+    race=horse
+    generate_name=no
+    image="units/monsters/horse/horse.png"
+    profile="portraits/monsters/horse.png"
+    hitpoints=30
+    movement_type=mounted
+    movement=8
+    experience=50
+    {AMLA_DEFAULT}
+    level=1
+    alignment=neutral
+    advances_to=null
+    cost=15
+    usage=scout
+    description=_ "Horses need a better description."
+    die_sound=horse-die.ogg
+    [defense]
+        village=60
+        forest=40
+    [/defense]
+    [resistance]
+        blade=90
+        pierce=110
+        impact=100
+    [/resistance]
+    {DEFENSE_ANIM "units/monsters/horse/horse-defend-2.png" "units/monsters/horse/horse-defend-1.png" {SOUND_LIST:HORSE_HIT} }
+    [attack]
+        name=kick
+        description=_"kick"
+        icon=attacks/hoof.png
+        type=impact
+        range=melee
+        damage=9
+        number=2
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=kick
+        [/filter_attack]
+        start_time=-550
+        offset=0.0~-0.05:350,-0.05~0.7:200,0.7~0.0:320
+        [frame]
+            image="units/monsters/horse/horse-attack[1~7].png:[100*4,80,70,260]"
+            sound=horse-elf-canter.wav
+        [/frame]
+        [frame]
+            image="units/monsters/horse/horse.png:60"
+        [/frame]
+        {SOUND:HIT club.ogg -100}
+    [/attack_anim]
+[/unit_type]
+
+#wmlindent: start ignoring
+#define HORSE_WHITE_IPF
+~CHAN(
+    if((red > green) and (green > blue), red*1.35, red*0.8),
+    if((red > green) and (green > blue), green*1.85, green*0.6),
+    if((red > green) and (green > blue), blue*3.6, blue*0.9)
+    )#enddef
+
+#define HORSE_WHITE_IPF_2
+~CHAN(
+    if((red > green) and (green > blue), red*1.1, red),
+    if((red > green) and (green > blue), green*1.4, green),
+    if((red > green) and (green > blue), blue*1.8, blue*1.3)
+    )#enddef
+#wmlindent: stop ignoring
+
+[unit_type]
+    id=White Horse
+    name= _ "White Horse"
+    [base_unit]
+        id=Bay Horse
+    [/base_unit]
+    image="units/monsters/horse/horse.png{HORSE_WHITE_IPF}"
+    profile="portraits/monsters/horse.png{HORSE_WHITE_IPF_2}"
+    [movement_costs]
+        forest=1
+        shallow_water=2
+        reef=2
+        swamp_water=2
+        cave=2
+    [/movement_costs]
+    [resistance]
+        arcane=100
+        blade=100
+        pierce=100
+        impact=100
+    [/resistance]
+    [defense]
+        village=60
+        forest=40
+    [/defense]
+    movement=9
+    cost=18
+    description=_ "Some horses have a white color, and they are merely white horses.  But there exist a special breed, found only in the wild woods, that are White Horses.  As if blessed by the faerie world, they have a grace and agility not found in their more common relatives."
+    {DEFENSE_ANIM "units/monsters/horse/horse-defend-2.png{HORSE_WHITE_IPF}" "units/monsters/horse/horse-defend-1.png{HORSE_WHITE_IPF}" {SOUND_LIST:HORSE_HIT} }
+    [attack_anim]
+        [filter_attack]
+            name=kick
+        [/filter_attack]
+        start_time=-550
+        offset=0.0~-0.05:350,-0.05~0.7:200,0.7~0.0:320
+        [frame]
+            image="units/monsters/horse/horse-attack[1~7].png{HORSE_WHITE_IPF}:[100*4,80,70,260]"
+            sound=horse-elf-canter.wav
+        [/frame]
+        [frame]
+            image="units/monsters/horse/horse.png{HORSE_WHITE_IPF}:60"
+        [/frame]
+        {SOUND:HIT club.ogg -100}
+    [/attack_anim]
+[/unit_type]
+
+#wmlindent: start ignoring
+#define HORSE_BLACK_IPF
+~CHAN(
+    if((red > green) and (green > blue), red*0.7, red*0.9),
+    if((red > green) and (green > blue), green*0.55, green),
+    if((red > green) and (green > blue), blue*0.8, blue*1.2)
+    )#enddef
+
+#define HORSE_BLACK_IPF_2
+~CHAN(
+    if((red > green) and (green > blue), red*0.6, red*1.8),
+    if((red > green) and (green > blue), green*0.4, green*1.8),
+    if((red > green) and (green > blue), blue*0.8, blue*2.0)
+    )#enddef
+#wmlindent: stop ignoring
+
+[unit_type]
+    id=Dark Horse
+    name= _ "Dark Horse"
+    [base_unit]
+        id=Bay Horse
+    [/base_unit]
+    profile="portraits/monsters/horse.png{HORSE_BLACK_IPF_2}"
+    image="units/monsters/horse/horse.png{HORSE_BLACK_IPF}"
+    experience=44
+    gender=male,female
+    ignore_race_traits=yes
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
+    {TRAIT_QUICK}
+    [movement_costs]
+        frozen=1
+        shallow_water=2
+        reef=2
+        sand=2
+        swamp_water=2
+        cave=2
+    [/movement_costs]
+    [resistance]
+        arcane=120
+        fire=120
+        cold=90
+        blade=90
+        pierce=100
+        impact=90
+    [/resistance]
+    [defense]
+        village=60
+        forest=50
+        frozen=60
+        sand=60
+    [/defense]
+    advances_to=Black Horse
+    alignment=chaotic
+    movement=8
+    cost=18
+    description=_ "Dark Horses are wild animals, but they seem to take an odd interest in the civilized races.  They leave no signs of their passage, but they have been noticed scouting camps and outposts during the night."
+    {DEFENSE_ANIM "units/monsters/horse/horse-defend-2.png{HORSE_BLACK_IPF}" "units/monsters/horse/horse-defend-1.png{HORSE_BLACK_IPF}" {SOUND_LIST:HORSE_HIT} }
+    [attack]
+        name=kick
+        description=_"kick"
+        icon=attacks/hoof-nightmare.png
+        type=impact
+        range=melee
+        damage=9
+        number=2
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=kick
+        [/filter_attack]
+        start_time=-550
+        offset=0.0~-0.05:350,-0.05~0.7:200,0.7~0.0:320
+        [frame]
+            image="units/monsters/horse/horse-attack[1~7].png{HORSE_BLACK_IPF}:[100*4,80,70,260]"
+            sound=horse-elf-canter.wav
+        [/frame]
+        [frame]
+            image="units/monsters/horse/horse.png{HORSE_BLACK_IPF}:60"
+        [/frame]
+        {SOUND:HIT club.ogg -100}
+    [/attack_anim]
+    [male]
+        name= _ "female^Dark Horse"
+        {TRAIT_STRONG}
+    [/male]
+    [female]
+        name= _ "female^Dark Horse"
+        {TRAIT_FEARLESS}
+    [/female]
+[/unit_type]
+
+# #undef HORSE_WHITE_IPF
+# #undef HORSE_WHITE_IPF_2
+# #undef HORSE_BLACK_IPF
+# #undef HORSE_BLACK_IPF_2

data/core/units/monsters/Horse_Black.cfg

@@ -0,0 +1,93 @@
+#textdomain wesnoth-units
+
+[unit_type]
+    id=Black Horse
+    name= _ "Black Horse"
+    race=horse
+    generate_name=no
+    gender=male,female
+    image="units/monsters/horse/horse-larger.png{HORSE_BLACK_IPF}"
+    # profile="portraits/monsters/horse.png"
+    hitpoints=48
+    ignore_race_traits=yes
+    {TRAIT_INTELLIGENT}
+    {TRAIT_RESILIENT}
+    {TRAIT_QUICK}
+    movement_type=mounted
+    movement=8
+    experience=80
+    {AMLA_DEFAULT}
+    level=2
+    alignment=chaotic
+    advances_to=null
+    cost=25
+    usage=scout
+    description=_ "The true nature of Black Horses is impossible to discern, but the fire in their eyes and the unnerving, unnatural sound of their calls suggest they are malevolent spirits."
+    die_sound=horse-die.ogg
+    [defense]
+        village=60
+        forest=40
+    [/defense]
+    [resistance]
+        blade=90
+        pierce=110
+        impact=100
+    [/resistance]
+    {DEFENSE_ANIM "units/monsters/horse/horse-larger-defend-2.png{HORSE_BLACK_IPF}" "units/monsters/horse/horse-larger-defend-1.png{HORSE_BLACK_IPF}" {SOUND_LIST:HORSE_HIT} }
+    [attack]
+        name=kick
+        description=_"kick"
+        icon=attacks/hoof-nightmare.png
+        type=impact
+        range=melee
+        damage=12
+        number=2
+    [/attack]
+    [attack]
+        name=whinny
+        description=_"whinny"
+        icon=attacks/fangs-horse.png~GS()~CS(-30,-5,35)
+        type=cold
+        range=ranged
+        damage=4
+        number=3
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=kick
+        [/filter_attack]
+        start_time=-550
+        offset=0.0~-0.05:350,-0.05~0.7:200,0.7~0.0:320
+        [frame]
+            image="units/monsters/horse/horse-larger-attack[1~7].png{HORSE_BLACK_IPF}:[100*4,80,70,260]"
+            sound=horse-elf-canter.wav
+        [/frame]
+        [frame]
+            image="units/monsters/horse/horse-larger.png{HORSE_BLACK_IPF}:60"
+        [/frame]
+        {SOUND:HIT club.ogg -100}
+    [/attack_anim]
+    # we can work on a better animation later
+    [attack_anim]
+        [filter_attack]
+            name=whinny
+        [/filter_attack]
+        start_time=-550
+        {MISSILE_FRAME_WAIL}
+        [frame]
+            image="units/monsters/horse/horse-larger.png{HORSE_BLACK_IPF}:60"
+        [/frame]
+        {SOUND:HIT wail-sml.wav -100}
+    [/attack_anim]
+    [male]
+        name= _ "Black Stallion"
+        profile="portraits/monsters/black-stallion.png"
+        {TRAIT_STRONG}
+    [/male]
+    [female]
+        name= _ "female^Black Nightmare"
+        profile="portraits/monsters/nightmare.png"
+        image="units/monsters/horse/horse-larger+female.png{HORSE_BLACK_IPF}"
+        {TRAIT_FEARLESS}
+    [/female]
+[/unit_type]

data/core/units/monsters/Horse_Great.cfg

@@ -0,0 +1,56 @@
+#textdomain wesnoth-units
+
+[unit_type]
+    id=Great Horse
+    name= _ "Great Horse"
+    race=horse
+    generate_name=no
+    image="units/monsters/horse/horse-larger.png"
+    profile="portraits/monsters/horse.png"
+    hitpoints=50
+    movement_type=mounted
+    movement=8
+    experience=80
+    {AMLA_DEFAULT}
+    level=2
+    alignment=neutral
+    advances_to=null
+    cost=25
+    usage=scout
+    description=_ "Great Horses need a better description."
+    die_sound=horse-die.ogg
+    [defense]
+        village=60
+        forest=40
+    [/defense]
+    [resistance]
+        blade=90
+        pierce=110
+        impact=100
+    [/resistance]
+    {DEFENSE_ANIM "units/monsters/horse/horse-larger-defend-2.png" "units/monsters/horse/horse-larger-defend-1.png" {SOUND_LIST:HORSE_HIT} }
+    [attack]
+        name=kick
+        description=_"kick"
+        icon=attacks/hoof.png
+        type=impact
+        range=melee
+        damage=13
+        number=2
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=kick
+        [/filter_attack]
+        start_time=-550
+        offset=0.0~-0.05:350,-0.05~0.7:200,0.7~0.0:320
+        [frame]
+            image="units/monsters/horse/horse-larger-attack[1~7].png:[100*4,80,70,260]"
+            sound=horse-elf-canter.wav
+        [/frame]
+        [frame]
+            image="units/monsters/horse/horse-larger.png:60"
+        [/frame]
+        {SOUND:HIT club.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/monsters/Seahorse.cfg

@@ -0,0 +1,127 @@
+#textdomain wesnoth-units
+
+[unit_type]
+    id=Great Seahorse
+    name= _ "Great Seahorse"
+    race=monster
+    # The ~O(0) trick is used here to allow the base tentacle image to get used in contexts where IPFs are not supported
+    image="units/monsters/seahorse.png~O(0)~BLIT(units/monsters/seahorse.png)~MASK(units/monsters/seahorse-mask.png)"
+    profile="portraits/monsters/seahorse.png"
+    hitpoints=35
+    movement_type=float
+    [resistance]
+        arcane=100
+        blade=80
+        cold=80
+        fire=120
+        impact=80
+        pierce=120
+    [/resistance]
+    movement=3
+    experience=60
+    level=1
+    alignment=neutral
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=12
+    undead_variation=swimmer
+    usage=fighter
+    description= _ "Seahorses are a variety of fish that have a horse-like head, but they have no real connection to equines.  Most seahorses are small, shy creatures that eat bugs and similar small prey, but Great Seahorses are large enough to threaten unwary travelers.  This large variety can spit water with enough force to stun a small animal, and has thick, bony plate armor, but like all seahorses, it is a slow swimmer and cannot move over land."
+    die_sound=water-blast.wav
+    {DEFENSE_ANIM "units/monsters/seahorse.png~MASK(units/monsters/seahorse-mask.png)" "units/monsters/seahorse.png~MASK(units/monsters/seahorse-mask.png)" squishy-hit.wav }
+    [attack]
+        name=bite
+        description=_"bite"
+        icon=attacks/fangs.png
+        type=blade
+        range=melee
+        damage=4
+        number=2
+    [/attack]
+    [attack]
+        name=water spray
+        description=_"water spray"
+        icon=attacks/waterspray.png
+        type=impact
+        range=ranged
+        damage=8
+        number=2
+    [/attack]
+    [standing_anim]
+        start_time=0
+        horse_start_time=0
+        horse_layer=1
+        horse_y=5~7:600,7~5:600
+        [frame]
+            image="units/monsters/seahorse-shadow.png~O(0.3):1200"
+        [/frame]
+        [horse_frame]
+            image="units/monsters/seahorse.png~MASK(units/monsters/seahorse-mask.png):1200"
+            auto_vflip=no
+        [/horse_frame]
+    [/standing_anim]
+    [movement_anim]
+        start_time=0
+        horse_start_time=0
+        horse_layer=1
+        horse_y=4~8:600,8~4:600
+        [frame]
+            image="units/monsters/seahorse-shadow.png~O(0.3):1200"
+        [/frame]
+        [horse_frame]
+            image="units/monsters/seahorse.png~MASK(units/monsters/seahorse-mask.png):1200"
+            auto_vflip=no
+        [/horse_frame]
+    [/movement_anim]
+    [death]
+        start_time=0
+        ripples_start_time=0
+        ripples_layer=10
+        ripples_y=19
+        [ripples_frame]
+            image="halo/ripples/ripple[13~1,13~1,13~1].png:28"
+            alpha=1.0,1.0,1.0~0.0
+        [/ripples_frame]
+        [frame]
+            image="units/monsters/seahorse.png:720"
+            alpha=0.7~0.0:720
+            y=8~20:600,20:120
+        [/frame]
+        [frame]
+            image="misc/blank-hex.png:1"
+        [/frame]
+    [/death]
+    [attack_anim]
+        [filter_attack]
+            name=water spray
+        [/filter_attack]
+        start_time=-200
+
+        missile_start_time=-165
+        [missile_frame]
+            duration=165
+            image="projectiles/water-spray.png"
+            image_diagonal="projectiles/water-spray.png"
+        [/missile_frame]
+
+        [frame]
+            image="units/monsters/seahorse.png~MASK(units/monsters/seahorse-mask.png):200"
+        [/frame]
+        [frame]
+            image="units/monsters/seahorse.png~MASK(units/monsters/seahorse-mask.png):200"
+            sound=water-blast.wav
+        [/frame]
+    [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=bite
+        [/filter_attack]
+        start_time=-200
+        offset=0.0~0.6:200,0.6~0.0:300
+
+        [frame]
+            image="units/monsters/seahorse.png~MASK(units/monsters/seahorse-mask.png):500"
+        [/frame]
+        {SOUND:HIT_AND_MISS bite-small.ogg miss-2.ogg -100}
+    [/attack_anim]
+[/unit_type]

data/core/units/undead/Corpse_Soulless.cfg

@@ -185,6 +185,16 @@
         {UNIT_BODY_SOULLESS_GRAPHICS soulless-goblin}
     [/variation]
 
+    [variation]
+        variation_id=horse
+        variation_name= _ "wc_variation^Horse"
+        inherit=yes
+        profile=portraits/undead/zombie-horse.png
+        {UNIT_BODY_SOULLESS_STATS    mounted 6 28}
+        {UNIT_BODY_SOULLESS_GRAPHICS soulless-horse}
+        {NOTE_DEFENSE_CAP}
+    [/variation]
+
     [variation]
         variation_id=mounted
         variation_name= _ "wc_variation^Mounted"

data/core/units/undead/Corpse_Walking.cfg

@@ -207,6 +207,16 @@
         [/movement_anim]
     [/variation]
 
+    [variation]
+        variation_id=horse
+        variation_name= _ "wc_variation^Horse"
+        inherit=yes
+        profile=portraits/undead/zombie-horse.png
+        {UNIT_BODY_WALKING_CORPSE_STATS    mounted 6 18}
+        {UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-horse}
+        {NOTE_DEFENSE_CAP}
+    [/variation]
+
     [variation]
         variation_id=mounted
         variation_name= _ "wc_variation^Mounted"