From 81b3290085b818a156416c63a1c7283975aa0e29 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Fri, 1 May 2020 20:39:21 +0200 Subject: [PATCH 01/10] SoF: fix wrong word in campaign description --- data/campaigns/Sceptre_of_Fire/_main.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Sceptre_of_Fire/_main.cfg b/data/campaigns/Sceptre_of_Fire/_main.cfg index 89f1dac0b34..d705947fc1d 100644 --- a/data/campaigns/Sceptre_of_Fire/_main.cfg +++ b/data/campaigns/Sceptre_of_Fire/_main.cfg @@ -22,7 +22,7 @@ {CAMPAIGN_DIFFICULTY HARD "units/dwarves/lord.png~RC(magenta>red)" ( _ "Lord") ( _ "Difficult")} # wmllint: directory spelling Dwarfdom - description= _ "The land of Wesnoth’s banner bold + description= _ "The mark of Wesnoth’s banner bold Comes not from its own land; It comes from Dwarfdom, grim and old Made by a runesmith’s hand. From 05c30fb9365232cb60dc999b0598477ad9876cd2 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Fri, 1 May 2020 20:40:30 +0200 Subject: [PATCH 02/10] SoF utils: add macro to clear rune variables after scenarios --- .../scenarios/1_A_Bargain_is_Struck.cfg | 2 ++ .../scenarios/2_Closing_the_Gates.cfg | 2 ++ .../3_Searching_for_the_Runecrafter.cfg | 1 + .../scenarios/4_Gathering_Materials.cfg | 2 ++ .../5_Hills_of_the_Shorbear_Clan.cfg | 2 ++ .../scenarios/6_Towards_the_Caves.cfg | 2 ++ .../scenarios/8_The_Dragon.cfg | 2 ++ .../Sceptre_of_Fire/utils/rune-equip.cfg | 28 +++++++++++++++++-- 8 files changed, 39 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg index 8b19e689b27..4ed9a236037 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg @@ -982,6 +982,8 @@ [event] name=scenario_end + {SOF_CLEAR_RUNE_VARS 1} + {CLEAR_VARIABLE incominggold,havestone} [/event] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg index aa7d02db5e7..392e8233a1d 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg @@ -769,6 +769,8 @@ [event] name=scenario_end + {SOF_CLEAR_RUNE_VARS 1} + {CLEAR_VARIABLE glyphs,glyph_i,locations_outside,gate_closed} [/event] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg index 59e28f9a3ed..c2271cf1c8c 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg @@ -612,6 +612,7 @@ [/message] {MAKE_LOYAL_NORMAL Baglur} {CLEAR_VARIABLE thur_x,thur_y} + {SOF_CLEAR_RUNE_VARS 1} [endlevel] result=victory bonus=yes diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg index 45842b717f8..16d36eb809c 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg @@ -1182,6 +1182,8 @@ variable=krawg [/unstore_unit] + {SOF_CLEAR_RUNE_VARS 1} + {CLEAR_VARIABLE alanin} {CLEAR_VARIABLE krawg} diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg index 0552e867785..b8051d2b1ce 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg @@ -898,6 +898,8 @@ [event] name=victory + {SOF_CLEAR_RUNE_VARS 1} + {CLEAR_VARIABLE elves_come} [/event] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg index 2266f8a16dd..d99e224304e 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg @@ -632,6 +632,8 @@ [event] name=victory + {SOF_CLEAR_RUNE_VARS 1} + # This [if] is used only in the case the player happened to defeat all # the enemy leaders and didn't move Alanin to the signpost [if] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg index 986a9786a37..4f0c731c160 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg @@ -472,6 +472,8 @@ [/unstore_unit] {CLEAR_VARIABLE thur} + {SOF_CLEAR_RUNE_VARS 1} + [object] id=sceptre of fire silent=yes diff --git a/data/campaigns/Sceptre_of_Fire/utils/rune-equip.cfg b/data/campaigns/Sceptre_of_Fire/utils/rune-equip.cfg index e27dd35a52b..e4a2c894f63 100644 --- a/data/campaigns/Sceptre_of_Fire/utils/rune-equip.cfg +++ b/data/campaigns/Sceptre_of_Fire/utils/rune-equip.cfg @@ -98,6 +98,21 @@ id=sof_rune_shop [/fire_event] [/event] + [event] + name=moveto + id=sof_rune_shop_flavor_text + first_time_only=yes + [filter] + id=Thursagan + [filter_location] + terrain=K* + [/filter_location] + [/filter] + [message] + speaker=Thursagan + message= _ "My tools are ready. Step closer, if you want to witness my rune-work." + [/message] + [/event] [event] name=side 1 turn id=sof_sfe_side1turn @@ -382,7 +397,7 @@ #define SOF_RUNIC_CHEST_SWIFTNESS X Y {SOF_RUNIC_CHEST_GENERIC ( [option] - {SOF_RUNIC_OPTION swiftness (_ "Swiftness") (_ "Adds 1 MP") ("misc/rune_icon.png~BLIT(scenery/summoning-circle4.png~CROP(6,6,60,60),0,0)") 8 ( + {SOF_RUNIC_OPTION "swiftness" (_ "Swiftness") (_ "Adds 1 MP") ("misc/rune_icon.png~BLIT(scenery/summoning-circle4.png~CROP(6,6,60,60),0,0)") 8 ( [effect] apply_to=movement increase=1 @@ -420,7 +435,7 @@ #define SOF_RUNIC_CHEST_ACCURACY X Y {SOF_RUNIC_CHEST_GENERIC ( [option] - {SOF_RUNIC_OPTION accuracy (_ "Accuracy") (_ "Increases ranged weapon accuracy 10%") ("misc/rune_icon.png~BLIT(scenery/summoning-circle5.png~CROP(6,6,60,60),0,0)") 10 ( + {SOF_RUNIC_OPTION "accuracy" (_ "Accuracy") (_ "Increases ranged weapon accuracy 10%") ("misc/rune_icon.png~BLIT(scenery/summoning-circle5.png~CROP(6,6,60,60),0,0)") 10 ( [effect] apply_to=attack range=ranged @@ -494,3 +509,12 @@ [/option] ) {X} {Y}} #enddef + +#define SOF_CLEAR_RUNE_VARS SIDE + [modify_unit] + [filter] + side={SIDE} + [/filter] + {CLEAR_VARIABLE swiftness_rune,accuracy_rune,force_rune} + [/modify_unit] +#enddef \ No newline at end of file From 6dd916283ccdfc2842fafbe5450f09f18105bcf8 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 13:20:18 +0200 Subject: [PATCH 03/10] add modify_unit tags added in 1.15.3 to schema validation --- data/schema/core/actionwml.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/schema/core/actionwml.cfg b/data/schema/core/actionwml.cfg index faaab855123..edd7b935082 100644 --- a/data/schema/core/actionwml.cfg +++ b/data/schema/core/actionwml.cfg @@ -369,6 +369,8 @@ {LINK_TAG "units/$modifications/advancement"} {LINK_TAG "units/$modifications/object"} {LINK_TAG "units/$modifications/base/effect"} + {LINK_TAG "$action_wml/clear_variable"} + {LINK_TAG "$action_wml/set_variable"} [/tag] [tag] name="transform_unit" From 3a81cb4468d91c1033beda8aa5ba0c65664c6c83 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 14:27:41 +0200 Subject: [PATCH 04/10] SoF change all mentions of dwarvish 'tribes' to 'clans' --- .../Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg | 4 ++-- .../Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg index 4ed9a236037..4f90289ab99 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg @@ -358,7 +358,7 @@ [/message] [message] speaker=Rugnur - message= _ "Well... I think we can make a deal, but I’m not sure. I’ll have to ask the tribal leaders." + message= _ "Well... I think we can make a deal, but I’m not sure. I’ll have to ask the clan leaders." [/message] [message] speaker=Haldric II @@ -371,7 +371,7 @@ [/message] [message] speaker=Haldric II - message= _ "I can always take my offer to another tribe more friendly to its potential patrons. You are not the only smiths in the Northlands!" + message= _ "I can always take my offer to another clan more friendly to its potential patrons. You are not the only smiths in the Northlands!" scroll=no [/message] [message] diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg index e6f4a1ec872..eff02b6000b 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg @@ -207,11 +207,11 @@ [/message] [message] speaker=Rugnur - message= _ "Sorry, lord, but he said he would move on to another tribe if I left." + message= _ "Sorry, lord, but he said he would move on to another clan if I left." [/message] [message] speaker=Durstorn - message= _ "Can’t you tell a bluff when you hear one?! He knows we’re the best craftsmen, and he wouldn’t have gone to another tribe if we stalled for a year. Oh well, what’s done is done. We’ll have to work for less than I would prefer..." + message= _ "Can’t you tell a bluff when you hear one?! He knows we’re the best craftsmen, and he wouldn’t have gone to another clan if we stalled for a year. Oh well, what’s done is done. We’ll have to work for less than I would prefer..." [/message] [message] speaker=Baglur From c17906db6e86f190391a22ca195638dc2638feb0 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 14:28:55 +0200 Subject: [PATCH 05/10] SoF S2p5: slightly tweak victory condition --- .../scenarios/2p5_Reaching_the_Runecrafter.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2p5_Reaching_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2p5_Reaching_the_Runecrafter.cfg index 532563e1e5f..7dd0062d0c2 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/2p5_Reaching_the_Runecrafter.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/2p5_Reaching_the_Runecrafter.cfg @@ -325,12 +325,12 @@ [filter_condition] [have_unit] id=Baglur - y=1-5 + y=1-3 [/have_unit] [and] [have_unit] id=Alanin - y=1-5 + y=1-3 [/have_unit] [/and] [/filter_condition] From 7a16f30c6196e76efe104a0f2f422d0c97fe0054 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 14:39:55 +0200 Subject: [PATCH 06/10] SoF S3: tweak dialogue, add event to tell players about the rune shop --- .../3_Searching_for_the_Runecrafter.cfg | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg index c2271cf1c8c..61a3963f84e 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg @@ -37,10 +37,10 @@ [story] [part] - story= _ "It was a couple more weeks of marching along the tracks before a chill breeze touched Rugnur's group, washing over them from a tunnel leading up to the surface. Had they reached the Northlands?" + story= _ "It was a couple more weeks of marching along the tracks before a chill breeze touched Rugnur's group, washing over them from a side tunnel leading up to the surface. Had they reached the Northlands?" [/part] [part] - story= _ "Much to his chagrin, Alanin was dispatched to scout further up the rails, but he soon came back and claimed the rails ended, the tunnel was unfinished to the north. For this reason, Rugnur lead the dwarves up the cold tunnel, and began to search for the runesmith named Thursagan. Thursagan, the Sage of Fire." + story= _ "Much to his chagrin, Alanin was dispatched to scout further up the rails, but he soon came back and claimed the rails ended, the main tunnel was unfinished to the north. For this reason, Rugnur lead the dwarves up the cold passage, and began to search for the runesmith named Thursagan. Thursagan, the Sage of Fire." [/part] [/story] @@ -212,7 +212,7 @@ [/message] [message] speaker=Baglur - message= _ "We need to find the mage Thursagan and convince him to return to the citadel with us. He’s somewhere up here." + message= _ "We need to find the sage Thursagan and convince him to return to the citadel with us. He’s somewhere up here." [/message] [message] speaker=Rugnur @@ -598,6 +598,21 @@ [/show_objectives] [/event] + # Event to tell players about Thursagan's rune shop so they do not need to discover it by chance + + [event] + name=moveto + [filter] + x=5-8 + y=25-29 + id=Thursagan + [/filter] + [message] + speaker=Thursagan + message= _ "If we want to make this work, we will need every rune-blasted edge we can get. If I have some time to set up shop at a keep, I can prepare a little rune-craft for your troops. My goods do not come cheap though, I will not stoop to trifling apprentice-work..." + [/message] + [/event] + # Thursagan reaches the signpost [event] @@ -607,8 +622,8 @@ id=Thursagan [/filter] [message] - speaker=Thursagan - message= _ "Well, now we are in the caves again! Come on, back south, to the city." + speaker=Rugnur + message= _ "Well, now we reached the caves again! Come on, back south, to the city." [/message] {MAKE_LOYAL_NORMAL Baglur} {CLEAR_VARIABLE thur_x,thur_y} From 7e00c45e665d9572eeaaa025c052594cf9dd05ed Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 14:42:10 +0200 Subject: [PATCH 07/10] SoF S4: prevent resource spawn on castles --- .../Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg index 16d36eb809c..3adb1314439 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg @@ -406,7 +406,7 @@ radius=5 [filter_radius] - terrain=!,Xu,Qxu,*^V* + terrain=!,Xu,Qxu,Cud,Kud,*^V* [/filter_radius] variable=possible_coal_1_locations @@ -429,7 +429,7 @@ radius=5 [filter_radius] - terrain=!,Xu,Qxu,*^V* + terrain=!,Xu,Qxu,Cud,Kud,*^V* [/filter_radius] variable=possible_coal_2_locations @@ -453,7 +453,7 @@ radius=12 [filter_radius] - terrain=!,Xu,Qxu,*^V* + terrain=!,Xu,Qxu,Cud,Kud,*^V* [/filter_radius] [/and] @@ -467,7 +467,7 @@ # Not sure if this is really needed [filter_radius] - terrain=!,Xu,Qxu,*^V* + terrain=!,Xu,Qxu,Cud,Kud,*^V* [/filter_radius] [/not] From 7e611923505fe2077d0093787ec3210f7e97d681 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 14:44:38 +0200 Subject: [PATCH 08/10] SoF S5: typo fixes and small dialogue tweaks Co-authored-by: nemaara --- .../scenarios/5_Hills_of_the_Shorbear_Clan.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg index b8051d2b1ce..612fa7bce4c 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg @@ -287,7 +287,7 @@ [/message] [message] speaker=Durstorn - message= _ "I’ll be doing the talking! I remember what happened last time you negotiated a deal, Rugnur! We lost five thousand pieces of silver!" + message= _ "I’ll be doing the talking! I remember what happened last time you negotiated a deal, Rugnur! We lost five thousand pieces of silver!" [/message] [message] speaker=Glonoin @@ -295,7 +295,7 @@ [/message] [message] speaker=Durstorn - message= _ "I’m Lord Durstorn, ruler of the Chaincolt Range. I have been told you are great jeweler-workers, and so we come to rent some of your tools for a short time, a few years at most." + message= _ "I’m Lord Durstorn, ruler of the Chaincolt Range. I have been told you are great jewel-workers, and so we come to rent some of your tools for a short time, a few years at most." [/message] [message] speaker=Glonoin @@ -441,7 +441,7 @@ [/unit] [message] speaker=narrator - message= _ "A brave dwarf ran out, grabbed the friendly gryphon by the sturdy neck-feathers, and hauled himself up over its back. The big animal took it all in stride, and seemed to understand what the pats and strokes of the dwarf's hands meant." + message= _ "A brave dwarf ran out, grabbed a friendly gryphon by the sturdy neck-feathers, and hauled himself up over its back. The big animal took it all in stride, and seemed to understand what the pats and strokes of the dwarf's hands meant." image=wesnoth-icon.png [/message] [message] @@ -483,7 +483,7 @@ [/message] [message] speaker=Glonoin - message= _ "Who the devil are you?" + message= _ "Who in the earth’s guts are you?" [/message] [message] speaker=Rugnur From e6be90afc0474415309173f7e7ea5077582666d0 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 14:45:44 +0200 Subject: [PATCH 09/10] SoF epilogue: add mention of Thursagan Co-authored-by: nemaara --- data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg index d6b7be97fbf..c4322566c66 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg @@ -32,7 +32,7 @@ [story] [part] - story= _ "And thus Rugnur died — a glorious death, in the eyes of the dwarven sages. But our tale is not yet complete. For Alanin lived still, as did Krawg the Gryphon." + story= _ "And thus Rugnur died a glorious death, in the eyes of the dwarven sages — and with him, Thursagan, greatest of the Runesmiths, whose legacy was soon lost. But our tale is not yet complete. For Alanin lived still, as did Krawg the Gryphon." music=the_king_is_dead.ogg [/part] [part] From 088aacb95f2ab25739836a40e4afa94c4bf9afd1 Mon Sep 17 00:00:00 2001 From: Lukas Jox Date: Mon, 11 May 2020 15:35:31 +0200 Subject: [PATCH 10/10] SoF S8: move keep to prevent dragon from suiciding --- data/campaigns/Sceptre_of_Fire/maps/8_The_Dragon.map | 4 ++-- data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/maps/8_The_Dragon.map b/data/campaigns/Sceptre_of_Fire/maps/8_The_Dragon.map index e049ee75d5b..94965db1174 100644 --- a/data/campaigns/Sceptre_of_Fire/maps/8_The_Dragon.map +++ b/data/campaigns/Sceptre_of_Fire/maps/8_The_Dragon.map @@ -15,8 +15,8 @@ Gd, Aa, Cea, Uu, Re, Rb, Uh, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Ur, Uu, Uu^Tf, Gd, Cea, Cea, Re, Uu^Vud, Uu, Xu, Xu, Xu, Xu, Ql, Ql, Ql, Ql, Uu, Ur, Uu, Uu, Uu, Uu^Vu, Xu, Xu, Xu, Xu, Uu, Uh, Uu, Uu^Em, Uu, Uu^Em, Uu^Em, Uh, Xu, Xu Aa, Aa, Ha, Ha, Xu, Xu, Xu, Xu, Cud, Xu, Ql, Xu, Ql, Ql, Uu, Ur^Es, Uh, Uh, Xu, Xu, Xu, Xu, Uh, Uh, Rb^Es, Rb, Uu, Ur, Ur^Es, Xu, Uu, Uu^Em, Xu, Xu Aa^Fpa, Aa^Fpa, Xu, Xu, Xu, Xu, Cud, Cud, Ql, Ql, Ql, Ql, Ql, Uu, Uu, Uu, Uh, Xu, Xu, Xu, Xu, Xu, Uh, Uh, Uu, Uh, Xu, Xu, Rd, Uu^Es, Uh, Uh, Xu, Xu -Ha, Ha^Fma, Xu, Xu, 3 Kud, Cud, Uu^Vu, Ql, Ql, Ql, Xu, Xu, Xu, Xu, Uh, Uu, Uu, Uu^Vu, Xu, Xu, Xu, Tb^Tf, Uu^Tf, Uu, Ql, Xu, Xu, Ql, Uu^Vu, Uu, Uh, Uh, Xu, Xu -Ha, Ha^Fma, Xu, Xu, Cud, Cud, Ql, Ql, Ql, Ql, Uu^Vu, Xu, Xu, Xu, Uh, Uu, Uu, Ur, Ur, Ur, Ur, Uu^Tf, Uu, Uu, Xu, Xu, Ql, Ql, Uu, Uu, Uh, Xu, Xu, Xu +Ha, Ha^Fma, Xu, Xu, Cud, Cud, Uu^Vu, Ql, Ql, Ql, Xu, Xu, Xu, Xu, Uh, Uu, Uu, Uu^Vu, Xu, Xu, Xu, Tb^Tf, Uu^Tf, Uu, Ql, Xu, Xu, Ql, Uu^Vu, Uu, Uh, Uh, Xu, Xu +Ha, Xu, Xu, 3 Kud, Cud, Cud, Ql, Ql, Ql, Ql, Uu^Vu, Xu, Xu, Xu, Uh, Uu, Uu, Ur, Ur, Ur, Ur, Uu^Tf, Uu, Uu, Xu, Xu, Ql, Ql, Uu, Uu, Uh, Xu, Xu, Xu Ha, Ha, Xu, Xu, Cud, Ql, Ql, Ql, Ql, Ql, Xu, Xu, Xu, Xu, Xu, Uu^Vu, Uu, Uu^Es, Uh, Uu, Uu^Tf, Uu, Uu^Vu, Ql, Xu, Xu, Uh, Uh, Uu, Uu, Ql, Ql, Xu, Xu Ha, Ms, Xu, Xu, Cud, Uu^Vu, Ql, Ql, Ql, Ql, Ql, Xu, Xu, Xu, Ql, Ql, Ql, Uu, Uh, Tb^Tf, Uh, Uu^Tf, Xu, Xu, Ql, Ql, Rd^Es, Uu^Tf, Uh, Xu, Xu, Xu, Xu, Xu Ms, Ms, Xu, Xu, Xu, Cud, Ql, Ql, Ql, Ql, Ql, Uu^Vu, Xu, Xu, Ql, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Ql, Xu, Rd, Uh, Ql, Xu, Xu, Xu, Xu, Xu diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg index 4f0c731c160..7425c269e9b 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg @@ -264,7 +264,7 @@ {RANDOM_MERCENARY "Dwarvish Lord" 2 13 ()} {RANDOM_MERCENARY "Dwarvish Lord" 2 14 ()} {RANDOM_MERCENARY "Dwarvish Dragonguard" 2 15 ()} - {RANDOM_MERCENARY "Dwarvish Dragonguard" 2 16 ()} + {RANDOM_MERCENARY "Dwarvish Dragonguard" 1 12 ()} [message] speaker=Rugnur