trackplacer: a slight change in how track IDs are used...

...to generate macros allows underscores to be used in IDs.
This commit is contained in:
Eric S. Raymond 2008-10-18 20:26:47 +00:00
parent 4af5ac30be
commit e31a404cce
8 changed files with 211 additions and 211 deletions

View file

@ -7,18 +7,18 @@
# trackplacer: map=data/campaigns/An_Orcish_Incursion/images/an-orcish-incursion-map.png
#
#define JOURNEY_STAGE_1
#define JOURNEY_STAGE1
{NEW_BATTLE 275 217}
#enddef
#define JOURNEY_STAGE_2
#define JOURNEY_STAGE2
{OLD_BATTLE 275 217}
{NEW_JOURNEY 235 204}
{NEW_JOURNEY 202 189}
{NEW_BATTLE 173 171}
#enddef
#define JOURNEY_STAGE_3
#define JOURNEY_STAGE3
{OLD_BATTLE 275 217}
{OLD_JOURNEY 235 204}
{OLD_JOURNEY 202 189}
@ -27,7 +27,7 @@
{NEW_BATTLE 221 126}
#enddef
#define JOURNEY_STAGE_4
#define JOURNEY_STAGE4
{OLD_BATTLE 275 217}
{OLD_JOURNEY 235 204}
{OLD_JOURNEY 202 189}
@ -39,7 +39,7 @@
{NEW_BATTLE 309 76}
#enddef
#define JOURNEY_STAGE_5
#define JOURNEY_STAGE5
{OLD_BATTLE 275 217}
{OLD_JOURNEY 235 204}
{OLD_JOURNEY 202 189}
@ -52,7 +52,7 @@
{NEW_BATTLE 337 53}
#enddef
#define JOURNEY_STAGE_6
#define JOURNEY_STAGE6
{OLD_BATTLE 275 217}
{OLD_JOURNEY 235 204}
{OLD_JOURNEY 202 189}
@ -66,7 +66,7 @@
{NEW_BATTLE 368 60}
#enddef
#define JOURNEY_STAGE_7
#define JOURNEY_STAGE7
{OLD_BATTLE 275 217}
{OLD_JOURNEY 235 204}
{OLD_JOURNEY 202 189}

View file

@ -5,11 +5,11 @@
#
# trackplacer: map=data/campaigns/Descent_Into_Darkness/images/misc/descent-into-darkness.png
#
#define JOURNEY_STAGE_1
#define JOURNEY_STAGE1
{NEW_BATTLE 800 425}
#enddef
#define JOURNEY_STAGE_2
#define JOURNEY_STAGE2
{OLD_BATTLE 800 425}
{NEW_JOURNEY 819 409}
{NEW_JOURNEY 823 377}
@ -17,7 +17,7 @@
{NEW_BATTLE 822 312}
#enddef
#define JOURNEY_STAGE_3
#define JOURNEY_STAGE3
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
@ -32,7 +32,7 @@
{NEW_BATTLE 538 267}
#enddef
#define JOURNEY_STAGE_4
#define JOURNEY_STAGE4
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
@ -52,7 +52,7 @@
{NEW_BATTLE 657 203}
#enddef
#define JOURNEY_STAGE_5
#define JOURNEY_STAGE5
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
@ -81,7 +81,7 @@
{NEW_BATTLE 814 185}
#enddef
#define JOURNEY_STAGE_6
#define JOURNEY_STAGE6
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
@ -121,7 +121,7 @@
{NEW_BATTLE 805 444}
#enddef
#define JOURNEY_STAGE_7
#define JOURNEY_STAGE7
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
@ -169,7 +169,7 @@
{NEW_BATTLE 521 441}
#enddef
#define JOURNEY_STAGE_8
#define JOURNEY_STAGE8
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}
@ -219,7 +219,7 @@
{NEW_BATTLE 500 375}
#enddef
#define JOURNEY_STAGE_9
#define JOURNEY_STAGE9
{OLD_BATTLE 800 425}
{OLD_JOURNEY 819 409}
{OLD_JOURNEY 823 377}

View file

