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

NR S12a & 13a: Improve handling of Sisal & the Liches

Browse source 
Make Sisal loyal at end of S12a.
Have Sisal & the Liches appear in S13a at a time that makes more sense.

[ci skip]
This commit is contained in:
sigurdfdragon 2018-03-05 19:10:32 -05:00 • committed by Jeffrey 'Sigurd' Westcoat
parent c243ca5c7b
commit 9f5a61601a
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
View file

@ -554,7 +554,14 @@
id=Sisal
[/have_unit]
[then]
{MODIFY_UNIT id=Sisal canrecruit no}
[modify_unit]
[filter]
id=Sisal
[/filter]
canrecruit=no
{TRAIT_LOYAL}
{IS_LOYAL}
[/modify_unit]
[message]
id=Tallin

45
data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View file

@ -355,9 +355,6 @@
# Check if Krash is alive, if yes place him at helm of side 7,
# otherwise it's taken over by older lich.
{RECALL_KRASH}
[recall]
id="Ro'Arthian"
[/recall]
[store_starting_location]
side=7
variable=side_seven_starts_at
@ -377,12 +374,11 @@
kill=yes
fire_event=no
[/store_unit]
{VARIABLE place_lich_at.x $side_seven_starts_at.x}
{VARIABLE place_lich_at.y $side_seven_starts_at.y}
{VARIABLE place_lich_at.side 7}
{VARIABLE place_lich_at.canrecruit yes}
[unstore_unit]
variable=place_lich_at
x,y=$side_seven_starts_at.x,$side_seven_starts_at.y
[/unstore_unit]
{UNMAKE_HERO "Ro'Arthian"}
[kill]
@ -422,9 +418,6 @@
[recall]
id=Eryssa
[/recall]
[recall]
id="Ro'Sothian"
[/recall]
[store_starting_location]
side=9
variable=side_nine_starts_at
@ -443,9 +436,20 @@
[/modify_side]
[/then]
[else]
{TELEPORT_UNIT id="Ro'Sothian" $side_nine_starts_at.x $side_nine_starts_at.y}
{MODIFY_UNIT id="Ro'Sothian" canrecruit yes}
{MODIFY_UNIT id="Ro'Sothian" side 9}
[store_unit]
[filter]
id="Ro'Sothian"
[/filter]
variable=place_second_lich_at
kill=yes
fire_event=no
[/store_unit]
{VARIABLE place_second_lich_at.side 9}
{VARIABLE place_second_lich_at.canrecruit yes}
[unstore_unit]
variable=place_second_lich_at
x,y=$side_nine_starts_at.x,$side_nine_starts_at.y
[/unstore_unit]
{UNMAKE_HERO "Ro'Sothian"}
[kill]
side=9
@ -562,12 +566,10 @@
# If Sisal is alive it means gold was recovered, give it back to
# three player sided split evenly
[recall]
id=Sisal
[/recall]
[if]
[have_unit]
id=Sisal
search_recall_list=yes
[/have_unit]
[then]
{VARIABLE_OP stored_gold multiply 0.33}
@ -666,10 +668,14 @@
[if]
[have_unit]
id=Sisal
search_recall_list=yes
[/have_unit]
[then]
{MODIFY_UNIT id=Sisal side 9}
{TELEPORT_UNIT id=Sisal 32 54}
[recall]
id=Sisal
show=no #so Eryssa move to unhide animation is not interrupted
[/recall]
[/then]
[/if]
[/then]
@ -740,9 +746,18 @@
[recall]
id=Elenia
[/recall]
[recall] #if not recalled above
id=Sisal
[/recall]
[recall]
id=Stalrag
[/recall]
[recall] #if not placed above
id="Ro'Arthian"
[/recall]
[recall] #if not placed above
id="Ro'Sothian"
[/recall]
# Intro
[message]
id=Tallin