TSG S7a-S9a: prepare to let Hylas die

(FR #3316)

This includes changing when the overlays and ellipses for the hero units are
changed, and for better testing part of the event is split into a victory event
in S6a.

[ci skip]
This commit is contained in:
Severin Glöckner 2018-07-26 18:11:25 +02:00
parent 461c4659a3
commit e55f192634
4 changed files with 63 additions and 45 deletions

View file

@ -496,8 +496,8 @@
[/store_unit]
{VARIABLE stored_Sir_Gerrick.canrecruit no}
{VARIABLE stored_Sir_Gerrick.ellipse misc/ellipse-hero}
{VARIABLE stored_Sir_Gerrick.overlays misc/hero-icon.png}
{VARIABLE stored_Sir_Gerrick.overlays misc/loyal-icon.png}
{CLEAR_VARIABLE stored_Sir_Gerrick.ellipse}
[store_unit]
variable=stored_Sir_Gerrick_army
@ -520,6 +520,10 @@
variable=stored_Ethiliel
[/unstore_unit]
# He may die from now on
{VARIABLE stored_Hylas.overlays misc/loyal-icon.png}
{CLEAR_VARIABLE stored_Hylas.ellipse}
[unstore_unit]
variable=stored_Hylas
[/unstore_unit]

View file

@ -232,7 +232,7 @@
ai_special=guardian
[/unit]
## guardians in M'Brin's keep
# Guardians in M'Brin's keep
#ifndef EASY
[unit]
side=2
@ -311,10 +311,6 @@
description= _ "Death of Deoran"
condition=lose
[/objective]
[objective]
description= _ "Death of Minister Hylas"
condition=lose
[/objective]
[objective]
description= _ "Death of Ethiliel"
condition=lose
@ -522,8 +518,26 @@
speaker=Grek
message= _ "Ha! Who wants stupid human lands!"
[/message]
[role]
role=disillusioned
side=1
type="Mage of Light,White Mage," +
"Elvish Sylph," +
"Master Bowman,Halberdier,Royal Guard,Cavalier," +
"Elvish Enchantress,Elvish Shyde,Elvish Champion,Elvish Marshal,Elvish Avenger," +
"Longbowman,Javelineer,Pikeman,Swordsman,Dragoon," +
"Elvish Hero,Elvish Sorceress,Elvish Captain,Elvish Marksman,Elvish Druid," +
"Bowman,Spearman,Cavalryman," +
"Elvish Fighter,Elvish Shaman,Peasant," +
"Mounted General,Horseman Commander,Junior Commander"
[not]
id=Ethiliel
[/not]
search_recall_list=no
[/role]
[message]
speaker=Minister Hylas
role=disillusioned
message= _ "Then you will not aid us in our quest to destroy the undead menace?"
[/message]
[message]

View file

@ -37,10 +37,6 @@
description= _ "Death of Deoran"
condition=lose
[/objective]
[objective]
description= _ "Death of Minister Hylas"
condition=lose
[/objective]
[objective]
description= _ "Death of Ethiliel"
condition=lose
@ -241,35 +237,35 @@
[/then]
[/if]
# Unstore Sir Gerrick and his troops back so that everyone will be happily
# reunited at the beginning of the next scenario.
{VARIABLE stored_Sir_Gerrick.x "recall"}
{VARIABLE stored_Sir_Gerrick.y "recall"}
[unstore_unit]
variable=stored_Sir_Gerrick
[/unstore_unit]
[foreach]
array=stored_Sir_Gerrick_army
[do]
{VARIABLE this_item.x "recall"}
{VARIABLE this_item.y "recall"}
[unstore_unit]
variable=this_item
[/unstore_unit]
[/do]
[/foreach]
{CLEAR_VARIABLE stored_Sir_Gerrick_army}
{CLEAR_VARIABLE stored_Sir_Gerrick}
[endlevel]
result=victory
bonus=yes
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
[event]
name=victory
# Unstore Sir Gerrick and his troops back so that everyone will be happily
# reunited at the beginning of the next scenario.
[unstore_unit]
variable=stored_Sir_Gerrick
x,y=recall,recall
[/unstore_unit]
[foreach]
array=stored_Sir_Gerrick_army
[do]
[unstore_unit]
variable=this_item
x,y=recall,recall
[/unstore_unit]
[/do]
[/foreach]
{CLEAR_VARIABLE stored_Sir_Gerrick_army}
{CLEAR_VARIABLE stored_Sir_Gerrick}
[/event]
[/scenario]

View file

@ -110,13 +110,6 @@
[recall]
id=Minister Hylas
[/recall]
[modify_unit]
[filter]
id=Sir Gerrick,Minister Hylas
[/filter]
ellipse=""
overlays="misc/loyal-icon.png"
[/modify_unit]
[message]
speaker=Sir Gerrick
@ -344,8 +337,19 @@
id=Ethiliel
[/filter]
[role]
role=realist
side=1
type="Mage of Light,White Mage," +
"Infantry Commander,Infantry Lieutenant," +
"Cavalier,Halberdier,Royal Guard,Master Bowman,Iron Mauler," +
"Javelineer,Longbowman,Pikeman,Swordsman,Dragoon,Shock Trooper," +
"Bowman,Cavalryman,Heavy Infantryman,Spearman,Peasant," +
"Mounted General,Horseman Commander,Junior Commander"
search_recall_list=no
[/role]
[message]
speaker=Minister Hylas
role=realist
message= _ "Itheldens elves have killed Ethiliel! Now we have no chance to come to an agreement with them. A war with the Elves is imminent."
[/message]
[message]