diff --git a/data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map b/data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map index c80f562b6347..726c0c3e46ea 100644 --- a/data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map +++ b/data/campaigns/The_South_Guard/maps/05_Choice_in_the_Fog.map @@ -35,8 +35,8 @@ Gd^Fp, Gd^Fp, Hhd, Gd^Fp, Hhd, Gd^Fp, Gd^Fp, Hhd, Hhd, Gd^Fp, Hh, Gs^Fp, Hhd, Gd Gd^Fp, Gd^Fp, Gd^Fp, Hhd, Hh, Gd^Fp, Gd^Fp, Hh, Hh, Hh, Mm, Hh, Gs^Fp, Hh, Gs^Fp, Gs^Fp, Gs, Hh, Hh, Mm, Hh, Gs^Fp, Hh, Gs, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Gs^Fp, Gs^Fp, Hh, Hh, Gg, Gs^Fp, Gs^Fp, Ww, Ww, Ss, Ss, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Rr, Rr, Gll^Fp, Rr, Gll^Fp, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp Gd^Fp, Gd^Fp, Hhd, Gd^Fp, Hh, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Gs^Fp, Hh, Gs^Fp, Gs, Hh, Hh, Mm, Mm, Gs, Hh, Hh, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Ww, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp Hh, Hh, Gs^Fp, Hh, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Ww, Gs, Ww, Hh, Ww, Gs^Fp, Gs^Fp, Hh, Gs^Fp, Gs^Fp, Ss, Ss, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Gs^Fp, Gs^Fp, Hh, Hh, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Ss, Gll^Fp, Gll^Fp, Hhd, Gll^Fp, Re, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp -Gs^Fp, Gs^Fp, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Wo, Ww, Wo, Ww, Ww, Ww, Wo, Ww, Ww, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gll^Fp, Hhd, Hhd, Gll^Fp, Gll^Fp, Rr, Rr, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp -Gs^Fp, Gs^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Ww, Mm, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Wo, Wo, Ww, Gs^Fp, Chr, Chr, Ss, Ss, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs, Gs^Fp, Ss, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gll^Fp, Hhd, Hhd, Hhd, Gll^Fp, Gll^Fp, Rr, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hhd, Gll^Fp, Gll^Fp, Gll^Fp +Gs^Fp, Gs^Fp, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Wo, Ww, Wo, Ww, Ww, Ww, Wo, Ww, Ww, Hh, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gll^Fp, Hhd, Hhd, Gll^Fp, Gll^Fp, Rr, Rr, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp +Gs^Fp, Gs^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Ww, Mm, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Wo, Wo, Ww, Khr, Chr, Chr, Ss, Ss, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs, Gs^Fp, Ss, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gll^Fp, Hhd, Hhd, Hhd, Gll^Fp, Gll^Fp, Rr, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hhd, Gll^Fp, Gll^Fp, Gll^Fp Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ww, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Ww^Vm, Wo, Wo, Wo, Ww, Gs^Fp, Chr, Gs^Fp, Re, Re, Re, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Gs^Fp, Ww, Ww, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gd, Gd, Rr, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hhd, Hhd, Gll^Fp, Gll^Fp Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Wo, Ww, Ww, Ss, Gs^Fp, Chr, 3 Khr, Re, Ss, Ss, Re, Re, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Ss, Gs^Fp, Gs^Fp, Gg, Hh, Ww, Ww, Ww, Ww, Gll^Fp, Gll^Fp, Gd, Re, Gll^Fp, Gll^Fp, Gll^Fp, Rr, Rr, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hhd, Gll^Fp, Hhd, Gll^Fp, Gll^Fp Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Hh, Ww, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Ww, Gs^Fp, Ww, Ww, Ss, Gs^Fp, Chr, Re, Gs^Fp, Ss, Ss, Re, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Hh, Gs^Fp, Ww, Ww, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gd, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Rr, Gll^Fp, Gll^Fp, Gll^Fp, Aa^Fpa, Hhd, Aa^Fpa, Aa^Fpa, Gll^Fp, Gll^Fp, Gll^Fp diff --git a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg index c58dfa0a4782..f15af545319a 100644 --- a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg +++ b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg @@ -89,6 +89,9 @@ type=Soulless id=Gruth name= _ "Gruth" + canrecruit=yes + overlays="misc/leader-expendable.png" + facing=se team_name=undead user_team_name=_"Undead" @@ -97,7 +100,16 @@ {GOLD 30 50 80} {INCOME 5 10 15} - canrecruit=yes + # Second leader: + [unit] + type=Soulless + id=Gerd + name=_ "Gerd" + canrecruit=yes + overlays="misc/leader-expendable.png" + facing=ne + x,y=21,38 + [/unit] [ai] recruitment_pattern=fighter {NO_SCOUTS} @@ -345,58 +357,141 @@ [/objectives] [/event] - # The adventurers defeat the zombie leader + # The adventures defeat the first zombie leader [event] name=die [filter] - id=Gruth + side=3 + canrecruit=yes [/filter] - - [if] + [filter_second] + side=1 + [/filter_second] + [filter_condition] [have_unit] - x,y=$x2,$y2 + side=3 + canrecruit=yes + [/have_unit] + [/filter_condition] - [not] - id=Ethiliel - [/not] + [message] + speaker=second_unit + # po: This message is shown when the frist zombie leader died. + # po: There is a second one, a few hexes next to him, the player most likely saw him already. + message= _ "He was not alone." + [/message] + [/event] - [not] - id=Minister Hylas - [/not] + # The adventurers defeat the second zombie leader - [not] - id=Deoran - [/not] - [/have_unit] + [event] + name=die + [filter] + side=3 + canrecruit=yes + [/filter] + [filter_second] + side=1 + [/filter_second] + [filter_condition] + [not] + [have_unit] + side=3 + canrecruit=yes + [/have_unit] + [/not] + [/filter_condition] + + [if] + [variable] + name=know_about_lich + boolean_equals=no + [/variable] [then] + [if] + [have_unit] + x,y=$x2,$y2 + [not] + id=Ethiliel,Minister Hylas,Deoran + [/not] + [/have_unit] + + [then] + [message] + speaker=second_unit + # po: Note that masters is in plural. + message= _ "The masters of the undead are defeated!" + [/message] + [/then] + + [else] + [message] + speaker=Sir Gerrick + # po: Note that masters is in plural. + message= _ "The masters of the undead are defeated!" + [/message] + [/else] + [/if] + [message] - speaker=second_unit - message= _ "The master of the undead is defeated!" + speaker=Minister Hylas + message= _ "No... I fear there is still much evil present." + [/message] + + [message] + speaker=Deoran + # po: Note that servants is in plural. + message= _ "Surely the undead infestation cannot be dispatched so easily. We have merely destroyed servants of a far darker master." [/message] [/then] + [elseif] + [have_unit] + id="Mal M'Brin" + [/have_unit] + + [then] + [if] + [have_unit] + x,y=$x2,$y2 + + [not] + id=Ethiliel,Minister Hylas + [/not] + [/have_unit] + + [then] + [message] + speaker=second_unit + message= _ "Two undead leaders have fallen…" + [/message] + [message] + speaker=Minister Hylas + message= _ "Though we have merely destroyed the servants of a far darker master…" + [/message] + [/then] + + [else] + [message] + speaker=Minister Hylas + message= _ "They were just servants of a far darker master…" + [/message] + [/else] + [/if] + [/then] + [/elseif] [else] [message] - speaker=Sir Gerrick - message= _ "The master of the undead is defeated!" + speaker=second_unit + message= _ "One less evil in this forest…" [/message] [/else] [/if] - - [message] - speaker=Minister Hylas - message= _ "No... I fear there is still much evil present." - [/message] - - [message] - speaker=Deoran - message= _ "Surely the undead infestation cannot be dispatched so easily. We have merely destroyed a servant of a far darker master." - [/message] [/event] - # the adventurers see the Lich, or the Lich moves in their vision area + # The adventurers see the Lich, or the Lich moves in their vision area [event] name=sighted @@ -416,6 +511,7 @@ scroll=no message= _ "We found the lich!" [/message] + {VARIABLE know_about_lich yes} [/event] # The adventurers locate the bandits: a choice must be made @@ -740,6 +836,10 @@ speaker=Urza Afalas message= _ "Fools! That lich will be the death of us all! You have sealed our doom!" [/message] + # Questionable if this should be enough to change the talk + # when killing the zombie leaders (it is currently set when + # sighting the lich before killing the zombies) + # {VARIABLE know_about_lich yes} [/then] [/elseif] [else] @@ -834,7 +934,7 @@ image=portraits/deoran-sad.png message= _ "Then we shall retreat towards Westin and prepare for the oncoming battle. I pray our only chance at victory was not lost today." [/message] - {CLEAR_VARIABLE side_with_bandits,found_urza_afalas,has_mermen} + {CLEAR_VARIABLE side_with_bandits,found_urza_afalas,has_mermen,know_about_lich} [endlevel] result=victory next_scenario=06b_The_Long_March @@ -932,7 +1032,7 @@ speaker=Sir Gerrick message= _ "Fare well, Deoran! I will be there to greet you when you return to Kerlath Province." [/message] - {CLEAR_VARIABLE side_with_bandits,found_urza_afalas} + {CLEAR_VARIABLE side_with_bandits,found_urza_afalas,know_about_lich} [endlevel] result=victory next_scenario=06a_Tidings_Good_and_Ill