1.16 animation update 7/24 (#5980)

* naga shield guard mace attack anim, shield attack/def anims

* naga high guard defense anim

* naga guard - adjust some animation timings, and base frame

(cherry picked from commit f8c0f3c60d)

data/core/units/nagas/Guard.cfg

@@ -34,10 +34,10 @@
         [filter_attack]
             name=mace
         [/filter_attack]
-        offset=0.0:250,0.0~0.6:250,0.6~0.0:350
+        offset=0.0~-0.05:250,0.0~0.6:250,0.6~0.0:350
         start_time=-500
         [frame]
-            image="units/nagas/guardian-attack-[1~5].png:[120,180,150,120,130]"
+            image="units/nagas/guardian-attack-[1~5].png:[120,180,120,130,150]"
         [/frame]
         [frame]
             image="units/nagas/guardian.png:150"

data/core/units/nagas/Guard_High.cfg

@@ -22,8 +22,15 @@
     usage=fighter
     description= _ "The elite naga guards are a rigid barrier to any invaders of a naga stronghold. They have powerful strikes and, like the lesser Shield Guard, they are difficult to dislodge from their posts because of effective use of a shield in melee techniques. This tactic does nothing against ranged attacks, but the nagas can usually seek better terrain advantage in such situations."
     die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/sentinel.png" "units/nagas/sentinel.png" {SOUND_LIST:NAGA_HIT} }
-    # {DEFENSE_ANIM "units/nagas/sentinel-defend-2.png" "units/nagas/sentinel-defend-1.png" {SOUND_LIST:NAGA_HIT} }
+    # {DEFENSE_ANIM_FILTERED "units/nagas/sentinel-shield-defend2.png" "units/nagas/sentinel-shield-attack-2.png" {SOUND_LIST:NAGA_HIT} (
+    #    [filter]
+    #      type=Naga High Guard
+    #    [/filter]
+    #    [filter_second_attack]
+    #      name=shield
+    #    [/filter_second_attack]
+    # )}
+    {DEFENSE_ANIM "units/nagas/sentinel-defend-2.png" "units/nagas/sentinel-defend-1.png" {SOUND_LIST:NAGA_HIT} }
     [attack]
         name=mace
         description= _"mace"
@@ -42,16 +49,16 @@
         [specials]
             {WEAPON_SPECIAL_ABSORB 0.6}
         [/specials]
-        icon=attacks/rectangular-shield.png
+        icon=icons/shield_steel.png
     [/attack]
     [attack_anim]
         [filter_attack]
             name=mace
         [/filter_attack]
-        start_time=-450
-        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
+        start_time=-500
+        offset=0.0:300,0.0~0.6:200,0.6~0.0:300
         [frame]
-            image="units/nagas/sentinel.png:550"
+            image="units/nagas/sentinel.png:700"
             # image="units/nagas/sentinel-attack-[1~4].png:[100*2,150,200]"
         [/frame]
         [frame]

data/core/units/nagas/Guard_Shield.cfg

@@ -21,6 +21,14 @@
     usage=fighter
     description= _ "The veteran naga guards are more difficult to dislodge from their posts because of effective use of a shield in melee techniques. This tactic does nothing against ranged attacks, but the nagas can usually seek better terrain advantage in such situations."
     die_sound=naga-die.ogg
+    {DEFENSE_ANIM_FILTERED "units/nagas/warden-shield-defend2.png" "units/nagas/warden-shield-attack-2.png" {SOUND_LIST:NAGA_HIT} (
+        [filter]
+            type=Naga Shield Guard
+        [/filter]
+        [filter_second_attack]
+            name=shield
+        [/filter_second_attack]
+    )}
     {DEFENSE_ANIM "units/nagas/warden-defend-2.png" "units/nagas/warden-defend-1.png" {SOUND_LIST:NAGA_HIT} }
     [attack]
         name=mace
@@ -46,11 +54,10 @@
         [filter_attack]
             name=mace
         [/filter_attack]
-        start_time=-450
-        offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0
+        start_time=-500
+        offset=0.0:300,0.0~0.6:200,0.6~0.0:300
         [frame]
-            image="units/nagas/warden.png:550"
-            # image="units/nagas/warden-attack-[1~4].png:[100*2,150,200]"
+            image="units/nagas/warden-attack-[1~6].png:[100,200,100*4]"
         [/frame]
         [frame]
             duration=100
@@ -58,4 +65,30 @@
         [/frame]
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
     [/attack_anim]
+    [attack_anim]
+        [filter_attack]
+            name=shield
+        [/filter_attack]
+        start_time=-450
+        offset=0.0:250,0.0~0.5:200,0.5~0.0:200
+        [frame]
+            image="units/nagas/warden-shield-attack-[1~3].png:[100*2,150]"
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                image="units/nagas/warden-shield-attack-4.png~BLIT(units/nagas/warden-shield-swoosh.png):200"
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                image="units/nagas/warden-shield-attack-4.png:200"
+            [/frame]
+        [/else]
+        [frame]
+            image="units/nagas/warden-shield-attack-2.png:100"
+        [/frame]
+        {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
+    [/attack_anim]
 [/unit_type]