diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg index 9d8ad6170e8..3b1fa16b63b 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg @@ -67,6 +67,7 @@ name= _ "Delfador" unrenamable=yes type=Elder Mage + profile=portraits/delfador.png side=1 x=19 y=23 diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg index a69b34215f5..49561dcd423 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg @@ -684,6 +684,7 @@ y=40 id=Delfador type=Elder Mage + profile=portraits/delfador.png name= _ "Delfador" unrenamable=yes [modifications] @@ -840,6 +841,7 @@ y=40 id=Delfador type=Elder Mage + profile=portraits/delfador.png name= _ "Delfador" unrenamable=yes [modifications] diff --git a/data/campaigns/tutorial/images/units/elder-mage-defend.png b/data/campaigns/tutorial/images/units/elder-mage-defend.png deleted file mode 100644 index 64e9c466b9e..00000000000 Binary files a/data/campaigns/tutorial/images/units/elder-mage-defend.png and /dev/null differ diff --git a/data/campaigns/tutorial/images/units/elder-mage-melee1.png b/data/campaigns/tutorial/images/units/elder-mage-melee1.png deleted file mode 100644 index b090c3b957f..00000000000 Binary files a/data/campaigns/tutorial/images/units/elder-mage-melee1.png and /dev/null differ diff --git a/data/campaigns/tutorial/images/units/elder-mage-melee2.png b/data/campaigns/tutorial/images/units/elder-mage-melee2.png deleted file mode 100644 index 97107c52d5f..00000000000 Binary files a/data/campaigns/tutorial/images/units/elder-mage-melee2.png and /dev/null differ diff --git a/data/campaigns/tutorial/images/units/elder-mage-ranged1.png b/data/campaigns/tutorial/images/units/elder-mage-ranged1.png deleted file mode 100644 index 90511e9baf6..00000000000 Binary files a/data/campaigns/tutorial/images/units/elder-mage-ranged1.png and /dev/null differ diff --git a/data/campaigns/tutorial/images/units/elder-mage-ranged2.png b/data/campaigns/tutorial/images/units/elder-mage-ranged2.png deleted file mode 100644 index 970ba9c0534..00000000000 Binary files a/data/campaigns/tutorial/images/units/elder-mage-ranged2.png and /dev/null differ diff --git a/data/campaigns/tutorial/images/units/elder-mage-ranged3.png b/data/campaigns/tutorial/images/units/elder-mage-ranged3.png deleted file mode 100644 index 380d07caf86..00000000000 Binary files a/data/campaigns/tutorial/images/units/elder-mage-ranged3.png and /dev/null differ diff --git a/data/campaigns/tutorial/images/units/elder-mage.png b/data/campaigns/tutorial/images/units/elder-mage.png deleted file mode 100644 index 62dcf654307..00000000000 Binary files a/data/campaigns/tutorial/images/units/elder-mage.png and /dev/null differ diff --git a/data/campaigns/tutorial/scenarios/1_Tutorial.cfg b/data/campaigns/tutorial/scenarios/1_Tutorial.cfg index 93876fd5f5d..6000996aef4 100644 --- a/data/campaigns/tutorial/scenarios/1_Tutorial.cfg +++ b/data/campaigns/tutorial/scenarios/1_Tutorial.cfg @@ -111,6 +111,7 @@ border_size=1 id=Delfador name=_ "Delfador" type=Elder Mage + profile=portraits/delfador.png x,y=13,6 side=3 {IS_HERO} diff --git a/data/campaigns/tutorial/units/Elder_Mage.cfg b/data/campaigns/tutorial/units/Elder_Mage.cfg deleted file mode 100644 index 4316bc58a60..00000000000 --- a/data/campaigns/tutorial/units/Elder_Mage.cfg +++ /dev/null @@ -1,163 +0,0 @@ -#textdomain wesnoth-tutorial -[unit_type] - id=Elder Mage - name= _ "Elder Mage" - race=human - image="units/elder-mage.png" - {DEFENSE_ANIM "units/elder-mage-defend.png" "units/elder-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} } - profile=portraits/delfador.png - hitpoints=55 - movement_type=smallfoot - [resistance] - fire=80 - [/resistance] - movement=6 - experience=150 - level=5 - alignment=neutral - advances_to=null - {AMLA_DEFAULT} - cost=65 - usage=mixed fighter - die_sound={SOUND_LIST:HUMAN_OLD_DIE} - description= _ "Once great, Elder Magi have seen their power diminished from wearying years of battle. Nevertheless, they remain feared on the battlefield for their powerful lightning bolts."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} - [attack] - name=staff - description= _"staff" - icon=attacks/staff-magic.png - type=impact - range=melee - damage=8 - number=2 - [/attack] - [attack] - name=lightning - description= _"lightning" - icon=attacks/lightning.png - type=fire - range=ranged - [specials] - {WEAPON_SPECIAL_MAGICAL} - [/specials] - damage=14 - number=4 - [/attack] - - [attack_anim] - [filter_attack] - name=staff - [/filter_attack] - [frame] - begin=-225 - end=-200 - image="units/elder-mage-ranged1.png" - [/frame] - [frame] - begin=-200 - end=-100 - image="units/elder-mage-melee1.png" - [/frame] - [if] - hits=yes - [frame] - begin=-100 - end=100 - image="units/elder-mage-melee2.png" - sound=staff.wav - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-100 - end=100 - image="units/elder-mage-melee2.png" - sound={SOUND_LIST:MISS} - [/frame] - [/else] - [frame] - begin=100 - end=150 - image="units/elder-mage-ranged1.png" - [/frame] - [frame] - begin=150 - end=200 - image="units/elder-mage.png" - [/frame] - [/attack_anim] - -#define ELDER_MAGE_LIGHTNING DIRECTION_NUMBER - [attack_anim] - [filter_attack] - name=lightning - [/filter_attack] - - [if] - direction=sw,s,se - - [missile_frame] - begin=-250 - end=150 - halo=halo/lightning-bolt-{DIRECTION_NUMBER}-1.png~FL(vert):100,halo/lightning-bolt-{DIRECTION_NUMBER}-2.png~FL(vert):100,halo/lightning-bolt-{DIRECTION_NUMBER}-3.png~FL(vert):100,halo/lightning-bolt-{DIRECTION_NUMBER}-4.png~FL(vert):100 - halo_y=-125 - offset=1.0 - [/missile_frame] - [/if] - [else] - direction=nw,n,ne - - [missile_frame] - begin=-250 - end=150 - halo=halo/lightning-bolt-{DIRECTION_NUMBER}-1.png:100,halo/lightning-bolt-{DIRECTION_NUMBER}-2.png:100,halo/lightning-bolt-{DIRECTION_NUMBER}-3.png:100,halo/lightning-bolt-{DIRECTION_NUMBER}-4.png:100 - halo_y=-125 - offset=1.0 - [/missile_frame] - [/else] - - [if] - hits=yes - [frame] - begin=-300 - end=-200 - image="units/elder-mage-ranged1.png" - sound=lightning.ogg - [/frame] - [/if] - [else] - hits=no - [frame] - begin=-300 - end=-200 - image="units/elder-mage-ranged1.png" - sound=lightning-miss.ogg - [/frame] - [/else] - [frame] - begin=-200 - end=-100 - image="units/elder-mage-ranged2.png" - [/frame] - [frame] - begin=-100 - end=100 - image="units/elder-mage-ranged3.png" - [/frame] - [frame] - begin=100 - end=200 - image="units/elder-mage-ranged2.png" - [/frame] - [frame] - begin=200 - end=250 - image="units/elder-mage-ranged1.png" - [/frame] - [/attack_anim] -#enddef - - {ELDER_MAGE_LIGHTNING 1} - {ELDER_MAGE_LIGHTNING 2} - {ELDER_MAGE_LIGHTNING 3} -[/unit_type] diff --git a/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-defend.png b/data/core/images/units/human-magi/elder-mage-defend.png similarity index 100% rename from data/campaigns/Heir_To_The_Throne/images/units/elder-mage-defend.png rename to data/core/images/units/human-magi/elder-mage-defend.png diff --git a/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee1.png b/data/core/images/units/human-magi/elder-mage-melee1.png similarity index 100% rename from data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee1.png rename to data/core/images/units/human-magi/elder-mage-melee1.png diff --git a/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee2.png b/data/core/images/units/human-magi/elder-mage-melee2.png similarity index 100% rename from data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee2.png rename to data/core/images/units/human-magi/elder-mage-melee2.png diff --git a/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged1.png b/data/core/images/units/human-magi/elder-mage-ranged1.png similarity index 100% rename from data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged1.png rename to data/core/images/units/human-magi/elder-mage-ranged1.png diff --git a/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged2.png b/data/core/images/units/human-magi/elder-mage-ranged2.png similarity index 100% rename from data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged2.png rename to data/core/images/units/human-magi/elder-mage-ranged2.png diff --git a/data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged3.png b/data/core/images/units/human-magi/elder-mage-ranged3.png similarity index 100% rename from data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged3.png rename to data/core/images/units/human-magi/elder-mage-ranged3.png diff --git a/data/campaigns/Heir_To_The_Throne/images/units/elder-mage.png b/data/core/images/units/human-magi/elder-mage.png similarity index 100% rename from data/campaigns/Heir_To_The_Throne/images/units/elder-mage.png rename to data/core/images/units/human-magi/elder-mage.png diff --git a/data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg b/data/core/units/humans/Elder_Mage.cfg similarity index 75% rename from data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg rename to data/core/units/humans/Elder_Mage.cfg index 875dda3719c..f83733212ee 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg +++ b/data/core/units/humans/Elder_Mage.cfg @@ -1,11 +1,10 @@ -#textdomain wesnoth-httt +#textdomain wesnoth-units [unit_type] id=Elder Mage name= _ "Elder Mage" race=human - image="units/elder-mage.png" - {DEFENSE_ANIM "units/elder-mage-defend.png" "units/elder-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} } - profile=portraits/delfador.png + image="units/human-magi/elder-mage.png" + {DEFENSE_ANIM "units/human-magi/elder-mage-defend.png" "units/human-magi/elder-mage.png" {SOUND_LIST:HUMAN_OLD_HIT} } hitpoints=55 movement_type=smallfoot [resistance] @@ -50,19 +49,19 @@ [frame] begin=-225 end=-200 - image="units/elder-mage-ranged1.png" + image="units/human-magi/elder-mage-ranged1.png" [/frame] [frame] begin=-200 end=-100 - image="units/elder-mage-melee1.png" + image="units/human-magi/elder-mage-melee1.png" [/frame] [if] hits=yes [frame] begin=-100 end=100 - image="units/elder-mage-melee2.png" + image="units/human-magi/elder-mage-melee2.png" sound=staff.wav [/frame] [/if] @@ -71,19 +70,19 @@ [frame] begin=-100 end=100 - image="units/elder-mage-melee2.png" + image="units/human-magi/elder-mage-melee2.png" sound={SOUND_LIST:MISS} [/frame] [/else] [frame] begin=100 end=150 - image="units/elder-mage-ranged1.png" + image="units/human-magi/elder-mage-ranged1.png" [/frame] [frame] begin=150 end=200 - image="units/elder-mage.png" + image="units/human-magi/elder-mage.png" [/frame] [/attack_anim] @@ -100,7 +99,7 @@ [frame] begin=-300 end=-200 - image="units/elder-mage-ranged1.png" + image="units/human-magi/elder-mage-ranged1.png" sound=lightning.ogg [/frame] [/if] @@ -109,29 +108,29 @@ [frame] begin=-300 end=-200 - image="units/elder-mage-ranged1.png" + image="units/human-magi/elder-mage-ranged1.png" sound=lightning-miss.ogg [/frame] [/else] [frame] begin=-200 end=-100 - image="units/elder-mage-ranged2.png" + image="units/human-magi/elder-mage-ranged2.png" [/frame] [frame] begin=-100 end=100 - image="units/elder-mage-ranged3.png" + image="units/human-magi/elder-mage-ranged3.png" [/frame] [frame] begin=100 end=200 - image="units/elder-mage-ranged2.png" + image="units/human-magi/elder-mage-ranged2.png" [/frame] [frame] begin=200 end=250 - image="units/elder-mage-ranged1.png" + image="units/human-magi/elder-mage-ranged1.png" [/frame] [/attack_anim] #enddef