New baseframes and animations for the Heavy Infantryman line

Baseframes by Sleepwalker https://forums.wesnoth.org/viewtopic.php?p=508533#p508533 (I believe) Animations by Vyncyn https://forums.wesnoth.org/viewtopic.php?p=601163#p601163
wesnoth · Aug 26, 2016 · d27ff57 · d27ff57
1 parent faab5c8
commit d27ff57
Show file tree

Hide file tree

Showing 35 changed files with 5 additions and 15 deletions.
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-attack-1.png b/data/core/images/units/human-loyalists/heavyinfantry-attack-1.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-attack-2.png b/data/core/images/units/human-loyalists/heavyinfantry-attack-2.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-defend-1.png b/data/core/images/units/human-loyalists/heavyinfantry-defend-1.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-defend-2.png b/data/core/images/units/human-loyalists/heavyinfantry-defend-2.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-1.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-1.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-2.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-2.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-3.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-3.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-4.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-4.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-5.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-5.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-6.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-6.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-7.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-7.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-8.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-8.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry-idle-9.png b/data/core/images/units/human-loyalists/heavyinfantry-idle-9.png
diff --git a/data/core/images/units/human-loyalists/heavyinfantry.png b/data/core/images/units/human-loyalists/heavyinfantry.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-attack-1.png b/data/core/images/units/human-loyalists/shocktrooper-attack-1.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-attack-2.png b/data/core/images/units/human-loyalists/shocktrooper-attack-2.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-attack-3.png b/data/core/images/units/human-loyalists/shocktrooper-attack-3.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-attack-4.png b/data/core/images/units/human-loyalists/shocktrooper-attack-4.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-attack-5.png b/data/core/images/units/human-loyalists/shocktrooper-attack-5.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-attack-6.png b/data/core/images/units/human-loyalists/shocktrooper-attack-6.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-defend-1.png b/data/core/images/units/human-loyalists/shocktrooper-defend-1.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper-defend-2.png b/data/core/images/units/human-loyalists/shocktrooper-defend-2.png
diff --git a/data/core/images/units/human-loyalists/shocktrooper.png b/data/core/images/units/human-loyalists/shocktrooper.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-attack-1.png b/data/core/images/units/human-loyalists/siegetrooper-attack-1.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-attack-2.png b/data/core/images/units/human-loyalists/siegetrooper-attack-2.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-attack-3.png b/data/core/images/units/human-loyalists/siegetrooper-attack-3.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-attack-4.png b/data/core/images/units/human-loyalists/siegetrooper-attack-4.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-attack-5.png b/data/core/images/units/human-loyalists/siegetrooper-attack-5.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-attack-6.png b/data/core/images/units/human-loyalists/siegetrooper-attack-6.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-defend-1.png b/data/core/images/units/human-loyalists/siegetrooper-defend-1.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper-defend-2.png b/data/core/images/units/human-loyalists/siegetrooper-defend-2.png
diff --git a/data/core/images/units/human-loyalists/siegetrooper.png b/data/core/images/units/human-loyalists/siegetrooper.png
diff --git a/data/core/units/humans/Loyalist_Heavy_Infantryman.cfg b/data/core/units/humans/Loyalist_Heavy_Infantryman.cfg
@@ -17,7 +17,7 @@
     description= _ "Heavy infantry are brawny fighters clad in full plate and wielding massive impact weapons. Though they fight with unmatched power in melee combat, they have poor mobility and are best employed in static defense of fortified positions. A few of these in battle line will stiffen it considerably, albeit at an obvious cost in tactical flexibility."
     die_sound={SOUND_LIST:HUMAN_DIE}
     usage=fighter
-    {DEFENSE_ANIM "units/human-loyalists/heavyinfantry-defend-2.png" "units/human-loyalists/heavyinfantry-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/heavyinfantry-defend-1.png" "units/human-loyalists/heavyinfantry-defend-2.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=mace
         description=_"mace"
@@ -27,13 +27,6 @@
         damage=11
         number=2
     [/attack]
-    [idle_anim]
-        {STANDARD_IDLE_FILTER}
-        start_time=0
-        [frame]
-            image="units/human-loyalists/heavyinfantry-idle-[1~9,8~1].png:[100*3,300,100*3,1000*3,100*7]"
-        [/frame]
-    [/idle_anim]
     [attack_anim]
         [filter_attack]
             name=mace

diff --git a/data/core/units/humans/Loyalist_Iron_Mauler.cfg b/data/core/units/humans/Loyalist_Iron_Mauler.cfg
@@ -20,7 +20,7 @@
 Though staggering in melee combat, there are many drawbacks to being outfitted in this way; Iron Maulers tire easily, and know all too well that they cannot run on the battlefield. Too often have they seen a distant comrade fall, yet were powerless to reach the scene in time to help."
     die_sound={SOUND_LIST:HUMAN_DIE}
     usage=fighter
-    {DEFENSE_ANIM "units/human-loyalists/siegetrooper-defend-2.png" "units/human-loyalists/siegetrooper-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/siegetrooper-defend-1.png" "units/human-loyalists/siegetrooper-defend-2.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=mace
         description=_"mace"
@@ -36,11 +36,8 @@ Though staggering in melee combat, there are many drawbacks to being outfitted i
         [/filter_attack]
         start_time=-260
         [frame]
-            image="units/human-loyalists/siegetrooper-attack-[1~2].png:[160,200]"
+            image="units/human-loyalists/siegetrooper-attack-[1~6].png:[85,100,125,50*3]"
         [/frame]
         {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100}
-        [frame]
-            image="units/human-loyalists/siegetrooper.png:100"
-        [/frame]
     [/attack_anim]
 [/unit_type]
diff --git a/data/core/units/humans/Loyalist_Shock_Trooper.cfg b/data/core/units/humans/Loyalist_Shock_Trooper.cfg
@@ -17,7 +17,7 @@
     description= _ "Shock troopers are the elite of the heavy infantry, and a significant part of their use is mere intimidation. The only men who can enter their ranks are prodigiously well-built, and when clad in black plate brimming with spikes, they are a fearsome sight to behold. The sight of Shock Troopers breaking an enemy often does the same to the morale of any opposition, who sometimes wonder if such armor covers monsters, rather than men. The drawback of such heavy armor is, of course, the time it takes to move into and out of combat."
     die_sound={SOUND_LIST:HUMAN_DIE}
     usage=fighter
-    {DEFENSE_ANIM "units/human-loyalists/shocktrooper-defend-2.png" "units/human-loyalists/shocktrooper-defend-1.png" {SOUND_LIST:HUMAN_HIT} }
+    {DEFENSE_ANIM "units/human-loyalists/shocktrooper-defend-1.png" "units/human-loyalists/shocktrooper-defend-2.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
         name=morning star
         description=_"flail"
@@ -32,7 +32,7 @@
             name=morning star
         [/filter_attack]
         start_time=-260
-        {SOUND:HIT_AND_MISS flail.ogg flail-miss.ogg -250}
+        {SOUND:HIT_AND_MISS flail.ogg flail-miss.ogg -260}
         [frame]
             image="units/human-loyalists/shocktrooper-attack-[1~6].png:[85,100,125,50*3]"
         [/frame]