diff --git a/changelog b/changelog index c036be2111e..be37e99fda5 100644 --- a/changelog +++ b/changelog @@ -61,6 +61,8 @@ Version 1.11.6+dev: * Converted animation WML to the new syntax * The Hammer of Thursagan: * Converted animation WML to the new syntax + * The Rise of Wesnoth: + * Converted animation WML to the new syntax * Engine: * CampaignWML support for MP including difficulties, extra defines etc. * Use the same codepath to initialize every MP campaign's scenario, thus diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Familiar.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Familiar.cfg index 8d6602ce18c..72e862d94c2 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Familiar.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Familiar.cfg @@ -43,102 +43,27 @@ [/if] start_time=-126 [frame] - duration=1 - image="units/familiar-3.png" - [/frame] - [frame] - duration=50 - image="units/familiar-4.png" + image="units/familiar-3.png:1,units/familiar-4.png:250,units/familiar-3.png:1" [/frame] [if] hits=hit - [frame] - duration=200 - image="units/familiar-4.png" + hit_sound_start_time=-26 + [hit_sound_frame] sound=familiar-teeth.ogg - [/frame] + [/hit_sound_frame] [/if] - [else] - hits=miss,kill - [frame] - duration=200 - image="units/familiar-4.png" - [/frame] - [/else] - [frame] - duration=1 - image="units/familiar-3.png" - [/frame] [/defend] [standing_anim] layer=60 start_time=0 [frame] - duration=50 - image="units/familiar-3.png" - [/frame] - [frame] - duration=60 - image="units/familiar-2.png" - [/frame] - [frame] - duration=80 - image="units/familiar-1.png" - [/frame] - [frame] - duration=60 - image="units/familiar-2.png" - [/frame] - [frame] - duration=50 - image="units/familiar-3.png" - [/frame] - [frame] - duration=60 - image="units/familiar-4.png" - [/frame] - [frame] - duration=80 - image="units/familiar-5.png" - [/frame] - [frame] - duration=60 - image="units/familiar-4.png" + image="units/familiar-[3~1,2~5,4].png:[50,60,80,60,50,60,80,60]" [/frame] [/standing_anim] [movement_anim] start_time=0 [frame] - duration=50 - image="units/familiar-3.png" - [/frame] - [frame] - duration=60 - image="units/familiar-2.png" - [/frame] - [frame] - duration=80 - image="units/familiar-1.png" - [/frame] - [frame] - duration=60 - image="units/familiar-2.png" - [/frame] - [frame] - duration=50 - image="units/familiar-3.png" - [/frame] - [frame] - duration=60 - image="units/familiar-4.png" - [/frame] - [frame] - duration=80 - image="units/familiar-5.png" - [/frame] - [frame] - duration=60 - image="units/familiar-4.png" + image="units/familiar-[3~1,2~5,4].png:[50,60,80,60,50,60,80,60]" [/frame] [/movement_anim] [attack_anim] @@ -150,53 +75,15 @@ start_time=-200 [frame] - duration=30 - image="units/familiar-3.png" + image="units/familiar-[3~2].png:30" [/frame] [frame] - duration=30 - image="units/familiar-2.png" - [/frame] - [frame] - duration=30 - image="units/familiar-1.png" + image="units/familiar-1.png:30" sound=bat-flapping.wav [/frame] [frame] - duration=30 - image="units/familiar-2.png" - [/frame] - [frame] - duration=30 - image="units/familiar-3.png" - [/frame] - [if] - hits=yes - [frame] - duration=70 - image="units/familiar-4.png" - sound=bite-small.ogg - [/frame] - [/if] - [else] - hits=no - [frame] - duration=70 - image="units/familiar-4.png" - sound={SOUND_LIST:MISS} - [/frame] - [/else] - [frame] - duration=50 - image="units/familiar-3.png" - [/frame] - [frame] - duration=50 - image="units/familiar-2.png" - [/frame] - [frame] - duration=40 - image="units/familiar-3.png" + image="units/familiar-[2~4,3,2,3].png:[30*2,70,50*2,40]" [/frame] + {SOUND:HIT_AND_MISS bite-small.ogg {SOUND_LIST:MISS} -50} [/attack_anim] [/unit_type] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg index 9541b397c47..d03af5cd27b 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg @@ -42,85 +42,42 @@ [leading_anim] start_time=-150 [frame] - duration=300 - image="units/noble-commander-leading.png" + image="units/noble-commander-leading.png:300" [/frame] [/leading_anim] [attack_anim] [filter_attack] name=bow [/filter_attack] + missile_start_time=-150 [missile_frame] - begin=-150 - end=0 + duration=150 image="projectiles/missile-n.png" image_diagonal="projectiles/missile-ne.png" [/missile_frame] - [if] - hits=yes - [frame] - begin=-350 - end=-300 - image="units/noble-commander-bow-1.png" - sound=bow.ogg - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-350 - end=-300 - image="units/noble-commander-bow-1.png" - sound=bow-miss.ogg - [/frame] - [/else] + start_time=-350 [frame] - begin=-300 - end=-250 - image="units/noble-commander-bow-2.png" + image="units/noble-commander-bow-[1~3].png:[50*2,150]" [/frame] + {SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -250} [frame] - begin=-250 - end=-100 - image="units/noble-commander-bow-3.png" - [/frame] - [frame] - begin=-100 - end=0 - image="units/noble-commander-bow.png" + image="units/noble-commander-bow.png:100" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=sword [/filter_attack] + start_time=-200 [frame] - begin=-200 - end=-100 - image="units/noble-commander.png" + image="units/noble-commander.png:100" [/frame] - [if] - hits=no - [frame] - begin=-100 - end=100 - image="units/noble-commander-sword-1.png" - sound={SOUND_LIST:MISS} - [/frame] - [/if] - [else] - hits=yes - [frame] - begin=-100 - end=100 - image="units/noble-commander-sword-1.png" - sound={SOUND_LIST:SWORD_SWISH} - [/frame] - [/else] + {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100} [frame] - begin=100 - end=175 - image="units/noble-commander.png" + image="units/noble-commander-sword-1.png:200" + [/frame] + [frame] + image="units/noble-commander.png:75" [/frame] [/attack_anim] [/unit_type] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg index 21b6f50f2cf..106d0f4def5 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg @@ -30,38 +30,16 @@ [filter_attack] name=sword [/filter_attack] + start_time=-200 [frame] - begin=-200 - end=-150 - image="units/noble-fighter.png" + image="units/noble-fighter.png:50" [/frame] [frame] - begin=-150 - end=-75 - image="units/noble-fighter-attack.png" + image="units/noble-fighter-attack.png:75,units/noble-fighter-attack2.png:175" [/frame] - [if] - hits=yes - [frame] - begin=-75 - end=100 - image="units/noble-fighter-attack2.png" - sound={SOUND_LIST:SWORD_SWISH} - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-75 - end=100 - image="units/noble-fighter-attack2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/else] + {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75} [frame] - begin=100 - end=175 - image="units/noble-fighter.png" + image="units/noble-fighter.png:75" [/frame] [/attack_anim] [/unit_type] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg index 9f011fc4276..035c2bf2001 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg @@ -43,85 +43,42 @@ [leading_anim] start_time=-150 [frame] - duration=300 - image="units/noble-lord-leading.png" + image="units/noble-lord-leading.png:300" [/frame] [/leading_anim] [attack_anim] [filter_attack] name=bow [/filter_attack] + missile_start_time=-150 [missile_frame] - begin=-150 - end=0 + duration=150 image="projectiles/missile-n.png" image_diagonal="projectiles/missile-ne.png" [/missile_frame] - [if] - hits=yes - [frame] - begin=-350 - end=-300 - image="units/noble-lord-bow-1.png" - sound=bow.ogg - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-350 - end=-300 - image="units/noble-lord-bow-1.png" - sound=bow-miss.ogg - [/frame] - [/else] + start_time=-350 [frame] - begin=-300 - end=-250 - image="units/noble-lord-bow-2.png" + image="units/noble-lord-bow-[1~3].png:[50*2,150]" [/frame] + {SOUND:HIT_AND_MISS bow.ogg bow-miss.ogg -250} [frame] - begin=-250 - end=-100 - image="units/noble-lord-bow-3.png" - [/frame] - [frame] - begin=-100 - end=0 - image="units/noble-lord-bow.png" + image="units/noble-lord-bow.png:100" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=sword [/filter_attack] + start_time=-200 [frame] - begin=-200 - end=-125 - image="units/noble-lord.png" + image="units/noble-lord.png:100" [/frame] - [if] - hits=yes - [frame] - begin=-125 - end=100 - image="units/noble-lord-sword-1.png" - sound={SOUND_LIST:SWORD_SWISH} - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-125 - end=100 - image="units/noble-lord-sword-1.png" - sound={SOUND_LIST:MISS} - [/frame] - [/else] + {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -100} [frame] - begin=100 - end=175 - image="units/noble-lord.png" + image="units/noble-lord-sword-1.png:200" + [/frame] + [frame] + image="units/noble-lord.png:75" [/frame] [/attack_anim] [/unit_type] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg index b737bde995f..054e2f168c9 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg @@ -30,28 +30,10 @@ [filter_attack] name=training sword [/filter_attack] + start_time=-200 [frame] - begin=-201 - end=-75 - image="units/noble-youth-attack.png" + image="units/noble-youth-attack.png:125,units/noble-youth-attack2.png:150" [/frame] - [if] - hits=yes - [frame] - begin=-75 - end=50 - image="units/noble-youth-attack2.png" - sound={SOUND_LIST:SWORD_SWISH} - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-75 - end=50 - image="units/noble-youth-attack2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/else] + {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75} [/attack_anim] [/unit_type] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg index 8cc63ea602c..7d5697d02bf 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg @@ -47,73 +47,34 @@ [filter_attack] name=curse [/filter_attack] + missile_start_time=-200 [missile_frame] - begin=-200 - end=0 + duration=200 image="projectiles/darkmissile-n.png" image_diagonal="projectiles/darkmissile-ne.png" [/missile_frame] + start_time=-400 + halo_start_time=-350 [frame] - begin=-400 - end=-100 - image="units/undead-vampirelady-magic-1.png" + image="units/undead-vampirelady-magic-[1~2].png:[300,350]" [/frame] - [if] - hits=yes - [frame] - begin=-100 - end=250 - image="units/undead-vampirelady-magic-2.png" - sound=magic-dark.ogg - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-100 - end=250 - image="units/undead-vampirelady-magic-2.png" - sound=magic-dark-miss.ogg - [/frame] - [/else] + [halo_frame] + halo="halo/undead/dark-magic-[1~6].png~O(35%):75" + halo_y=10 + halo_x=5 + auto_vflip=no + [/halo_frame] + {SOUND:HIT_AND_MISS magic-dark.ogg magic-dark-miss.ogg -100} [/attack_anim] [attack_anim] [filter_attack] name=blood kiss [/filter_attack] + start_time=-300 offset=0.0~0.3,0.3~0.5,0.5~0.6,0.6~0.3,0.3~0.0 [frame] - begin=-300 - end=-200 - image="units/undead-vampirelady-bite-1.png" - [/frame] - [frame] - begin=-200 - end=-100 - image="units/undead-vampirelady-bite-2.png" - [/frame] - [if] - hits=yes - [frame] - begin=-100 - end=150 - image="units/undead-vampirelady-bite-3.png" - sound=bite-small.ogg - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-100 - end=150 - image="units/undead-vampirelady-bite-3.png" - sound={SOUND_LIST:MISS} - [/frame] - [/else] - [frame] - begin=150 - end=200 - image="units/undead-vampirelady-bite-4.png" + image="units/undead-vampirelady-bite-[1~4].png:[100*2,250,50]" [/frame] + {SOUND:HIT_AND_MISS bite-small.ogg {SOUND_LIST:MISS} -100} [/attack_anim] [/unit_type] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg index 041c06d7aa2..2fc1de713ac 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg @@ -14,9 +14,7 @@ {DEFENSE_ANIM "units/human-loyalists/royal-warrior-defend.png" "units/human-loyalists/royal-warrior.png" {SOUND_LIST:HUMAN_OLD_HIT} } [leading_anim] [frame] - begin=-150 - end=150 - image="units/human-loyalists/royal-warrior-leading.png" + image="units/human-loyalists/royal-warrior-leading.png:300" [/frame] [/leading_anim] [/unit_type] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg index eb449d9f7b8..30d1fd3e62f 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Lady.cfg @@ -23,74 +23,40 @@ die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [defend] hits=miss + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-lady-masked.png" + image="units/wesfolk-lady-masked.png:1" [/frame] [frame] - begin=-125 - end=-42 - image="units/wesfolk-lady-masked-defend-1-1.png" + duration=250 + image="units/wesfolk-lady-masked-defend-1-[1,2,1].png" [/frame] [frame] - begin=-42 - end=41 - image="units/wesfolk-lady-masked-defend-1-2.png" - [/frame] - [frame] - begin=41 - end=125 - image="units/wesfolk-lady-masked-defend-1-1.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-lady-masked.png" + image="units/wesfolk-lady-masked.png:1" [/frame] [/defend] [defend] hits=hit + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-lady-masked.png" + image="units/wesfolk-lady-masked.png:1,units/wesfolk-lady-masked-defend.png:250,units/wesfolk-lady-masked.png:1" [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-lady-masked-defend.png" + sound_start_time=-25 + [sound_frame] sound={SOUND_LIST:HUMAN_FEMALE_HIT} - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-lady-masked.png" - [/frame] + [/sound_frame] [/defend] [defend] hits=kill + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-lady-masked.png" - [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-lady-masked-defend.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-lady-masked.png" + image="units/wesfolk-lady-masked.png:1,units/wesfolk-lady-masked-defend.png:250,units/wesfolk-lady-masked.png:1" [/frame] [/defend] [leading_anim] start_time=-150 [frame] - duration=300 - image="units/wesfolk-lady-masked-sling-2.png" + image="units/wesfolk-lady-masked-sling-2.png:300" [/frame] [/leading_anim] [attack] @@ -115,74 +81,44 @@ [filter_attack] name=sling [/filter_attack] + start_time=-400 + sound_start_time=-400 offset=0.0 [if] hits=yes {MISSILE_FRAME_STONE_HIT 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-lady-masked-sling-1.png" + [sound_frame] sound=sling.ogg - [/frame] + [/sound_frame] [/if] [else] hits=no {MISSILE_FRAME_STONE_MISS 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-lady-masked-sling-1.png" + [sound_frame] sound=sling-miss.ogg - [/frame] + [/sound_frame] [/else] [frame] - begin=-150 - end=50 - image="units/wesfolk-lady-masked-sling-2.png" + image="units/wesfolk-lady-masked-sling-[1~2].png:[250,200]" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=staff [/filter_attack] + start_time=-175 [frame] - begin=-175 - end=-150 - image="units/wesfolk-lady-masked.png" + image="units/wesfolk-lady-masked.png:25" [/frame] [frame] - begin=-150 - end=-75 - image="units/wesfolk-lady-masked-staff-1.png" + image="units/wesfolk-lady-masked-staff-[1~2].png:[75,175]" [/frame] - [if] - hits=no - [frame] - begin=-75 - end=100 - image="units/wesfolk-lady-masked-staff-2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/if] - [else] - hits=yes - [frame] - begin=-75 - end=100 - image="units/wesfolk-lady-masked-staff-2.png" - sound=staff.wav - [/frame] - [/else] + {SOUND:HIT_AND_MISS staff.wav {SOUND_LIST:MISS} -75} [frame] - begin=100 - end=150 - image="units/wesfolk-lady-masked-defend-1-2.png" + image="units/wesfolk-lady-masked-defend-1-2.png:50" [/frame] [frame] - begin=150 - end=175 - image="units/wesfolk-lady-masked.png" + image="units/wesfolk-lady-masked.png:25" [/frame] [/attack_anim] [variation] @@ -191,148 +127,84 @@ image="units/wesfolk-lady.png" [defend] hits=miss + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-lady.png" + image="units/wesfolk-lady.png:1" [/frame] [frame] - begin=-125 - end=-42 - image="units/wesfolk-lady-defend-1-1.png" + duration=250 + image="units/wesfolk-lady-defend-1-[1,2,1].png" [/frame] [frame] - begin=-42 - end=41 - image="units/wesfolk-lady-defend-1-2.png" - [/frame] - [frame] - begin=41 - end=125 - image="units/wesfolk-lady-defend-1-1.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-lady.png" + image="units/wesfolk-lady.png:1" [/frame] [/defend] [defend] hits=hit + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-lady.png" + image="units/wesfolk-lady.png:1,units/wesfolk-lady-defend.png:250,units/wesfolk-lady.png:1" [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-lady-defend.png" + sound_start_time=-25 + [sound_frame] sound={SOUND_LIST:HUMAN_FEMALE_HIT} - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-lady.png" - [/frame] + [/sound_frame] [/defend] [defend] hits=kill + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-lady.png" - [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-lady-defend.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-lady.png" + image="units/wesfolk-lady.png:1,units/wesfolk-lady-defend.png:250,units/wesfolk-lady.png:1" [/frame] [/defend] [leading_anim] start_time=-150 [frame] - duration=300 - image="units/wesfolk-lady-sling-2.png" + image="units/wesfolk-lady-sling-2.png:300" [/frame] [/leading_anim] [attack_anim] [filter_attack] name=sling [/filter_attack] + start_time=-400 + sound_start_time=-400 offset=0.0 [if] hits=yes {MISSILE_FRAME_STONE_HIT 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-lady-sling-1.png" + [sound_frame] sound=sling.ogg - [/frame] + [/sound_frame] [/if] [else] hits=no {MISSILE_FRAME_STONE_MISS 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-lady-sling-1.png" + [sound_frame] sound=sling-miss.ogg - [/frame] + [/sound_frame] [/else] [frame] - begin=-150 - end=50 - image="units/wesfolk-lady-sling-2.png" + image="units/wesfolk-lady-sling-[1~2].png:[250,200]" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=staff [/filter_attack] + start_time=-175 [frame] - begin=-175 - end=-150 - image="units/wesfolk-lady.png" + image="units/wesfolk-lady.png:25" [/frame] [frame] - begin=-150 - end=-75 - image="units/wesfolk-lady-staff-1.png" + image="units/wesfolk-lady-staff-[1~2].png:[75,175]" [/frame] - [if] - hits=no - [frame] - begin=-75 - end=100 - image="units/wesfolk-lady-staff-2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/if] - [else] - hits=yes - [frame] - begin=-75 - end=100 - image="units/wesfolk-lady-staff-2.png" - sound=staff.wav - [/frame] - [/else] + {SOUND:HIT_AND_MISS staff.wav {SOUND_LIST:MISS} -75} [frame] - begin=100 - end=150 - image="units/wesfolk-lady-defend-1-2.png" + image="units/wesfolk-lady-defend-1-2.png:50" [/frame] [frame] - begin=150 - end=175 - image="units/wesfolk-lady.png" + image="units/wesfolk-lady.png:25" [/frame] [/attack_anim] [/variation] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg index b4af73ffabb..4a8414d5c6b 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Leader.cfg @@ -24,74 +24,40 @@ die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [defend] hits=miss + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-leader-masked.png" + image="units/wesfolk-leader-masked.png:1" [/frame] [frame] - begin=-125 - end=-42 - image="units/wesfolk-leader-masked-defend-1-1.png" + duration=250 + image="units/wesfolk-leader-masked-defend-1-[1,2,1].png" [/frame] [frame] - begin=-42 - end=41 - image="units/wesfolk-leader-masked-defend-1-2.png" - [/frame] - [frame] - begin=41 - end=125 - image="units/wesfolk-leader-masked-defend-1-1.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-leader-masked.png" + image="units/wesfolk-leader-masked.png:1" [/frame] [/defend] [defend] hits=hit + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-leader-masked.png" + image="units/wesfolk-leader-masked.png:1,units/wesfolk-leader-masked-defend.png:250,units/wesfolk-leader-masked.png:1" [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-leader-masked-defend.png" + sound_start_time=-25 + [sound_frame] sound={SOUND_LIST:HUMAN_FEMALE_HIT} - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-leader-masked.png" - [/frame] + [/sound_frame] [/defend] [defend] hits=kill + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-leader-masked.png" - [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-leader-masked-defend.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-leader-masked.png" + image="units/wesfolk-leader-masked.png:1,units/wesfolk-leader-masked-defend.png:250,units/wesfolk-leader-masked.png:1" [/frame] [/defend] [leading_anim] start_time=-150 [frame] - duration=300 - image="units/wesfolk-leader-masked-leading.png" + image="units/wesfolk-leader-masked-leading.png:300" [/frame] [/leading_anim] [attack] @@ -116,74 +82,44 @@ [filter_attack] name=sling [/filter_attack] + start_time=-400 + sound_start_time=-400 offset=0.0 [if] hits=yes {MISSILE_FRAME_STONE_HIT 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-leader-masked-sling-1.png" + [sound_frame] sound=sling.ogg - [/frame] + [/sound_frame] [/if] [else] hits=no {MISSILE_FRAME_STONE_MISS 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-leader-masked-sling-1.png" + [sound_frame] sound=sling-miss.ogg - [/frame] + [/sound_frame] [/else] [frame] - begin=-150 - end=50 - image="units/wesfolk-leader-masked-sling-2.png" + image="units/wesfolk-leader-masked-sling-[1~2].png:[250,200]" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=staff [/filter_attack] + start_time=-175 [frame] - begin=-175 - end=-150 - image="units/wesfolk-leader-masked.png" + image="units/wesfolk-leader-masked.png:25" [/frame] [frame] - begin=-150 - end=-75 - image="units/wesfolk-leader-masked-staff-1.png" + image="units/wesfolk-leader-masked-staff-[1~2].png:[75,175]" [/frame] - [if] - hits=no - [frame] - begin=-75 - end=100 - image="units/wesfolk-leader-masked-staff-2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/if] - [else] - hits=yes - [frame] - begin=-75 - end=100 - image="units/wesfolk-leader-masked-staff-2.png" - sound=staff.wav - [/frame] - [/else] + {SOUND:HIT_AND_MISS staff.wav {SOUND_LIST:MISS} -75} [frame] - begin=100 - end=150 - image="units/wesfolk-leader-masked-defend-1-2.png" + image="units/wesfolk-leader-masked-defend-1-2.png:50" [/frame] [frame] - begin=150 - end=175 - image="units/wesfolk-leader-masked.png" + image="units/wesfolk-leader-masked.png:25" [/frame] [/attack_anim] [variation] @@ -192,148 +128,84 @@ image="units/wesfolk-leader.png" [defend] hits=miss + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-leader.png" + image="units/wesfolk-leader.png:1" [/frame] [frame] - begin=-125 - end=-42 - image="units/wesfolk-leader-defend-1-1.png" + duration=250 + image="units/wesfolk-leader-defend-1-[1,2,1].png" [/frame] [frame] - begin=-42 - end=41 - image="units/wesfolk-leader-defend-1-2.png" - [/frame] - [frame] - begin=41 - end=125 - image="units/wesfolk-leader-defend-1-1.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-leader.png" + image="units/wesfolk-leader.png:1" [/frame] [/defend] [defend] hits=hit + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-leader.png" + image="units/wesfolk-leader.png:1,units/wesfolk-leader-defend.png:250,units/wesfolk-leader.png:1" [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-leader-defend.png" + sound_start_time=-25 + [sound_frame] sound={SOUND_LIST:HUMAN_FEMALE_HIT} - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-leader.png" - [/frame] + [/sound_frame] [/defend] [defend] hits=kill + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-leader.png" - [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-leader-defend.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-leader.png" + image="units/wesfolk-leader.png:1,units/wesfolk-leader-defend.png:250,units/wesfolk-leader.png:1" [/frame] [/defend] [leading_anim] start_time=-150 [frame] - duration=300 - image="units/wesfolk-leader-leading.png" + image="units/wesfolk-leader-leading.png:300" [/frame] [/leading_anim] [attack_anim] [filter_attack] name=sling [/filter_attack] + start_time=-400 + sound_start_time=-400 offset=0.0 [if] hits=yes {MISSILE_FRAME_STONE_HIT 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-leader-sling-1.png" + [sound_frame] sound=sling.ogg - [/frame] + [/sound_frame] [/if] [else] hits=no {MISSILE_FRAME_STONE_MISS 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-leader-sling-1.png" + [sound_frame] sound=sling-miss.ogg - [/frame] + [/sound_frame] [/else] [frame] - begin=-150 - end=50 - image="units/wesfolk-leader-sling-2.png" + image="units/wesfolk-leader-sling-[1~2].png:[250,200]" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=staff [/filter_attack] + start_time=-175 [frame] - begin=-175 - end=-150 - image="units/wesfolk-leader.png" + image="units/wesfolk-leader.png:25" [/frame] [frame] - begin=-150 - end=-75 - image="units/wesfolk-leader-staff-1.png" + image="units/wesfolk-leader-staff-[1~2].png:[75,175]" [/frame] - [if] - hits=no - [frame] - begin=-75 - end=100 - image="units/wesfolk-leader-staff-2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/if] - [else] - hits=yes - [frame] - begin=-75 - end=100 - image="units/wesfolk-leader-staff-2.png" - sound=staff.wav - [/frame] - [/else] + {SOUND:HIT_AND_MISS staff.wav {SOUND_LIST:MISS} -75} [frame] - begin=100 - end=150 - image="units/wesfolk-leader-defend-1-2.png" + image="units/wesfolk-leader-defend-1-2.png:50" [/frame] [frame] - begin=150 - end=175 - image="units/wesfolk-leader.png" + image="units/wesfolk-leader.png:25" [/frame] [/attack_anim] [/variation] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg index 9c72838959f..4220ac5dfb1 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Wesfolk_Outcast.cfg @@ -23,74 +23,40 @@ die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [defend] hits=miss + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-outcast-masked.png" + image="units/wesfolk-outcast-masked.png:1" [/frame] [frame] - begin=-125 - end=-42 - image="units/wesfolk-outcast-masked-defend-1-1.png" + duration=250 + image="units/wesfolk-outcast-masked-defend-1-[1,2,1].png" [/frame] [frame] - begin=-42 - end=41 - image="units/wesfolk-outcast-masked-defend-1-2.png" - [/frame] - [frame] - begin=41 - end=125 - image="units/wesfolk-outcast-masked-defend-1-1.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-outcast-masked.png" + image="units/wesfolk-outcast-masked.png:1" [/frame] [/defend] [defend] hits=hit + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-outcast-masked.png" + image="units/wesfolk-outcast-masked.png:1,units/wesfolk-outcast-masked-defend.png:250,units/wesfolk-outcast-masked.png:1" [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-outcast-masked-defend.png" + sound_start_time=-25 + [sound_frame] sound={SOUND_LIST:HUMAN_FEMALE_HIT} - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-outcast-masked.png" - [/frame] + [/sound_frame] [/defend] [defend] hits=kill + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-outcast-masked.png" - [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-outcast-masked-defend.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-outcast-masked.png" + image="units/wesfolk-outcast-masked.png:1,units/wesfolk-outcast-masked-defend.png:250,units/wesfolk-outcast-masked.png:1" [/frame] [/defend] [leading_anim] start_time=-150 [frame] - duration=300 - image="units/wesfolk-outcast-masked-sling-2.png" + image="units/wesfolk-outcast-masked-sling-2.png:300" [/frame] [/leading_anim] [attack] @@ -115,74 +81,44 @@ [filter_attack] name=sling [/filter_attack] + start_time=-400 + sound_start_time=-400 offset=0.0 [if] hits=yes {MISSILE_FRAME_STONE_HIT 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-outcast-masked-sling-1.png" + [sound_frame] sound=sling.ogg - [/frame] + [/sound_frame] [/if] [else] hits=no {MISSILE_FRAME_STONE_MISS 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-outcast-masked-sling-1.png" + [sound_frame] sound=sling-miss.ogg - [/frame] + [/sound_frame] [/else] [frame] - begin=-100 - end=50 - image="units/wesfolk-outcast-masked-sling-2.png" + image="units/wesfolk-outcast-masked-sling-[1~2].png:[250,200]" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=staff [/filter_attack] + start_time=-175 [frame] - begin=-175 - end=-150 - image="units/wesfolk-outcast-masked.png" + image="units/wesfolk-outcast-masked.png:25" [/frame] [frame] - begin=-150 - end=-75 - image="units/wesfolk-outcast-masked-staff-1.png" + image="units/wesfolk-outcast-masked-staff-[1~2].png:[75,175]" [/frame] - [if] - hits=no - [frame] - begin=-75 - end=100 - image="units/wesfolk-outcast-masked-staff-2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/if] - [else] - hits=yes - [frame] - begin=-75 - end=100 - image="units/wesfolk-outcast-masked-staff-2.png" - sound=staff.wav - [/frame] - [/else] + {SOUND:HIT_AND_MISS staff.wav {SOUND_LIST:MISS} -75} [frame] - begin=100 - end=150 - image="units/wesfolk-outcast-masked-defend-1-2.png" + image="units/wesfolk-outcast-masked-defend-1-2.png:50" [/frame] [frame] - begin=150 - end=175 - image="units/wesfolk-outcast-masked.png" + image="units/wesfolk-outcast-masked.png:25" [/frame] [/attack_anim] [variation] @@ -191,148 +127,84 @@ image="units/wesfolk-outcast.png" [defend] hits=miss + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-outcast.png" + image="units/wesfolk-outcast.png:1" [/frame] [frame] - begin=-125 - end=-42 - image="units/wesfolk-outcast-defend-1-1.png" + duration=250 + image="units/wesfolk-outcast-defend-1-[1,2,1].png" [/frame] [frame] - begin=-42 - end=41 - image="units/wesfolk-outcast-defend-1-2.png" - [/frame] - [frame] - begin=41 - end=125 - image="units/wesfolk-outcast-defend-1-1.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-outcast.png" + image="units/wesfolk-outcast.png:1" [/frame] [/defend] [defend] hits=hit + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-outcast.png" + image="units/wesfolk-outcast.png:1,units/wesfolk-outcast-defend.png:250,units/wesfolk-outcast.png:1" [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-outcast-defend.png" + sound_start_time=-25 + [sound_frame] sound={SOUND_LIST:HUMAN_FEMALE_HIT} - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-outcast.png" - [/frame] + [/sound_frame] [/defend] [defend] hits=kill + start_time=-126 [frame] - begin=-126 - end=-125 - image="units/wesfolk-outcast.png" - [/frame] - [frame] - begin=-125 - end=125 - image="units/wesfolk-outcast-defend.png" - [/frame] - [frame] - begin=125 - end=126 - image="units/wesfolk-outcast.png" + image="units/wesfolk-outcast.png:1,units/wesfolk-outcast-defend.png:250,units/wesfolk-outcast.png:1" [/frame] [/defend] [leading_anim] start_time=-150 [frame] - duration=300 - image="units/wesfolk-outcast-sling-2.png" + image="units/wesfolk-outcast-sling-2.png:300" [/frame] [/leading_anim] [attack_anim] [filter_attack] name=sling [/filter_attack] + start_time=-400 + sound_start_time=-400 offset=0.0 [if] hits=yes {MISSILE_FRAME_STONE_HIT 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-outcast-sling-1.png" + [sound_frame] sound=sling.ogg - [/frame] + [/sound_frame] [/if] [else] hits=no {MISSILE_FRAME_STONE_MISS 8 -8} - [frame] - begin=-400 - end=-150 - image="units/wesfolk-outcast-sling-1.png" + [sound_frame] sound=sling-miss.ogg - [/frame] + [/sound_frame] [/else] [frame] - begin=-150 - end=50 - image="units/wesfolk-outcast-sling-2.png" + image="units/wesfolk-outcast-sling-[1~2].png:[250,200]" [/frame] [/attack_anim] [attack_anim] [filter_attack] name=staff [/filter_attack] + start_time=-175 [frame] - begin=-175 - end=-150 - image="units/wesfolk-outcast.png" + image="units/wesfolk-outcast.png:25" [/frame] [frame] - begin=-150 - end=-75 - image="units/wesfolk-outcast-staff-1.png" + image="units/wesfolk-outcast-staff-[1~2].png:[75,175]" [/frame] - [if] - hits=no - [frame] - begin=-75 - end=100 - image="units/wesfolk-outcast-staff-2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/if] - [else] - hits=yes - [frame] - begin=-75 - end=100 - image="units/wesfolk-outcast-staff-2.png" - sound=staff.wav - [/frame] - [/else] + {SOUND:HIT_AND_MISS staff.wav {SOUND_LIST:MISS} -75} [frame] - begin=100 - end=150 - image="units/wesfolk-outcast-defend-1-2.png" + image="units/wesfolk-outcast-defend-1-2.png:50" [/frame] [frame] - begin=150 - end=175 - image="units/wesfolk-outcast.png" + image="units/wesfolk-outcast.png:25" [/frame] [/attack_anim] [/variation] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg b/data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg index 384db6fb9ee..f5e2623207b 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg @@ -36,33 +36,16 @@ Woses are utterly unwarlike, but possess a great strength. They are, however, ne [filter_attack] name=crush [/filter_attack] - [if] - hits=yes - [frame] - begin=-500 - end=-100 - image="units/wose-sapling.png" - sound=wose-attack.ogg - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-500 - end=-100 - image="units/wose-sapling.png" - sound=wose-miss.ogg - [/frame] - [/else] + start_time=-500 + {SOUND:HIT_AND_MISS wose-attack.ogg wose-miss.ogg -500} [frame] - begin=-100 - end=50 - image="units/wose-sapling-attack.png" + image="units/wose-sapling.png:400" [/frame] [frame] - begin=50 - end=125 - image="units/wose-sapling.png" + image="units/wose-sapling-attack.png:150" + [/frame] + [frame] + image="units/wose-sapling.png:75" [/frame] [/attack_anim] [/unit_type]