@ -6,11 +6,11 @@
#
# trackplacer: map=data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
#
#define JOURNEY1_STAGE_1
#define JOURNEY1_STAGE1
{NEW_BATTLE 759 508}
#enddef
#define JOURNEY1_STAGE_2
#define JOURNEY1_STAGE2
{OLD_BATTLE 759 508}
{NEW_JOURNEY 788 509}
{NEW_BATTLE 821 517}
@ -22,13 +22,13 @@
{OLD_BATTLE 821 517}
#enddef
#define JOURNEY2_STAGE_1
#define JOURNEY2_STAGE1
{NEW_JOURNEY 844 507}
{NEW_JOURNEY 847 487}
{NEW_BATTLE 847 469}
#enddef
#define JOURNEY2_STAGE_2
#define JOURNEY2_STAGE2
{OLD_JOURNEY 844 507}
{OLD_JOURNEY 847 487}
{OLD_BATTLE 847 469}
@ -46,14 +46,14 @@
{OLD_BATTLE 729 460}
#enddef
#define JOURNEY3_STAGE_1
#define JOURNEY3_STAGE1
{NEW_JOURNEY 846 525}
{NEW_JOURNEY 879 545}
{NEW_JOURNEY 908 562}
{NEW_BATTLE 938 583}
#enddef
#define JOURNEY3_STAGE_2
#define JOURNEY3_STAGE2
{OLD_JOURNEY 846 525}
{OLD_JOURNEY 879 545}
{OLD_JOURNEY 908 562}
@ -62,7 +62,7 @@
{NEW_BATTLE 988 611}
#enddef
#define JOURNEY3_STAGE_3
#define JOURNEY3_STAGE3
{OLD_JOURNEY 846 525}
{OLD_JOURNEY 879 545}
{OLD_JOURNEY 908 562}
@ -94,7 +94,7 @@
{OLD_BATTLE 729 460}
#enddef
#define JOURNEY4_STAGE_1
#define JOURNEY4_STAGE1
{NEW_JOURNEY 709 449}
{NEW_BATTLE 689 424}
#enddef
@ -104,13 +104,13 @@
{OLD_BATTLE 689 424}
#enddef
#define JOURNEY5_STAGE_1
#define JOURNEY5_STAGE1
{NEW_JOURNEY 666 401}
{NEW_JOURNEY 629 383}
{NEW_BATTLE 602 368}
#enddef
#define JOURNEY5_STAGE_2
#define JOURNEY5_STAGE2
{OLD_JOURNEY 666 401}
{OLD_JOURNEY 629 383}
{OLD_BATTLE 602 368}
@ -128,12 +128,12 @@
{OLD_BATTLE 552 244}
#enddef
#define JOURNEY6_STAGE_1
#define JOURNEY6_STAGE1
{NEW_JOURNEY 707 411}
{NEW_BATTLE 709 381}
#enddef
#define JOURNEY6_STAGE_2
#define JOURNEY6_STAGE2
{OLD_JOURNEY 707 411}
{OLD_BATTLE 709 381}
{NEW_JOURNEY 670 349}
@ -153,13 +153,13 @@
{OLD_BATTLE 552 244}
#enddef
#define JOURNEY7_STAGE_1
#define JOURNEY7_STAGE1
{NEW_JOURNEY 583 250}
{NEW_JOURNEY 617 237}
{NEW_BATTLE 636 214}
#enddef
#define JOURNEY7_STAGE_2
#define JOURNEY7_STAGE2
{OLD_JOURNEY 583 250}
{OLD_JOURNEY 617 237}
{OLD_BATTLE 636 214}
@ -169,7 +169,7 @@
{NEW_BATTLE 507 132}
#enddef
#define JOURNEY7_STAGE_3
#define JOURNEY7_STAGE3
{OLD_JOURNEY 583 250}
{OLD_JOURNEY 617 237}
{OLD_BATTLE 636 214}
@ -188,7 +188,7 @@
{NEW_BATTLE 633 352}
#enddef
#define JOURNEY7_STAGE_4
#define JOURNEY7_STAGE4
{OLD_JOURNEY 583 250}
{OLD_JOURNEY 617 237}
{OLD_BATTLE 636 214}
@ -209,7 +209,7 @@
{NEW_BATTLE 648 404}
#enddef
#define JOURNEY7_STAGE_5
#define JOURNEY7_STAGE5
{OLD_JOURNEY 583 250}
{OLD_JOURNEY 617 237}
{OLD_BATTLE 636 214}
@ -233,7 +233,7 @@
{NEW_BATTLE 610 511}
#enddef
#define JOURNEY7_STAGE_6
#define JOURNEY7_STAGE6
{OLD_JOURNEY 583 250}
{OLD_JOURNEY 617 237}
{OLD_BATTLE 636 214}
@ -291,30 +291,30 @@
#define TO_THE_OUTPOST
background="eastern-invasion-map.png"
{JOURNEY1_STAGE_1}
{JOURNEY1_STAGE1}
#enddef
#define TO_AN_UNEXPECTED_APPEARANCE
background="eastern-invasion-map.png"
{JOURNEY1_STAGE_2}
{JOURNEY1_STAGE2}
#enddef
#define TO_AN_ELVEN_ALLIANCE
background="eastern-invasion-map.png"
{JOURNEY1_COMPLETE}
{JOURNEY2_STAGE_1}
{JOURNEY2_STAGE1}
#enddef
#define TO_THE_UNDEAD_BORDER_PATROL
background="eastern-invasion-map.png"
{JOURNEY1_COMPLETE}
{JOURNEY3_STAGE_1}
{JOURNEY3_STAGE1}
#enddef
#define TO_MAL_RAVANALS_CAPITOL
background="eastern-invasion-map.png"
{JOURNEY1_COMPLETE}
{JOURNEY3_STAGE_2}
{JOURNEY3_STAGE2}
#enddef
#define TO_NORTHERN_OUTPOST
@ -324,11 +324,11 @@
variable=first_fork
[case]
value=west
{JOURNEY2_STAGE_2}
{JOURNEY2_STAGE2}
[/case]
[case]
value=east
{JOURNEY3_STAGE_3}
{JOURNEY3_STAGE3}
[/case]
[/switch]
#enddef
@ -351,21 +351,21 @@
#define TO_TWO_PATHS
background="eastern-invasion-map.png"
{FROM_NORTHERN_OUTPOST}
{JOURNEY4_STAGE_1}
{JOURNEY4_STAGE1}
#enddef
#define TO_UNDEAD_CROSSING
background="eastern-invasion-map.png"
{FROM_NORTHERN_OUTPOST}
{JOURNEY4_COMPLETE}
{JOURNEY5_STAGE_1}
{JOURNEY5_STAGE1}
#enddef
#define TO_THE_CROSSING
background="eastern-invasion-map.png"
{FROM_NORTHERN_OUTPOST}
{JOURNEY4_COMPLETE}
{JOURNEY6_STAGE_1}
{JOURNEY6_STAGE1}
#enddef
#define TO_TRAINING_THE_OGRES
@ -376,11 +376,11 @@
variable=second_fork
[case]
value=west
{JOURNEY5_STAGE_2}
{JOURNEY5_STAGE2}
[/case]
[case]
value=north
{JOURNEY6_STAGE_2}
{JOURNEY6_STAGE2}
[/case]
[/switch]
#enddef
@ -404,35 +404,35 @@
#define TO_XENOPHOBIA
background="eastern-invasion-map.png"
{FROM_TRAINING_THE_OGRES}
{JOURNEY7_STAGE_1}
{JOURNEY7_STAGE1}
#enddef
#define TO_LAKE_VRUG
background="eastern-invasion-map.png"
{FROM_TRAINING_THE_OGRES}
{JOURNEY7_STAGE_2}
{JOURNEY7_STAGE2}
#enddef
#define TO_EVACUATION
background="eastern-invasion-map.png"
{FROM_TRAINING_THE_OGRES}
{JOURNEY7_STAGE_3}
{JOURNEY7_STAGE3}
#enddef
#define TO_THE_DROWNED_PLAINS
background="eastern-invasion-map.png"
{FROM_TRAINING_THE_OGRES}
{JOURNEY7_STAGE_4}
{JOURNEY7_STAGE4}
#enddef
#define TO_APPROACHING_WELDYN
background="eastern-invasion-map.png"
{FROM_TRAINING_THE_OGRES}
{JOURNEY7_STAGE_5}
{JOURNEY7_STAGE5}
#enddef
#define TO_THE_COUNCIL
background="eastern-invasion-map.png"
{FROM_TRAINING_THE_OGRES}
{JOURNEY7_STAGE_6}
{JOURNEY7_STAGE6}
#enddef

