Corrected inclusion of Kaleh ability events...

...and added a leadership skill upgrade.
This commit is contained in:
Jan Rietema 2007-11-03 12:00:54 +00:00
parent 63fa08b7ba
commit 3bf5161390
18 changed files with 167 additions and 182 deletions

View file

@ -1316,6 +1316,7 @@
[/message]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -2584,6 +2584,7 @@
#define ELYSSA_FEATURING
#enddef
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -1719,6 +1719,7 @@
[/endlevel]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -2265,6 +2265,7 @@
[/message]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -4273,7 +4273,8 @@
message= _ "Oh no, we took too long and enemy reinforcements have arrived. We'll surely be overwhelmed now!"
[/message]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -2465,6 +2465,7 @@
[/set_variable]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -2346,6 +2346,7 @@
[/set_variable]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -832,5 +832,6 @@
#undef ELYSSA_FEATURING
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/global-events.cfg}
[/scenario]

View file

@ -826,5 +826,6 @@
[/message]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/global-events.cfg}
[/scenario]

View file

@ -6635,6 +6635,7 @@
{UNDERGROUND}
[/time_area]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -4173,6 +4173,7 @@
{CLEAR_VARIABLE unitstats}
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -937,5 +937,6 @@
[/endlevel]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/global-events.cfg}
[/scenario]

View file

@ -2446,6 +2446,7 @@
[/if]
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{KALEH_DEATH}
{FRIEND_DEATH}

View file

@ -1914,6 +1914,7 @@
#[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/deaths.cfg}
{LATE_KALEH_DEATH}
{LATE_ALLY_DEATH}

View file

@ -632,5 +632,6 @@
{CLEAR_VARIABLE stored_nym}
[/event]
{@campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg}
{@campaigns/Under_the_Burning_Suns/utils/global-events.cfg}
[/scenario]

View file

@ -644,182 +644,3 @@ This attack puts enormous pressure on the enemy, disrupting his ZOC if a hit is
[/attack_anim]
[/unit]
#define KALEH_ABILITIES
[event]
# charisma ability
name=moveto
first_time_only=no
[filter]
side=1
[filter_adjacent]
ability=charisma
[/filter_adjacent]
[or]
side=1
ability=charisma
[/or]
[or]
side=1
[wml_filter]
upkeep="loyal"
[/wml_filter]
[/or]
[/filter]
[store_unit]
variable=player_unit
kill=no
[filter]
side=1
[/filter]
[/store_unit]
{FOREACH player_unit i}
{VARIABLE player_unit[$i].upkeep "full"}
[unstore_unit]
variable=player_unit[$i]
[/unstore_unit]
{NEXT i}
[store_unit]
variable=player_unit
kill=no
[filter]
side=1
canrecruit=0
[filter_adjacent]
ability="charisma"
[/filter_adjacent]
[/filter]
[/store_unit]
{FOREACH player_unit i}
{VARIABLE player_unit[$i].upkeep "loyal"}
[unstore_unit]
variable=player_unit[$i]
[/unstore_unit]
{NEXT i}
[allow_undo]
[/allow_undo]
[/event]
# the stun attack
[event]
name=attacker_hits
first_time_only=no
[special_filter]
weapon=sword_rush
[/special_filter]
[filter_second]
[not]
level=0
[/not]
[not]
role="zoc_off"
[/not]
[/filter_second]
{VARIABLE second_unit.role "zoc_off"}
[unstore_unit]
variable=second_unit
text="stunned"
red,green,blue=150,120,250
[/unstore_unit]
{VARIABLE unit.status.slowed "on"}
[unstore_unit]
variable=unit
text="slowed"
red,green,blue=200,55,55
[/unstore_unit]
[object]
silent=yes
id=stun
[filter]
x,y=$x2,$y2
[/filter]
[effect]
apply_to=zoc
value=0
[/effect]
[/object]
[/event]
[event]
name=new turn
first_time_only=no
[store_unit]
variable=zoc_unit
kill=no
[filter]
role="zoc_off"
[/filter]
[/store_unit]
{FOREACH zoc_unit i}
{VARIABLE zoc_unit[$i].role ""}
[unstore_unit]
variable=zoc_unit[$i]
[/unstore_unit]
[object]
silent=yes
[filter]
x=$zoc_unit[$i].x
y=$zoc_unit[$i].y
[/filter]
[effect]
apply_to=zoc
value=1
[/effect]
[/object]
{NEXT i}
[/event]
# upgrade leadership event
[event]
name=new turn
first_time_only=no
[if]
[variable]
name=kaleh_level_leadership
less_than=3
[/variable]
[then]
[if]
[have_unit]
side=1
canrecruit=1
[wml_filter]
variation=Marshal
[/wml_filter]
[/have_unit]
[then]
[store_unit]
variable=kaleh
kill=no
[filter]
side=1
canrecruit=1
[wml_filter]
variation=Marshal
[/wml_filter]
[/filter]
[/store_unit]
{VARIABLE kaleh_level_leadership 3}
[object]
silent=yes
x=$kaleh.x
y=$kaleh.y
[effect]
apply_to=remove_ability
[abilities]
id=leadership
[/abilities]
[/effect]
[effect]
apply_to=new_ability
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
[/abilities]
[/effect]
[/object]
{CLEAR_VARIABLE kaleh}
[/then]
[/if]
[/then]
[/if]
[/event]
#enddef

