From 55065088a1848bafaffa458d3786a3f7681bb3ff Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 01/38] HttT Remove unused macro --- .../Heir_To_The_Throne/utils/httt_utils.cfg | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg index d7d38095963a..5715120daa01 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg @@ -644,28 +644,3 @@ fire: +10%" equals={VALUE} [/variable] #enddef - -#define UNDEAD_GUARDIAN TYPE X Y - [unit] - side=3 - type={TYPE} - x={X} - y={Y} - [object] - silent=yes - [filter] - side=3 - [/filter] - [effect] - apply_to=movement_costs - replace=true - [movement_costs] - swamp_water={UNREACHABLE} - deep_water={UNREACHABLE} - shallow_water={UNREACHABLE} - forest={UNREACHABLE} - [/movement_costs] - [/effect] - [/object] - [/unit] -#enddef From 74786a219bf7d7a6b03eedb4af4a0ff90f265096 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 02/38] HttT Remove macro artifacts --- .../Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg | 4 ++++ .../Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg | 6 ++++++ .../Heir_To_The_Throne/scenarios/07_Crossroads.cfg | 3 +++ .../scenarios/08_The_Princess_of_Wesnoth.cfg | 2 ++ .../Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg | 2 ++ .../Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg | 3 +++ .../Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg | 2 ++ .../Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg | 2 ++ .../Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg | 3 +++ .../Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg | 3 +++ .../Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg | 2 ++ 11 files changed, 32 insertions(+) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg index e900cc099f32..490fc87c5b0a 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg @@ -584,3 +584,7 @@ [/message] [/event] [/scenario] + +#undef AVOID_CHANTAL +#undef HIGH_PRIORITY_TARGETS +#undef EBESIEGED_RECRUITMENT diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg index 9511f641ac99..095297d7c2ce 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg @@ -556,3 +556,9 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef EMPTY_TEMPLE_TRAP +#undef MOREMIRMU_TRAP +#undef XAKAE_TRAP +#undef ISLE_GALLEON_ARRIVE +#undef RESTORE_RECALL_LIST diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg index bf69ac169c47..f0d94954132b 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg @@ -537,3 +537,6 @@ SE — Fort Tahn" {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef CROSSROADS_AI_PARAMS +#undef ORC_AMBUSH_AREA diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg index ef96fbc7062d..ecc4ccc369c5 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg @@ -414,3 +414,5 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef SECOND_WAVE diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg index 0913d106d9a5..ffee66a2433d 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg @@ -462,3 +462,5 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef VOD_AI_PARMS diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg index c296cc3282b8..ce2dc705ba0d 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg @@ -464,3 +464,6 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef FORD_GUARD +#undef SEA_CREATURE diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg index 5ba5182acf41..e2431e869a5d 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg @@ -679,3 +679,5 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef LISAR_GUARD_DOORS diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg index e8729131b86c..5d3a3dddaba7 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg @@ -636,3 +636,5 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef MORE_UNITS diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg index 9426f1e2ae16..561d71a6f1ab 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg @@ -442,3 +442,6 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef HASTY_TROLL +#undef HASTY_GOBLIN_KNIGHT diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg index 5af11c4b499c..9549fddc2ce0 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg @@ -396,3 +396,6 @@ [/endlevel] [/event] [/scenario] + +#undef SWAMP_DREAD_AI_PARAMS +#undef ENDOWED_KNIGHT diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg index e040eab3acd0..619aad69e7b4 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg @@ -524,3 +524,5 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef BONUS_VICTORY From a2811dd620f73e05469ed7aaf1435cecd205bca3 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 03/38] HttT Remove variable artifacts --- .../scenarios/03_The_Isle_of_Alduin.cfg | 1 + .../scenarios/05b_Isle_of_the_Damned.cfg | 3 +++ .../scenarios/06_The_Siege_of_Elensefar.cfg | 1 + .../Heir_To_The_Throne/scenarios/07_Crossroads.cfg | 3 +-- .../scenarios/09_The_Valley_of_Death.cfg | 1 + .../Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg | 1 + .../Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg | 1 + .../Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg | 3 ++- .../Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg | 8 -------- .../scenarios/14_Plunging_Into_the_Darkness.cfg | 1 + .../Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg | 3 ++- .../Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg | 1 + .../Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg | 5 +++++ .../Heir_To_The_Throne/scenarios/20a_North_Elves.cfg | 5 ----- .../Heir_To_The_Throne/scenarios/21_Elven_Council.cfg | 1 + .../scenarios/24_Battle_for_Wesnoth.cfg | 1 + data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg | 8 +++++++- 17 files changed, 29 insertions(+), 18 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg index ccd8b4ad7a66..a2d5ec720024 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg @@ -352,6 +352,7 @@ [/allow_recruit] [/then] [/if] + {CLEAR_VARIABLE received_mages} [kill] id=Seimus diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg index 095297d7c2ce..b1a08bee2789 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg @@ -390,6 +390,7 @@ [/else] #endif [/if] + {CLEAR_VARIABLE random} [/event] [event] @@ -474,6 +475,7 @@ message= _ "You regain your lost troops and $isle_damned_starting_gold gold!" image=wesnoth-icon.png [/message] + {CLEAR_VARIABLE isle_damned_starting_gold} [allow_recruit] side=1 @@ -535,6 +537,7 @@ message= _ "You regain your lost troops and $isle_damned_starting_gold gold!" image=wesnoth-icon.png [/message] + {CLEAR_VARIABLE isle_damned_starting_gold} [allow_recruit] side=1 diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg index 34a2fd900383..6477d18c7513 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg @@ -646,6 +646,7 @@ message= _ "We cannot go to Wesmere, for Asheviere’s orcs have the approaches ringed about with steel; Kalenz and I barely escaped, and Chantal cannot get out. Until we are stronger, we must go where the orcs are not." [/message] + {CLEAR_VARIABLE thieves_ford} [endlevel] result=victory bonus=yes diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg index f0d94954132b..322be413e057 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg @@ -363,6 +363,7 @@ [/object] [/command] [/random_placement] + {CLEAR_VARIABLE ambush_location} #enddef @@ -390,10 +391,8 @@ {ORC_AMBUSH_AREA 3 26-40 16-23 7} #endif - {CLEAR_VARIABLE possible_ambush_locations} {CLEAR_VARIABLE random_ambusher_type_table} {CLEAR_VARIABLE random_ambusher_type_i} - {CLEAR_VARIABLE ambusher} [/event] [event] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg index ffee66a2433d..aa2647f41b6f 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg @@ -458,6 +458,7 @@ [/kill] [/then] [/if] + {CLEAR_VARIABLE moremirmu} [/event] {campaigns/Heir_To_The_Throne/utils/deaths.cfg} diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg index fb04807ce751..a99c988ccdaf 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg @@ -414,6 +414,7 @@ message= _ "Let us continue onward!" [/message] + {CLEAR_VARIABLE gryphon_disposition} [endlevel] result=victory bonus=yes diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg index ce2dc705ba0d..e618f9326b48 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg @@ -455,6 +455,7 @@ [/then] [/if] + {CLEAR_VARIABLE lisar_still_here} [endlevel] result=victory bonus=yes diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg index beb7e355c721..5d04c7e47641 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg @@ -335,7 +335,7 @@ [/do] [/while] - {CLEAR_VARIABLE non_snowy_locs} + {CLEAR_VARIABLE non_snowy_locs,i,num_of_falling_snow,random,terrain,turns_left} [/event] [/event] @@ -396,6 +396,7 @@ [/else] [/if] + {CLEAR_VARIABLE turn_limit} [endlevel] result=victory bonus=yes diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg index e2431e869a5d..5aeacd2568bb 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg @@ -552,10 +552,6 @@ speaker=Konrad message= _ "Pray that we live to see sunlight again." [/message] - [set_variable] - name=killed_enemies - value=false - [/set_variable] [endlevel] result=victory bonus=yes @@ -582,10 +578,6 @@ speaker=Konrad message= _ "Pray that we live to see sunlight again." [/message] - [set_variable] - name=killed_enemies - value=false - [/set_variable] [endlevel] result=victory bonus=yes diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg index f82b5eedbc47..24614e309337 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg @@ -670,6 +670,7 @@ [/then] [/if] + {CLEAR_VARIABLE get_gryphons} [endlevel] result=victory bonus=no diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg index d4b7a3a52426..35ff3866d665 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg @@ -244,6 +244,7 @@ [/terrain] [/do] [/foreach] + {CLEAR_VARIABLE scepter_vicinity} [terrain] x=$scepter_x y=$scepter_y @@ -345,7 +346,7 @@ [event] name=victory - {CLEAR_VARIABLE concentrating,moved_too_close} + {CLEAR_VARIABLE concentrating,moved_too_close,lava_body,lava_count,scepter_x,scepter_y} [/event] [event] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg index 9549fddc2ce0..345dfad571d6 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg @@ -389,6 +389,7 @@ {CLEAR_VARIABLE temp_armor_x} {CLEAR_VARIABLE temp_armor_y} {CLEAR_VARIABLE armor_taken} + {CLEAR_VARIABLE armored_knight,dk_kill_count} [endlevel] result=victory bonus=yes diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg index a537fef4f584..695312bfd158 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg @@ -503,6 +503,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des message= _ "We’ve found $random gold in the drake nest." image=items/gold-coins-medium.png [/message] + {CLEAR_VARIABLE random} # Remove the current location from the array [for] @@ -527,6 +528,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des [/if] [/do] [/for] + {CLEAR_VARIABLE i} [/event] [event] @@ -627,6 +629,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des [+unit] ai_special=guardian [/unit] + {CLEAR_VARIABLE spawn_type} [/case] [case] @@ -645,6 +648,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des {VARIABLE this_item.delayed_spawning_on_turn "$($turn_number + 2)"} [/case] [/switch] + {CLEAR_VARIABLE spawn_level} [/then] [/if] [/else] @@ -951,6 +955,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des speaker=Konrad message= _ "Everybody inside..." [/message] + {CLEAR_VARIABLE waterfall_sighted,drake_bases} [endlevel] result=victory bonus=yes 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 304bb0b65269..ce16e4b6dfc8 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 @@ -261,11 +261,6 @@ [event] name=prestart - # - # Variable cleanup from last scenario - # - {CLEAR_VARIABLE armored_knight} - # # Add a bunch of strong guardians to discourage you from # attacking the leaders These are full-fledged war camps, diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg index 6414673d8cf5..d5263ed56147 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg @@ -305,6 +305,7 @@ speaker=Parandra message= _ "Yes, rest. Your soldiers will be tended to and refreshed. We have made sure you will leave our protection with the resources to finish your journey." [/message] + {CLEAR_VARIABLE scepter} [endlevel] result=victory bonus=no diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg index 1dbe6728761c..fd217553dff5 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg @@ -212,6 +212,7 @@ {NAMED_LOYAL_UNIT 1 (Grand Knight) 39 8 (Sir Alric) (_ "Sir Alric")} [/then] [/if] + {CLEAR_VARIABLE clan_alric,clan_bayar,clan_daryn,clan_ruga} [/event] [event] diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg index 5715120daa01..c62e34223eb4 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg @@ -58,6 +58,10 @@ {PLACE_IMAGE items/flame-sword.png ({X}) ({Y})} {VARIABLE sword_taken 0} + [event] + name=victory + {CLEAR_VARIABLE sword_taken} + [/event] [/event] [event] name=moveto @@ -446,6 +450,7 @@ fire: +10%" y=$y_range terrain={TERRAIN} [/terrain] + {CLEAR_VARIABLE side_store,min_x,min_y,max_x,max_y,x_range,y_range} #enddef #textdomain wesnoth-help @@ -503,15 +508,16 @@ fire: +10%" {CLEAR_VARIABLE lava_body} {VARIABLE lava_body.x $potential_locs[$random].x} {VARIABLE lava_body.y $potential_locs[$random].y} + {CLEAR_VARIABLE random} [terrain] x=$lava_body.x y=$lava_body.y terrain=Ql [/terrain] - {CLEAR_VARIABLE potential_locs} {CLEAR_VARIABLE randrange} [/then] [/if] + {CLEAR_VARIABLE potential_locs} #enddef #define EXPAND_LAVA From 2cf5c075ca10b0ac0cce181072423c251843897d Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 04/38] HttT [else][if] s/b [elseif]; [if] requires conditional --- .../scenarios/10_Gryphon_Mountain.cfg | 272 +++++++++--------- .../scenarios/19b_Swamp_Of_Dread.cfg | 42 ++- .../scenarios/19c_Cliffs_of_Thoria.cfg | 54 ++-- 3 files changed, 180 insertions(+), 188 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg index a99c988ccdaf..b0f992688e8e 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg @@ -266,147 +266,145 @@ message= _ "With these gryphon eggs we should be able to breed gryphons that will serve us. When they are large enough to carry mounts, we can hire gryphon riders!" [/message] [/then] - [else] - [if] - [and] - [variable] - name=gryphon_disposition - greater_than_equal_to=2 - [/variable] - [have_unit] + [elseif] + [and] + [variable] + name=gryphon_disposition + greater_than_equal_to=2 + [/variable] + [have_unit] + side=3 + [/have_unit] + [/and] + [then] + [message] + speaker=Konrad + message= _ "It is a shame we could not get those gryphon eggs. I am glad we did not slaughter any gryphons. They are magnificent animals (looks back at the mountain). Still..." + [/message] + [message] + speaker=Konrad + message= _ "Whoa!!" + [/message] + # + # Wake up all the sleeping gryphons + # + [store_unit] + variable=gryphon_store + [filter] side=3 - [/have_unit] - [/and] - [then] - [message] - speaker=Konrad - message= _ "It is a shame we could not get those gryphon eggs. I am glad we did not slaughter any gryphons. They are magnificent animals (looks back at the mountain). Still..." - [/message] - [message] - speaker=Konrad - message= _ "Whoa!!" - [/message] - # - # Wake up all the sleeping gryphons - # - [store_unit] - variable=gryphon_store - [filter] - side=3 - [/filter] - [/store_unit] - [foreach] - array=gryphon_store - [do] - {VARIABLE this_item.type Gryphon} - [unstore_unit] - variable=this_item - [/unstore_unit] + [/filter] + [/store_unit] + [foreach] + array=gryphon_store + [do] + {VARIABLE this_item.type Gryphon} + [unstore_unit] + variable=this_item + [/unstore_unit] [/do] [/foreach] - {CLEAR_VARIABLE gryphon_store} - # - # Figure out where Konrad is standing - # - [store_unit] - variable=konrad_store - [filter] - id=Konrad - [/filter] - [/store_unit] - [if] - [variable] - name=konrad_store.x - greater_than=13 - [/variable] - [then] - {VARIABLE destination_x 24} - [/then] - [else] - {VARIABLE destination_x 1} - [/else] - [/if] - [if] - [variable] - name=konrad_store.y - greater_than=16 - [/variable] - [then] - {VARIABLE destination_y 39} - [/then] - [else] - {VARIABLE destination_y 1} - [/else] - [/if] - # - # Put some more gryphons up there and view the mountain - # - {NAMED_LOYAL_UNIT 3 (Gryphon) 13 14 (Graik) ( _ "Graik")} - {NAMED_LOYAL_UNIT 3 (Gryphon) 13 18 (Griak) ( _ "Griak")} - [scroll_to] - x,y=13,16 - [/scroll_to] - [message] - speaker=narrator - image="wesnoth-icon.png" - message= _ "Indeed, the majestic beasts were now circling the mountain’s peak. Several glared in Konrad’s direction, their eagle eyes fixed on him at an incredible distance." - [/message] - [sound] - name=gryphon-shriek-1.ogg - [/sound] - [store_unit] - variable=gryphon_store - [filter] + {CLEAR_VARIABLE gryphon_store} + # + # Figure out where Konrad is standing + # + [store_unit] + variable=konrad_store + [filter] + id=Konrad + [/filter] + [/store_unit] + [if] + [variable] + name=konrad_store.x + greater_than=13 + [/variable] + [then] + {VARIABLE destination_x 24} + [/then] + [else] + {VARIABLE destination_x 1} + [/else] + [/if] + [if] + [variable] + name=konrad_store.y + greater_than=16 + [/variable] + [then] + {VARIABLE destination_y 39} + [/then] + [else] + {VARIABLE destination_y 1} + [/else] + [/if] + # + # Put some more gryphons up there and view the mountain + # + {NAMED_LOYAL_UNIT 3 (Gryphon) 13 14 (Graik) ( _ "Graik")} + {NAMED_LOYAL_UNIT 3 (Gryphon) 13 18 (Griak) ( _ "Griak")} + [scroll_to] + x,y=13,16 + [/scroll_to] + [message] + speaker=narrator + image="wesnoth-icon.png" + message= _ "Indeed, the majestic beasts were now circling the mountain’s peak. Several glared in Konrad’s direction, their eagle eyes fixed on him at an incredible distance." + [/message] + [sound] + name=gryphon-shriek-1.ogg + [/sound] + [store_unit] + variable=gryphon_store + [filter] + side=3 + [/filter] + [/store_unit] + [foreach] + array=gryphon_store + [do] + {VARIABLE temp_x $this_item.x} + {VARIABLE temp_y $this_item.y} + {VARIABLE range_x ("$temp_x|, $destination_x")} + {VARIABLE range_y ("$temp_y|, $destination_y")} + [kill] + x=$temp_x + y=$temp_y + [/kill] + [move_unit_fake] + type=Gryphon side=3 - [/filter] - [/store_unit] - [foreach] - array=gryphon_store - [do] - {VARIABLE temp_x $this_item.x} - {VARIABLE temp_y $this_item.y} - {VARIABLE range_x ("$temp_x|, $destination_x")} - {VARIABLE range_y ("$temp_y|, $destination_y")} - [kill] - x=$temp_x - y=$temp_y - [/kill] - [move_unit_fake] - type=Gryphon - side=3 - x=$range_x - y=$range_y - [/move_unit_fake] - [/do] - [/foreach] - {CLEAR_VARIABLE konrad_store} - {CLEAR_VARIABLE gryphon_store} - {CLEAR_VARIABLE temp_x} - {CLEAR_VARIABLE temp_y} - {CLEAR_VARIABLE range_x} - {CLEAR_VARIABLE range_y} - {CLEAR_VARIABLE destination_x} - {CLEAR_VARIABLE destination_y} - [message] - speaker=Delfador - message= _ "Amazing! I have never before heard of such behavior in gryphons." - [/message] - [message] - speaker=Konrad - message= _ "What does it mean?" - [/message] - [message] - speaker=Delfador - message= _ "I do not know. Come now, the show is over." - [/message] - [/then] - [else] - [message] - speaker=Konrad - message= _ "It is a shame we could not get those gryphon eggs — they would surely have given us an advantage sometime. Still, we must continue." - [/message] - [/else] - [/if] + x=$range_x + y=$range_y + [/move_unit_fake] + [/do] + [/foreach] + {CLEAR_VARIABLE konrad_store} + {CLEAR_VARIABLE gryphon_store} + {CLEAR_VARIABLE temp_x} + {CLEAR_VARIABLE temp_y} + {CLEAR_VARIABLE range_x} + {CLEAR_VARIABLE range_y} + {CLEAR_VARIABLE destination_x} + {CLEAR_VARIABLE destination_y} + [message] + speaker=Delfador + message= _ "Amazing! I have never before heard of such behavior in gryphons." + [/message] + [message] + speaker=Konrad + message= _ "What does it mean?" + [/message] + [message] + speaker=Delfador + message= _ "I do not know. Come now, the show is over." + [/message] + [/then] + [/elseif] + [else] + [message] + speaker=Konrad + message= _ "It is a shame we could not get those gryphon eggs — they would surely have given us an advantage sometime. Still, we must continue." + [/message] [/else] [/if] [message] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg index 345dfad571d6..c07a5a02e0a4 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg @@ -306,28 +306,6 @@ name=dk_kill_count numerical_equals=4 [/variable] - [else] - [if] - [variable] - name=dk_kill_count - numerical_equals=3 - [/variable] - [then] - [message] - speaker=narrator - image="wesnoth-icon.png" - message= _ "A final blow destroys the lich, releasing a small shock wave of energy outwards. The last of his minions silently falls like a puppet with its strings cut. A cloud of dust billows outwards as the remnants of the lich’s once-mortal body disintegrate for the last time." - [/message] - [/then] - [else] - [message] - speaker=narrator - image="wesnoth-icon.png" - message= _ "A final blow destroys the lich, releasing a small shock wave of energy outwards. His minions fall like puppets with their strings cut. A cloud of dust billows out as the remnants of the lich’s once-mortal body disintegrate for the last time." - [/message] - [/else] - [/if] - [/else] [then] [message] speaker=narrator @@ -335,6 +313,26 @@ message= _ "A final blow destroys the lich, releasing a small shock wave of energy outwards. A giant cloud of dust billows out as the remnants of the lich’s once-mortal body disintegrate for the last time." [/message] [/then] + [elseif] + [variable] + name=dk_kill_count + numerical_equals=3 + [/variable] + [then] + [message] + speaker=narrator + image="wesnoth-icon.png" + message= _ "A final blow destroys the lich, releasing a small shock wave of energy outwards. The last of his minions silently falls like a puppet with its strings cut. A cloud of dust billows outwards as the remnants of the lich’s once-mortal body disintegrate for the last time." + [/message] + [/then] + [/elseif] + [else] + [message] + speaker=narrator + image="wesnoth-icon.png" + message= _ "A final blow destroys the lich, releasing a small shock wave of energy outwards. His minions fall like puppets with their strings cut. A cloud of dust billows out as the remnants of the lich’s once-mortal body disintegrate for the last time." + [/message] + [/else] [/if] [message] speaker=Delfador diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg index 695312bfd158..d3e9b52e8215 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg @@ -609,48 +609,44 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des [/then] [else] - [if] - [then] #ifdef EASY - {VARIABLE_OP spawn_level rand "1,2"} + {VARIABLE_OP spawn_level rand "1,2"} #else - {VARIABLE_OP spawn_level rand "1,2,2,3"} + {VARIABLE_OP spawn_level rand "1,2,2,3"} #endif - [switch] - variable=spawn_level + [switch] + variable=spawn_level - [case] - value=1 + [case] + value=1 - {VARIABLE_OP spawn_type rand "Drake Fighter,Drake Burner,Drake Glider"} + {VARIABLE_OP spawn_type rand "Drake Fighter,Drake Burner,Drake Glider"} - {GENERIC_UNIT 2 $spawn_type $this_item.x $this_item.y} - [+unit] - ai_special=guardian - [/unit] - {CLEAR_VARIABLE spawn_type} - [/case] + {GENERIC_UNIT 2 $spawn_type $this_item.x $this_item.y} + [+unit] + ai_special=guardian + [/unit] + {CLEAR_VARIABLE spawn_type} + [/case] - [case] - value=2 + [case] + value=2 - {VARIABLE_OP this_item.spawn_type rand "Drake Warrior,Drake Flare,Fire Drake,Sky Drake"} + {VARIABLE_OP this_item.spawn_type rand "Drake Warrior,Drake Flare,Fire Drake,Sky Drake"} - {VARIABLE this_item.delayed_spawning_on_turn "$($turn_number + 1)"} - [/case] + {VARIABLE this_item.delayed_spawning_on_turn "$($turn_number + 1)"} + [/case] - [case] - value=3 + [case] + value=3 - {VARIABLE_OP this_item.spawn_type rand "Drake Blademaster,Drake Flameheart,Inferno Drake,Drake Enforcer,Drake Warden,Hurricane Drake"} + {VARIABLE_OP this_item.spawn_type rand "Drake Blademaster,Drake Flameheart,Inferno Drake,Drake Enforcer,Drake Warden,Hurricane Drake"} - {VARIABLE this_item.delayed_spawning_on_turn "$($turn_number + 2)"} - [/case] - [/switch] - {CLEAR_VARIABLE spawn_level} - [/then] - [/if] + {VARIABLE this_item.delayed_spawning_on_turn "$($turn_number + 2)"} + [/case] + [/switch] + {CLEAR_VARIABLE spawn_level} [/else] [/if] [/then] From 66a68bccdeb524a8c1fc5c4b9da31adb07ada28e Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 05/38] HttT Filters should go first --- .../scenarios/04_The_Bay_of_Pearls.cfg | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg index f0695f35743d..597a5cbecd5d 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg @@ -309,16 +309,16 @@ [event] name=moveto - [remove_item] - x,y=$x1,$y1 - [/remove_item] - [filter] side=1 x=19 y=23 [/filter] + [remove_item] + x,y=$x1,$y1 + [/remove_item] + [unit] side=1 x=19 @@ -382,16 +382,16 @@ [event] name=moveto - [remove_item] - x,y=$x1,$y1 - [/remove_item] - [filter] side=1 x=11 y=33 [/filter] + [remove_item] + x,y=$x1,$y1 + [/remove_item] + [unit] side=1 x=11 @@ -456,16 +456,16 @@ [event] name=moveto - [remove_item] - x,y=$x1,$y1 - [/remove_item] - [filter] side=1 x=7 y=35 [/filter] + [remove_item] + x,y=$x1,$y1 + [/remove_item] + [unit] side=1 x=7 @@ -504,16 +504,16 @@ [event] name=moveto - [remove_item] - x,y=$x1,$y1 - [/remove_item] - [filter] x=5 y=38 side=1 [/filter] + [remove_item] + x,y=$x1,$y1 + [/remove_item] + [unit] side=1 x=5 @@ -564,16 +564,16 @@ [event] name=moveto - [remove_item] - x,y=$x1,$y1 - [/remove_item] - [filter] side=1 x=3 y=10 [/filter] + [remove_item] + x,y=$x1,$y1 + [/remove_item] + [unit] side=1 x=3 From af1ca672a40933b5aa105b6b618d69c653c0c519 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 06/38] HttT S02 Fix bug: Missing objective There actually is an alternate objective for EASY and NORMAL. --- .../Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg index f4951da3f4a4..32c4c2daf624 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg @@ -25,9 +25,11 @@ #ifdef HARD [objective] {ALTERNATIVE_OBJECTIVE_CAPTION} - description= _ "Defeat the enemy leader"+{OBJECTIVE_FOOTNOTE _"(special bonus)"} + description= _ "Defeat the enemy leader"+{EARLY_FINISH_BONUS_FOOTNOTE}+{OBJECTIVE_FOOTNOTE _"(special bonus)"} condition=win [/objective] +#else + {ALTERNATIVE_OBJECTIVE_BONUS ( _ "Defeat the enemy leader")} #endif [objective] description= _ "Death of Konrad" @@ -43,7 +45,6 @@ [/objective] [gold_carryover] - bonus=no carryover_percentage=40 [/gold_carryover] [/objectives] From be881db8797e7454515b2ca43ed660ee774a6fc3 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 07/38] HttT S02 Fix bux: Simyr inconsistent --- .../Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg index 32c4c2daf624..8452bd154980 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg @@ -339,6 +339,7 @@ facing=sw [modifications] {TRAIT_LOYAL} + {TRAIT_INTELLIGENT} [/modifications] {IS_LOYAL} [/unit] From 372932ffb4e7d1695aaa433d6694f7859265db47 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 08/38] HttT S02 Fix typo: Missing comma --- .../Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg index 8452bd154980..95bd7bc7f5e8 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg @@ -193,7 +193,7 @@ [/message] [message] speaker=Delfador - message= _ "Yes, we will sail to the Isle of Alduin, my home Konrad, and the home of many magi." + message= _ "Yes, we will sail to the Isle of Alduin, my home, Konrad, and the home of many magi." [/message] [message] speaker=Kaylan From 9cc6eb7deb80232d64b0f04617245dbb92a2efab Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 09/38] HttT S04 Fix bug: Remove ford artifact on HARD --- .../Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg index 597a5cbecd5d..11f77cd01080 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg @@ -120,7 +120,7 @@ #ifdef HARD [terrain] x=4-6 - y=40 + y=40-41 terrain=Ww [/terrain] #endif From 0c6aae0b384934932fb0f537668267d88d99976c Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 10/38] HttT S05b Fix bug: No special bonus The (special bonus) footnote implies you get something simply for killing the leaders: you do not. Moremirmu is not a special bonus for defeating both leaders. He is simply a unit you may, or may not, find along the way. --- .../Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg index b1a08bee2789..7bf2714a03b6 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg @@ -22,11 +22,7 @@ condition=win show_turn_counter=yes [/objective] - [objective] - {ALTERNATIVE_OBJECTIVE_CAPTION} - description= _ "Defeat all enemy leaders"+{OBJECTIVE_FOOTNOTE _"(special bonus)"} - condition=win - [/objective] + {ALTERNATIVE_OBJECTIVE ( _ "Defeat all enemy leaders")} [objective] description= _ "Death of Konrad" condition=lose From cd995390f3231cd49db1ab453e59393ffba70e3e Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 11/38] HttT S06 Fix bug: Advisor may be dead We may not have a unit assigned to the Advisor role, or it may have died since being assigned. This effects the initial recall, and the speaker for turn 4 when the thieves appear. Select based upon level and how long we've been able to recruit the type. --- .../scenarios/06_The_Siege_of_Elensefar.cfg | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg index 6477d18c7513..c822d0368e5e 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg @@ -155,13 +155,41 @@ {PLACE_IMAGE scenery/rock1.png 13 12} {PLACE_IMAGE scenery/rock2.png 25 28} +#define ADVISOR [role] - type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Elvish Rider,Paladin,Mage,White Mage,Red Mage role=Advisor + [auto_recall][/auto_recall] + + type="Elvish Sylph,Great Mage," + + + "Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," + + "Paladin,Grand Knight," + + "Mage of Light,Arch Mage,Silver Mage," + + "Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," + + "Highwayman,Fugitive,Huntsman,Ranger," + + + "Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," + + "Knight,Lancer," + + "White Mage,Red Mage," + + "Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," + + "Bandit,Outlaw,Trapper," + + + "Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," + + "Horseman," + + "Mage," + + "Merman Fighter,Merman Hunter,Mermaid Initiate," + + "Thug,Footpad,Poacher" + [else] + [unit] + side=1 + type=Elvish Fighter + role=Advisor + placement=leader + [/unit] + [/else] [/role] - [recall] - role=Advisor - [/recall] +#enddef + {ADVISOR} [/event] [event] @@ -265,6 +293,7 @@ speaker=Reglok message= _ "Greetings, friend. We are from the Elensefar Thieves’ Guild. We would like to help you against the orcs!" [/message] + {ADVISOR} [message] role=Advisor message= _ "Thieves, hmmm? Who says we can trust such as you?" @@ -720,3 +749,5 @@ {campaigns/Heir_To_The_Throne/utils/deaths.cfg} [/scenario] + +#undef ADVISOR From 2d75dca42efc678cf16749dce5cf5001368604d8 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 12/38] HttT S06 Fix bug: Thieves' Ford wipes out a pier No need, movement costs are the same. So let's keep the pier. It's less jarring on the eye. --- .../scenarios/06_The_Siege_of_Elensefar.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg index c822d0368e5e..495957b2ac43 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg @@ -521,8 +521,8 @@ #create terrain [terrain] terrain=Wwf # wmllint: ignore - x=7-8 - y=30-32 + x=8,7-8 + y=30,31-32 [/terrain] #dialog [message] From 28404e922fea266d94527921f47ed2d0af87087f Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 13/38] HttT S06 Fix bug: Adjust time area It was missing some unimportant cave area. --- .../scenarios/06_The_Siege_of_Elensefar.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg index 495957b2ac43..c1ca8409880a 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg @@ -144,8 +144,8 @@ #endif [time_area] - x=13-22,23 ,24 ,25-26 - y=0-5 ,0-3,0-1,0-2 + x= 11, 12, 13, 14, 15, 16-22, 23, 24, 25-26 + y= 0-1, 0-2, 0-6, 0-5, 0-6, 0-5, 0-3, 0-1, 0-2 {UNDERGROUND} [/time_area] From 738307b5cef705d5728161cab6ec9c6c96ecf4d8 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 14/38] HttT S07 Fix bug: Units not hiding Placing a duplicated unit causes it to drop into an adjacent hex and being missed by the object. This only happens rarely, and almost always at the overlaped column. But it can happen anywhere. We'll just skip it and so what if we're a unit shy. Call it a very tiny, quite rare Easter Egg. --- .../scenarios/07_Crossroads.cfg | 89 ++++++++++--------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg index 322be413e057..13a7cd2ec8eb 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg @@ -321,46 +321,55 @@ # variables, thus always having the same ratio of different # types. - [unit] - x,y=$ambush_location.x,$ambush_location.y - type=$random_ambusher_type_table[$random_ambusher_type_i].type - side={SIDE} - facing=sw - role=ambusher - random_traits=yes - - [modifications] - {TRAIT_LOYAL} - [/modifications] - {IS_LOYAL} - [/unit] - - [object] - silent=yes - - [filter] - x,y=$ambush_location.x,$ambush_location.y - [/filter] - - [effect] - apply_to=new_ability - - [abilities] - [hides] - id=orc_ambush - affect_self=yes - - [filter_self] - role=ambusher - - [filter_location] - terrain=Hh,Mm - [/filter_location] - [/filter_self] - [/hides] - [/abilities] - [/effect] - [/object] + [if] + [not] + [have_unit] + x,y=$ambush_location.x,$ambush_location.y + [/have_unit] + [/not] + [then] + [unit] + x,y=$ambush_location.x,$ambush_location.y + type=$random_ambusher_type_table[$random_ambusher_type_i].type + side={SIDE} + facing=sw + role=ambusher + random_traits=yes + + [modifications] + {TRAIT_LOYAL} + [/modifications] + {IS_LOYAL} + [/unit] + + [object] + silent=yes + + [filter] + x,y=$ambush_location.x,$ambush_location.y + [/filter] + + [effect] + apply_to=new_ability + + [abilities] + [hides] + id=orc_ambush + affect_self=yes + + [filter_self] + role=ambusher + + [filter_location] + terrain=Hh,Mm + [/filter_location] + [/filter_self] + [/hides] + [/abilities] + [/effect] + [/object] + [/then] + [/if] [/command] [/random_placement] {CLEAR_VARIABLE ambush_location} From a3c9ca1fa3eb5ca1dcfd4fc7aad5218abe8119a6 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 15/38] HttT S07 Fix bug: Overlapped areas This causes a statistical bump in the overlapped column. Not really a problem because doing it this way is SO 'not-random' but it increases the chance of tickling the bug causing a unit to fail to hide. --- .../Heir_To_The_Throne/scenarios/07_Crossroads.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg index 13a7cd2ec8eb..f5a1eed5ea18 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg @@ -382,21 +382,21 @@ {ORC_AMBUSH_AREA 2 5-35 1-7 5} {ORC_AMBUSH_AREA 2 9-24 8-15 5} {ORC_AMBUSH_AREA 3 1-17 17-24 9} - {ORC_AMBUSH_AREA 3 18-26 16-23 5} + {ORC_AMBUSH_AREA 3 18-25 16-23 5} {ORC_AMBUSH_AREA 3 26-40 16-23 5} #endif #ifdef NORMAL {ORC_AMBUSH_AREA 2 5-35 1-7 6} {ORC_AMBUSH_AREA 2 9-24 8-15 6} {ORC_AMBUSH_AREA 3 1-17 17-24 10} - {ORC_AMBUSH_AREA 3 18-26 16-23 6} + {ORC_AMBUSH_AREA 3 18-25 16-23 6} {ORC_AMBUSH_AREA 3 26-40 16-23 6} #endif #ifdef HARD {ORC_AMBUSH_AREA 2 5-35 1-7 7} {ORC_AMBUSH_AREA 2 9-24 8-15 7} {ORC_AMBUSH_AREA 3 1-17 17-24 11} - {ORC_AMBUSH_AREA 3 18-26 16-23 7} + {ORC_AMBUSH_AREA 3 18-25 16-23 7} {ORC_AMBUSH_AREA 3 26-40 16-23 7} #endif From c6542da477ba596a3a50152ebd4b8b59fa731b85 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 16/38] HttT S08 Fix bug: Advisor may be dead --- .../scenarios/08_The_Princess_of_Wesnoth.cfg | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg index ecc4ccc369c5..c8034d9aa5f1 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg @@ -150,12 +150,40 @@ id=Kalenz [/recall] [role] - type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Elvish Rider,Paladin,Mage,White Mage,Red Mage role=Advisor + [auto_recall][/auto_recall] + + type="Elvish Sylph,Great Mage," + + + "Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," + + "Paladin,Grand Knight," + + "Mage of Light,Arch Mage,Silver Mage," + + "Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," + + "Highwayman,Fugitive,Huntsman,Ranger," + + "Assassin," + + + "Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," + + "Knight,Lancer," + + "White Mage,Red Mage," + + "Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," + + "Bandit,Outlaw,Trapper," + + "Rogue," + + + "Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," + + "Horseman," + + "Mage," + + "Merman Fighter,Merman Hunter,Mermaid Initiate," + + "Thug,Footpad,Poacher," + + "Thief" + [else] + [unit] + side=1 + type=Elvish Fighter + role=Advisor + placement=leader + [/unit] + [/else] [/role] - [recall] - role=Advisor - [/recall] [/event] [event] From b3fed9db8948e4a4900fe87a12a54f2d543a11da Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 17/38] HttT S08 Fix bug: Objective footnote The note about Li'sar's hit points is a footnote, not the objective. --- .../Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg index c8034d9aa5f1..c1bb8b6f3b62 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg @@ -20,7 +20,7 @@ [objectives] side=1 [objective] - description= _ "Force Li’sar’s surrender (reduce her hitpoints to 0 or lower)" + description= _ "Force Li’sar’s surrender"+{OBJECTIVE_FOOTNOTE ( _ "(reduce her hitpoints to 0 or lower)")} condition=win [/objective] [objective] From 73da0aa4a42891879d26bd5849da3c905c345a96 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 18/38] HttT S10 Fix bug: Does not meet objectives The objective is to defeat THE enemy leader, Robryn. As a bonus, if Konrad kills the Mother Gryphon, he gets Gryphon eggs; but that is a bonus objective, not a victory objective. --- .../Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg index b0f992688e8e..a0adbfa51ca2 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg @@ -246,7 +246,10 @@ [/event] [event] - name=enemies defeated + name=die + [filter] + id=Robryn + [/filter] [message] speaker=Konrad message= _ "We have defeated them! Now what do we do?" From f16e67434d2b8f21e171cd1ab395311f9934a964 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 19/38] HttT S11 Fix bugs: No reinforcements moveto: there is no second unit to filter on x,y ranges: use dash, not comma --- .../scenarios/11_The_Ford_of_Abez.cfg | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg index e618f9326b48..e4549d82c51e 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg @@ -302,11 +302,11 @@ #if the players marches over to Li'sar's keep, reinforcements appear [event] name=moveto - [filter_second] + [filter] side=1 x=0-16 - y=23,34 - [/filter_second] + y=23-34 + [/filter] {FORD_GUARD 1 29} {FORD_GUARD 1 29} {FORD_GUARD 1 29} @@ -322,13 +322,16 @@ #getting closer --> more reinforcements [event] name=moveto - [filter_second] + [filter] side=1 x=2-9 - y=24,30 - [/filter_second] + y=24-30 + [/filter] [message] - speaker=second_unit + side=2 + [not] + id="Li'sar" + [/not] message= _ "Stop! You shall not pass! Quick, reinforcements, protect the Princess!" [/message] {FORD_GUARD 1 27} From 9f7933defa23b44d7c477be977e230bfbea5b13e Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 20/38] HttT S11 Fix bug: Does not meet objectives Even if you do kill Li'sar and Gaga-Breuk, you still have to make it to the far shore, as stated. That means you still have to make it past the Sea Monsters. Hope you were in the water when they appeared, or you're not gonna make it! --- .../Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg index e4549d82c51e..f2c337b6253e 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg @@ -7,6 +7,7 @@ {DEFAULT_SCHEDULE} + victory_when_enemies_defeated=no next_scenario=12_Northern_Winter {SCENARIO_MUSIC "loyalists.ogg"} From 8bdd07cd4d8beed15f0e5a2a9a045bfb948b3110 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 21/38] HttT S12 Fix bug: Divide by zero An off-by-one on the turn calculations. Turns left should include current turn; else divides by zero on the last turn. To reproduce you MUST step through every turn! Simply jumping to the last turn or two will not tickle the bug. --- .../Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg index 5d04c7e47641..b1a9048d17d6 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg @@ -5,12 +5,14 @@ map_data="{campaigns/Heir_To_The_Throne/maps/12_Northern_Winter.map}" {TURNS 50 40 40} - # when changing the turn limits, also change this event accordingly [event] name=prestart + [store_turns] + variable=turn_limit + [/store_turns] [set_variable] name=turn_limit - {QUANTITY value 50 40 40} + add=1 [/set_variable] [/event] From f719bc06f9a667e588e768a4cfa8cd6795b99ddb Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 22/38] HttT S12 Fix bug: No human to complain Choose lowest-level human, preferring those who have been with us the shortest time. In none can be found, recruit a Thief. This ensures Kalenz has several humans around for his pointed comment. --- .../scenarios/12_Northern_Winter.cfg | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg index b1a9048d17d6..e6044e497c13 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg @@ -144,11 +144,30 @@ [role] role=human-advisor - type=Knight,Paladin,White Mage,Mage of Light,Red Mage,Arch Mage,Great Mage,Horseman + [auto_recall][/auto_recall] + + type="Thief," + + "Poacher,Footpad,Thug," + + "Mage," + + "Horseman," + + "Rogue," + + "Trapper,Outlaw,Bandit," + + "Red Mage,White Mage," + + "Lancer,Knight," + + "Assassin," + + "Ranger,Huntsman,Fugitive,Highwayman," + + "Silver Mage,Arch Mage,Mage of Light," + + "Grand Knight,Paladin," + + "Great Mage" + [else] + [unit] + side=1 + type=Thief + role=human-advisor + placement=leader + [/unit] + [/else] [/role] - [recall] - role=human-advisor - [/recall] [recall] id=Delfador [/recall] From fd37c8aa3815b4aaf4c9427960c29c33d1647a20 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 23/38] HttT S13 Fix bug: No rider If Haldiel was recalled, select him. Otherwise, select the highest-level rider and recall him. If none exist, recruit a Horseman for the role. --- .../scenarios/13_The_Dwarven_Doors.cfg | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg index 5aeacd2568bb..083b549d4eed 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg @@ -173,13 +173,25 @@ [recall] id=Haldiel [/recall] - [role] - type=Elvish Outrider,Elvish Rider,Elvish Scout,Lancer,Paladin,Grand Knight,Knight,Horseman + [role] #If Haldiel was just recalled, this will select him. role=Rider + [auto_recall][/auto_recall] + + type="Elvish Outrider," + + "Paladin,Grand Knight," + + "Elvish Rider," + + "Knight,Lancer," + + "Elvish Scout," + + "Horseman" + [else] + [unit] + side=1 + type=Horseman + role=Rider + placement=leader + [/unit] + [/else] [/role] - [recall] - role=Rider - [/recall] [redraw] [/redraw] From 76c35da543e2c7ad81ba5b38e2b88282848ba2d9 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 24/38] HttT S17 Fix bug: Hide sides Hide the sides which were removed. Also, doesn't it bother you when a comment is just wrong like that? --- .../scenarios/17_Scepter_of_Fire.cfg | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg index 35ff3866d665..c5d5978212e4 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg @@ -94,9 +94,9 @@ {SOF_TERRAIN_MASK} # - # Except on hard, you only have to face 3 enemies - # instead of 4. This part randomly kills one of the - # 4 leaders. + # Except on hard, you only have to face 4 enemies + # instead of 5. This part randomly kills 1 or 2 of the + # 6 leaders. # #ifdef HARD #else @@ -105,12 +105,20 @@ [kill] side=$side_kill [/kill] + [modify_side] + side=$side_kill + hidden=yes + [/modify_side] #endif {VARIABLE_OP side_kill rand "2..3"} {ERASE_CASTLE $side_kill Uu} [kill] side=$side_kill [/kill] + [modify_side] + side=$side_kill + hidden=yes + [/modify_side] {CLEAR_VARIABLE side_kill} # just making sure that the starting castle is big enough that From f319d58cff3310237425507a0123fb330a28732b Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 25/38] HttT S17 Fix bug: Castles not removed --- data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg index c62e34223eb4..3706514ce144 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg @@ -443,8 +443,8 @@ fire: +10%" {VARIABLE_OP max_x add 1} {VARIABLE max_y $side_store.y} {VARIABLE_OP max_y add 1} - {VARIABLE x_range ("$min_x|-|$max_x")} - {VARIABLE y_range ("$min_y|-|$max_y")} + {VARIABLE x_range ("$min_x|-$max_x")} + {VARIABLE y_range ("$min_y|-$max_y")} [terrain] x=$x_range y=$y_range From 49047381a6e9d5d04a6459609590a9f44fbb101c Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 26/38] HttT S17 Fix bug: Unusable castle hex Moved the player's chamber up 3 hex to try to avoid having unusable slots for recruit/recall. Can't ever be sure but, testing, where before I only needed 3 or 4 restarts to get a bad castle, now I still have not seen one after 20. --- .../Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg index c5d5978212e4..8e49ae4bb543 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg @@ -445,7 +445,7 @@ [chamber] id=player x=15-35 - y=68 + y=65 size=8 jagged=50 [items] From 71217cd986077423d6a002915971b594d400da96 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 27/38] HttT S19b Fix bug: Objectives wrong Early completion bonus for all victory, not just if you defeat all four Death Knights before killing the Lich. --- .../Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg index c07a5a02e0a4..134b99afafbf 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg @@ -26,7 +26,7 @@ [/objective] [objective] {BONUS_OBJECTIVE_CAPTION} - description= _ "Defeat all Death Knights first"+{EARLY_FINISH_BONUS_FOOTNOTE} + description= _ "Defeat all Death Knights first" condition=win [/objective] [objective] From 0db307d9e25a58ee9e4f61de453f04c3565316f6 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 28/38] HttT S19c Fix bug: Wrong objectives If you found the waterfall before finding the sergeant it switched back to telling you to find the waterfall. Needs if'ing logic, DUH! --- .../scenarios/19c_Cliffs_of_Thoria.cfg | 93 ++++++------------- 1 file changed, 27 insertions(+), 66 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg index d3e9b52e8215..e44fa6553cb2 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg @@ -65,12 +65,33 @@ [event] name=prestart + [objectives] side=1 [objective] + [show_if] + [not] + {CHECK_VARIABLE waterfall_sighted yes} + [/not] + [/show_if] description= _ "Make it to the end of the river" condition=win [/objective] + [objective] + [show_if] + {CHECK_VARIABLE waterfall_sighted yes} + [/show_if] + description= _ "Reach the cave" + condition=win + [/objective] + [objective] + [show_if] + {CHECK_VARIABLE sergeant_sighted yes} + [/show_if] + {BONUS_OBJECTIVE_CAPTION} + description= _ "Rescue the sergeant" + condition=win + [/objective] [objective] description= _ "Death of Konrad" condition=lose @@ -189,6 +210,7 @@ id="Li'sar" [/recall] + {VARIABLE sergeant_sighted no} {VARIABLE waterfall_sighted no} {OBJ_TRIDENT_STORM 17 11 cot_stormtrident} {PLACE_IMAGE items/gohere.png 55 3} @@ -751,41 +773,8 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des speaker=Delfador message= _ "Fair enough..." [/message] - [objectives] - side=1 - [objective] - description= _ "Make it to the end of the river" - condition=win - [/objective] - [objective] - {BONUS_OBJECTIVE_CAPTION} - description= _ "Rescue the sergeant" - condition=win - [/objective] - [objective] - description= _ "Death of Konrad" - condition=lose - [/objective] - [objective] - description= _ "Death of Delfador" - condition=lose - [/objective] - [objective] - description= _ "Death of Li’sar" - condition=lose - [/objective] - [objective] - description= _ "Death of Kalenz" - condition=lose - [/objective] - - {TURNS_RUN_OUT} - - [gold_carryover] - bonus=yes - carryover_percentage=40 - [/gold_carryover] - [/objectives] + {VARIABLE sergeant_sighted yes} + [show_objectives][/show_objectives] [/event] [event] @@ -838,6 +827,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des speaker=Konrad message= _ "Follow us when you think you are capable and beware of monsters. We have fought many already, and there are sure to be more ahead." [/message] + {VARIABLE sergeant_sighted no} [/event] [event] @@ -877,36 +867,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des message= _ "Unfortunately, we have no other options. Onward into the cave!" [/message] - [objectives] - side=1 - [objective] - description= _ "Reach the cave" - condition=win - [/objective] - [objective] - description= _ "Death of Konrad" - condition=lose - [/objective] - [objective] - description= _ "Death of Delfador" - condition=lose - [/objective] - [objective] - description= _ "Death of Li’sar" - condition=lose - [/objective] - [objective] - description= _ "Death of Kalenz" - condition=lose - [/objective] - - {TURNS_RUN_OUT} - - [gold_carryover] - bonus=yes - carryover_percentage=40 - [/gold_carryover] - [/objectives] + [show_objectives][/show_objectives] {PLACE_IMAGE items/gohere.png 37 1} [/event] @@ -951,7 +912,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des speaker=Konrad message= _ "Everybody inside..." [/message] - {CLEAR_VARIABLE waterfall_sighted,drake_bases} + {CLEAR_VARIABLE sergeant_sighted,waterfall_sighted,drake_bases} [endlevel] result=victory bonus=yes From 3a42f3968025398b231e835cf38b7c28eef16c1e Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 29/38] HttT S19c Fix bug: Merman advisor may be dead If needed, select an alternate from those on the map; otherwise just skip the line. --- .../Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg index e44fa6553cb2..3562715331d9 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg @@ -849,6 +849,14 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des {WATERFALL_MASK 55 3} + [role] + role=merman-advisor + reassign=no + search_recall_list=no + type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," + + "Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," + + "Merman Fighter,Merman Hunter,Mermaid Initiate" + [/role] [message] role=merman-advisor message= _ "Even we merfolk cannot swim that. The road east is blocked." From 8f09ac74adc57ef93e77863c85b5afb20ff300ef Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 30/38] HttT S19c Fix bug: Clear fog Clear the fog around the sergeant. Also improve the detection range, and keep the camera on him for a while. --- .../scenarios/19c_Cliffs_of_Thoria.cfg | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg index 3562715331d9..2e9f92ded599 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg @@ -681,9 +681,16 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des name=moveto [filter] side=1 - x=40-50 - y=11-20 [/filter] + [filter_condition] + [have_location] + x,y=$x1,$y1 + [and] + x,y=45,16 + radius=7 + [/and] + [/have_location] + [/filter_condition] [modify_side] side=4 share_view=yes @@ -692,21 +699,25 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des speaker=unit message= _ "I see someone at the top of the furthermost cliff!" [/message] - [remove_shroud] - side=1 - x=43-47 - y=14-17 - [/remove_shroud] + [lift_fog] + [filter_side] + side=1 + [/filter_side] + x,y=45,16 + radius=2 + [/lift_fog] [scroll_to] x=45 y=16 [/scroll_to] [message] speaker=unit + scroll=no message= _ "It is a young human sergeant, barely more than a boy. He appears badly hurt but still alive." [/message] [message] speaker=unit + scroll=no message= _ "I wonder why the drakes haven’t finished him by now? It is strange that there are not any drakes in that area." [/message] #define SERPENT X Y @@ -728,6 +739,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des #undef SERPENT [message] type=Water Serpent + scroll=no message= _ "Grrroar" # wmllint: no spellcheck [/message] [scroll_to_unit] @@ -735,6 +747,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des [/scroll_to_unit] [message] speaker=unit + scroll=no message= _ "Well... that answers the question." [/message] [message] From 8f20715f9a6e1f200d94c20c27a76b144ffc1bf4 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 31/38] HttT S20a Fix bug: El'rien might be dead In fact, all his men might be, too. Add dialog to handle this. --- .../scenarios/20a_North_Elves.cfg | 102 ++++++++++++++---- 1 file changed, 81 insertions(+), 21 deletions(-) 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 ce16e4b6dfc8..be07cbd4aa10 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 @@ -702,15 +702,43 @@ x=75-79 y=17-19 [/filter] - [message] - speaker="El'rien" - # wmllint: local spelling Emetria - message= _ "Greetings, Elf-friend! Welcome to Emetria, my hold in Lintanir. You must take shelter here until the battle passes. If you stay with me here for a little while, we will all be safe." - [/message] - [message] - speaker=Konrad - message= _ "Thank you, Lord El’rien. The hospitality of the North Elves is as generous as that of your kin in the south! My men will help you hold out against our enemies." - [/message] + [if] + [have_unit] + id="El'rien" + [/have_unit] + [then] + [message] + speaker="El'rien" + # wmllint: local spelling Emetria + message= _ "Greetings, Elf-friend! Welcome to Emetria, my hold in Lintanir. You must take shelter here until the battle passes. If you stay with me here for a little while, we will all be safe." + [/message] + [message] + speaker=Konrad + message= _ "Thank you, Lord El’rien. The hospitality of the North Elves is as generous as that of your kin in the south! My men will help you hold out against our enemies." + [/message] + [/then] + [elseif] + [have_unit] + side=4 + [/have_unit] + [then] + [message] + side=4 + message= _ "Welcome to Emetria. You must take shelter here until the battle passes. If you stay for a while, we will all be safe." + [/message] + [message] + speaker=Konrad + message= _ "Thank you. The hospitality of the North Elves is as generous as that of your kin in the south! My men will help you hold out against our enemies." + [/message] + [/then] + [/elseif] + [else] + [message] + speaker=Konrad + message= _ "There is nobody here! We can take shelter here, but must hold out against our enemies alone." + [/message] + [/else] + [/if] [/event] # Once you make it far enough, TELL THE PLAYER! @@ -788,18 +816,50 @@ [event] name=victory - [message] - speaker="El'rien" - message= _ "Elf-friends, you have made it to safety!" - [/message] - [message] - speaker=Kalenz - message= _ "El’rien, we have the Sceptre of Fire with us! We must escort them to Elensiria!" - [/message] - [message] - speaker="El'rien" - message= _ "Indeed. We will escort you to our capital, where we will make Council." - [/message] + [if] + [have_unit] + id="El'rien" + [/have_unit] + [then] + [message] + speaker="El'rien" + message= _ "Elf-friends, you have made it to safety!" + [/message] + [message] + speaker=Kalenz + message= _ "El’rien, we have the Sceptre of Fire with us! We must escort them to Elensiria!" + [/message] + [message] + speaker="El'rien" + message= _ "Indeed. We will escort you to our capital, where we will make Council." + [/message] + [/then] + [elseif] + [have_unit] + side=4 + [/have_unit] + [then] + [message] + speaker=Kalenz + message= _ "Where is your leader? Where is El’rien?" + [/message] + [message] + side=4 + message= _ "Alas, he has fallen just this day! We were told of your coming, Lord Kalenz. Council has already been called. You must hurry, but we cannot afford the men to escort you." + [/message] + [message] + speaker=Kalenz + message= _ "This is grave news. We will carry word to Elensiria. Hold fast! We will send reinforcements." + [/message] + [/then] + [/elseif] + [else] + [message] + speaker=Kalenz + message= _ "Where is El’rien? Where are his men? Things are moving quicker than we feared. Hurry, we must reach Elensiria." + [/message] + [/else] + [/if] [/event] {campaigns/Heir_To_The_Throne/utils/deaths.cfg} From 901deee49f66c3bbe994d3cea6cb23c54c794a42 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 32/38] HttT S20b Fix bug: Victory zone Precisely defined, now, as any land outside the cavern; including the fungus, but not the water. Applies to the area the AI should avoid, as well. --- .../scenarios/20b_Underground_Channels.cfg | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 cd90af76500c..d51a3c4e7863 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 @@ -153,8 +153,10 @@ [ai] {ATTACK_DEPTH 6 5 4} [avoid] - x=1-41,42-50 - y=1-35,7-35 + [not] + x=41,42,43-44,45-46,47-48,49-50 + y=3,2,1-3,1-4,1-5,1-6 + [/not] [/avoid] [/ai] {FLAG_VARIANT wood-elvish} @@ -190,8 +192,8 @@ [event] name=moveto [filter] - x=43-50 - y=1-5 + x=41,42,43-44,45-46,47-48,49-50 + y=3,2,1-3,1-4,1-5,1-6 id=Konrad [/filter] From 1f7bb04cba845f80267505a556295146b87ba87d Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 33/38] HttT S20b Fix bug: Bona-Melodia may be dead The ending was too abrupt, especially if Bona-Melodia died. --- .../scenarios/20b_Underground_Channels.cfg | 77 ++++++++++++++++++- 1 file changed, 73 insertions(+), 4 deletions(-) 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 d51a3c4e7863..cd2fd194aa03 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 @@ -197,10 +197,79 @@ id=Konrad [/filter] - [message] - speaker=Bona-Melodia - message= _ "Get that vile creature!" - [/message] + [if] + [have_unit] + id=Bona-Melodia + [/have_unit] + [then] + [message] + speaker=Bona-Melodia + message= _ "Get that vile creature!" + [/message] + + [message] + speaker=Kalenz + message= _ "Hold!" + [/message] + + [message] + speaker=Bona-Melodia + message= _ "Milord Kalenz! My apologies. I mistook him for one of those foul lizardmen. How came you to be traveling such paths?" + [/message] + + [message] + speaker=Kalenz + message= _ "Change is coming to the human lands. We rush to Elensiria seeking assistance, and the perils of the Longlier presented the quickest route." + [/message] + + [message] + speaker=Bona-Melodia + message= _ "Uradredia has already called a meeting of the Council of Lintanir. You must hurry, for they gather even now." + [/message] + + [message] + speaker=Kalenz + message= _ "Then there is little time! Fare well." + [/message] + [/then] + [elseif] + [have_unit] + side=5 + [/have_unit] + [then] + [message] + speaker=Kalenz + message= _ "What is this? Where is your leader?" + [/message] + + [message] + side=5 + message= _ "We were beset by many foul lizardmen. Alas, Bona-Melodia has fallen." + [/message] + + [message] + speaker=Kalenz + message= _ "This bodes ill for Lintanir. We rush to Elensiria on other matters but will carry word of what has transpired here." + [/message] + + [message] + side=5 + message= _ "Lord Uradredia has called a meeting of the Council of Lintanir. Rumor is there are greater needs than ours." + [/message] + + [message] + speaker=Kalenz + message= _ "Then we must hurry. Stand fast, we will send reinforcements." + [/message] + [/then] + [/elseif] + [else] + [message] + speaker=Kalenz + message= _ "What is this? Where are the guardians? I see signs of battle everywhere: Saurian footprints, Elvish blood. This bodes ill for Lintanir. We must hurry onward to Elensiria. Quickly, before we, too, are beset." + [/message] + [/else] + [/if] [endlevel] result=victory From 9251d449dcec301da597efc58aca139a2fcd81a9 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 34/38] HttT S20b Fix bug: Unused side --- .../scenarios/20b_Underground_Channels.cfg | 9 --------- 1 file changed, 9 deletions(-) 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 cd2fd194aa03..53440be9dfac 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 @@ -162,15 +162,6 @@ {FLAG_VARIANT wood-elvish} [/side] - [side] - side=6 - no_leader=yes - controller=ai - canrecruit=no - team_name=elves - user_team_name=_"Rebels" - [/side] - [event] name=start [recall] From a9e381730e291b4155ea73596f38e3280182b91f Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 35/38] HttT S22 Fix bug: Malatus dies first Just switch the roles and do the comic bit anyway. --- .../scenarios/22_Return_to_Wesnoth.cfg | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg index 030ae415efbb..3041a619af28 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg @@ -197,6 +197,11 @@ [filter] id=Josephus [/filter] + [filter_condition] + [have_unit] + id=Malatus + [/have_unit] + [/filter_condition] [message] speaker=Malatus message= _ "These intruders are stronger than we expected. Call in the reinforcements!" @@ -217,6 +222,36 @@ [/message] [/event] + [event] + name=die + [filter] + id=Malatus + [/filter] + [filter_condition] + [have_unit] + id=Josephus + [/have_unit] + [/filter_condition] + [message] + speaker=Josephus + message= _ "These intruders are stronger than we expected. Call in the reinforcements!" + [/message] + + {NAMED_LOYAL_UNIT 4 (Halberdier) 33 37 (Dacayan) ( _ "Dacayan")} + {LOYAL_UNIT 4 (Halberdier) 32 37} + {LOYAL_UNIT 4 (Halberdier) 34 37} + + #a little attempt at comic relief + [message] + speaker=Dacayan + message= _ "The Queen has sent us to aid you in capturing these rebels." + [/message] + [message] + speaker=Josephus + message= _ "We have changed the plan. Now we are killing them." + [/message] + [/event] + [event] name=turn 18 [message] From 9b56cb103b6703a887b008bc8f57b88a1ee647f8 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 36/38] HttT S24 Fix bug: Missing journey map --- .../Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg index fd217553dff5..f8baad12940b 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg @@ -17,6 +17,8 @@ {EXTRA_SCENARIO_MUSIC "suspense.ogg"} {EXTRA_SCENARIO_MUSIC "the_city_falls.ogg"} + {HTTT_TRACK {JOURNEY_24_NEW} } + [event] name=prestart [objectives] From c3d74c5726dd3859228deb773a62acd41353ffea Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 16:10:09 -0500 Subject: [PATCH 37/38] HttT S25 Fix bug: Comment wrong --- .../campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg index eded73f02833..885850347804 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg @@ -71,7 +71,7 @@ # - if you examine a certain area of wall in Plunging Into the Darkness, you open a cave that releases a Giant Spider -- and a chest full of gold # - if you bring a merman to a section of deep water in The Lost General, you can rescue a trapped dwarf # - if you keep your ally leader alive in The Lost General, he allows you to recruit Dwarvish Guardsmen -# - if you develop a merman up to L3 and then bring a mer to the start of the River Longlier, you will unlock a bonus scenario > not finished yet +# - if you bring a merman to the start of the River Longlier, you will unlock a series of two bonus scenarios # - if you visit the Elvish great tree living on the Plains of Snow, you are given a magical flaming sword # - if you kill one of the Death Knights in the Swamp of Dread, it will drop a strong piece of armor # - if you kill all 4 of the Death Knights in the Swamp of Dread, it severely weakens the Lich, dropping its HP by half From 4da8f20d0c8b5589019fa742fbb5546ba4dbc507 Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sat, 6 Aug 2016 13:00:00 -0500 Subject: [PATCH 38/38] HttT Fix typo: Sceptre vs scepter Change all "scepter" to "sceptre" except for Dark Queen's scepter. The definite article Sceptre of Fire and all variables related to it use sceptre spelling. General articles, such as the Dark Queen's scepter and attack, use scepter spelling. Note some file names do not follow this rule and remain unchanged. --- .../scenarios/06_The_Siege_of_Elensefar.cfg | 2 +- .../scenarios/12_Northern_Winter.cfg | 4 +- .../scenarios/16_Hasty_Alliance.cfg | 2 +- .../scenarios/17_Scepter_of_Fire.cfg | 46 +++++++++---------- .../scenarios/18_A_Choice_Must_Be_Made.cfg | 6 +-- .../scenarios/21_Elven_Council.cfg | 4 +- .../scenarios/24_Battle_for_Wesnoth.cfg | 2 +- .../units/Battle_Princess.cfg | 6 +-- .../Heir_To_The_Throne/units/Commander.cfg | 8 ++-- .../Heir_To_The_Throne/units/Fighter.cfg | 6 +-- .../Heir_To_The_Throne/units/Lord.cfg | 8 ++-- .../Heir_To_The_Throne/units/Princess.cfg | 6 +-- .../Heir_To_The_Throne/utils/httt_utils.cfg | 20 ++++---- 13 files changed, 60 insertions(+), 60 deletions(-) diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg index c1ca8409880a..b00ba35bd775 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg @@ -647,7 +647,7 @@ [message] speaker=Konrad - message= _ "Oh, and you want me to get this scepter?" + message= _ "Oh, and you want me to get this Sceptre?" [/message] [message] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg index e6044e497c13..c8bcc9163ff3 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg @@ -400,7 +400,7 @@ [message] speaker=narrator image="wesnoth-icon.png" - message= _ "Konrad finally decided he could not wait until the gryphons grew to maturity — Delfador’s insistence that the scepter must be recovered was too compelling. And so after many days of rest, the party set out once again for the dwarven kingdom..." + message= _ "Konrad finally decided he could not wait until the gryphons grew to maturity — Delfador’s insistence that the Sceptre must be recovered was too compelling. And so after many days of rest, the party set out once again for the dwarven kingdom..." [/message] [/then] [else] @@ -412,7 +412,7 @@ [message] speaker=narrator image="wesnoth-icon.png" - message= _ "Eventually Delfador’s insistence that the scepter must be recovered proved too compelling, even when it meant dismantling the camp without the spring having yet fully arrived. And so after many days of rest, the party set out once again for the dwarven kingdom..." + message= _ "Eventually Delfador’s insistence that the Sceptre must be recovered proved too compelling, even when it meant dismantling the camp without the spring having yet fully arrived. And so after many days of rest, the party set out once again for the dwarven kingdom..." [/message] [/else] [/if] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg index 561d71a6f1ab..ee77ceb77130 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg @@ -7,7 +7,7 @@ {DEEP_UNDERGROUND} - next_scenario=17_Scepter_of_Fire + next_scenario=17_Sceptre_of_Fire {SCENARIO_MUSIC "underground.ogg"} # More in start event diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg index 8e49ae4bb543..04ef800b4dba 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg @@ -1,6 +1,6 @@ #textdomain wesnoth-httt [scenario] - id=17_Scepter_of_Fire + id=17_Sceptre_of_Fire name= _ "The Sceptre of Fire" next_scenario=18_A_Choice_Must_Be_Made scenario_generation=cave @@ -231,19 +231,19 @@ [store_locations] terrain=Xu,Qxu,Ql [and] - x=$scepter_x - y=$scepter_y + x=$sceptre_x + y=$sceptre_y radius=3 [/and] [or] - x=$scepter_x - y=$scepter_y + x=$sceptre_x + y=$sceptre_y radius=1 [/or] - variable=scepter_vicinity + variable=sceptre_vicinity [/store_locations] [foreach] - array=scepter_vicinity + array=sceptre_vicinity [do] [terrain] x=$this_item.x @@ -252,10 +252,10 @@ [/terrain] [/do] [/foreach] - {CLEAR_VARIABLE scepter_vicinity} + {CLEAR_VARIABLE sceptre_vicinity} [terrain] - x=$scepter_x - y=$scepter_y + x=$sceptre_x + y=$sceptre_y terrain=Uu^Ii [/terrain] @@ -306,7 +306,7 @@ name=moveto [filter] [filter_location] - x,y=$scepter_x,$scepter_y + x,y=$sceptre_x,$sceptre_y radius=6 [/filter_location] side=1 @@ -354,7 +354,7 @@ [event] name=victory - {CLEAR_VARIABLE concentrating,moved_too_close,lava_body,lava_count,scepter_x,scepter_y} + {CLEAR_VARIABLE concentrating,moved_too_close,lava_body,lava_count,sceptre_x,sceptre_y} [/event] [event] @@ -373,18 +373,18 @@ local H = wesnoth.require "lua/helper.lua" local W = H.set_wml_action_metatable {} local delf = wesnoth.get_units { id = 'Delfador' }[1] - local sceptre_x, sceptre_y = wesnoth.get_variable('scepter_x'), wesnoth.get_variable('scepter_y') + local sceptre_x, sceptre_y = wesnoth.get_variable('sceptre_x'), wesnoth.get_variable('sceptre_y') local path = wesnoth.find_path(delf, sceptre_x, sceptre_y, {ignore_units = true, viewing_side = 0}) -- # wmllint: noconvert _ = wesnoth.textdomain 'wesnoth-httt' - local dirs = { _"I sense the path to the sceptre is to the east of me.", - _"I sense the path to the sceptre is to the south-east of me.", - _"I sense the path to the sceptre is to the south of me.", - _"I sense the path to the sceptre is to the south-west of me.", - _"I sense the path to the sceptre is to the west of me.", - _"I sense the path to the sceptre is to the north-west of me.", - _"I sense the path to the sceptre is to the north of me.", - _"I sense the path to the sceptre is to the north-east of me." } + local dirs = { _"I sense the path to the Sceptre is to the east of me.", + _"I sense the path to the Sceptre is to the south-east of me.", + _"I sense the path to the Sceptre is to the south of me.", + _"I sense the path to the Sceptre is to the south-west of me.", + _"I sense the path to the Sceptre is to the west of me.", + _"I sense the path to the Sceptre is to the north-west of me.", + _"I sense the path to the Sceptre is to the north of me.", + _"I sense the path to the Sceptre is to the north-east of me." } local goal = { x = path[6][1], y = path[6][2] } @@ -570,11 +570,11 @@ {PASSAGE_NORMAL mini_2 2 5 2} [items] # - # These macros handle the placement and attainment of the scepter, + # These macros handle the placement and attainment of the sceptre, # including ending the level in victory. # I moved them to the utils file to make the chamber WML more readable # - # The scepter will always be in mini chamber 3, but the location of this + # The sceptre will always be in mini chamber 3, but the location of this # particular chamber is highly variable # {PLACE_SCEPTRE} diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg index b752c8113fc4..e0ddea6a4e7f 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg @@ -167,11 +167,11 @@ [if] [variable] - name=scepter + name=sceptre equals="Konrad" [/variable] - #if Konrad got the Sceptre + #if Konrad got the sceptre [then] [message] speaker="Li'sar" @@ -203,7 +203,7 @@ [/message] [/then] - #if Li'sar got the Sceptre + #if Li'sar got the sceptre [else] [message] speaker="Li'sar" diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg index d5263ed56147..eaa649708bb9 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg @@ -172,7 +172,7 @@ [/message] [if] [variable] - name=scepter + name=sceptre equals="Konrad" [/variable] [then] @@ -305,7 +305,7 @@ speaker=Parandra message= _ "Yes, rest. Your soldiers will be tended to and refreshed. We have made sure you will leave our protection with the resources to finish your journey." [/message] - {CLEAR_VARIABLE scepter} + {CLEAR_VARIABLE sceptre} [endlevel] result=victory bonus=no diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg index f8baad12940b..3df5f26ef2f5 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg @@ -251,7 +251,7 @@ [/message] [message] speaker=Delfador - message= _ "How long must the people endure your rule? Give the throne to your daughter. She is the rightful heir. We even hold the scepter to prove it!" + message= _ "How long must the people endure your rule? Give the throne to your daughter. She is the rightful heir. We even hold the Sceptre to prove it!" [/message] [message] speaker=Asheviere diff --git a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg index e9bc5264e286..34fe0fa8581b 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg @@ -52,7 +52,7 @@ [/attack_anim] {WEAPON_SPECIAL_INITIATIVE_EVENTS} [variation] - variation_id=scepter + variation_id=sceptre hide_help=yes id=Battle Princess name= _ "female^Battle Princess" @@ -90,7 +90,7 @@ number=4 [/attack] [attack] - name=scepter of fire + name=sceptre of fire #the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire @@ -104,7 +104,7 @@ [/attack] [attack_anim] [filter_attack] - name=scepter of fire + name=sceptre of fire [/filter_attack] {MISSILE_FRAME_FIREBALL_XY 22 -22} diff --git a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg index 4726325e4e71..9f1d4538ac66 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg @@ -94,13 +94,13 @@ [variation] {HTTT_COMMANDER -scepter} - variation_id=scepter + variation_id=sceptre hide_help=yes cost=60 {LEADING_ANIM "units/konrad-commander-scepter-leading.png" "units/konrad-commander-scepter.png" 17,-22} description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL} [attack] - name=scepter of fire + name=sceptre of fire #the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire @@ -114,7 +114,7 @@ [/attack] {DEFENSE_ANIM_FILTERED "units/konrad-commander-scepter-defend.png" "units/konrad-commander-scepter.png" {SOUND_LIST:HUMAN_HIT} ( [filter_second_attack] - name=scepter of fire + name=sceptre of fire [/filter_second_attack] )} {DEFENSE_ANIM_FILTERED "units/konrad-commander-bow-defend.png" "units/konrad-commander-bow.png" {SOUND_LIST:HUMAN_HIT} ( @@ -124,7 +124,7 @@ )} [attack_anim] [filter_attack] - name=scepter of fire + name=sceptre of fire [/filter_attack] {MISSILE_FRAME_FIREBALL_XY 16 -24} start_time=-300 diff --git a/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg b/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg index 06e4bc9344f1..08e974b73cad 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg @@ -51,12 +51,12 @@ description= _ "Young and brash, Fighters attack with a sword, and are vulnerable to more seasoned enemies. However they have the potential to become great warriors one day." [variation] {HTTT_FIGHTER} - variation_id=scepter + variation_id=sceptre hide_help=yes cost=38 description= _ "Young and brash, Fighters attack with a sword, and are vulnerable to more seasoned enemies. However they have the potential to become great warriors one day."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL} [attack] - name=scepter of fire + name=sceptre of fire #the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire @@ -70,7 +70,7 @@ [/attack] [attack_anim] [filter_attack] - name=scepter of fire + name=sceptre of fire [/filter_attack] {MISSILE_FRAME_FIREBALL_XY 0 0} sound_start_time=-300 diff --git a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg index 3261a96b3cf6..f953d65e80da 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg @@ -107,14 +107,14 @@ {DEFENSE_ANIM_RANGE "units/konrad-lord-bow-defend.png" "units/konrad-lord-bow.png" {SOUND_LIST:HUMAN_HIT} ranged} [variation] {HTTT_LORD -scepter} - variation_id=scepter + variation_id=sceptre hide_help=yes cost=85 {LEADING_ANIM "units/konrad-lord-scepter-leading.png" "units/konrad-lord-scepter.png" -16,-21} description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL} {DEFENSE_ANIM_FILTERED "units/konrad-lord-scepter-defend.png" "units/konrad-lord-scepter.png" {SOUND_LIST:HUMAN_HIT} ( [filter_second_attack] - name=scepter of fire + name=sceptre of fire [/filter_second_attack] )} {DEFENSE_ANIM_FILTERED "units/konrad-lord-bow-defend.png" "units/konrad-lord-bow.png" {SOUND_LIST:HUMAN_HIT} ( @@ -123,7 +123,7 @@ [/filter_second_attack] )} [attack] - name=scepter of fire + name=sceptre of fire #the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire @@ -137,7 +137,7 @@ [/attack] [attack_anim] [filter_attack] - name=scepter of fire + name=sceptre of fire [/filter_attack] {MISSILE_FRAME_FIREBALL_XY -16 -21} start_time=-300 diff --git a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg index e224cedd27b6..a68f1373a97f 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg @@ -51,7 +51,7 @@ [/attack_anim] {WEAPON_SPECIAL_INITIATIVE_EVENTS} [variation] - variation_id=scepter + variation_id=sceptre hide_help=yes id=Princess name= _ "female^Princess" @@ -88,7 +88,7 @@ number=4 [/attack] [attack] - name=scepter of fire + name=sceptre of fire #the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire @@ -102,7 +102,7 @@ [/attack] [attack_anim] [filter_attack] - name=scepter of fire + name=sceptre of fire [/filter_attack] {MISSILE_FRAME_FIREBALL_XY -15 -20} diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg index 3706514ce144..b190987a17cf 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg @@ -304,7 +304,7 @@ fire: +10%" [event] same_location_as_previous=yes - store_location_as=scepter + store_location_as=sceptre name=moveto first_time_only=no [filter] @@ -313,7 +313,7 @@ fire: +10%" y=32 [/filter] [object] - id=object_scepter + id=object_sceptre name= _ "Sceptre of Fire" image=items/sceptre-of-fire.png duration=forever @@ -324,7 +324,7 @@ fire: +10%" [/filter] [effect] apply_to=variation - name=scepter + name=sceptre [/effect] [/object] [/event] @@ -338,7 +338,7 @@ fire: +10%" id=Konrad [/filter] [set_variable] - name=scepter + name=sceptre value="Konrad" [/set_variable] @@ -372,7 +372,7 @@ fire: +10%" id="Li'sar" [/filter] [set_variable] - name=scepter + name=sceptre value="Li'sar" [/set_variable] @@ -483,9 +483,9 @@ fire: +10%" [/filter_adjacent_location] [/filter_adjacent_location] [not] - # don't start near the cave floor around the scepter - x=$scepter_x - y=$scepter_y + # don't start near the cave floor around the sceptre + x=$sceptre_x + y=$sceptre_y radius=5 [/not] [not] @@ -561,8 +561,8 @@ fire: +10%" radius=1 [/not] [not] - # don't go anywhere near the cave floor around the scepter - x,y=$scepter_x,$scepter_y + # don't go anywhere near the cave floor around the sceptre + x,y=$sceptre_x,$sceptre_y radius=4 [filter_radius] terrain=U*,Re