View file

@ -6,11 +6,11 @@
#
# trackplacer: map=data/core/images/maps/wesnoth.png
#
#define JOURNEY1_STAGE_1
#define JOURNEY1_STAGE1
{NEW_BATTLE 112 718}
#enddef
#define JOURNEY1_STAGE_2
#define JOURNEY1_STAGE2
{OLD_BATTLE 112 718}
{NEW_JOURNEY 116 692}
{NEW_JOURNEY 120 670}
@ -19,7 +19,7 @@
{NEW_BATTLE 132 600}
#enddef
#define JOURNEY1_STAGE_3
#define JOURNEY1_STAGE3
{OLD_BATTLE 112 718}
{OLD_JOURNEY 116 692}
{OLD_JOURNEY 120 670}
@ -31,7 +31,7 @@
{NEW_BATTLE 90 556}
#enddef
#define JOURNEY1_STAGE_4
#define JOURNEY1_STAGE4
{OLD_BATTLE 112 718}
{OLD_JOURNEY 116 692}
{OLD_JOURNEY 120 670}
@ -65,7 +65,7 @@
{OLD_BATTLE 192 502}
#enddef
#define JOURNEY2_STAGE_1
#define JOURNEY2_STAGE1
{NEW_JOURNEY 210 492}
{NEW_JOURNEY 216 468}
{NEW_JOURNEY 204 447}
@ -73,7 +73,7 @@
{NEW_BATTLE 160 430}
#enddef
#define JOURNEY2_STAGE_2
#define JOURNEY2_STAGE2
{OLD_JOURNEY 210 492}
{OLD_JOURNEY 216 468}
{OLD_JOURNEY 204 447}
@ -101,14 +101,14 @@
{OLD_BATTLE 198 313}
#enddef
#define JOURNEY3_STAGE_1
#define JOURNEY3_STAGE1
{NEW_JOURNEY 164 502}
{NEW_JOURNEY 140 510}
{NEW_JOURNEY 115 504}
{NEW_BATTLE 97 486}
#enddef
#define JOURNEY3_STAGE_2
#define JOURNEY3_STAGE2
{OLD_JOURNEY 164 502}
{OLD_JOURNEY 140 510}
{OLD_JOURNEY 115 504}
@ -118,7 +118,7 @@
{NEW_BATTLE 56 424}
#enddef
#define JOURNEY3_STAGE_3
#define JOURNEY3_STAGE3
{OLD_JOURNEY 164 502}
{OLD_JOURNEY 140 510}
{OLD_JOURNEY 115 504}
@ -152,7 +152,7 @@
{OLD_BATTLE 198 313}
#enddef
#define JOURNEY4_STAGE_1
#define JOURNEY4_STAGE1
{NEW_JOURNEY 214 334}
{NEW_JOURNEY 230 355}
{NEW_JOURNEY 246 376}
@ -165,7 +165,7 @@
{NEW_BATTLE 358 523}
#enddef
#define JOURNEY4_STAGE_2
#define JOURNEY4_STAGE2
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -182,7 +182,7 @@
{NEW_BATTLE 394 459}
#enddef
#define JOURNEY4_STAGE_3
#define JOURNEY4_STAGE3
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -201,7 +201,7 @@
{NEW_BATTLE 410 419}
#enddef
#define JOURNEY4_STAGE_4
#define JOURNEY4_STAGE4
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -223,7 +223,7 @@
{NEW_BATTLE 464 383}
#enddef
#define JOURNEY4_STAGE_5
#define JOURNEY4_STAGE5
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -247,7 +247,7 @@
{NEW_BATTLE 476 335}
#enddef
#define JOURNEY4_STAGE_6
#define JOURNEY4_STAGE6
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -276,7 +276,7 @@
{NEW_BATTLE 566 280}
#enddef
#define JOURNEY4_STAGE_7
#define JOURNEY4_STAGE7
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -309,7 +309,7 @@
{NEW_BATTLE 526 224}
#enddef
#define JOURNEY4_STAGE_8
#define JOURNEY4_STAGE8
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -343,7 +343,7 @@
{NEW_BATTLE 533 205}
#enddef
#define JOURNEY4_STAGE_9
#define JOURNEY4_STAGE9
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -380,7 +380,7 @@
{NEW_BATTLE 554 148}
#enddef
#define JOURNEY4_STAGE_10
#define JOURNEY4_STAGE10
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -420,7 +420,7 @@
{NEW_BATTLE 602 112}
#enddef
#define JOURNEY4_STAGE_11
#define JOURNEY4_STAGE11
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -463,7 +463,7 @@
{NEW_BATTLE 662 127}
#enddef
#define JOURNEY4_STAGE_12
#define JOURNEY4_STAGE12
{OLD_JOURNEY 214 334}
{OLD_JOURNEY 230 355}
{OLD_JOURNEY 246 376}
@ -555,7 +555,7 @@
{OLD_BATTLE 728 136}
#enddef
#define JOURNEY5_STAGE_1
#define JOURNEY5_STAGE1
{NEW_JOURNEY 751 132}
{NEW_JOURNEY 774 128}
{NEW_JOURNEY 797 124}
@ -563,7 +563,7 @@
{NEW_BATTLE 843 116}
#enddef
#define JOURNEY5_STAGE_2
#define JOURNEY5_STAGE2
{OLD_JOURNEY 751 132}
{OLD_JOURNEY 774 128}
{OLD_JOURNEY 797 124}
@ -578,7 +578,7 @@
{NEW_BATTLE 935 218}
#enddef
#define JOURNEY5_STAGE_3
#define JOURNEY5_STAGE3
{OLD_JOURNEY 751 132}
{OLD_JOURNEY 774 128}
{OLD_JOURNEY 797 124}
@ -612,7 +612,7 @@
{OLD_REST 989 224}
#enddef
#define JOURNEY6_STAGE_1
#define JOURNEY6_STAGE1
{NEW_JOURNEY 734 156}
{NEW_JOURNEY 740 176}
{NEW_JOURNEY 746 196}
@ -623,7 +623,7 @@
{NEW_BATTLE 776 296}
#enddef
#define JOURNEY6_STAGE_2
#define JOURNEY6_STAGE2
{OLD_JOURNEY 734 156}
{OLD_JOURNEY 740 176}
{OLD_JOURNEY 746 196}
@ -642,7 +642,7 @@
{NEW_BATTLE 935 218}
#enddef
#define JOURNEY6_STAGE_3
#define JOURNEY6_STAGE3
{OLD_JOURNEY 734 156}
{OLD_JOURNEY 740 176}
{OLD_JOURNEY 746 196}
@ -684,7 +684,7 @@
{OLD_REST 989 224}
#enddef
#define JOURNEY7_STAGE_1
#define JOURNEY7_STAGE1
{NEW_JOURNEY 749 144}
{NEW_JOURNEY 773 153}
{NEW_JOURNEY 786 169}
@ -692,7 +692,7 @@
{NEW_BATTLE 822 198}
#enddef
#define JOURNEY7_STAGE_2
#define JOURNEY7_STAGE2
{OLD_JOURNEY 749 144}
{OLD_JOURNEY 773 153}
{OLD_JOURNEY 786 169}
@ -704,7 +704,7 @@
{NEW_BATTLE 898 174}
#enddef
#define JOURNEY7_STAGE_3
#define JOURNEY7_STAGE3
{OLD_JOURNEY 749 144}
{OLD_JOURNEY 773 153}
{OLD_JOURNEY 786 169}
@ -738,7 +738,7 @@
{OLD_REST 989 224}
#enddef
#define JOURNEY8_STAGE_1
#define JOURNEY8_STAGE1
{NEW_JOURNEY 973 236}
{NEW_JOURNEY 957 248}
{NEW_JOURNEY 941 260}
@ -756,7 +756,7 @@
{NEW_BATTLE 749 404}
#enddef
#define JOURNEY8_STAGE_2
#define JOURNEY8_STAGE2
{OLD_JOURNEY 973 236}
{OLD_JOURNEY 957 248}
{OLD_JOURNEY 941 260}
@ -779,7 +779,7 @@
{NEW_BATTLE 824 479}
#enddef
#define JOURNEY8_STAGE_3
#define JOURNEY8_STAGE3
{OLD_JOURNEY 973 236}
{OLD_JOURNEY 957 248}
{OLD_JOURNEY 941 260}
@ -855,7 +855,7 @@
[part]
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_STAGE_1}
{JOURNEY1_STAGE1}
[/part]
[/story]
#enddef
@ -865,7 +865,7 @@
[part]
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_STAGE_2}
{JOURNEY1_STAGE2}
[/part]
[/story]
#enddef
@ -875,7 +875,7 @@
[part]
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_STAGE_3}
{JOURNEY1_STAGE3}
[/part]
[/story]
#enddef
@ -885,7 +885,7 @@
[part]
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_STAGE_4}
{JOURNEY1_STAGE4}
[/part]
[/story]
#enddef
@ -896,7 +896,7 @@
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_STAGE_1}
{JOURNEY2_STAGE1}
[/part]
[/story]
#enddef
@ -907,7 +907,7 @@
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_STAGE_1}
{JOURNEY3_STAGE1}
[/part]
[/story]
#enddef
@ -917,7 +917,7 @@
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_STAGE_2}
{JOURNEY3_STAGE2}
[/part]
[/story]
#enddef
@ -934,7 +934,7 @@
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_STAGE_2}
{JOURNEY2_STAGE2}
[/part]
[/then]
[else]
@ -942,7 +942,7 @@
background=maps/wesnoth-httt.jpg
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_STAGE_3}
{JOURNEY3_STAGE3}
[/part]
[/else]
[/if]
@ -962,7 +962,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_1}
{JOURNEY4_STAGE1}
[/part]
[/then]
[else]
@ -971,7 +971,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_1}
{JOURNEY4_STAGE1}
[/part]
[/else]
[/if]
@ -991,7 +991,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_2}
{JOURNEY4_STAGE2}
[/part]
[/then]
[else]
@ -1000,7 +1000,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_2}
{JOURNEY4_STAGE2}
[/part]
[/else]
[/if]
@ -1020,7 +1020,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_3}
{JOURNEY4_STAGE3}
[/part]
[/then]
[else]
@ -1029,7 +1029,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_3}
{JOURNEY4_STAGE3}
[/part]
[/else]
[/if]
@ -1049,7 +1049,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_4}
{JOURNEY4_STAGE4}
[/part]
[/then]
[else]
@ -1058,7 +1058,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_4}
{JOURNEY4_STAGE4}
[/part]
[/else]
[/if]
@ -1078,7 +1078,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_5}
{JOURNEY4_STAGE5}
[/part]
[/then]
[else]
@ -1087,7 +1087,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_5}
{JOURNEY4_STAGE5}
[/part]
[/else]
[/if]
@ -1107,7 +1107,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_6}
{JOURNEY4_STAGE6}
[/part]
[/then]
[else]
@ -1116,7 +1116,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_6}
{JOURNEY4_STAGE6}
[/part]
[/else]
[/if]
@ -1136,7 +1136,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_7}
{JOURNEY4_STAGE7}
[/part]
[/then]
[else]
@ -1145,7 +1145,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_7}
{JOURNEY4_STAGE7}
[/part]
[/else]
[/if]
@ -1165,7 +1165,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_8}
{JOURNEY4_STAGE8}
[/part]
[/then]
[else]
@ -1174,7 +1174,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_8}
{JOURNEY4_STAGE8}
[/part]
[/else]
[/if]
@ -1194,7 +1194,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_9}
{JOURNEY4_STAGE9}
[/part]
[/then]
[else]
@ -1203,7 +1203,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_9}
{JOURNEY4_STAGE9}
[/part]
[/else]
[/if]
@ -1223,7 +1223,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_10}
{JOURNEY4_STAGE10}
[/part]
[/then]
[else]
@ -1232,7 +1232,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_10}
{JOURNEY4_STAGE10}
[/part]
[/else]
[/if]
@ -1252,7 +1252,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_11}
{JOURNEY4_STAGE11}
[/part]
[/then]
[else]
@ -1261,7 +1261,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_11}
{JOURNEY4_STAGE11}
[/part]
[/else]
[/if]
@ -1281,7 +1281,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_STAGE_12}
{JOURNEY4_STAGE12}
[/part]
[/then]
[else]
@ -1290,7 +1290,7 @@
show_title=yes
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_STAGE_12}
{JOURNEY4_STAGE12}
[/part]
[/else]
[/if]
@ -1311,7 +1311,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_STAGE_1}
{JOURNEY5_STAGE1}
[/part]
[/then]
[else]
@ -1321,7 +1321,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_STAGE_1}
{JOURNEY5_STAGE1}
[/part]
[/else]
[/if]
@ -1342,7 +1342,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_STAGE_1}
{JOURNEY6_STAGE1}
[/part]
[/then]
[else]
@ -1352,7 +1352,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_STAGE_1}
{JOURNEY6_STAGE1}
[/part]
[/else]
[/if]
@ -1373,7 +1373,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_STAGE_1}
{JOURNEY7_STAGE1}
[/part]
[/then]
[else]
@ -1383,7 +1383,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_STAGE_1}
{JOURNEY7_STAGE1}
[/part]
[/else]
[/if]
@ -1410,7 +1410,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_STAGE_2}
{JOURNEY5_STAGE2}
[/part]
[/then]
[else]
@ -1420,7 +1420,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_STAGE_2}
{JOURNEY5_STAGE2}
[/part]
[/else]
[/if]
@ -1446,7 +1446,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_STAGE_2}
{JOURNEY6_STAGE2}
[/part]
[/then]
[else]
@ -1456,7 +1456,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_STAGE_2}
{JOURNEY6_STAGE2}
[/part]
[/else]
[/if]
@ -1479,7 +1479,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_STAGE_2}
{JOURNEY7_STAGE2}
[/part]
[/then]
[else]
@ -1489,7 +1489,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_STAGE_2}
{JOURNEY7_STAGE2}
[/part]
[/else]
[/if]
@ -1516,7 +1516,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_STAGE_3}
{JOURNEY5_STAGE3}
[/part]
[/then]
[else]
@ -1526,7 +1526,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_STAGE_3}
{JOURNEY5_STAGE3}
[/part]
[/else]
[/if]
@ -1552,7 +1552,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_STAGE_3}
{JOURNEY6_STAGE3}
[/part]
[/then]
[else]
@ -1562,7 +1562,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_STAGE_3}
{JOURNEY6_STAGE3}
[/part]
[/else]
[/if]
@ -1588,7 +1588,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_STAGE_3}
{JOURNEY7_STAGE3}
[/part]
[/then]
[else]
@ -1598,7 +1598,7 @@
{JOURNEY1_COMPLETE}
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_STAGE_3}
{JOURNEY7_STAGE3}
[/part]
[/else]
[/if]
@ -1628,7 +1628,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_COMPLETE}
{JOURNEY8_STAGE_1}
{JOURNEY8_STAGE1}
[/part]
[/then]
[else]
@ -1639,7 +1639,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_COMPLETE}
{JOURNEY8_STAGE_1}
{JOURNEY8_STAGE1}
[/part]
[/else]
[/if]
@ -1666,7 +1666,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_COMPLETE}
{JOURNEY8_STAGE_1}
{JOURNEY8_STAGE1}
[/part]
[/then]
[else]
@ -1677,7 +1677,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_COMPLETE}
{JOURNEY8_STAGE_1}
{JOURNEY8_STAGE1}
[/part]
[/else]
[/if]
@ -1704,7 +1704,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_1}
{JOURNEY8_STAGE1}
[/part]
[/then]
[else]
@ -1715,7 +1715,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_1}
{JOURNEY8_STAGE1}
[/part]
[/else]
[/if]
@ -1745,7 +1745,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_COMPLETE}
{JOURNEY8_STAGE_2}
{JOURNEY8_STAGE2}
[/part]
[/then]
[else]
@ -1756,7 +1756,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_COMPLETE}
{JOURNEY8_STAGE_2}
{JOURNEY8_STAGE2}
[/part]
[/else]
[/if]
@ -1783,7 +1783,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_COMPLETE}
{JOURNEY8_STAGE_2}
{JOURNEY8_STAGE2}
[/part]
[/then]
[else]
@ -1794,7 +1794,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY6_COMPLETE}
{JOURNEY8_STAGE_2}
{JOURNEY8_STAGE2}
[/part]
[/else]
[/if]
@ -1821,7 +1821,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_2}
{JOURNEY8_STAGE2}
[/part]
[/then]
[else]
@ -1832,7 +1832,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_2}
{JOURNEY8_STAGE2}
[/part]
[/else]
[/if]
@ -1862,7 +1862,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_COMPLETE}
{JOURNEY8_STAGE_3}
{JOURNEY8_STAGE3}
[/part]
[/then]
[else]
@ -1873,7 +1873,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY5_COMPLETE}
{JOURNEY8_STAGE_3}
{JOURNEY8_STAGE3}
[/part]
[/else]
[/if]
@ -1900,7 +1900,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_3}
{JOURNEY8_STAGE3}
[/part]
[/then]
[else]
@ -1911,7 +1911,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_3}
{JOURNEY8_STAGE3}
[/part]
[/else]
[/if]
@ -1938,7 +1938,7 @@
{JOURNEY2_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_3}
{JOURNEY8_STAGE3}
[/part]
[/then]
[else]
@ -1949,7 +1949,7 @@
{JOURNEY3_COMPLETE}
{JOURNEY4_COMPLETE}
{JOURNEY7_COMPLETE}
{JOURNEY8_STAGE_3}
{JOURNEY8_STAGE3}
[/part]
[/else]
[/if]

