From a06c7a3894d6197d8c9c6ef724a83f4639eac3c4 Mon Sep 17 00:00:00 2001 From: Isaac Clerencia Perez Date: Wed, 26 Jul 2006 09:30:23 +0000 Subject: [PATCH] Merge 2006-07-25T22:53:36Z!lari.nieminen@iki.fi and 2006-07-25T23:07:12Z!lari.nieminen@iki.fi --- .../units/Battle_Princess.cfg | 25 +++++++-- .../Heir_To_The_Throne/units/Commander.cfg | 16 +++++- .../Heir_To_The_Throne/units/Lord.cfg | 16 +++++- .../Heir_To_The_Throne/units/Princess.cfg | 32 ++++++----- data/tutorial/units/Commander.cfg | 54 +++++++------------ data/tutorial/units/Lord.cfg | 24 +++------ 6 files changed, 94 insertions(+), 73 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg index a9157185f71..18b1625b12d 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg @@ -5,7 +5,13 @@ race=human image="human-battleprincess.png" {DEFENSE_ANIM "human-battleprincess.png" "human-battleprincess.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } - image_leading="human-battleprincess-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="human-battleprincess-leading.png" + [/frame] + [/leading_anim] profile=portraits/lisar.png hitpoints=52 movement_type=elusivefoot @@ -118,7 +124,13 @@ race=human image="human-battleprincess.png" {DEFENSE_ANIM "human-battleprincess-defend.png" "human-battleprincess.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } - image_leading="human-battleprincess-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="human-battleprincess-leading.png" + [/frame] + [/leading_anim] profile=portraits/lisar.png hitpoints=52 movement_type=elusivefoot @@ -232,9 +244,14 @@ image_diagonal="projectiles/fireball-nw.png" [/missile_frame] [frame] - sound=fire.wav begin=-200 - end=0 + end=-100 + image="human-battleprincess.png" + [/frame] + [frame] + sound=fire.wav + begin=-100 + end=50 [/frame] [/animation] [/attack] diff --git a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg index 6ddd08b323e..328003ec032 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg @@ -3,7 +3,13 @@ name= _ "Commander" race=human image="konrad-commander.png" - image_leading="konrad-commander-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="konrad-commander-leading.png" + [/frame] + [/leading_anim] profile=portraits/konrad.png hitpoints=45 [abilities] @@ -180,7 +186,13 @@ name= _ "Commander" race=human image="konrad-commander.png" - image_leading="konrad-commander-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="konrad-commander-leading.png" + [/frame] + [/leading_anim] profile=portraits/konrad.png hitpoints=45 [abilities] diff --git a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg index 7a7d1da50c2..ef6f38a924c 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg @@ -4,7 +4,13 @@ race=human image="konrad-lord.png" {DEFENSE_ANIM "konrad-lord-defend.png" "konrad-lord.png" {SOUND_LIST:HUMAN_HIT} } - image_leading="konrad-lord-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="konrad-lord-leading.png" + [/frame] + [/leading_anim] profile=portraits/konrad.png hitpoints=68 [abilities] @@ -207,7 +213,13 @@ race=human image="konrad-lord.png" {DEFENSE_ANIM "konrad-lord-defend.png" "konrad-lord.png" {SOUND_LIST:HUMAN_HIT} } - image_leading="konrad-lord-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="konrad-lord-leading.png" + [/frame] + [/leading_anim] profile=portraits/konrad.png hitpoints=68 [abilities] diff --git a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg index 70c4a1cced6..3ec482fbd58 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg @@ -5,7 +5,13 @@ race=human image="human-princess.png" {DEFENSE_ANIM "human-princess-defend.png" "human-princess.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } - image_leading="human-princess-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="human-princess-leading.png" + [/frame] + [/leading_anim] profile=portraits/lisar.png hitpoints=48 movement_type=elusivefoot @@ -92,9 +98,15 @@ id=Princess name= _ "Princess" race=human - image="scepter-princess.png" - {DEFENSE_ANIM "scepter-princess-defend.png" "scepter-princess.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } - image_leading="scepter-princess-leading.png" + image="human-princess.png" + {DEFENSE_ANIM "human-princess-defend.png" "human-princess.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } + [leading_anim] + [frame] + begin=-150 + end=150 + image="human-princess-leading.png" + [/frame] + [/leading_anim] profile=portraits/lisar.png hitpoints=48 movement_type=elusivefoot @@ -194,21 +206,15 @@ image="projectiles/fireball-n.png" image_diagonal="projectiles/fireball-nw.png" [/missile_frame] - [frame] - begin=-300 - end=-200 - image="scepter-princess-attack-scepter-1.png" - [/frame] [frame] begin=-200 end=-100 - image="scepter-princess-attack-scepter-2.png" - sound=fire.wav + image="human-princess.png" [/frame] [frame] + sound=fire.wav begin=-100 - end=100 - image="scepter-princess-attack-scepter-3.png" + end=50 [/frame] [/animation] [/attack] diff --git a/data/tutorial/units/Commander.cfg b/data/tutorial/units/Commander.cfg index 890a8018619..328003ec032 100644 --- a/data/tutorial/units/Commander.cfg +++ b/data/tutorial/units/Commander.cfg @@ -3,7 +3,13 @@ name= _ "Commander" race=human image="konrad-commander.png" - image_leading="konrad-commander-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="konrad-commander-leading.png" + [/frame] + [/leading_anim] profile=portraits/konrad.png hitpoints=45 [abilities] @@ -18,7 +24,6 @@ cost=36 usage=mixed fighter unit_description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle." - get_hit_sound={SOUND_LIST:HUMAN_HIT} die_sound={SOUND_LIST:HUMAN_DIE} [attack] name=sword @@ -173,29 +178,21 @@ [/frame] [/animation] [/attack] - [defend] - range=melee - [frame] - begin=-150 - end=150 - image="konrad-commander-defend.png" - [/frame] - [/defend] - [defend] - range=ranged - [frame] - begin=-150 - end=150 - image="konrad-commander-bow-defend.png" - [/frame] - [/defend] + {DEFENSE_ANIM_FILTERED "konrad-commander-defend.png" "konrad-commander.png" {SOUND_LIST:HUMAN_HIT} range=melee} + {DEFENSE_ANIM_FILTERED "konrad-commander-bow-defend.png" "konrad-commander.png" {SOUND_LIST:HUMAN_HIT} range=ranged} [variation] variation_name=scepter id=Commander name= _ "Commander" race=human image="konrad-commander.png" - image_leading="konrad-commander-leading.png" + [leading_anim] + [frame] + begin=-150 + end=150 + image="konrad-commander-leading.png" + [/frame] + [/leading_anim] profile=portraits/konrad.png hitpoints=45 [abilities] @@ -210,7 +207,6 @@ cost=42 usage=mixed fighter unit_description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle." - get_hit_sound={SOUND_LIST:HUMAN_HIT} die_sound={SOUND_LIST:HUMAN_DIE} [attack] name=sword @@ -303,21 +299,7 @@ [/frame] [/animation] [/attack] - [defend] - range=melee - [frame] - begin=-150 - end=150 - image="konrad-commander-defend.png" - [/frame] - [/defend] - [defend] - range=ranged - [frame] - begin=-150 - end=150 - image="konrad-commander-ranged-defend.png" - [/frame] - [/defend] + {DEFENSE_ANIM_FILTERED "konrad-commander-defend.png" "konrad-commander.png" {SOUND_LIST:HUMAN_HIT} range=melee} + {DEFENSE_ANIM_FILTERED "konrad-commander-ranged-defend.png" "konrad-commander.png" {SOUND_LIST:HUMAN_HIT} range=ranged} [/variation] [/unit] diff --git a/data/tutorial/units/Lord.cfg b/data/tutorial/units/Lord.cfg index c84cad559d4..ef6f38a924c 100644 --- a/data/tutorial/units/Lord.cfg +++ b/data/tutorial/units/Lord.cfg @@ -3,21 +3,14 @@ name= _ "Lord" race=human image="konrad-lord.png" - [defend] + {DEFENSE_ANIM "konrad-lord-defend.png" "konrad-lord.png" {SOUND_LIST:HUMAN_HIT} } + [leading_anim] [frame] - range=melee begin=-150 end=150 - image="konrad-lord-defend.png" + image="konrad-lord-leading.png" [/frame] - [frame] - range=ranged - begin=-150 - end=150 - image="konrad-lord-bow-defend.png" - [/frame] - [/defend] - image_leading="konrad-lord-leading.png" + [/leading_anim] profile=portraits/konrad.png hitpoints=68 [abilities] @@ -33,7 +26,6 @@ cost=65 usage=mixed fighter unit_description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units." - get_hit_sound={SOUND_LIST:HUMAN_HIT} die_sound={SOUND_LIST:HUMAN_DIE} [attack] name=sword @@ -220,14 +212,14 @@ name= _ "Lord" race=human image="konrad-lord.png" - [defend] + {DEFENSE_ANIM "konrad-lord-defend.png" "konrad-lord.png" {SOUND_LIST:HUMAN_HIT} } + [leading_anim] [frame] begin=-150 end=150 - image="konrad-lord-defend.png" + image="konrad-lord-leading.png" [/frame] - [/defend] - image_leading="konrad-lord-leading.png" + [/leading_anim] profile=portraits/konrad.png hitpoints=68 [abilities]