diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-1.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-1.png new file mode 100644 index 00000000000..6793ac26f21 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-2.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-2.png new file mode 100644 index 00000000000..9a75c57e4f4 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-3.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-3.png new file mode 100644 index 00000000000..7e6102588d5 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-3.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-4.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-4.png new file mode 100644 index 00000000000..52d6123a2da Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-4.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-1.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-1.png new file mode 100644 index 00000000000..448ece9b3ad Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-2.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-2.png new file mode 100644 index 00000000000..3a8271e7ba8 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian.png index e01d9ec5714..0badefe8c61 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian.png and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-1.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-1.png new file mode 100644 index 00000000000..005f88311d2 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-2.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-2.png new file mode 100644 index 00000000000..90ee4def0ab Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-3.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-3.png new file mode 100644 index 00000000000..5f045b638e7 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-3.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-4.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-4.png new file mode 100644 index 00000000000..9c77cda02d0 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-4.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-5.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-5.png new file mode 100644 index 00000000000..73447fab5a5 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-5.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-6.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-6.png new file mode 100644 index 00000000000..0fca3156b04 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-6.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png index e1ae883ee7b..3c673dcc0fb 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-1.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-1.png new file mode 100644 index 00000000000..dbec869654f Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-2.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-2.png new file mode 100644 index 00000000000..bff50b75f2d Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-3.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-3.png new file mode 100644 index 00000000000..12873aa7cf5 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-3.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-4.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-4.png new file mode 100644 index 00000000000..68604f6c3d9 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-4.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-1.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-1.png new file mode 100644 index 00000000000..fdbaf36d3ea Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-2.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-2.png new file mode 100644 index 00000000000..8004e68d807 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel.png index 9fc6d3a4a16..31d75773fe3 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel.png and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-1.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-1.png new file mode 100644 index 00000000000..300df194d04 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-2.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-2.png new file mode 100644 index 00000000000..f510cb446c3 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-3.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-3.png new file mode 100644 index 00000000000..e6c229cd5e7 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-3.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-4.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-4.png new file mode 100644 index 00000000000..e23d3706618 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-4.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-1.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-1.png new file mode 100644 index 00000000000..3ee18081f3f Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-2.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-2.png new file mode 100644 index 00000000000..adc11f6baff Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden.png b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden.png index ca5f6a832ed..7778db65ae4 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden.png and b/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg index e11597574f6..9c43d5b275f 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg @@ -21,7 +21,7 @@ usage=fighter description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids." die_sound=naga-die.ogg - {DEFENSE_ANIM "units/nagas/guardian.png" "units/nagas/guardian.png" {SOUND_LIST:NAGA_HIT} } + {DEFENSE_ANIM "units/nagas/guardian-defend-2.png" "units/nagas/guardian-defend-1.png" {SOUND_LIST:NAGA_HIT} } [attack] name=mace description= _"mace" @@ -37,8 +37,12 @@ offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0 start_time=-450 [frame] - image="units/nagas/guardian.png:570" + image="units/nagas/guardian-attack-[1~4].png:[100*2,150,200]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + [frame] + duration=100 + image="units/nagas/guardian.png" + [/frame] + {SOUND:HIT_AND_MISS mace.ogg {SOUND_LIST:MISS} -100} [/attack_anim] [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg index 62042bce465..1451eaf281a 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg @@ -18,7 +18,7 @@ usage=archer description= _ "Naga Hunters are Naga who are skilled at hunting with a bow. Since the naga are naturally resistant to poison, they have no qualms about hunting with poisoned arrows. These two foot long shafts, tipped with a potent poison, have been known to slay many kinds of prey."+{SPECIAL_NOTES}+{SPECIAL_NOTES_POISON} die_sound=naga-die.ogg - {DEFENSE_ANIM "units/nagas/hunter.png" "units/nagas/hunter.png" {SOUND_LIST:NAGA_HIT} } + {DEFENSE_ANIM "units/nagas/hunter-attack-ranged-1.png" "units/nagas/hunter.png" {SOUND_LIST:NAGA_HIT} } [attack] name=sword description= _"sword" @@ -50,11 +50,11 @@ image="projectiles/missile-n.png" image_diagonal="projectiles/missile-ne.png" [/missile_frame] - start_time=-420 + start_time=-410 [frame] - image="units/nagas/hunter.png:490" + image="units/nagas/hunter-attack-ranged-[1~6].png:[65*4,100,150]" [/frame] - {SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -280} + {SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -410} [/attack_anim] [attack_anim] [filter_attack] diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg index 829555d99ca..63ae57aed31 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg @@ -21,8 +21,8 @@ cost=100 usage=fighter description= _ "The heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids." - {DEFENSE_ANIM "units/nagas/sentinel.png" "units/nagas/sentinel.png" {SOUND_LIST:NAGA_HIT} } die_sound=naga-die.ogg + {DEFENSE_ANIM "units/nagas/sentinel-defend-2.png" "units/nagas/sentinel-defend-1.png" {SOUND_LIST:NAGA_HIT} } [attack] name=mace description= _"mace" @@ -35,11 +35,15 @@ [filter_attack] name=mace [/filter_attack] - offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0 start_time=-450 + offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0 [frame] - image="units/nagas/sentinel.png:570" + image="units/nagas/sentinel-attack-[1~4].png:[100*2,150,200]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + [frame] + duration=100 + image="units/nagas/sentinel.png" + [/frame] + {SOUND:HIT_AND_MISS mace.ogg {SOUND_LIST:MISS} -100} [/attack_anim] [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg index a1c4a53c89e..00b83e88773 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg @@ -20,8 +20,8 @@ cost=48 usage=fighter description= _ "These heavy fighters are the elite guards of the naga. They are slower and more heavily armored than most naga and wield huge maces which they use to crush their enemies. They mostly guard naga outposts, but occasionally participate in offensive raids." - {DEFENSE_ANIM "units/nagas/warden.png" "units/nagas/warden.png" {SOUND_LIST:NAGA_HIT} } die_sound=naga-die.ogg + {DEFENSE_ANIM "units/nagas/warden-defend-2.png" "units/nagas/warden-defend-1.png" {SOUND_LIST:NAGA_HIT} } [attack] name=mace description= _"mace" @@ -34,11 +34,15 @@ [filter_attack] name=mace [/filter_attack] - offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0 start_time=-450 + offset=0.0~0.3,0.3~0.5,0.5~0.60,0.60~0.3,0.3~0.0 [frame] - image="units/nagas/warden.png:570" + image="units/nagas/warden-attack-[1~4].png:[100*2,150,200]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + [frame] + duration=100 + image="units/nagas/warden.png" + [/frame] + {SOUND:HIT_AND_MISS mace.ogg {SOUND_LIST:MISS} -100} [/attack_anim] [/unit_type]