Fix generated macro names from trackplacer.

A journey track for Northern Rebirth.
2008-10-18 21:45:29 +00:00 · 2008-10-18 21:45:29 +00:00 · 60f77f915a
commit 60f77f915a
parent e31a404cce
36 changed files with 198 additions and 31 deletions
--- a/data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg
@ -80,7 +80,7 @@
        [part]
            background="an-orcish-incursion-map.png"
            show_title="yes"
-            {JOURNEY_STAGE_1}
+            {JOURNEY_STAGE1}
        [/part]
    [/story]

--- a/data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg
@ -75,7 +75,7 @@
        [part]
            background="an-orcish-incursion-map.png"
            show_title="yes"
-            {JOURNEY_STAGE_2}
+            {JOURNEY_STAGE2}
        [/part]
    [/story]

--- a/data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg
@ -72,7 +72,7 @@
        [part]
            background="an-orcish-incursion-map.png"
            show_title="yes"
-            {JOURNEY_STAGE_3}
+            {JOURNEY_STAGE3}
        [/part]
    [/story]

--- a/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg
@ -105,7 +105,7 @@
        [part]
            background="an-orcish-incursion-map.png"
            show_title="yes"
-            {JOURNEY_STAGE_4}
+            {JOURNEY_STAGE4}
        [/part]
    [/story]

--- a/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg
@ -32,7 +32,7 @@
        [part]
            background="an-orcish-incursion-map.png"
            show_title="yes"
-            {JOURNEY_STAGE_5}
+            {JOURNEY_STAGE5}
        [/part]
    [/story]

--- 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
@ -150,7 +150,7 @@ Undead are resistant to physical attack. Use mages to attack the undead, and elv
        [part]
            background="an-orcish-incursion-map.png"
            show_title="yes"
-            {JOURNEY_STAGE_6}
+            {JOURNEY_STAGE6}
        [/part]
    [/story]
    turns="24"
--- a/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
@ -20,7 +20,7 @@
        [part]
            background="an-orcish-incursion-map.png"
            show_title="yes"
-            {JOURNEY_STAGE_7}
+            {JOURNEY_STAGE7}
        [/part]
    [/story]

--- a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
@ -40,7 +40,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_1}
+            {JOURNEY_STAGE1}
        [/part]
    [/story]

--- a/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
@ -22,7 +22,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_2}
+            {JOURNEY_STAGE2}
        [/part]
    [/story]

--- 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
@ -19,7 +19,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_3}
+            {JOURNEY_STAGE3}
        [/part]
    [/story]

--- 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
@ -22,7 +22,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_4}
+            {JOURNEY_STAGE4}
        [/part]
    [/story]

--- a/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
@ -25,7 +25,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_5}
+            {JOURNEY_STAGE5}
        [/part]
    [/story]

--- a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
@ -23,7 +23,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_6}
+            {JOURNEY_STAGE6}
        [/part]
    [/story]

--- a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
@ -28,7 +28,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_7}
+            {JOURNEY_STAGE7}
        [/part]
    [/story]

--- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
@ -24,7 +24,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_8}
+            {JOURNEY_STAGE8}
        [/part]
    [/story]

--- a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
@ -27,7 +27,7 @@
        [part]
            show_title=yes
            background="misc/descent-into-darkness.png"
-            {JOURNEY_STAGE_9}
+            {JOURNEY_STAGE9}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
+++ b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
@ -39,7 +39,7 @@
        [part]
            show_title=yes
            background="maps/wesnoth-liberty.png"
-            {JOURNEY_STAGE_1}
+            {JOURNEY_STAGE1}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
+++ b/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
@ -14,7 +14,7 @@
        [part]
            show_title=yes
            background="maps/wesnoth-liberty.png"
-            {JOURNEY_STAGE_2}
+            {JOURNEY_STAGE2}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
+++ b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
@ -15,7 +15,7 @@
        [part]
            show_title=yes
            background="maps/wesnoth-liberty.png"
-            {JOURNEY_STAGE_3}
+            {JOURNEY_STAGE3}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
+++ b/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
@ -24,7 +24,7 @@
            music="knolls.ogg"
            show_title=yes
            background="maps/wesnoth-liberty.png"
-            {JOURNEY_STAGE_4}
+            {JOURNEY_STAGE4}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
+++ b/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
@ -15,7 +15,7 @@
        [part]
            show_title=yes
            background="maps/wesnoth-liberty.png"
-            {JOURNEY_STAGE_5}
+            {JOURNEY_STAGE5}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
+++ b/data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
@ -13,7 +13,7 @@
        [part]
            show_title=yes
            background="maps/wesnoth-liberty.png"
-            {JOURNEY_STAGE_6}
+            {JOURNEY_STAGE6}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
+++ b/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
@ -26,7 +26,7 @@
        [part]
            show_title=yes
            background="maps/wesnoth-liberty.png"
