From 61d4d8f83c94a5fde723fd3acb026c6b1538e17a Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Mon, 15 Feb 2016 22:55:31 -0500 Subject: [PATCH 1/6] AOI S6: Fix bug where mage recall & dialog won't trigger. This occurs whenever you only have Silver Mages left.Reported in the forums. https://forums.wesnoth.org/viewtopic.php?f=41&t=20321#p363025 --- .../scenarios/06_A_Detour_through_the_Swamp.cfg | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg index a5ff89c948a..aa41cc1e71d 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg @@ -95,7 +95,10 @@ [/recall] [role] - type="Red Mage,White Mage,Mage,Arch Mage,Mage of Light,Great Mage" + type="Red Mage,White Mage,Mage,Arch Mage,Silver Mage,Mage of Light,Great Mage" + [not] + canrecruit=yes + [/not] role=mage [/role] @@ -119,7 +122,10 @@ name=enemies defeated [role] - type="Red Mage,White Mage,Mage,Arch Mage,Mage of Light,Great Mage" + type="Red Mage,White Mage,Mage,Arch Mage,Silver Mage,Mage of Light,Great Mage" + [not] + canrecruit=yes + [/not] role=mage [/role] From 88f4237cb88b9e92b4b51b73493dc9cdcbfa8021 Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Mon, 15 Feb 2016 23:24:37 -0500 Subject: [PATCH 2/6] AOI S7: Simplfy advisor search to match version in AOI utils/macros.cfg --- data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg index c7a4c62c97c..287e347f919 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg @@ -248,7 +248,10 @@ [/kill] [role] - type="Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Elvish Outrider,Elvish Rider,Elvish Avenger,Elvish Ranger,Elvish Sharpshooter,Elvish Marksman,Elvish Shyde,Elvish Druid,Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout" + race=elf + [not] + canrecruit=yes + [/not] role=advisor [/role] From 9ee59e41c13653989dc53885bc2bdaacdc3c6eae Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Mon, 15 Feb 2016 23:38:52 -0500 Subject: [PATCH 3/6] AOI S5: Use stock macros for loyal units. --- .../scenarios/05_Linaera_the_Quick.cfg | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg index 0e7ce512f72..3b0dcee02da 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg @@ -222,32 +222,14 @@ {MODIFY_UNIT (side=1) facing se} - {GENERIC_UNIT 3 Mage 17 17} - [+unit] - facing=se - overlays="misc/loyal-icon.png" - [modifications] - {TRAIT_LOYAL} - [/modifications] - [/unit] + {LOYAL_UNIT 3 Mage 17 17} + {FACING se} - {GENERIC_UNIT 3 Mage 16 18} - [+unit] - facing=se - overlays="misc/loyal-icon.png" - [modifications] - {TRAIT_LOYAL} - [/modifications] - [/unit] + {LOYAL_UNIT 3 Mage 16 18} + {FACING se} - {GENERIC_UNIT 3 Mage 15 17} - [+unit] - facing=se - overlays="misc/loyal-icon.png" - [modifications] - {TRAIT_LOYAL} - [/modifications] - [/unit] + {LOYAL_UNIT 3 Mage 15 17} + {FACING se} [message] speaker=Erlornas From 27895f19fb3719eb14502dc5e031ba0c60056329 Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Tue, 16 Feb 2016 00:20:10 -0500 Subject: [PATCH 4/6] AOI: Use stock macro to add loyal icon. --- .../scenarios/01_Defend_the_Forest.cfg | 2 +- .../An_Orcish_Incursion/scenarios/07_Showdown.cfg | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg index c50dc6a5ea3..e85ee8e29be 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg @@ -73,7 +73,7 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - overlays="misc/loyal-icon.png" + {IS_LOYAL} facing=ne [/unit] [/side] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg index 287e347f919..02ca7231cad 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg @@ -124,7 +124,7 @@ {TRAIT_LOYAL} {TRAIT_RESILIENT} [/modifications] - overlays="misc/loyal-icon.png" + {IS_LOYAL} facing=sw [/unit] @@ -144,7 +144,7 @@ [modifications] {TRAIT_LOYAL} [/modifications] - overlays="misc/loyal-icon.png" + {IS_LOYAL} facing=sw [/unit] @@ -164,7 +164,7 @@ [modifications] {TRAIT_LOYAL} [/modifications] - overlays="misc/loyal-icon.png" + {IS_LOYAL} facing=sw [/unit] @@ -184,7 +184,7 @@ [modifications] {TRAIT_LOYAL} [/modifications] - overlays="misc/loyal-icon.png" + {IS_LOYAL} facing=sw [/unit] @@ -204,7 +204,7 @@ [modifications] {TRAIT_LOYAL} [/modifications] - overlays="misc/loyal-icon.png" + {IS_LOYAL} facing=sw [/unit] From 99fc5e2735e1ec366b7ea53b18248e9f0dd36787 Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Tue, 16 Feb 2016 00:28:26 -0500 Subject: [PATCH 5/6] AOI S5: Fix elf facing when Linaera teleports in. --- .../An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg index 3b0dcee02da..d1dcbeb165f 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg @@ -220,8 +220,6 @@ animate=yes [/teleport] - {MODIFY_UNIT (side=1) facing se} - {LOYAL_UNIT 3 Mage 17 17} {FACING se} From e0dc24dbd7c4d697b5e22344d7bbdc4cd6a7ff49 Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Tue, 16 Feb 2016 00:38:45 -0500 Subject: [PATCH 6/6] AOI: Remove extra spaces in comments. --- .../An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg | 2 +- data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg | 2 +- data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg | 2 +- .../An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg | 2 +- .../An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg | 4 ++-- .../scenarios/06_A_Detour_through_the_Swamp.cfg | 2 +- data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg | 2 +- data/campaigns/An_Orcish_Incursion/utils/macros.cfg | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg index e85ee8e29be..8c11f774260 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-aoi # Warning: If you are not a native and literate English speaker, do -# not try to modify the storyline text. It is deliberately written +# not try to modify the storyline text. It is deliberately written # in a somewhat archaic and poetic form of English, and some previous # attempts to "fix" it inflicted damage that was difficult to undo. diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg index 70a77a91c06..9b989bce41d 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-aoi # Warning: If you are not a native and literate English speaker, do -# not try to modify the storyline text. It is deliberately written +# not try to modify the storyline text. It is deliberately written # in a somewhat archaic and poetic form of English, and some previous # attempts to "fix" it inflicted damage that was difficult to undo. diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg index 1ae104f9577..39ba71bf6d1 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-aoi # Warning: If you are not a native and literate English speaker, do -# not try to modify the storyline text. It is deliberately written +# not try to modify the storyline text. It is deliberately written # in a somewhat archaic and poetic form of English, and some previous # attempts to "fix" it inflicted damage that was difficult to undo. diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg index de671c66ceb..ff1d964d61a 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-aoi # Warning: If you are not a native and literate English speaker, do -# not try to modify the storyline text. It is deliberately written +# not try to modify the storyline text. It is deliberately written # in a somewhat archaic and poetic form of English, and some previous # attempts to "fix" it inflicted damage that was difficult to undo. diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg index d1dcbeb165f..2c3aef5c0d7 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-aoi # Warning: If you are not a native and literate English speaker, do -# not try to modify the storyline text. It is deliberately written +# not try to modify the storyline text. It is deliberately written # in a somewhat archaic and poetic form of English, and some previous # attempts to "fix" it inflicted damage that was difficult to undo. @@ -197,7 +197,7 @@ #po: and fairies was extremely blurry. In Wesnoth it is #po: deliberately unclear whether Faerie is a place that is #po: the source of magical power or a label for the inner - #po: nonhuman/magical nature of the Elves. Translate freely. + #po: nonhuman/magical nature of the Elves. Translate freely. message= _ "Erlornas closed his eyes and brought his hands forward, joined palms forming a cup open to the sky. Soon they began to glow, then to flare like a brazier with the fire of Faerie, casting a cold, blue light all around the elf-lord. A wisp of light emerged from the eerie flames, and at a few murmured words from the elf-lord flew away towards the tower below. Then the light around Erlornas faded and all was seemingly as before." [/message] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg index aa41cc1e71d..60ab795ed30 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-aoi # Warning: If you are not a native and literate English speaker, do -# not try to modify the storyline text. It is deliberately written +# not try to modify the storyline text. It is deliberately written # in a somewhat archaic and poetic form of English, and some previous # attempts to "fix" it inflicted damage that was difficult to undo. diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg index 02ca7231cad..9beac1cecdc 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg @@ -1,7 +1,7 @@ #textdomain wesnoth-aoi # Warning: If you are not a native and literate English speaker, do -# not try to modify the storyline text. It is deliberately written +# not try to modify the storyline text. It is deliberately written # in a somewhat archaic and poetic form of English, and some previous # attempts to "fix" it inflicted damage that was difficult to undo. diff --git a/data/campaigns/An_Orcish_Incursion/utils/macros.cfg b/data/campaigns/An_Orcish_Incursion/utils/macros.cfg index 2d4223e552d..4a8b5774f28 100644 --- a/data/campaigns/An_Orcish_Incursion/utils/macros.cfg +++ b/data/campaigns/An_Orcish_Incursion/utils/macros.cfg @@ -22,7 +22,7 @@ [/recall] [/then] [elseif] - # Else, make a new advisor from an elf unit + # Else, make a new advisor from an elf unit [have_unit] side=1 race=elf