diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-1.png b/data/core/images/units/human-loyalists/spearman-attack-n-1.png new file mode 100644 index 000000000000..24f60705a912 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-1.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-10.png b/data/core/images/units/human-loyalists/spearman-attack-n-10.png new file mode 100644 index 000000000000..72b54e6f7681 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-10.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-11.png b/data/core/images/units/human-loyalists/spearman-attack-n-11.png new file mode 100644 index 000000000000..3d3da24257a1 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-11.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-12.png b/data/core/images/units/human-loyalists/spearman-attack-n-12.png new file mode 100644 index 000000000000..5d638e4d716b Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-12.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-2.png b/data/core/images/units/human-loyalists/spearman-attack-n-2.png new file mode 100644 index 000000000000..23e3aee8d218 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-2.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-3.png b/data/core/images/units/human-loyalists/spearman-attack-n-3.png new file mode 100644 index 000000000000..471ffe6f3c79 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-3.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-4.png b/data/core/images/units/human-loyalists/spearman-attack-n-4.png new file mode 100644 index 000000000000..b4ef33537171 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-4.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-5.png b/data/core/images/units/human-loyalists/spearman-attack-n-5.png new file mode 100644 index 000000000000..8cd420d75633 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-5.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-6.png b/data/core/images/units/human-loyalists/spearman-attack-n-6.png new file mode 100644 index 000000000000..1804cf9a17d7 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-6.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-7.png b/data/core/images/units/human-loyalists/spearman-attack-n-7.png new file mode 100644 index 000000000000..4ef0c9150a34 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-7.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-8.png b/data/core/images/units/human-loyalists/spearman-attack-n-8.png new file mode 100644 index 000000000000..900da8abfd81 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-8.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n-9.png b/data/core/images/units/human-loyalists/spearman-attack-n-9.png new file mode 100644 index 000000000000..d6e1ac30dd30 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-attack-n-9.png differ diff --git a/data/core/images/units/human-loyalists/spearman-attack-n.png b/data/core/images/units/human-loyalists/spearman-attack-n.png deleted file mode 100644 index 90e4f8a6be9d..000000000000 Binary files a/data/core/images/units/human-loyalists/spearman-attack-n.png and /dev/null differ diff --git a/data/core/images/units/human-loyalists/spearman-n.png b/data/core/images/units/human-loyalists/spearman-n.png new file mode 100644 index 000000000000..03101abd105c Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-n.png differ diff --git a/data/core/images/units/human-loyalists/spearman-stand-n-1.png b/data/core/images/units/human-loyalists/spearman-stand-n-1.png new file mode 100644 index 000000000000..8a235a747cec Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-stand-n-1.png differ diff --git a/data/core/images/units/human-loyalists/spearman-stand-n-2.png b/data/core/images/units/human-loyalists/spearman-stand-n-2.png new file mode 100644 index 000000000000..d5b4196ad0ec Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-stand-n-2.png differ diff --git a/data/core/images/units/human-loyalists/spearman-stand-n-3.png b/data/core/images/units/human-loyalists/spearman-stand-n-3.png new file mode 100644 index 000000000000..f3978ab80a17 Binary files /dev/null and b/data/core/images/units/human-loyalists/spearman-stand-n-3.png differ diff --git a/data/core/images/units/human-loyalists/spearman-stand-1.png b/data/core/images/units/human-loyalists/spearman-stand-s-1.png similarity index 100% rename from data/core/images/units/human-loyalists/spearman-stand-1.png rename to data/core/images/units/human-loyalists/spearman-stand-s-1.png diff --git a/data/core/images/units/human-loyalists/spearman-stand-2.png b/data/core/images/units/human-loyalists/spearman-stand-s-2.png similarity index 100% rename from data/core/images/units/human-loyalists/spearman-stand-2.png rename to data/core/images/units/human-loyalists/spearman-stand-s-2.png diff --git a/data/core/images/units/human-loyalists/spearman-stand-3.png b/data/core/images/units/human-loyalists/spearman-stand-s-3.png similarity index 100% rename from data/core/images/units/human-loyalists/spearman-stand-3.png rename to data/core/images/units/human-loyalists/spearman-stand-s-3.png diff --git a/data/core/images/units/human-loyalists/spearman-stand-4.png b/data/core/images/units/human-loyalists/spearman-stand-s-4.png similarity index 100% rename from data/core/images/units/human-loyalists/spearman-stand-4.png rename to data/core/images/units/human-loyalists/spearman-stand-s-4.png diff --git a/data/core/images/units/human-loyalists/spearman-stand-5.png b/data/core/images/units/human-loyalists/spearman-stand-s-5.png similarity index 100% rename from data/core/images/units/human-loyalists/spearman-stand-5.png rename to data/core/images/units/human-loyalists/spearman-stand-s-5.png diff --git a/data/core/images/units/human-loyalists/spearman-stand-6.png b/data/core/images/units/human-loyalists/spearman-stand-s-6.png similarity index 100% rename from data/core/images/units/human-loyalists/spearman-stand-6.png rename to data/core/images/units/human-loyalists/spearman-stand-s-6.png diff --git a/data/core/units/humans/Loyalist_Spearman.cfg b/data/core/units/humans/Loyalist_Spearman.cfg index 11a30c1628c2..d39afead94a8 100644 --- a/data/core/units/humans/Loyalist_Spearman.cfg +++ b/data/core/units/humans/Loyalist_Spearman.cfg @@ -32,21 +32,38 @@ [/portrait] [standing_anim] start_time=0 - [frame] - image="units/human-loyalists/spearman.png:400" - [/frame] - [frame] - image="units/human-loyalists/spearman-stand-[1~6].png:[150*2,300,100*3]" - [/frame] + direction=s,se,sw + + [if] + direction=s,se,sw + [frame] + image="units/human-loyalists/spearman.png:400" + [/frame] + [frame] + image="units/human-loyalists/spearman-stand-s-[1~6].png:[150*2,300,100*3]" + [/frame] + [/if] + + [else] + direction=n,ne,nw + [frame] + image="units/human-loyalists/spearman-n.png:400" + [/frame] + [frame] + image="units/human-loyalists/spearman-stand-n-[1~3,2~1].png:[150*2,400,150*2]" + [/frame] + [/else] [/standing_anim] [idle_anim] {STANDARD_IDLE_FILTER} + direction=s,se,sw [frame] image="units/human-loyalists/spearman-idle[1~4,3,2].png:[100*3,400,100*2]" [/frame] [/idle_anim] [idle_anim] {STANDARD_IDLE_FILTER} + direction=s,se,sw [frame] image="units/human-loyalists/spearman-idle2-[1~6].png:[100*4,400,100]" [/frame] @@ -106,7 +123,7 @@ [filter_attack] name=spear [/filter_attack] - start_time=-200 + start_time=-250 direction=s offset="0~0.5,0.5~0" [frame] @@ -119,17 +136,13 @@ name=spear [/filter_attack] direction=n - start_time=-200 - [frame] - image="units/human-loyalists/spearman.png:100" - [/frame] - {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -100} - [frame] - image="units/human-loyalists/spearman-attack-n.png:200" - [/frame] + start_time=-228 + offset="0~0.4,0.4~0" [frame] - image="units/human-loyalists/spearman.png:50" + image="units/human-loyalists/spearman-attack-n-[1~12].png:32" [/frame] + + {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -64} [/attack_anim] [attack_anim] [filter_attack] @@ -156,8 +169,8 @@ direction=se,sw offset="0~0.4,0.4~0" [frame] - image="units/human-loyalists/spearman-attack-se-[1~11].png:32" + image="units/human-loyalists/spearman-attack-se-[1~12].png:32" [/frame] - {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -128} + {SOUND:HIT_AND_MISS spear.ogg spear-miss.ogg -64} [/attack_anim] [/unit_type]