-	    {JOURNEY_STAGE_8}
+	    {JOURNEY_STAGE8}
        [/part]
    [/story]

--- a/data/campaigns/Liberty/scenarios/08_Glory.cfg
+++ b/data/campaigns/Liberty/scenarios/08_Glory.cfg
@ -35,7 +35,7 @@
            music="battle.ogg"
            show_title=yes
            background="maps/wesnoth-liberty.png"
-	    {JOURNEY_STAGE_8}
+	    {JOURNEY_STAGE8}
        [/part]
    [/story]

--- a/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
@ -54,6 +54,10 @@
        [part]
            story= _ "Then one day Al'Tar, the current 'master' of Dwarven Doors, was attacked by a neighboring tribe of orcs. Tallin seized his moment. Using knowledge born of years of watching, listening and planning, he managed to steal a few weapons and a small amount of Al'Tar's gold. He fled to an abandoned ruin in the forest to rally his fellow peasants."
        [/part]
+        [part]
+            show_title=yes
+            {TO_BREAKING_THE_CHAINS}
+        [/part]        
    [/story]

    # Load map, set scenario length, time scheudle and point to next
--- a/data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/03_To_The_Mines.cfg
@ -76,6 +76,10 @@
            story= _ "Och, human tho'u ye are, ye speak very like a dwarf, lad. Form, up men! To the mines! Let the guardsmen stay behind along with the noncombatants - for their safety and to hold the keep."
            background=portraits/Hamel.jpg
        [/part]
+        [part]
+            show_title=yes
+            {TO_TO_THE_MINES}
+        [/part]        
    [/story]

    map_data="{campaigns/Northern_Rebirth/maps/to_the_mines.map}"
--- a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
@ -177,7 +177,9 @@
        [/part]
        [part]
            story= _ "And so Tallin and his party set out to secure the help of the mages."
-        [/part]
+            show_title=yes
+            {TO_SETTLING_DISPUTES}
+        [/part]        
    [/story]

    # Players side, allied with dwarves
--- a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
@ -130,6 +130,10 @@
            story= _ "Then to arms, men! For Knalga and the princess!"
            background=portraits/Tallin.jpg
        [/part]
+        [part]
+            show_title=yes
+            {TO_ELVISH_PRINCESS}
+        [/part]        
    [/story]

    # Prestart event, set objectives
--- a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
@ -10,7 +10,7 @@
    victory_when_enemies_defeated=yes
    next_scenario=eastern_flank

-    # Story with few branches depending on wether Anita is alive and hostile
+    # Story with few branches depending on whether Anita is alive and hostile
    # towards the Alliance.
    # wmllint: recognize Anita
    [story]
@ -295,6 +295,10 @@
                [/if]
            [/else]
        [/if]
+        [part]
+            show_title=yes
+            {TO_STOLEN_GOLD}
+        [/part]        
    [/story]

    # Players side
--- a/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg
@ -15,7 +15,9 @@
        [/part]
        [part]
            story= _ "Following the bank of a river, they soon entered a valley. At the mouth of the valley there loomed the massive orcish fortress of Angthurim."
-        [/part]
+            show_title=yes
+            {TO_EASTERN_FLANK}
+        [/part]        
    [/story]
    # Players side
    [side]
--- a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
@ -104,7 +104,10 @@
        [/part]
        [part]
            story= _ "It seemed to the gryphon that the elves were sore beset. The party quickly turned south and plunged into the forest."
-        [/part]
+        [part]
+            show_title=yes
+            {TO_GET_THE_GOLD}
+        [/part]        
    [/story]

    # Players side - Tallin
--- a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
@ -21,6 +21,10 @@
        [part]
            story= _ "The idea was to completely surround Rakshas on all sides, cutting off any chance of escape or reinforcements."
        [/part]
+        [part]
+            show_title=yes
+            {TO_SHOWDOWN}
+        [/part]        
    [/story]
    # Players side - Tallin
    [side]
