From 91c8a77f79482bc00292fbd73b027e058e786a2e Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 20 Oct 2008 18:42:40 +0000 Subject: [PATCH] Refactor uses of track files... ...so that all information about map backgrounds lives inside them, rather than being exposed in scenario files. This means that map artists can cerate new maps without having to touch scenario text to make the changes effective. --- .../scenarios/1_Defend_the_Forest.cfg | 3 +- .../scenarios/2_Assassins.cfg | 3 +- .../scenarios/3_Wasteland.cfg | 3 +- .../scenarios/4_Valley_of_Trolls.cfg | 3 +- .../scenarios/5_Linaera_the_Quick.cfg | 3 +- .../6_A_Detour_through_the_Swamp.cfg | 3 +- .../scenarios/7_Showdown.cfg | 3 +- .../An_Orcish_Incursion/utils/journey.cfg | 37 +++++++++++++++ .../scenarios/01_Saving_Parthyn.cfg | 3 +- .../scenarios/02_Peaceful_Valley.cfg | 3 +- .../scenarios/03_A_Haunting_in_Winter.cfg | 3 +- .../scenarios/04_Beginning_of_the_Revenge.cfg | 3 +- .../scenarios/05_Orc_War.cfg | 3 +- .../scenarios/06_Return_to_Parthyn.cfg | 3 +- .../scenarios/07_A_Small_Favor.cfg | 3 +- .../scenarios/10_Alone_at_Last.cfg | 3 +- .../scenarios/11_Descent_into_Darkness.cfg | 3 +- .../Descent_Into_Darkness/utils/journey.cfg | 46 +++++++++++++++++++ .../Liberty/scenarios/01_The_Raid.cfg | 3 +- .../scenarios/02_Civil_Disobedience.cfg | 3 +- .../scenarios/03_A_Strategy_Of_Hope.cfg | 3 +- .../Liberty/scenarios/04_Unlawful_Orders.cfg | 3 +- .../Liberty/scenarios/05_Hide_and_Seek.cfg | 3 +- .../Liberty/scenarios/06_The_Gray_Woods.cfg | 3 +- .../Liberty/scenarios/07_The_Hunters.cfg | 3 +- data/campaigns/Liberty/scenarios/08_Glory.cfg | 3 +- data/campaigns/Liberty/utils/journey.cfg | 41 +++++++++++++++++ .../Northern_Rebirth/utils/journey.cfg | 11 ++++- .../Son_Of_The_Black_Eye/utils/journey.cfg | 4 ++ .../scenarios/1_Rooting_Out_A_Mage.cfg | 3 +- .../Two_Brothers/scenarios/2_The_Chase.cfg | 3 +- .../scenarios/3_Guarded_Castle.cfg | 3 +- data/campaigns/Two_Brothers/utils/journey.cfg | 17 +++++++ 33 files changed, 182 insertions(+), 55 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg index d76b96e301e..64944eb1b33 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg @@ -78,9 +78,8 @@ story=_ "The orcs were first sighted from the north marches of the great forest of Wesmere." [/part] [part] - background="an-orcish-incursion-map.png" show_title="yes" - {JOURNEY_STAGE1} + {TO_DEFEND_THE_FOREST} [/part] [/story] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg index deef54b830e..4c157fb285e 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg @@ -73,9 +73,8 @@ story=_ "Soon they arrived at a region where the forest was cut through by many streams, only to find something unexpected." [/part] [part] - background="an-orcish-incursion-map.png" show_title="yes" - {JOURNEY_STAGE2} + {TO_ASSASSINS} [/part] [/story] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg index c081c16493a..c1e7dabcc28 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg @@ -70,9 +70,8 @@ story= _ "Perhaps, but not here. The tribe this camp housed was too small to impress fear on other orcs. Come next morning, the elves were prepared for battle." [/part] [part] - background="an-orcish-incursion-map.png" show_title="yes" - {JOURNEY_STAGE3} + {TO_WASTELAND} [/part] [/story] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg index d8d23983a22..492faf9cef4 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg @@ -103,9 +103,8 @@ story=_ "When sunrise came, the elves moved into battle formations. Whatever waited in the slopes ahead, it would not find them unprepared." [/part] [part] - background="an-orcish-incursion-map.png" show_title="yes" - {JOURNEY_STAGE4} + {TO_VALLEY_OF_TROLLS} [/part] [/story] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg index 7cc52247748..7c69eda6ad0 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg @@ -30,9 +30,8 @@ story=_ "Erlornas surveyed the siege from atop a small tree-covered hill overlooking the tower valley..." [/part] [part] - background="an-orcish-incursion-map.png" show_title="yes" - {JOURNEY_STAGE5} + {TO_LINAERA_THE_QUICK} [/part] [/story] diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg index 310f8c635b9..031dfb5df1b 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg @@ -148,9 +148,8 @@ Undead are resistant to physical attack. Use mages to attack the undead, and elv [/event] [story] [part] - background="an-orcish-incursion-map.png" show_title="yes" - {JOURNEY_STAGE6} + {TO_A_DETOUR_THROUGH_THE_SWAMP} [/part] [/story] turns="24" diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg index 8a12a10081b..86691358945 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg @@ -18,9 +18,8 @@ [story] [part] - background="an-orcish-incursion-map.png" show_title="yes" - {JOURNEY_STAGE7} + {TO_SHOWDOWN} [/part] [/story] diff --git a/data/campaigns/An_Orcish_Incursion/utils/journey.cfg b/data/campaigns/An_Orcish_Incursion/utils/journey.cfg index 10a85d29681..f4510532220 100644 --- a/data/campaigns/An_Orcish_Incursion/utils/journey.cfg +++ b/data/campaigns/An_Orcish_Incursion/utils/journey.cfg @@ -97,3 +97,40 @@ #enddef # trackplacer: tracks end + +#define TO_DEFEND_THE_FOREST + background="an-orcish-incursion-map.png" + {JOURNEY_STAGE1} +#enddef + +#define TO_ASSASSINS + background="an-orcish-incursion-map.png" + {JOURNEY_STAGE2} +#enddef + +#define TO_WASTELAND + background="an-orcish-incursion-map.png" + {JOURNEY_STAGE3} +#enddef + +#define TO_VALLEY_OF_TROLLS + background="an-orcish-incursion-map.png" + {JOURNEY_STAGE4} +#enddef + +#define TO_LINAERA_THE_QUICK + background="an-orcish-incursion-map.png" + {JOURNEY_STAGE5} +#enddef + +#define TO_A_DETOUR_THROUGH_THE_SWAMP + background="an-orcish-incursion-map.png" + {JOURNEY_STAGE6} +#enddef + +#define TO_SHOWDOWN + background="an-orcish-incursion-map.png" + {JOURNEY_STAGE7} +#enddef + + diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg index e26f7a6be19..2798833a43f 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg @@ -39,8 +39,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE1} + {TO_SAVING_PARTHYN} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg index 613286e0bb9..ef0147a298f 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg @@ -21,8 +21,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE2} + {TO_PEACEFUL_VALLEY} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg index 058eb0f2bf3..e3f35e0ab80 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg @@ -18,8 +18,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE3} + {TO_A_HAUNTING_IN_WINTER} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg index c0aec2a16e5..9f1e234d423 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg @@ -21,8 +21,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE4} + {TO_BEGINNING_OF_THE_REVENGE} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg index 5d01c1277ce..be1ed26909e 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg @@ -24,8 +24,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE5} + {TO_ORC_WAR} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg index 82a72db6a94..0a28a2c6ce3 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg @@ -22,8 +22,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE6} + {TO_RETURN_TO_PARTHYN} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg index 23a8a7a3cf3..c03b42e41a0 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg @@ -27,8 +27,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE7} + {TO_A_SMALL_FAVOR} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 2eebd90f4d6..82c1b34d703 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -23,8 +23,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE8} + {TO_ALONE_AT_LAST} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg index c0926dc5499..fd51ce5b5b5 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg @@ -26,8 +26,7 @@ [/part] [part] show_title=yes - background="misc/descent-into-darkness.png" - {JOURNEY_STAGE9} + {TO_DESCENT_INTO_DARKNESS} [/part] [/story] diff --git a/data/campaigns/Descent_Into_Darkness/utils/journey.cfg b/data/campaigns/Descent_Into_Darkness/utils/journey.cfg index 35ac6da5186..8cba0145914 100644 --- a/data/campaigns/Descent_Into_Darkness/utils/journey.cfg +++ b/data/campaigns/Descent_Into_Darkness/utils/journey.cfg @@ -328,3 +328,49 @@ #enddef # trackplacer: tracks end + +#define TO_SAVING_PARTHYN + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE1} +#enddef + +#define TO_PEACEFUL_VALLEY + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE2} +#enddef + +#define TO_A_HAUNTING_IN_WINTER + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE3} +#enddef + +#define TO_BEGINNING_OF_THE_REVENGE + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE4} +#enddef + +#define TO_ORC_WAR + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE5} +#enddef + +#define TO_RETURN_TO_PARTHYN + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE6} +#enddef + +#define TO_A_SMALL_FAVOR + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE7} +#enddef + +#define TO_ALONE_AT_LAST + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE8} +#enddef + +#define TO_DESCENT_INTO_DARKNESS + background="misc/descent-into-darkness.png" + {JOURNEY_STAGE9} +#enddef + diff --git a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg index 13668f46bf5..de2a1ba5239 100644 --- a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg +++ b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg @@ -38,8 +38,7 @@ [part] show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE1} + {TO_THE_RAID} [/part] [/story] diff --git a/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg b/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg index c2a1e66769c..74315e45ad2 100644 --- a/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg +++ b/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg @@ -13,8 +13,7 @@ [story] [part] show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE2} + {TO_CIVIL_DISOBEDIENCE} [/part] [/story] diff --git a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg index 0c3ccd52dfc..3a9bb869632 100644 --- a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg +++ b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg @@ -14,8 +14,7 @@ [story] [part] show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE3} + {TO_A_STRATEGY_OF_HOPE} [/part] [/story] diff --git a/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg b/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg index 54df8c23c3d..1e6f86079ac 100644 --- a/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg +++ b/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg @@ -23,8 +23,7 @@ [part] music="knolls.ogg" show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE4} + {TO_UNLAWFUL_ORDERS} [/part] [/story] diff --git a/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg b/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg index eba3bc5101c..16890424599 100644 --- a/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg +++ b/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg @@ -14,8 +14,7 @@ [story] [part] show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE5} + {TO_HIDE_AND_SEEK} [/part] [/story] diff --git a/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg b/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg index 5643a426008..293527db21b 100644 --- a/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg +++ b/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg @@ -12,8 +12,7 @@ [story] [part] show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE6} + {TO_THE_GRAY_WOODS} [/part] [/story] diff --git a/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg b/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg index c6fa3b655ce..5b6c457b471 100644 --- a/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg +++ b/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg @@ -25,8 +25,7 @@ [/part] [part] show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE8} + {TO_THE_HUNTERS} [/part] [/story] diff --git a/data/campaigns/Liberty/scenarios/08_Glory.cfg b/data/campaigns/Liberty/scenarios/08_Glory.cfg index 6ae118e8606..1048ad74cc6 100644 --- a/data/campaigns/Liberty/scenarios/08_Glory.cfg +++ b/data/campaigns/Liberty/scenarios/08_Glory.cfg @@ -34,8 +34,7 @@ [part] music="battle.ogg" show_title=yes - background="maps/wesnoth-liberty.png" - {JOURNEY_STAGE8} + {TO_GLORY} [/part] [/story] diff --git a/data/campaigns/Liberty/utils/journey.cfg b/data/campaigns/Liberty/utils/journey.cfg index bcdb5935932..64ff41c09c5 100644 --- a/data/campaigns/Liberty/utils/journey.cfg +++ b/data/campaigns/Liberty/utils/journey.cfg @@ -140,3 +140,44 @@ #enddef # trackplacer: tracks end + +#define TO_THE_RAID + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE1} +#enddef + +#define TO_CIVIL_DISOBEDIENCE + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE2} +#enddef + +#define TO_A_STRATEGY_OF_HOPE + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE3} +#enddef + +#define TO_UNLAWFUL_ORDERS + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE4} +#enddef + +#define TO_HIDE_AND_SEEK + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE5} +#enddef + +#define TO_THE_GRAY_WOODS + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE6} +#enddef + +#define TO_THE_HUNTERS + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE7} +#enddef + +#define TO_GLORY + background="maps/wesnoth-liberty.png" + {JOURNEY_STAGE8} +#enddef + diff --git a/data/campaigns/Northern_Rebirth/utils/journey.cfg b/data/campaigns/Northern_Rebirth/utils/journey.cfg index 334a3277bb5..2f0e0e394c9 100644 --- a/data/campaigns/Northern_Rebirth/utils/journey.cfg +++ b/data/campaigns/Northern_Rebirth/utils/journey.cfg @@ -88,12 +88,14 @@ # a good example for future campaign developers. #define TO_BREAKING_THE_CHAINS - {REVOLT_STAGE1} + background=maps/wesnoth.png + {REVOLT_STAGE1} #enddef # Infested Caves doesn't beed a separate map. #define TO_TO_THE_MINES + background=maps/wesnoth.png # "a few miles north" of the infested caves. {REVOLT_STAGE2} #enddef @@ -101,16 +103,19 @@ # Clearing The Mines and The Pursuit don't needs maps. #define TO_OLD_FRIEND + background=maps/wesnoth.png # Back at Knalga again {REVOLT_STAGE1} #enddef #define TO_SETTLING_DISPUTES + background=maps/wesnoth.png # Takes place at "Higbrook Pass", direction not specified. {REVOLT_STAGE3} #enddef #define TO_ELVISH_PRINCESS + background=maps/wesnoth.png # To the castle of Bitterhold, a day's march northwest of Knalga {RESCUE_STAGE1} #enddef @@ -118,21 +123,25 @@ # Introductions doesn't beed a separate map. #define TO_STOLEN_GOLD + background=maps/wesnoth.png # The trolls' trail leads south from Knalga {RECOVERY_STAGE1} #enddef #define TO_EASTERN_FLANK + background=maps/wesnoth.png # Direction not specified here. To the grim forttress of Angthurim! {RECOVERY_STAGE2} #enddef #define TO_GET_THE_GOLD + background=maps/wesnoth.png # Rakshas fled further south {RECOVERY_STAGE2} #enddef #define TO_SHOWDOWN + background=maps/wesnoth.png # Rakshas's trail curves west to the showdown. {RECOVERY_STAGE3} #enddef diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/journey.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/journey.cfg index 5756ae10d05..bd1cd1ae3a2 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/utils/journey.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/utils/journey.cfg @@ -1,3 +1,7 @@ +# Note: this file is in trackplacer format, but because it uses +# multiple map files trackplacer cannot yet edit it directly. +# It's a placeholder for when we replace the SoTBE map. + # trackplacer: tracks begin #define JOURNEY_STAGE1 diff --git a/data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg b/data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg index 344fe3c6aa0..ba6e030ee65 100644 --- a/data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg +++ b/data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg @@ -53,9 +53,8 @@ [/part] [part] story=_ "Heeding the call of his amulet, Arne gathered such men as he could and hurried to Maghre to help Bjarn." - background=maps/wesnoth.png show_title=yes - {JOURNEY_STAGE1} + {TO_ROOTING_OUT_A_MAGE} [/part] [/story] diff --git a/data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg index a6b17b9fc98..000953ef1f5 100644 --- a/data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg +++ b/data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg @@ -16,9 +16,8 @@ [part] music=frantic.ogg story=_ "The pursuit had already run for several days when the kidnappers came to the bounds of the huge forest known as the Gray Woods. Ancient tales warned of lost souls haunting the wood, hunting and killing anyone brave enough to enter it." - background=maps/wesnoth.png show_title=yes - {JOURNEY_STAGE2} + {TO_THE_CHASE} [/part] [part] story=_ "Heedless of those rumors, Arne followed them. His only worry was that his horsemen would be at disadvantage if attacked in the forest." diff --git a/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg b/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg index e88b8db97d5..822dfe053c8 100644 --- a/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg +++ b/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg @@ -49,9 +49,8 @@ [story] [part] - background=maps/wesnoth.png show_title=yes - {JOURNEY_STAGE3} + {TO_GUARDED_CASTLE} [/part] [/story] diff --git a/data/campaigns/Two_Brothers/utils/journey.cfg b/data/campaigns/Two_Brothers/utils/journey.cfg index 60980d038c6..6104555c72f 100644 --- a/data/campaigns/Two_Brothers/utils/journey.cfg +++ b/data/campaigns/Two_Brothers/utils/journey.cfg @@ -38,3 +38,20 @@ #enddef # trackplacer: tracks end + +#define TO_ROOTING_OUT_A_MAGE + background=maps/wesnoth.png + {JOURNEY_STAGE1} +#enddef + +#define TO_THE_CHASE + background=maps/wesnoth.png + {JOURNEY_STAGE2} +#enddef + +#define TO_GUARDED_CASTLE + background=maps/wesnoth.png + {JOURNEY_STAGE3} +#enddef + +