From 8bd4df9c007db4b2c3cf2ff9b6398aa7461900a5 Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Tue, 7 Jun 2016 16:15:45 -0400 Subject: [PATCH] HttT: Add journey tracks for Cliffs of Thoria / Underground Channels path. --- changelog | 1 + .../scenarios/20a_North_Elves.cfg | 2 +- .../scenarios/20b_Underground_Channels.cfg | 2 +- .../Heir_To_The_Throne/utils/bigmap.cfg | 148 ++++++++++++++---- 4 files changed, 121 insertions(+), 32 deletions(-) diff --git a/changelog b/changelog index 1c0de8be1612..944def397ac5 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ Version 1.13.4+dev: * Campaigns: * Heir to the Throne: + * Add journey tracks for 19c/20b path. * New sprites for Li'sar. * S10: Clarify objectives and change egg image on capture. * S19c: Removed the undead and the swamps. diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg index e49007b87dd2..304bb0b65269 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg @@ -54,7 +54,7 @@ [/objectives] [/event] - {HTTT_TRACK {JOURNEY_20_NEW} } + {HTTT_TRACK {JOURNEY_20A_NEW} } [side] team_name=elves diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg index 37e1e4466240..cd90af76500c 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg @@ -8,7 +8,7 @@ next_scenario="21_Elven_Council" victory_when_enemies_defeated=no - # {HTTT_TRACK {JOURNEY_20B_NEW} } + {HTTT_TRACK {JOURNEY_20B_NEW} } {DEFAULT_SCHEDULE} diff --git a/data/campaigns/Heir_To_The_Throne/utils/bigmap.cfg b/data/campaigns/Heir_To_The_Throne/utils/bigmap.cfg index 175ff57aba17..a6b63617ba09 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/bigmap.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/bigmap.cfg @@ -501,13 +501,39 @@ #define JOURNEY_19C_NEW {JOURNEY_18_OLD} + {JOURNEY 780 230} + {JOURNEY 795 231} + {JOURNEY 810 231} + {JOURNEY 825 233} + {JOURNEY 840 231} + {JOURNEY 855 224} + {JOURNEY 870 208} + {JOURNEY 885 200} + {JOURNEY 900 199} + {JOURNEY 915 204} + {JOURNEY 927 213} + {JOURNEY 921 225} + {NEW_BATTLE 925 238} #enddef #define JOURNEY_19C_OLD {JOURNEY_18_OLD} -#enddef - -#define JOURNEY_20_NEW + {OLD_JOURNEY 780 230} + {OLD_JOURNEY 795 231} + {OLD_JOURNEY 810 231} + {OLD_JOURNEY 825 233} + {OLD_JOURNEY 840 231} + {OLD_JOURNEY 855 224} + {OLD_JOURNEY 870 208} + {OLD_JOURNEY 885 200} + {OLD_JOURNEY 900 199} + {OLD_JOURNEY 915 204} + {OLD_JOURNEY 927 213} + {OLD_JOURNEY 921 225} + {OLD_BATTLE 925 238} +#enddef + +#define JOURNEY_20A_NEW [switch] variable=A_Choice_Was_Made [case] @@ -558,7 +584,7 @@ [/switch] #enddef -#define JOURNEY_20_OLD +#define JOURNEY_20A_OLD [switch] variable=A_Choice_Was_Made [case] @@ -609,36 +635,98 @@ [/switch] #enddef +#define JOURNEY_20B_NEW + {JOURNEY_19C_OLD} + {JOURNEY 940 238} + {JOURNEY 955 228} + {JOURNEY 970 218} + {NEW_BATTLE 985 208} +#enddef + +#define JOURNEY_20B_OLD + {JOURNEY_19C_OLD} + {OLD_JOURNEY 940 238} + {OLD_JOURNEY 955 228} + {OLD_JOURNEY 970 218} + {OLD_BATTLE 985 208} +#enddef + #define JOURNEY_21_NEW - {JOURNEY_20_OLD} - {JOURNEY 1124 333} - {JOURNEY 1129 319} - {JOURNEY 1128 304} - {JOURNEY 1125 289} - {JOURNEY 1122 274} - {JOURNEY 1120 259} - {JOURNEY 1119 244} - {JOURNEY 1122 229} - {JOURNEY 1129 216} - {JOURNEY 1142 208} - {JOURNEY 1156 204} - {NEW_REST 1172 204} + [if] + [variable] + name=A_Choice_Was_Made + not_equals=c + [/variable] + [then] + {JOURNEY_20A_OLD} + {JOURNEY 1124 333} + {JOURNEY 1129 319} + {JOURNEY 1128 304} + {JOURNEY 1125 289} + {JOURNEY 1122 274} + {JOURNEY 1120 259} + {JOURNEY 1119 244} + {JOURNEY 1122 229} + {JOURNEY 1129 216} + {JOURNEY 1142 208} + {JOURNEY 1156 204} + {NEW_REST 1172 204} + [/then] + [else] + {JOURNEY_20B_OLD} + {JOURNEY 1000 206} + {JOURNEY 1016 204} + {JOURNEY 1031 202} + {JOURNEY 1047 200} + {JOURNEY 1062 198} + {JOURNEY 1078 196} + {JOURNEY 1093 194} + {JOURNEY 1109 196} + {JOURNEY 1124 198} + {JOURNEY 1140 200} + {JOURNEY 1155 202} + {NEW_REST 1172 204} + [/else] + [/if] #enddef #define JOURNEY_21_OLD - {JOURNEY_20_OLD} - {OLD_JOURNEY 1124 333} - {OLD_JOURNEY 1129 319} - {OLD_JOURNEY 1128 304} - {OLD_JOURNEY 1125 289} - {OLD_JOURNEY 1122 274} - {OLD_JOURNEY 1120 259} - {OLD_JOURNEY 1119 244} - {OLD_JOURNEY 1122 229} - {OLD_JOURNEY 1129 216} - {OLD_JOURNEY 1142 208} - {OLD_JOURNEY 1156 204} - {OLD_REST 1172 204} + [if] + [variable] + name=A_Choice_Was_Made + not_equals=c + [/variable] + [then] + {JOURNEY_20A_OLD} + {OLD_JOURNEY 1124 333} + {OLD_JOURNEY 1129 319} + {OLD_JOURNEY 1128 304} + {OLD_JOURNEY 1125 289} + {OLD_JOURNEY 1122 274} + {OLD_JOURNEY 1120 259} + {OLD_JOURNEY 1119 244} + {OLD_JOURNEY 1122 229} + {OLD_JOURNEY 1129 216} + {OLD_JOURNEY 1142 208} + {OLD_JOURNEY 1156 204} + {OLD_REST 1172 204} + [/then] + [else] + {JOURNEY_20B_OLD} + {OLD_JOURNEY 1000 206} + {OLD_JOURNEY 1016 204} + {OLD_JOURNEY 1031 202} + {OLD_JOURNEY 1047 200} + {OLD_JOURNEY 1062 198} + {OLD_JOURNEY 1078 196} + {OLD_JOURNEY 1093 194} + {OLD_JOURNEY 1109 196} + {OLD_JOURNEY 1124 198} + {OLD_JOURNEY 1140 200} + {OLD_JOURNEY 1155 202} + {OLD_REST 1172 204} + [/else] + [/if] #enddef #define JOURNEY_22_NEW