--- a/data/campaigns/Northern_Rebirth/utils/journey.cfg
+++ b/data/campaigns/Northern_Rebirth/utils/journey.cfg
@ -0,0 +1,140 @@
+# trackplacer: tracks begin
+#
+# Hand-hack this section strictly at your own risk.
+#
+# trackplacer: map=data/core/images/maps/wesnoth.png
+#
+#define REVOLT_STAGE1
+    {NEW_BATTLE 526 225}
+#enddef
+
+#define REVOLT_STAGE2
+    {OLD_BATTLE 526 225}
+    {NEW_BATTLE 524 213}
+#enddef
+
+#define REVOLT_STAGE3
+    {OLD_BATTLE 526 225}
+    {OLD_BATTLE 524 213}
+    {NEW_JOURNEY 536 205}
+    {NEW_JOURNEY 545 208}
+    {NEW_JOURNEY 554 208}
+    {NEW_JOURNEY 563 201}
+    {NEW_BATTLE 569 191}
+#enddef
+
+#define REVOLT_COMPLETE
+    {OLD_BATTLE 526 225}
+    {OLD_BATTLE 524 213}
+    {OLD_JOURNEY 536 205}
+    {OLD_JOURNEY 545 208}
+    {OLD_JOURNEY 554 208}
+    {OLD_JOURNEY 563 201}
+    {OLD_BATTLE 569 191}
+#enddef
+
+#define RESCUE_STAGE1
+    {NEW_JOURNEY 517 221}
+    {NEW_BATTLE 504 215}
+#enddef
+
+#define RESCUE_COMPLETE
+    {OLD_JOURNEY 517 221}
+    {OLD_BATTLE 504 215}
+#enddef
+
+#define RECOVERY_STAGE1
+    {NEW_JOURNEY 526 236}
+    {NEW_JOURNEY 529 245}
+    {NEW_BATTLE 530 256}
+#enddef
+
+#define RECOVERY_STAGE2
+    {OLD_JOURNEY 526 236}
+    {OLD_JOURNEY 529 245}
+    {OLD_BATTLE 530 256}
+    {NEW_JOURNEY 520 256}
+    {NEW_BATTLE 509 266}
+#enddef
+
+#define RECOVERY_STAGE3
+    {OLD_JOURNEY 526 236}
+    {OLD_JOURNEY 529 245}
+    {OLD_BATTLE 530 256}
+    {OLD_JOURNEY 520 256}
+    {OLD_BATTLE 509 266}
+    {NEW_JOURNEY 498 264}
+    {NEW_JOURNEY 485 261}
+    {NEW_JOURNEY 474 258}
+    {NEW_BATTLE 462 257}
+#enddef
+
+#define RECOVERY_COMPLETE
+    {OLD_JOURNEY 526 236}
+    {OLD_JOURNEY 529 245}
+    {OLD_BATTLE 530 256}
+    {OLD_JOURNEY 520 256}
+    {OLD_BATTLE 509 266}
+    {OLD_JOURNEY 498 264}
+    {OLD_JOURNEY 485 261}
+    {OLD_JOURNEY 474 258}
+    {OLD_BATTLE 462 257}
+#enddef
+
+# trackplacer: tracks end
+
+# There isn't enough territory traversed in this campaign to make a map 
+# very interesting (so much of it happens underground) but let's set
+# a good example for future campaign developers.
+
+#define TO_BREAKING_THE_CHAINS
+    {REVOLT_STAGE1}
+#endif
+
+# Infested Caves doesn't beed a separate map.
+
+#define TO_TO_THE_MINES
+    # "a few miles north" of the infested caves.
+    {REVOLT_STAGE2}
+#endif
+
+# Clearing The Mines and The Pursuit don't needs maps.
+
+#define TO_OLD_FRIEND
+    # Back at Knalga again
+    {REVOLT_STAGE1}
+#endif
+
+#define TO_SETTLING_DISPUTES
+   # Takes place at "Higbrook Pass", direction not specified.
+   {REVOLT_STAGE3}
+#endif
+
+#define TO_ELVISH_PRINCESS
+   # To the castle of Bitterhold, a day's march northwest of Knalga
+   {RESCUE_STAGE1}
+#endif
+
+# Introductions doesn't beed a separate map.
+
+#define TO_STOLEN_GOLD
+   # The trolls' trail leads south from Knalga
+   {RECOVERY_STAGE1}
+#endif
+
+#define TO_EASTERN_FLABK
+   # Direction not specified here.  To the grim forttress of Angthurim!
+   {RECOVERY_STAGE2}
+#endif
+
+#define TO_GET_THE_GOLD
+   # Rakshas fled further south
+   {RECOVERY_STAGE2}
+#endif
+
+#define TO_SHOWDOWN
+   # Rakshas's trail curves west to the showdown.
+   {RECOVERY_STAGE3}
+#endif
+
+# Epilog doesn't beed a separate map.
--- a/data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg
+++ b/data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg
@ -55,7 +55,7 @@
            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_STAGE_1}
+            {JOURNEY_STAGE1}
        [/part]    
    [/story]

--- a/data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg
+++ b/data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg
@ -18,7 +18,7 @@
            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_STAGE_2}
+            {JOURNEY_STAGE2}
        [/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."
--- a/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
+++ b/data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg
@ -51,7 +51,7 @@
        [part]
            background=maps/wesnoth.png
            show_title=yes
-            {JOURNEY_STAGE_3}
+            {JOURNEY_STAGE3}
        [/part]
    [/story]