0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Elder Mage into core, decoupling it from Delfador's portrait.

Browse source 
It was already used in one campaign and the tutorial; in LoW, soon to
be mainlined, it's used for the mage Crelanu, and in Delfador's
Memoirs it's used for Delfador again.
This commit is contained in:
Eric S. Raymond 2008-10-07 02:07:37 +00:00
parent b18a3f3e4a
commit e5c4d601fc
19 changed files with 19 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
View file

@ -67,6 +67,7 @@
name= _ "Delfador"
unrenamable=yes
type=Elder Mage
profile=portraits/delfador.png
side=1
x=19
y=23

2
data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
View file

@ -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]

BIN
data/campaigns/tutorial/images/units/elder-mage-defend.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
data/campaigns/tutorial/images/units/elder-mage-melee1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
data/campaigns/tutorial/images/units/elder-mage-melee2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
data/campaigns/tutorial/images/units/elder-mage-ranged1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
data/campaigns/tutorial/images/units/elder-mage-ranged2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
data/campaigns/tutorial/images/units/elder-mage-ranged3.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
data/campaigns/tutorial/images/units/elder-mage.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

1
data/campaigns/tutorial/scenarios/1_Tutorial.cfg
View file

@ -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}

163
data/campaigns/tutorial/units/Elder_Mage.cfg
View file

@ -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]

0
data/campaigns/Heir_To_The_Throne/images/units/elder-mage-defend.png → data/core/images/units/human-magi/elder-mage-defend.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee1.png → data/core/images/units/human-magi/elder-mage-melee1.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
data/campaigns/Heir_To_The_Throne/images/units/elder-mage-melee2.png → data/core/images/units/human-magi/elder-mage-melee2.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged1.png → data/core/images/units/human-magi/elder-mage-ranged1.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged2.png → data/core/images/units/human-magi/elder-mage-ranged2.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
data/campaigns/Heir_To_The_Throne/images/units/elder-mage-ranged3.png → data/core/images/units/human-magi/elder-mage-ranged3.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
data/campaigns/Heir_To_The_Throne/images/units/elder-mage.png → data/core/images/units/human-magi/elder-mage.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

31
data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg → data/core/units/humans/Elder_Mage.cfg
View file

@ -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