View file

@ -4,11 +4,11 @@
#
# trackplacer: map=data/core/images/maps/wesnoth.png
#
#define FLIGHT_STAGE_1
#define FLIGHT_STAGE1
{NEW_BATTLE 1001 250}
#enddef
#define FLIGHT_STAGE_2
#define FLIGHT_STAGE2
{OLD_BATTLE 1001 250}
{NEW_JOURNEY 977 238}
{NEW_JOURNEY 958 228}
@ -20,7 +20,7 @@
{NEW_BATTLE 760 207}
#enddef
#define FLIGHT_STAGE_3
#define FLIGHT_STAGE3
{OLD_BATTLE 1001 250}
{OLD_JOURNEY 977 238}
{OLD_JOURNEY 958 228}
@ -70,13 +70,13 @@
{OLD_BATTLE 393 258}
#enddef
#define TREASURY_STAGE_1
#define TREASURY_STAGE1
{NEW_JOURNEY 375 261}
{NEW_JOURNEY 349 267}
{NEW_BATTLE 287 245}
#enddef
#define TREASURY_STAGE_2
#define TREASURY_STAGE2
{OLD_JOURNEY 375 261}
{OLD_JOURNEY 349 267}
{OLD_BATTLE 287 245}
@ -90,7 +90,7 @@
{NEW_BATTLE 262 126}
#enddef
#define TREASURY_STAGE_3
#define TREASURY_STAGE3
{OLD_JOURNEY 375 261}
{OLD_JOURNEY 349 267}
{OLD_BATTLE 287 245}
@ -111,7 +111,7 @@
{NEW_BATTLE 370 176}
#enddef
#define TREASURY_STAGE_4
#define TREASURY_STAGE4
{OLD_JOURNEY 375 261}
{OLD_JOURNEY 349 267}
{OLD_BATTLE 287 245}
@ -163,7 +163,7 @@
{OLD_BATTLE 352 242}
#enddef
#define BOOK_STAGE_1
#define BOOK_STAGE1
{NEW_JOURNEY 378 235}
{NEW_JOURNEY 394 227}
{NEW_JOURNEY 414 223}
@ -179,7 +179,7 @@
{NEW_BATTLE 567 130}
#enddef
#define BOOK_STAGE_2
#define BOOK_STAGE2
{OLD_JOURNEY 378 235}
{OLD_JOURNEY 394 227}
{OLD_JOURNEY 414 223}
@ -198,7 +198,7 @@
{NEW_BATTLE 577 84}
#enddef
#define BOOK_STAGE_3
#define BOOK_STAGE3
{OLD_JOURNEY 378 235}
{OLD_JOURNEY 394 227}
{OLD_JOURNEY 414 223}
@ -240,7 +240,7 @@
{OLD_BATTLE 592 21}
#enddef
#define ALLIANCE_STAGE_1
#define ALLIANCE_STAGE1
{NEW_JOURNEY 356 252}
{NEW_JOURNEY 365 262}
{NEW_JOURNEY 378 276}
@ -260,7 +260,7 @@
{NEW_BATTLE 508 436}
#enddef
#define ALLIANCE_STAGE_2
#define ALLIANCE_STAGE2
{OLD_JOURNEY 356 252}
{OLD_JOURNEY 365 262}
{OLD_JOURNEY 378 276}
@ -303,7 +303,7 @@
{NEW_BATTLE 848 303}
#enddef
#define ALLIANCE_STAGE_3
#define ALLIANCE_STAGE3
{OLD_JOURNEY 356 252}
{OLD_JOURNEY 365 262}
{OLD_JOURNEY 378 276}
@ -353,7 +353,7 @@
{NEW_BATTLE 926 177}
#enddef
#define ALLIANCE_STAGE_4
#define ALLIANCE_STAGE4
{OLD_JOURNEY 356 252}
{OLD_JOURNEY 365 262}
{OLD_JOURNEY 378 276}
@ -455,7 +455,7 @@
{OLD_JOURNEY 909 188}
#enddef
#define SAURIANS_STAGE_1
#define SAURIANS_STAGE1
{NEW_JOURNEY 910 206}
{NEW_JOURNEY 836 223}
{NEW_JOURNEY 775 234}
@ -469,7 +469,7 @@
{NEW_BATTLE 262 128}
#enddef
#define SAURIANS_STAGE_2
#define SAURIANS_STAGE2
{OLD_JOURNEY 910 206}
{OLD_JOURNEY 836 223}
{OLD_JOURNEY 775 234}
@ -513,16 +513,16 @@
{OLD_BATTLE 318 276}
#enddef
#define CIVILWAR_STAGE_1
#define CIVILWAR_STAGE1
{NEW_BATTLE 970 249}
#enddef
#define CIVILWAR_STAGE_2
#define CIVILWAR_STAGE2
{OLD_BATTLE 970 249}
{NEW_BATTLE 932 161}
#enddef
#define CIVILWAR_STAGE_3
#define CIVILWAR_STAGE3
{OLD_BATTLE 970 249}
{OLD_BATTLE 932 161}
{NEW_BATTLE 926 177}
@ -540,84 +540,84 @@
#define TO_THE_UPROOTING
background=low-map.png
{FLIGHT_STAGE_1}
{FLIGHT_STAGE1}
#enddef
#define TO_HOSTILE_MOUNTAINS
background=low-map.png
{FLIGHT_STAGE_2}
{FLIGHT_STAGE2}
#enddef
#define TO_KALIAN
background=low-map.png
{FLIGHT_STAGE_3}
{FLIGHT_STAGE3}
#enddef
#define TO_ELVISH_TREASURY
background=low-map.png
{FLIGHT_COMPLETE}
{TREASURY_STAGE_1}
{TREASURY_STAGE1}
#enddef
#define TO_ELVISH_TREASURY_BATTLE
background=low-map.png
# FIXME: we really want just the final battle marker here
{FLIGHT_COMPLETE}
{TREASURY_STAGE_1}
{TREASURY_STAGE1}
#enddef
#define TO_SAURIAN_TREASURY
background=low-map.png
# FIXME: we really want just the final battle marker here
{FLIGHT_COMPLETE}
{TREASURY_STAGE_2}
{TREASURY_STAGE2}
#enddef
#define TO_SAURIAN_TREASURY_BATTLE
background=low-map.png
# FIXME: we really want just the final battle marker here
{FLIGHT_COMPLETE}
{TREASURY_STAGE_2}
{TREASURY_STAGE2}
#enddef
#define TO_ACQUAINTANCE_IN_NEED
background=low-map.png
# FIXME: we really want just the final battle marker here
{FLIGHT_COMPLETE}
{TREASURY_STAGE_3}
{TREASURY_STAGE3}
#enddef
#define TO_ACQUAINTANCE_IN_NEED_BATTLE
background=low-map.png
{FLIGHT_COMPLETE}
{TREASURY_STAGE_3}
{TREASURY_STAGE3}
#enddef
#define TO_ELVES_LAST_STAND
background=low-map.png
{FLIGHT_COMPLETE}
{TREASURY_STAGE_4}
{TREASURY_STAGE4}
#enddef
#define TO_BOUNTY_HUNTERS
background=low-map.png
{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_STAGE_1}
{BOOK_STAGE1}
#enddef
#define TO_CLIFFS_OF_THORIA
background=low-map.png
{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_STAGE_2}
{BOOK_STAGE2}
#enddef
#define TO_BATTLE_OF_THE_BOOK
background=low-map.png
{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_STAGE_3}
{BOOK_STAGE3}
#enddef
#define TO_BATTLE_OF_THE_BOOK_BATTLE
@ -625,7 +625,7 @@
# FIXME: we really want just the final battle marker here
{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_STAGE_3}
{BOOK_STAGE3}
#enddef
#define TO_ANCIENT_ALLIANCE
@ -634,7 +634,7 @@
#{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_COMPLETE}
{ALLIANCE_STAGE_1}
{ALLIANCE_STAGE1}
#enddef
#define TO_ANCIENT_ALLIANCE_BATTLE
@ -642,7 +642,7 @@
#{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_COMPLETE}
{ALLIANCE_STAGE_1}
{ALLIANCE_STAGE1}
#enddef
#define TO_THE_CHIEF_MUST_DIE
@ -650,7 +650,7 @@
#{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_COMPLETE}
{ALLIANCE_STAGE_2}
{ALLIANCE_STAGE2}
#enddef
#define TO_BREAKING_THE_SIEGE
@ -658,7 +658,7 @@
#{FLIGHT_COMPLETE}
{TREASURY_COMPLETE}
{BOOK_COMPLETE}
{ALLIANCE_STAGE_3}
{ALLIANCE_STAGE3}
#enddef
#define TO_COSTLY_REVENGE
@ -667,7 +667,7 @@
{TREASURY_COMPLETE}
{BOOK_COMPLETE}
{ALLIANCE_COMPLETE}
{SAURIANS_STAGE_1}
{SAURIANS_STAGE1}
#enddef
#define TO_COSTLY_REVENGE_BATTLE
@ -677,7 +677,7 @@
#{TREASURY_COMPLETE}
#{BOOK_COMPLETE}
{ALLIANCE_COMPLETE}
{SAURIANS_STAGE_1}
{SAURIANS_STAGE1}
#enddef
#define TO_COUNCIL_RULING
@ -686,27 +686,27 @@
#{TREASURY_COMPLETE}
#{BOOK_COMPLETE}
{ALLIANCE_COMPLETE}
{SAURIANS_STAGE_2}
{SAURIANS_STAGE2}
#enddef
#define TO_ELVISH_ASSASSINS
background=low-map.png
{CIVILWAR_STAGE_1}
{CIVILWAR_STAGE1}
#enddef
#define TO_ELVISH_ASSASSINS_BATTLE
# FIXME: we really want just the final battle marker here
background=low-map.png
{CIVILWAR_STAGE_1}
{CIVILWAR_STAGE1}
#enddef
#define TO_NORTHERN_BATTLE
background=low-map.png
{CIVILWAR_STAGE_2}
{CIVILWAR_STAGE2}
#enddef
#define TO_END_OF_WAR
background=low-map.png
{CIVILWAR_STAGE_3}
{CIVILWAR_STAGE3}
#enddef

