some basic animations - forwardporting PR#3896

data/core/units/elves/Outrider.cfg

@@ -45,7 +45,7 @@ The speed of these soldiers allows the elves to strike when and where they choos
         damage=8
         number=3
     [/attack]
-    {DEFENSE_ANIM "units/elves-wood/outrider/outrider.png" "units/elves-wood/outrider/outrider.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/elves-wood/outrider/outrider-defend2.png" "units/elves-wood/outrider/outrider-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [movement_anim]
         start_time=0
         [frame]
@@ -75,20 +75,24 @@ The speed of these soldiers allows the elves to strike when and where they choos
         [filter_attack]
             name=sword
         [/filter_attack]
-        start_time=-200
+        start_time=-300
+        offset="0.0:150,0.0~0.6:150,0.6~0.0:220"
         [frame]
-            image="units/elves-wood/outrider/outrider.png:25"
+            image="units/elves-wood/outrider/outrider-melee-0.png:80"
+        [/frame]
+        [frame]
+            image="units/elves-wood/outrider/outrider-melee-1.png:70"
             sound=horse-elf-canter.wav
         [/frame]
         [frame]
-            image="units/elves-wood/outrider/outrider.png:[75,200]"
+            image="units/elves-wood/outrider/outrider-melee-[2,3].png:[75,90]"
         [/frame]
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100}
         [frame]
-            image="units/elves-wood/outrider/outrider.png:75"
+            image="units/elves-wood/outrider/outrider-melee-[4,5,6].png:[90,80,75]"
         [/frame]
         [frame]
-            image="units/elves-wood/outrider/outrider.png:25"
+            image="units/elves-wood/outrider/outrider.png:1"
         [/frame]
     [/attack_anim]
 [/unit_type]

data/core/units/elves/Rider.cfg

@@ -45,7 +45,7 @@
         damage=9
         number=2
     [/attack]
