From c685445907dcd0ba5a1659910ae7f93875a6e1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20Gl=C3=B6ckner?= Date: Fri, 19 Oct 2018 10:40:48 +0200 Subject: [PATCH] SoF: Alanin is no more a leader In the scenarios where one plays him he retains now his usual overlay. Master only, as the scenarios depend on changes in previous scenarios, which breakssave compatibility. [ci skip] --- .../maps/7_Outriding_the_Outriders.map | 2 +- .../Sceptre_of_Fire/maps/Epilogue.map | 2 +- .../scenarios/6_Towards_the_Caves.cfg | 25 ------------------- .../scenarios/7_Outriding_the_Outriders.cfg | 22 ++++++++++++---- .../scenarios/9_Caverns_of_Flame.cfg | 4 --- .../Sceptre_of_Fire/scenarios/Epilogue.cfg | 9 +++++-- 6 files changed, 26 insertions(+), 38 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/maps/7_Outriding_the_Outriders.map b/data/campaigns/Sceptre_of_Fire/maps/7_Outriding_the_Outriders.map index 613369cde3de..e14008b4aaf0 100644 --- a/data/campaigns/Sceptre_of_Fire/maps/7_Outriding_the_Outriders.map +++ b/data/campaigns/Sceptre_of_Fire/maps/7_Outriding_the_Outriders.map @@ -2,7 +2,7 @@ Ms, Ms, Ms, Ms, Ms, Ha, Gd, Gd, Wo, Ww, Ai, Ai, Gd, Gd, Aa, Aa, Aa, Gd, Rd, Re, Ms, Ms, Ms, Ms, Ms, Ha, Gd, Gd, Wo, Ww, Ai, Ai, Gd, Gd, Aa, Aa, Aa, Gd, Rd, Re, Gd, Gd, Aa, Gd, Aa^Fpa, Aa^Fpa Ms, Ms, Ms, Ms, Ha, Ha, Gd, Ww, Wo, Ww, Ha, Ai, Ha^Fpa, Gd, Gd, Gd, Gd, Gd, Rd, Gd, Ha, Gd, Aa, Aa, Ha, Ha Ms, Ms, Ms, Ms, Ha, Gd, Gd, Wo, Ww, Ai, Mm, Ha^Fpa, Ha, Aa^Fpa, Gd, Gd, Rd, Rd, Gd, Gd, Ha, Ha, Ha, Ha, Ha, Ha -Ms, Ms, Ha, Ha, Gd, Gd, Ww, Wo, Ai, Ai, Mm, Mm, Gd, Gd, Rd, Rd, Gd, 1 Gd, Gd, Gd, Ha, Ha, Ms, Ms, Ms, Ms +Ms, Ms, Ha, Ha, Gd, Gd, Ww, Wo, Ai, Ai, Mm, Mm, Gd, Gd, Rd, Rd, Gd, Gd, Gd, Gd, Ha, Ha, Ms, Ms, Ms, Ms Ha, Ha, Ai, Ai, Wo, Wo, Ai, Ai, Ai, Ai, Ha, Ha^Vhha, Rd, Rd, Mm, Gd, Gd, Gd, Ha, Ha, Ms, Ms, Ms, Ms, Ms, Ms Gd, Gd, Ww, Wo, Ww, Ww, Gd, Ai, Aa, Aa, Aa, Rd, Gd, Gd, Ha^Fpa, Ha, Gd, Ha, Ha, Ha, Ha, Ms, Ms, Ms, Ms, Ms Wo, Wo, Ww, Ww, Gd, Gd, Gd, Gd, Ha^Fpa, Aa, Gd, Rd, Rd, Gd, Ha, Ha^Fpa, Gd, Gd, Gd, Ha, Ha, Ms, Ms, Ms, Ms, Ms diff --git a/data/campaigns/Sceptre_of_Fire/maps/Epilogue.map b/data/campaigns/Sceptre_of_Fire/maps/Epilogue.map index 63446bfa7cb6..4d109d858304 100644 --- a/data/campaigns/Sceptre_of_Fire/maps/Epilogue.map +++ b/data/campaigns/Sceptre_of_Fire/maps/Epilogue.map @@ -1,5 +1,5 @@ Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Hh, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Hh, Hh, Gg, Gg, Rr, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Hh, Gg, Gs^Fds, Gg, Gg -Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Hh, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, 1 Rr, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Hh, Hh, Gg, Gg, Gg +Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Hh, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Rr, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Hh, Hh, Gg, Gg, Gg Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Rr, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Hh, Gg, Gg, Gg, Gg Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gs^Fds, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Rr, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg, Gg Gg, Gg, Gs^Fds, Gs^Fds, Hh, Gg, Hh, Hh, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Rr, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Hh, Gg, Gg diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg index 6edadaac287d..3f52967faf88 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg @@ -508,9 +508,6 @@ variable=alanin kill=yes [/store_unit] - {VARIABLE alanin.canrecruit yes} - {CLEAR_VARIABLE alanin.ellipse} - {CLEAR_VARIABLE alanin.overlays} [show_objectives] [/show_objectives] [/then] @@ -526,9 +523,6 @@ variable=alanin kill=yes [/store_unit] - {VARIABLE alanin.canrecruit yes} - {CLEAR_VARIABLE alanin.ellipse} - {CLEAR_VARIABLE alanin.overlays} [endlevel] result=victory bonus=no @@ -557,9 +551,6 @@ speaker=Rugnur message= _ "Tell him to send forces north to aid us and fight the elves, but that we are probably going to die. We will run northeast towards the old eastern mines, and if he wants his sceptre intact he’d best send troops to meet us there." [/message] - {MODIFY_UNIT id=Alanin canrecruit yes} - {MODIFY_UNIT id=Alanin ellipse ""} - {MODIFY_UNIT id=Alanin overlays ""} [store_unit] [filter] side=1 @@ -631,9 +622,6 @@ variable=alanin kill=yes [/store_unit] - {VARIABLE alanin.canrecruit yes} - {CLEAR_VARIABLE alanin.ellipse} - {CLEAR_VARIABLE alanin.overlays} [/then] [/if] @@ -659,19 +647,6 @@ [/then] [/if] - [unstore_unit] - variable=alanin - [/unstore_unit] - - # Let's make Alanin invisible in linger mode, will be unhidden at the - # start of the next scenario - - [hide_unit] - x,y=$alanin.x,$alanin.y - [/hide_unit] - - {CLEAR_VARIABLE alanin} - [store_side] side=1 variable=stored_Rugnur_side diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg index 2262370c2190..d122485f1bb7 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg @@ -12,11 +12,10 @@ {DEFAULT_SCHEDULE} [side] - id=Alanin - type=Dragoon + no_leader=yes + defeat_condition=no_units_left # actually: Alanin dies save_id=Rugnur side=1 - canrecruit=yes controller=human recruit= shroud=yes @@ -74,8 +73,10 @@ [event] name=prestart - [unhide_unit] - [/unhide_unit] + [unstore_unit] + variable=alanin + x,y=17,4 + [/unstore_unit] [objectives] side=1 @@ -409,6 +410,17 @@ {CLEAR_VARIABLE random} [/event] + [event] + name=die + [filter] + id=Alanin + [/filter] + + [endlevel] + result=defeat + [/endlevel] + [/event] + [event] name=time over diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg index 95fa5aaec970..fd43e95ac0c2 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg @@ -837,11 +837,7 @@ x=$move_x y=$move_y [/move_unit_fake] - [unstore_unit] - variable=alanin - [/unstore_unit] {CLEAR_VARIABLE move_x,move_y} - {CLEAR_VARIABLE alanin} [endlevel] result=victory carryover_report=no diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg index ec06a138ae1c..f1ba16193201 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg @@ -9,8 +9,8 @@ {DEFAULT_SCHEDULE} [side] - id=Alanin - type=Dragoon + no_leader=yes + defeat_condition=no_units_left save_id=Rugnur side=1 canrecruit=yes @@ -84,6 +84,11 @@ side=2 type=Swordsman [/unit] + + [unstore_unit] + variable=alanin + x,y=18,1 + [/unstore_unit] [/event] [event]