View file

@ -7,17 +7,17 @@
# trackplacer: map=data/campaigns/Liberty/images/maps/wesnoth-liberty.png
#
#define JOURNEY_STAGE_1
#define JOURNEY_STAGE1
{NEW_BATTLE 252 252}
#enddef
#define JOURNEY_STAGE_2
#define JOURNEY_STAGE2
{OLD_BATTLE 252 252}
{NEW_JOURNEY 247 248}
{NEW_BATTLE 242 267}
#enddef
#define JOURNEY_STAGE_3
#define JOURNEY_STAGE3
{OLD_BATTLE 252 252}
{OLD_JOURNEY 247 248}
{OLD_BATTLE 242 267}
@ -25,7 +25,7 @@
{NEW_BATTLE 229 248}
#enddef
#define JOURNEY_STAGE_4
#define JOURNEY_STAGE4
{OLD_BATTLE 252 252}
{OLD_JOURNEY 247 248}
{OLD_BATTLE 242 267}
@ -36,7 +36,7 @@
{NEW_BATTLE 209 300}
#enddef
#define JOURNEY_STAGE_5
#define JOURNEY_STAGE5
{OLD_BATTLE 252 252}
{OLD_JOURNEY 247 248}
{OLD_BATTLE 242 267}
@ -51,7 +51,7 @@
{NEW_BATTLE 273 346}
#enddef
#define JOURNEY_STAGE_6
#define JOURNEY_STAGE6
{OLD_BATTLE 252 252}
{OLD_JOURNEY 247 248}
{OLD_BATTLE 242 267}
@ -69,7 +69,7 @@
{NEW_BATTLE 288 400}
#enddef
#define JOURNEY_STAGE_7
#define JOURNEY_STAGE7
{OLD_BATTLE 252 252}
{OLD_JOURNEY 247 248}
{OLD_BATTLE 242 267}
@ -91,7 +91,7 @@
{NEW_BATTLE 223 412}
#enddef
#define JOURNEY_STAGE_8
#define JOURNEY_STAGE8
{OLD_BATTLE 252 252}
{OLD_JOURNEY 247 248}
{OLD_BATTLE 242 267}

