orcish grunt sprite animations (#5506)

* units - orc grunt die anims (north and south) * units - face-graft for orcish grunt defend frames
wesnoth · Jan 31, 2021 · 842725b · 842725b
1 parent a924706
commit 842725b
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 3 deletions.
diff --git a/data/core/images/units/orcs/grunt-defend-1.png b/data/core/images/units/orcs/grunt-defend-1.png
diff --git a/data/core/images/units/orcs/grunt-defend-2.png b/data/core/images/units/orcs/grunt-defend-2.png
diff --git a/data/core/images/units/orcs/grunt-die-1.png b/data/core/images/units/orcs/grunt-die-1.png
diff --git a/data/core/images/units/orcs/grunt-die-2.png b/data/core/images/units/orcs/grunt-die-2.png
diff --git a/data/core/images/units/orcs/grunt-die-3.png b/data/core/images/units/orcs/grunt-die-3.png
diff --git a/data/core/images/units/orcs/grunt-die-4.png b/data/core/images/units/orcs/grunt-die-4.png
diff --git a/data/core/images/units/orcs/grunt-die-5.png b/data/core/images/units/orcs/grunt-die-5.png
diff --git a/data/core/images/units/orcs/grunt-die-6.png b/data/core/images/units/orcs/grunt-die-6.png
diff --git a/data/core/images/units/orcs/grunt-die-7.png b/data/core/images/units/orcs/grunt-die-7.png
diff --git a/data/core/images/units/orcs/grunt-die-8.png b/data/core/images/units/orcs/grunt-die-8.png
diff --git a/data/core/images/units/orcs/grunt-die-sword.png b/data/core/images/units/orcs/grunt-die-sword.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-1.png b/data/core/images/units/orcs/grunt-ne-die-1.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-2.png b/data/core/images/units/orcs/grunt-ne-die-2.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-3.png b/data/core/images/units/orcs/grunt-ne-die-3.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-4.png b/data/core/images/units/orcs/grunt-ne-die-4.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-5.png b/data/core/images/units/orcs/grunt-ne-die-5.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-6.png b/data/core/images/units/orcs/grunt-ne-die-6.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-7.png b/data/core/images/units/orcs/grunt-ne-die-7.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-8.png b/data/core/images/units/orcs/grunt-ne-die-8.png
diff --git a/data/core/images/units/orcs/grunt-ne-die-sword.png b/data/core/images/units/orcs/grunt-ne-die-sword.png
diff --git a/data/core/units/orcs/Grunt.cfg b/data/core/units/orcs/Grunt.cfg
@@ -19,9 +19,32 @@
     {DEFENSE_ANIM_DIRECTIONAL "units/orcs/grunt-defend-2.png" "units/orcs/grunt-defend-1.png" "units/orcs/grunt-ne-defend-2.png" "units/orcs/grunt-ne-defend-1.png" {SOUND_LIST:ORC_HIT} }
     [death]
         start_time=0
-        [frame]
-            image="units/orcs/grunt-die-[1~8].png:120"
-        [/frame]
+        sword_start_time=0
+        [if]
+            direction=s,se,sw
+            sword_alpha=0.0:240,1.0:640
+            # alpha=1.0:800,1.0~0.0:80 # we cannot overide alpha in [death] anim
+            [frame]
+                image="units/orcs/grunt-die-[1~8].png:[120*3,100*2,80,70,170]"
+            [/frame]
+            [sword_frame]
+                image="units/orcs/grunt-die-sword.png:880"
+                layer=11
+                auto_vflip=no
+            [/sword_frame]
+        [/if]
+        [else]
+            direction=n,ne,nw
+            sword_alpha=0.0:360,1.0:520
+            [frame]
+                image="units/orcs/grunt-ne-die-[1~8].png:[120*3,100*2,80,70,170]"
+            [/frame]
+            [sword_frame]
+                image="units/orcs/grunt-ne-die-sword.png:880"
+                layer=11
+                auto_vflip=no
+            [/sword_frame]
+        [/else]
     [/death]
     [standing_anim]
         start_time=0