DM: Fix Delfador portrait and character progression

Previously young_delfador.png ended up unused in play. From cleanup in
previous commit, it looks like the portrait change was intended for when
Delfador reached level 3, so that has been set now.

Previously, old_delfador.png was unused, as Delfador never became
an elder mage. Is now used for S20 on, where Delfador is now an elder mage.
This commit is contained in:
sigurdfdragon 2017-10-11 14:53:13 -04:00 committed by Jeffrey 'Sigurd' Westcoat
parent 5ca2ff7489
commit 56af9534c0
7 changed files with 29 additions and 28 deletions

View file

@ -185,7 +185,7 @@
{MODIFY_UNIT id=Eldred hitpoints 1}
[move_unit_fake]
type=$delfador_store.type
type=Elder Mage
x=25,24,24
y=18,17,16
[/move_unit_fake]

View file

@ -42,7 +42,7 @@
#### Delfador's code ####
#wmllint: validate-off
[side]
{YOUNG_DELFADOR}
{OLD_DELFADOR}
side=1
save_id=Player
persistent=yes

View file

@ -25,7 +25,7 @@
#wmllint: validate-off
[side]
{YOUNG_DELFADOR}
{OLD_DELFADOR}
side=1
save_id=Player
persistent=yes

View file

@ -5,7 +5,6 @@
[/base_unit]
id=Journeyman Mage
name=_"Journeyman Mage"
# profile="portraits/young_delfador.png"
movement=6 # To "travel far", or at least a little faster
alignment=neutral # Rather than lawful
cost=25 # A little more expensive

View file

@ -14,7 +14,6 @@
fire=60 # Add fire resistance
[/resistance]
movement=6 # A little faster
# advances_to=Elder Mage
cost=125 # Rather more expensive
description=_"A Mage Magister, though equivalent in degree to a Great Mage, has special abilities of command and healing derived from extensive experience of battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_HEALS}
[attack]

View file

@ -27,14 +27,27 @@
[effect]
apply_to=profile
[filter]
type=Elder Mage
type=Mage Commander,Mage Magister
[/filter]
portrait=portraits/old_delfador.png
portrait=portraits/young_delfador.png
[/effect]
[/object]
[/modifications]
#enddef
#define OLD_DELFADOR
id=Delfador
name= _"Delfador"
type=Elder Mage
profile="portraits/old_delfador.png"
canrecruit=yes
unrenamable=yes
[modifications]
{TRAIT_RESILIENT}
{TRAIT_INTELLIGENT}
[/modifications]
#enddef
#define CHANTAL
type=Elvish Druid
id=Chantal

View file

@ -628,28 +628,18 @@
# At the end of Prince of Wesnoth (20), Delfador intervenes.
#define DELFADOR_ARRIVES X Y
[unstore_unit]
variable=delfador_store
find_vacant=yes
x,y={X},{Y}
[/unstore_unit]
{CLEAR_VARIABLE delfador_store}
[modify_unit]
[filter]
id=Delfador
[/filter]
type=""
[/modify_unit]
[heal_unit]
[filter]
id=Delfador
[/filter]
amount=full
animate=no
moves=full
restore_attacks=yes
restore_statuses=yes
[/heal_unit]
# recreate Delfador as he is now 54, 26 years older than last time.
[unit]
{OLD_DELFADOR}
x,y={X},{Y}
placement=map
passable=yes
overwrite=no
facing=ne
side=1
[/unit]
# clears any fog around his appearance
[redraw]
side=1
[/redraw]