View file

@ -7,17 +7,17 @@
# trackplacer: map=data/core/images/maps/wesnoth.png
#
#define JOURNEY_STAGE_1
#define JOURNEY_STAGE1
{NEW_BATTLE 304 475}
#enddef
#define JOURNEY_STAGE_2
#define JOURNEY_STAGE2
{OLD_BATTLE 304 475}
{NEW_JOURNEY 306 457}
{NEW_BATTLE 311 442}
#enddef
#define JOURNEY_STAGE_3
#define JOURNEY_STAGE3
{OLD_BATTLE 304 475}
{OLD_JOURNEY 306 457}
{OLD_BATTLE 311 442}

View file

@ -161,7 +161,7 @@ class JourneyTracks:
if track[-1][0] not in segmenters:
endpoints.append(len(track)-1)
for (i, e) in enumerate(endpoints):
fp.write("#define %s_STAGE_%d\n" % (name, i+1,))
fp.write("#define %s_STAGE%d\n" % (name, i+1,))
for j in range(0, e+1):
age="OLD"
if i == 0 or j > endpoints[i-1]:
@ -200,7 +200,7 @@ class JourneyTracks:
waypoint_re = re.compile("{NEW_(" + "|".join(icon_presentation_order) + ")" \
+ " +([0-9]+) +([0-9]+)}")
property_re = re.compile("# *trackplacer: ([^=]+)=(.*)")
define_re = re.compile("#define ([^_]*)")
define_re = re.compile("#define (.*)_STAGE[0-9]+")
state = "before"
for line in fp:
# This is how we ignore stuff outside of track sections