-    {DEFENSE_ANIM "units/elves-wood/rider/rider.png" "units/elves-wood/rider/rider.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/elves-wood/rider/rider-defend2.png" "units/elves-wood/rider/rider-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [movement_anim]
         start_time=0
         [frame]

data/core/units/elves/Scout.cfg

@@ -45,7 +45,7 @@
         damage=6
         number=2
     [/attack]
-    {DEFENSE_ANIM "units/elves-wood/scout/scout.png" "units/elves-wood/scout/scout.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/elves-wood/scout/scout-defend2.png" "units/elves-wood/scout/scout-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [movement_anim]
         start_time=0
         [frame]

data/core/units/humans/Horse_Grand_Knight.cfg

@@ -45,7 +45,7 @@
             image="units/human-loyalists/grand-knight/grand-knight.png:150"
         [/frame]
     [/movement_anim]
-    {DEFENSE_ANIM "units/human-loyalists/grand-knight/grand-knight.png" "units/human-loyalists/grand-knight/grand-knight.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/grand-knight/grand-knight-se-defend2.png" "units/human-loyalists/grand-knight/grand-knight-se-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [attack_anim]
         [filter_attack]
             name=lance

data/core/units/humans/Horse_Lancer.cfg

@@ -29,7 +29,8 @@
         damage=12
         number=3
     [/attack]
-    {DEFENSE_ANIM "units/human-loyalists/lancer/lancer.png" "units/human-loyalists/lancer/lancer.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM_FILTERED "units/human-loyalists/lancer/lancer-se-defend2-miss.png" "units/human-loyalists/lancer/lancer-se-defend1-miss.png" {SOUND_LIST:HORSE_HIT} (hits=miss)}
+    {DEFENSE_ANIM_FILTERED "units/human-loyalists/lancer/lancer-se-defend2.png" "units/human-loyalists/lancer/lancer-se-defend1.png" {SOUND_LIST:HORSE_HIT} (hits=hit,kill)}    
     [movement_anim]
         start_time=0
         [frame]
@@ -41,22 +42,14 @@
             name=lance
         [/filter_attack]
         start_time=-250
+# this is a placeholder, it looks better than the lance-up default image, but it is not really an animation
         [frame]
-            image="units/human-loyalists/lancer/lancer.png:25"
+            image="units/human-loyalists/lancer/lancer-se-attack1.png:25"
             sound=horse-canter.wav
         [/frame]
         [frame]
-            image="units/human-loyalists/lancer/lancer.png:75"
+            image="units/human-loyalists/lancer/lancer-se-attack[1,1,1,1].png:[75,300,50,25]"
         [/frame]
         {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -150}
-        [frame]
-            image="units/human-loyalists/lancer/lancer.png:300"
-        [/frame]
-        [frame]
-            image="units/human-loyalists/lancer/lancer.png:50"
-        [/frame]
-        [frame]
-            image="units/human-loyalists/lancer/lancer.png:25"
-        [/frame]
     [/attack_anim]
 [/unit_type]

data/core/units/humans/Horse_Paladin.cfg

@@ -60,7 +60,7 @@ Full paladins are generally not quite as fearsome as the ‘Grand Knights’ tha
             image="units/human-loyalists/paladin/paladin.png:150"
         [/frame]
     [/movement_anim]
-    {DEFENSE_ANIM "units/human-loyalists/paladin/paladin.png" "units/human-loyalists/paladin/paladin.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/paladin/paladin-se-defend2.png" "units/human-loyalists/paladin/paladin-se-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [attack_anim]
         [filter_attack]
             name=lance

data/core/units/humans/Loyalist_Cavalier.cfg

@@ -26,7 +26,7 @@
             image="units/human-loyalists/cavalier/cavalier.png:150"
         [/frame]
     [/movement_anim]
-    {DEFENSE_ANIM "units/human-loyalists/cavalier/cavalier.png" "units/human-loyalists/cavalier/cavalier.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/cavalier/cavalier-defend2.png" "units/human-loyalists/cavalier/cavalier-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [resistance]
         blade=70
         impact=60

data/core/units/humans/Loyalist_Cavalryman.cfg

@@ -27,7 +27,7 @@ Cavalrymen are very useful for taking and holding positions on open ground, for
             image="units/human-loyalists/cavalryman/cavalryman.png:150"
         [/frame]
     [/movement_anim]
-    {DEFENSE_ANIM "units/human-loyalists/cavalryman/cavalryman.png" "units/human-loyalists/cavalryman/cavalryman.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/cavalryman/cavalryman-defend2.png" "units/human-loyalists/cavalryman/cavalryman-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [resistance]
         blade=70
         impact=60

data/core/units/humans/Loyalist_Dragoon.cfg

@@ -25,7 +25,7 @@
             image="units/human-loyalists/dragoon/dragoon.png:150"
         [/frame]
     [/movement_anim]
-    {DEFENSE_ANIM "units/human-loyalists/dragoon/dragoon.png" "units/human-loyalists/dragoon/dragoon.png" {SOUND_LIST:HORSE_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/dragoon/dragoon-defend2.png" "units/human-loyalists/dragoon/dragoon-defend1.png" {SOUND_LIST:HORSE_HIT} }
     [resistance]
         blade=70
         impact=60

data/core/units/merfolk/Diviner.cfg

@@ -22,7 +22,7 @@
     usage=healer
     description= _ "Years of devotion may endow a priestess with great wisdom on the workings of the world, and grants some the favor of the light. The power thus given to these ladies of the water is a recurring motif in tale and song; such as the that of the knights of the silver spire, cornered and slain to a man at the banks of the Alavynne, but who rode again the next day, in full number, and wrought the downfall of the crimson duke."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_CURES}+{SPECIAL_NOTES_ILLUMINATES}
     die_sound=mermaid-die.ogg
-    {DEFENSE_ANIM "units/merfolk/diviner.png" "units/merfolk/diviner.png" mermaid-hit.ogg }
+    {DEFENSE_ANIM "units/merfolk/diviner-defend2.png" "units/merfolk/diviner-defend1.png" mermaid-hit.ogg }
     [abilities]
         {ABILITY_ILLUMINATES}
         {ABILITY_CURES}

data/core/units/merfolk/Enchantress.cfg

@@ -17,7 +17,7 @@
     usage=mixed fighter
     description= _ "Mermaids, like elves, have a powerful and native ability in magic, though theirs is considerably different than that of the elves. Those who master this ability are held in high regard, and their skill is used in a multitude of crafts, many of which humanity would never dream. The obvious use in war is forbidden against their own race — this power is the greater part of what protects their people from the monsters that wander out of the abyss."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
     die_sound=mermaid-die.ogg
-    {DEFENSE_ANIM "units/merfolk/enchantress.png" "units/merfolk/enchantress.png" mermaid-hit.ogg }
+    {DEFENSE_ANIM "units/merfolk/enchantress-defend2.png" "units/merfolk/enchantress-defend1.png" mermaid-hit.ogg }
     [attack]
         name=staff
         description=_"staff"

data/core/units/merfolk/Entangler.cfg

@@ -19,7 +19,7 @@
     description= _ "Merfolk tend to use a combination of both nets and clubs in fishing; nets to collect the fish, and clubs to finish the kill. Both of these tools have seen adaptation for warfare, and are valuable enough that auxiliaries who specialize in using them are deliberately brought to battle.
 
 Mermen often find themselves in a standoff with land-based enemies; the merfolk are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, mermen can’t give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
-    {DEFENSE_ANIM "units/merfolk/entangler.png" "units/merfolk/entangler.png" mermen-hit.wav }
+    {DEFENSE_ANIM "units/merfolk/entangler-defend2.png" "units/merfolk/entangler-defend1.png" mermen-hit.wav }
     die_sound=mermen-die.ogg
     [attack]
         name=club

data/core/units/merfolk/Hoplite.cfg

@@ -19,7 +19,7 @@
     usage=fighter
     description= _ "With their towering shields, the Merman Hoplites form the elite guard of the watery realm. Their powerful armor and rigid discipline allow them to hold a steadfast line in the maelstrom of battle. In times of desperation, they can even do so on land, though not nearly as well as a creature with legs."+{SPECIAL_NOTES}+{SPECIAL_NOTES_STEADFAST}
     die_sound=mermen-die.ogg
-    {DEFENSE_ANIM "units/merfolk/hoplite.png" "units/merfolk/hoplite.png" mermen-hit.wav }
+    {DEFENSE_ANIM "units/merfolk/hoplite-defend2.png" "units/merfolk/hoplite-defend1.png" mermen-hit.wav }
     [resistance]
         blade=80
         pierce=70

data/core/units/merfolk/Javelineer.cfg

@@ -17,7 +17,7 @@
     usage=mixed fighter
     description= _ "Those mermen who master the art of the javelin can become nearly as effective as an archer — though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the mermen more than makes up for this when facing foes who cannot swim."
     die_sound=mermen-die.ogg
-    {DEFENSE_ANIM "units/merfolk/javelineer.png" "units/merfolk/javelineer.png" mermen-hit.wav }
+    {DEFENSE_ANIM "units/merfolk/javelineer-defend2.png" "units/merfolk/javelineer-defend1.png" mermen-hit.wav }
     [attack]
         name=spear
         description=_"spear"

data/core/units/merfolk/Netcaster.cfg

@@ -18,7 +18,7 @@
     description= _ "Fishing, as practiced by mermen, is largely a matter of chasing schools of fish into waiting nets, where oar-like clubs are used to dispatch the prey. The improvisation of using these against soldiers proved very effective; most land-native creatures are already quite awkward when waist-deep in water, and getting caught in a net can render them nearly helpless.
 
 The effectiveness of this method led to the development of smaller, weighted nets, which could be cast through the air; these were useless for fishing, but were useful both in combat and in hunting game that came too close to shore. Clubs were used in combat with little or no adaptation from fishing, since they were already quite deadly."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
-    {DEFENSE_ANIM "units/merfolk/netcaster.png" "units/merfolk/netcaster.png" mermen-hit.wav }
+    {DEFENSE_ANIM "units/merfolk/netcaster-defend2.png" "units/merfolk/netcaster-defend1.png" mermen-hit.wav }
     die_sound=mermen-die.ogg
     [attack]
         name=club

data/core/units/merfolk/Priestess.cfg

@@ -20,7 +20,7 @@
     usage=healer
     description= _ "Among merfolk, mysticism is generally left to the mermaids, who are more inclined to it. It is they who dedicate themselves to the ideal of bringing peace and life to the world, and to the arts which make that possible. Their piety also grants them certain powers, allowing them to guard their people against magical or unnatural things."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_CURES}
     die_sound=mermaid-die.ogg
-    {DEFENSE_ANIM "units/merfolk/priestess.png" "units/merfolk/priestess.png" mermaid-hit.ogg }
+    {DEFENSE_ANIM "units/merfolk/priestess-defend2.png" "units/merfolk/priestess-defend1.png" mermaid-hit.ogg }
     [abilities]
         {ABILITY_CURES}
     [/abilities]

data/core/units/merfolk/Siren.cfg

@@ -20,7 +20,7 @@
 
 The myriad applications of this rarely occur to land dwellers, who simply regard it with wonder."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
     die_sound=mermaid-die.ogg
-    {DEFENSE_ANIM "units/merfolk/siren.png" "units/merfolk/siren.png" mermaid-hit.ogg }
+    {DEFENSE_ANIM "units/merfolk/siren-defend2.png" "units/merfolk/siren-defend1.png" mermaid-hit.ogg }
     [attack]
         #note - this "naia" is deliberate, it is not a typo, it is not supposed to be "naiad".
         # wmllint: local spelling naia
@@ -63,14 +63,14 @@ The myriad applications of this rarely occur to land dwellers, who simply regard
         {MERMAID_STAFF_FLARE 16 -12}
 
         [frame]
-            image="units/merfolk/siren.png:300" ### magic-1
+            image="units/merfolk/siren-magic-1.png:200"
         [/frame]
         [frame]
-            image="units/merfolk/siren.png:50" ### magic-2
+            image="units/merfolk/siren-magic-2.png:200" 
             sound=water-blast.wav
         [/frame]
         [frame]
-            image="units/merfolk/siren.png:80" ### magic-1
+            image="units/merfolk/siren-magic-1.png:120"
         [/frame]
     [/attack_anim]
     [attack_anim]

data/core/units/merfolk/Spearman.cfg

@@ -16,7 +16,7 @@
     usage=mixed fighter
     description= _ "Archery is little favored by the mermen, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
     die_sound=mermen-die.ogg
-    {DEFENSE_ANIM "units/merfolk/spearman.png" "units/merfolk/spearman.png" mermen-hit.wav }
+    {DEFENSE_ANIM "units/merfolk/spearman-defend2.png" "units/merfolk/spearman-defend1.png" mermen-hit.wav }
     [attack]
         name=spear
         description=_"spear"

data/core/units/merfolk/Triton.cfg

@@ -18,7 +18,7 @@
     # wmllint: local spelling tritons
     description= _ "Tritons are combat masters of the sea. Skilled in use of the trident, Tritons easily defeat any enemy foolish enough to wander into their preferred environment. Their mastery of their weapon affords them flexibility in its use, and the highest-ranking among them use weaponry more comparable to halberds than simple spears."
     die_sound=mermen-die.ogg
-    {DEFENSE_ANIM "units/merfolk/triton.png" "units/merfolk/triton.png" mermen-hit.wav }
+    {DEFENSE_ANIM "units/merfolk/triton-defend2.png" "units/merfolk/triton-defend1.png" mermen-hit.wav }
     [attack]
         name=trident
         description=_"trident"