View file

@ -1,5 +1,3 @@
#textdomain wesnoth-utbs
# Make sure our special units keep the right portraits as they advance
{SET_PORTRAIT_ON_ADVANCE "Elyssa" "Silver Mage" "portraits/elyssa_silver.png"}
# add the events for Kaleh abilities
{KALEH_ABILITIES}

View file

@ -0,0 +1,151 @@
# add the events for Kaleh abilities
[event]
# charisma ability
name=moveto
first_time_only=no
[filter]
side=1
[filter_adjacent]
ability=charisma
[/filter_adjacent]
[or]
side=1
ability=charisma
[/or]
[or]
side=1
[wml_filter]
upkeep="loyal"
[/wml_filter]
[/or]
[/filter]
[store_unit]
variable=player_unit
kill=no
[filter]
side=1
[/filter]
[/store_unit]
{FOREACH player_unit i}
{VARIABLE player_unit[$i].upkeep "full"}
[unstore_unit]
variable=player_unit[$i]
[/unstore_unit]
{NEXT i}
[store_unit]
variable=player_unit
kill=no
[filter]
side=1
canrecruit=0
[filter_adjacent]
ability="charisma"
[/filter_adjacent]
[/filter]
[/store_unit]
{FOREACH player_unit i}
{VARIABLE player_unit[$i].upkeep "loyal"}
[unstore_unit]
variable=player_unit[$i]
[/unstore_unit]
{NEXT i}
[allow_undo]
[/allow_undo]
[/event]
# the stun attack
[event]
name=attacker_hits
first_time_only=no
[special_filter]
weapon=sword_rush
[/special_filter]
[filter_second]
[not]
level=0
[/not]
[not]
role="zoc_off"
[/not]
[/filter_second]
{VARIABLE second_unit.role "zoc_off"}
[unstore_unit]
variable=second_unit
text="stunned"
red,green,blue=150,120,250
[/unstore_unit]
{VARIABLE unit.status.slowed "on"}
[unstore_unit]
variable=unit
text="slowed"
red,green,blue=200,55,55
[/unstore_unit]
[object]
silent=yes
id=stun
[filter]
x,y=$x2,$y2
[/filter]
[effect]
apply_to=zoc
value=0
[/effect]
[/object]
[/event]
[event]
name=new turn
first_time_only=no
[store_unit]
variable=zoc_unit
kill=no
[filter]
role="zoc_off"
[/filter]
[/store_unit]
{FOREACH zoc_unit i}
{VARIABLE zoc_unit[$i].role ""}
[unstore_unit]
variable=zoc_unit[$i]
[/unstore_unit]
[object]
silent=yes
[filter]
x=$zoc_unit[$i].x
y=$zoc_unit[$i].y
[/filter]
[effect]
apply_to=zoc
value=1
[/effect]
[/object]
{NEXT i}
[/event]
# upgrade leadership event
[event]
name=post_advance
first_time_only=yes
[filter]
side=1
canrecruit=1
[wml_filter]
variation=Marshal
[/wml_filter]
[/filter]
[object]
silent=yes
x=$unit.x
y=$unit.y
[effect]
apply_to=remove_ability
[abilities]
id=leadership
[/abilities]
[/effect]
[effect]
apply_to=new_ability
[abilities]
{ABILITY_LEADERSHIP_LEVEL_3}
[/abilities]
[/effect]
[/object]
[/event]