diff --git a/changelog b/changelog index 347071816b1c..ea39585d04ce 100644 --- a/changelog +++ b/changelog @@ -45,8 +45,8 @@ Version 1.13.0-dev: and connect engines from the multiplayer codepath. * Eras, mods, and options are now available for sp campaigns. * Fix sighted events firing too early in several scenarios. Fixes bug #22466 - * Use the new bigmaps for Tale of Two Brothers, Delfadors Memoirs and the - epilogue of Legend of Wesmere. + * Use the new bigmaps for A Tale of Two Brothers, Delfadors Memoirs, The + Hammer of Thursagan and the epilogue of Legend of Wesmere. * Descent into Darkness: * Fixed various issues with player and enemy gold and income in 'Descent into Darkness'. diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png new file mode 100644 index 000000000000..7602cba3ba6a Binary files /dev/null and b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png differ diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png new file mode 100644 index 000000000000..2a33dfd8e6e1 Binary files /dev/null and b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png differ diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png new file mode 100644 index 000000000000..03abfd734425 Binary files /dev/null and b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png differ diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png new file mode 100644 index 000000000000..75fbe0c093a7 Binary files /dev/null and b/data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png differ diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg index 0dcd35e67453..bab1b3cb1596 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg @@ -21,20 +21,17 @@ [story] [part] - background=maps/wesnoth.png + {THOT_BIGMAP} music=northerners.ogg story= _ "In the first few years after the founding of the Northern Alliance, the dwarves of Knalga and the human population of Dwarven Doors were fully preoccupied with rebuilding what had been broken by the long orcish occupation. But soon enough they prospered once again. The dwarves began mining their past for inspiration to rebuild Knalga even greater than before, and began also reaching out for contact with their scattered kinfolk." [/part] [part] - background=maps/wesnoth.png + {THOT_BIGMAP} music=northerners.ogg story= _ "But the threat from hostile orcs, wild men, and remnant undead was not yet ended. The dwarves kept strong guards on the approaches to Knalga. In the year 550 after the founding of Wesnoth, the captain of the East Gate received a warning that a small band of rogue orcs had been sighted." [/part] - [part] - show_title=yes - {TO_AT_THE_EAST_GATE} - [/part] [/story] + {THOT_TRACK {JOURNEY_STAGE1}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg index fb5016f51834..43fee9d78746 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg @@ -18,10 +18,11 @@ [story] [part] - background=maps/wesnoth.png + {THOT_BIGMAP} story= _ "Following the victory against the orcs, Aiglondur was summoned to the audience hall of Hamel, lord of Knalga and Lord Companion of the Northern Alliance. Beside the dais stood a stranger in the robes of the Order of Loremasters..." [/part] [/story] + {THOT_TRACK {JOURNEY_STAGE2}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg index 00b4b73da149..5a18251a2652 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg @@ -16,18 +16,15 @@ [story] [part] - background=maps/wesnoth.png + {THOT_BIGMAP} #po: "march" is *not* a typo for "marsh" here. #po: In archaic English, "march" means "border". #po: (The same word, as "-mark", is in the name of "the Estmarks": #po: the hills of the eastern border.) story= _ "Angarthing and Aiglondur and the dwarvish troop traveled swiftly to the east through the settled lands of the Northern Alliance. Soon enough they came to the wilder march country, where raids by large bands of hostile orcs and men were all too common." [/part] - [part] - show_title=yes - {TO_STRANGE_ALLIES} - [/part] [/story] + {THOT_TRACK {JOURNEY_STAGE3}} # Player controls Aiglondur's troops with Marth Tak's as allies; # the stinger is that if Marth Tak dies, you lose. The opponent, diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg index ac22712e4147..64859bc3bd14 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg @@ -16,14 +16,11 @@ [story] [part] - background=maps/wesnoth.png + {THOT_BIGMAP} story= _ "Aiglondur and his troop, some still shaking their heads dubiously at the very notion of fighting alongside orcs rather than against them, continued east to the easternmost edge of the Northern Alliance’s lands." [/part] - [part] - show_title=yes - {TO_TROLL_BRIDGE} - [/part] [/story] + {THOT_TRACK {JOURNEY_STAGE4}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg index b488dfe807e5..a58dce1e733f 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg @@ -20,14 +20,11 @@ [story] [part] - background=maps/wesnoth.png + {THOT_BIGMAP} story= _ "The Alliance’s road ended at the troll bridge. East of it lay only the wildlands." [/part] - [part] - show_title=yes - {TO_INVADERS} - [/part] [/story] + {THOT_TRACK {JOURNEY_STAGE5}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg index 9e001909890d..0817316e6237 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg @@ -21,12 +21,7 @@ {EXTRA_SCENARIO_MUSIC "northern_mountains.ogg"} {EXTRA_SCENARIO_MUSIC "casualties_of_war.ogg"} - [story] - [part] - show_title=yes - {TO_HIGH_PASS} - [/part] - [/story] + {THOT_TRACK {JOURNEY_STAGE6}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg index 867706dd408c..a2571ab95568 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg @@ -14,12 +14,7 @@ {EXTRA_SCENARIO_MUSIC "traveling_minstrels.ogg"} {EXTRA_SCENARIO_MUSIC "nunc_dimittis.ogg"} - [story] - [part] - show_title=yes - {TO_MAGES_AND_DRAKES} - [/part] - [/story] + {THOT_TRACK {JOURNEY_STAGE7}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg index 18766c206d10..669f9fc32753 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg @@ -14,12 +14,7 @@ {EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"} {EXTRA_SCENARIO_MUSIC "battle.ogg"} - [story] - [part] - show_title=yes - {TO_FEAR} - [/part] - [/story] + {THOT_TRACK {JOURNEY_STAGE8}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg index 16a81b1d39dd..7b5a5b12a252 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg @@ -14,12 +14,7 @@ {EXTRA_SCENARIO_MUSIC "traveling_minstrels.ogg"} {EXTRA_SCENARIO_MUSIC "frantic.ogg"} - [story] - [part] - show_title=yes - {TO_FORBIDDEN_FOREST} - [/part] - [/story] + {THOT_TRACK {JOURNEY_STAGE9}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg index 2dfc1a90cb93..1f73291485a5 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg @@ -20,12 +20,7 @@ {EXTRA_SCENARIO_MUSIC "loyalists.ogg"} {EXTRA_SCENARIO_MUSIC "northerners.ogg"} - [story] - [part] - show_title=yes - {TO_THE_SIEGE_OF_KAL_KARTHA} - [/part] - [/story] + {THOT_TRACK {JOURNEY_STAGE10}} [side] side=1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg index 3494abcc40cc..e23b37a3466f 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg @@ -25,6 +25,8 @@ {EXTRA_SCENARIO_MUSIC "revelation.ogg"} {EXTRA_SCENARIO_MUSIC "transience.ogg"} + {THOT_TRACK {JOURNEY_STAGE11}} + [side] side=1 controller=human diff --git a/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg b/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg new file mode 100644 index 000000000000..80b27e959d2c --- /dev/null +++ b/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg @@ -0,0 +1,257 @@ +#textdomain wesnoth-thot +# wmllint: no translatables + +#define THOT_BIGMAP + [background_layer] + image=maps/background.jpg + scale_vertically=yes + scale_horizontally=no + keep_aspect_ratio=yes + [/background_layer] + [background_layer] + image=maps/thot.png + scale_vertically=yes + scale_horizontally=no + keep_aspect_ratio=yes + base_layer=yes + [/background_layer] +#enddef + +#define THOT_TRACK STAGE +[story] + [part] + show_title=yes + {THOT_BIGMAP} + {STAGE} + [/part] +[/story] +#enddef + + +# trackplacer: tracks begin +# +# Hand-hack this section strictly at your own risk. +# +# trackplacer: map=data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png +# +#define JOURNEY_STAGE1 + {NEW_BATTLE 707 631} +#enddef + +#define JOURNEY_STAGE2 + {OLD_BATTLE 707 631} + {NEW_JOURNEY 684 624} + {NEW_JOURNEY 669 614} + {NEW_REST 653 597} +#enddef + +#define JOURNEY_STAGE3 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {NEW_JOURNEY 669 614} + {NEW_JOURNEY 684 624} + {NEW_JOURNEY 707 631} + {NEW_JOURNEY 725 637} + {NEW_BATTLE 746 637} +#enddef + +#define JOURNEY_STAGE4 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {NEW_JOURNEY 762 622} + {NEW_BATTLE 768 606} +#enddef + +#define JOURNEY_STAGE5 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {OLD_JOURNEY 762 622} + {OLD_BATTLE 768 606} + {NEW_JOURNEY 769 585} + {NEW_JOURNEY 772 570} + {NEW_BATTLE 775 551} +#enddef + +#define JOURNEY_STAGE6 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {OLD_JOURNEY 762 622} + {OLD_BATTLE 768 606} + {OLD_JOURNEY 769 585} + {OLD_JOURNEY 772 570} + {OLD_BATTLE 775 551} + {NEW_JOURNEY 781 530} + {NEW_BATTLE 786 514} +#enddef + +#define JOURNEY_STAGE7 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {OLD_JOURNEY 762 622} + {OLD_BATTLE 768 606} + {OLD_JOURNEY 769 585} + {OLD_JOURNEY 772 570} + {OLD_BATTLE 775 551} + {OLD_JOURNEY 781 530} + {OLD_BATTLE 786 514} + {NEW_JOURNEY 808 496} + {NEW_JOURNEY 834 498} + {NEW_JOURNEY 858 508} + {NEW_BATTLE 880 516} +#enddef + +#define JOURNEY_STAGE8 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {OLD_JOURNEY 762 622} + {OLD_BATTLE 768 606} + {OLD_JOURNEY 769 585} + {OLD_JOURNEY 772 570} + {OLD_BATTLE 775 551} + {OLD_JOURNEY 781 530} + {OLD_BATTLE 786 514} + {OLD_JOURNEY 808 496} + {OLD_JOURNEY 834 498} + {OLD_JOURNEY 858 508} + {OLD_BATTLE 880 516} + {NEW_JOURNEY 898 505} + {NEW_JOURNEY 910 491} + {NEW_BATTLE 919 472} +#enddef + +#define JOURNEY_STAGE9 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {OLD_JOURNEY 762 622} + {OLD_BATTLE 768 606} + {OLD_JOURNEY 769 585} + {OLD_JOURNEY 772 570} + {OLD_BATTLE 775 551} + {OLD_JOURNEY 781 530} + {OLD_BATTLE 786 514} + {OLD_JOURNEY 808 496} + {OLD_JOURNEY 834 498} + {OLD_JOURNEY 858 508} + {OLD_BATTLE 880 516} + {OLD_JOURNEY 898 505} + {OLD_JOURNEY 910 491} + {OLD_BATTLE 919 472} + {NEW_JOURNEY 926 455} + {NEW_JOURNEY 932 441} + {NEW_BATTLE 947 429} +#enddef + +#define JOURNEY_STAGE10 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {OLD_JOURNEY 762 622} + {OLD_BATTLE 768 606} + {OLD_JOURNEY 769 585} + {OLD_JOURNEY 772 570} + {OLD_BATTLE 775 551} + {OLD_JOURNEY 781 530} + {OLD_BATTLE 786 514} + {OLD_JOURNEY 808 496} + {OLD_JOURNEY 834 498} + {OLD_JOURNEY 858 508} + {OLD_BATTLE 880 516} + {OLD_JOURNEY 898 505} + {OLD_JOURNEY 910 491} + {OLD_BATTLE 919 472} + {OLD_JOURNEY 926 455} + {OLD_JOURNEY 932 441} + {OLD_BATTLE 947 429} + {NEW_JOURNEY 969 420} + {NEW_JOURNEY 984 408} + {NEW_JOURNEY 1005 398} + {NEW_BATTLE 1030 391} +#enddef + +#define JOURNEY_STAGE11 + {OLD_BATTLE 707 631} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 669 614} + {OLD_REST 653 597} + {OLD_JOURNEY 669 614} + {OLD_JOURNEY 684 624} + {OLD_JOURNEY 707 631} + {OLD_JOURNEY 725 637} + {OLD_BATTLE 746 637} + {OLD_JOURNEY 762 622} + {OLD_BATTLE 768 606} + {OLD_JOURNEY 769 585} + {OLD_JOURNEY 772 570} + {OLD_BATTLE 775 551} + {OLD_JOURNEY 781 530} + {OLD_BATTLE 786 514} + {OLD_JOURNEY 808 496} + {OLD_JOURNEY 834 498} + {OLD_JOURNEY 858 508} + {OLD_BATTLE 880 516} + {OLD_JOURNEY 898 505} + {OLD_JOURNEY 910 491} + {OLD_BATTLE 919 472} + {OLD_JOURNEY 926 455} + {OLD_JOURNEY 932 441} + {OLD_BATTLE 947 429} + {OLD_JOURNEY 969 420} + {OLD_JOURNEY 984 408} + {OLD_JOURNEY 1005 398} + {OLD_BATTLE 1030 391} + {NEW_JOURNEY 1048 391} + {NEW_REST 1067 383} +#enddef + +# trackplacer: tracks end + diff --git a/data/campaigns/The_Hammer_of_Thursagan/utils/journey.cfg b/data/campaigns/The_Hammer_of_Thursagan/utils/journey.cfg deleted file mode 100644 index 991bb308bbb5..000000000000 --- a/data/campaigns/The_Hammer_of_Thursagan/utils/journey.cfg +++ /dev/null @@ -1,346 +0,0 @@ -#textdomain wesnoth-thot -# trackplacer: tracks begin -# -# Hand-hack this section strictly at your own risk. -# -# trackplacer: map=data/core/images/maps/wesnoth.png -# -#define JOURNEY_STAGE1 - {NEW_BATTLE 500 225} -#enddef - -#define JOURNEY_STAGE1_END - {NEW_BATTLE 500 225} -#enddef - -#define JOURNEY_STAGE2 - {OLD_BATTLE 500 225} - {NEW_JOURNEY 518 226} - {NEW_JOURNEY 534 233} - {NEW_BATTLE 552 236} -#enddef - -#define JOURNEY_STAGE2_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {NEW_BATTLE 552 236} -#enddef - -#define JOURNEY_STAGE3 - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {NEW_JOURNEY 566 243} - {NEW_BATTLE 583 246} -#enddef - -#define JOURNEY_STAGE3_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {NEW_BATTLE 583 246} -#enddef - -#define JOURNEY_STAGE4 - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {NEW_JOURNEY 598 242} - {NEW_JOURNEY 611 236} - {NEW_BATTLE 625 226} -#enddef - -#define JOURNEY_STAGE4_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {NEW_BATTLE 625 226} -#enddef - -#define JOURNEY_STAGE5 - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {NEW_JOURNEY 632 211} - {NEW_BATTLE 643 198} -#enddef - -#define JOURNEY_STAGE5_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {NEW_BATTLE 643 198} -#enddef - -#define JOURNEY_STAGE6 - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {NEW_JOURNEY 651 180} - {NEW_BATTLE 668 177} -#enddef - -#define JOURNEY_STAGE6_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {NEW_BATTLE 668 177} -#enddef - -#define JOURNEY_STAGE7 - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {OLD_BATTLE 668 177} - {NEW_BATTLE 683 163} -#enddef - -#define JOURNEY_STAGE7_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {OLD_BATTLE 668 177} - {NEW_BATTLE 683 163} -#enddef - -#define JOURNEY_STAGE8 - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {OLD_BATTLE 668 177} - {OLD_BATTLE 683 163} - {NEW_JOURNEY 679 148} - {NEW_BATTLE 680 134} -#enddef - -#define JOURNEY_STAGE8_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {OLD_BATTLE 668 177} - {OLD_BATTLE 683 163} - {OLD_JOURNEY 679 148} - {NEW_BATTLE 680 134} -#enddef - -#define JOURNEY_STAGE9 - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {OLD_BATTLE 668 177} - {OLD_BATTLE 683 163} - {OLD_JOURNEY 679 148} - {OLD_BATTLE 680 134} - {NEW_JOURNEY 693 121} - {NEW_JOURNEY 703 113} - {NEW_JOURNEY 715 104} - {NEW_BATTLE 730 95} -#enddef - -#define JOURNEY_STAGE9_END - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {OLD_BATTLE 668 177} - {OLD_BATTLE 683 163} - {OLD_JOURNEY 679 148} - {OLD_BATTLE 680 134} - {OLD_JOURNEY 693 121} - {OLD_JOURNEY 703 113} - {OLD_JOURNEY 715 104} - {NEW_BATTLE 730 95} -#enddef - -#define JOURNEY_COMPLETE - {OLD_BATTLE 500 225} - {OLD_JOURNEY 518 226} - {OLD_JOURNEY 534 233} - {OLD_BATTLE 552 236} - {OLD_JOURNEY 566 243} - {OLD_BATTLE 583 246} - {OLD_JOURNEY 598 242} - {OLD_JOURNEY 611 236} - {OLD_BATTLE 625 226} - {OLD_JOURNEY 632 211} - {OLD_BATTLE 643 198} - {OLD_JOURNEY 651 180} - {OLD_BATTLE 668 177} - {OLD_BATTLE 683 163} - {OLD_JOURNEY 679 148} - {OLD_BATTLE 680 134} - {OLD_JOURNEY 693 121} - {OLD_JOURNEY 703 113} - {OLD_JOURNEY 715 104} - {OLD_BATTLE 730 95} -#enddef - -# trackplacer: tracks end - -#define TO_AT_THE_EAST_GATE - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE1} -#enddef - -# Reclaiming The Past is a talk scenario that doesn't need a map. - -#define TO_STRANGE_ALLIES - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE2} -#enddef - -#define TO_TROLL_BRIDGE - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE3} -#enddef - -#define TO_INVADERS - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE4} -#enddef - -#define TO_HIGH_PASS - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE5} -#enddef - -#define TO_MAGES_AND_DRAKES - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE6} -#enddef - -#define TO_FEAR - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE7} -#enddef - -#define TO_FORBIDDEN_FOREST - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE8} -#enddef - -#define TO_THE_SIEGE_OF_KAL_KARTHA - background=maps/wesnoth.png - show_title=yes - {JOURNEY_STAGE9} -#enddef - -# The last two scenarios are both dungeon crawls not requiring a map. - -# trackplacer: epilog begins - -#undef JOURNEY_STAGE1_END -#undef JOURNEY_STAGE2_END -#undef JOURNEY_STAGE3_END -#undef JOURNEY_STAGE4_END -#undef JOURNEY_STAGE5_END -#undef JOURNEY_STAGE6_END -#undef JOURNEY_STAGE7_END -#undef JOURNEY_STAGE8_END -#undef JOURNEY_STAGE9_END -#undef JOURNEY_COMPLETE - -# trackplacer: epilog ends diff --git a/l10n-track b/l10n-track index 4003ffe1ceaa..3eba608f9de6 100644 --- a/l10n-track +++ b/l10n-track @@ -12,6 +12,7 @@ ok ¦data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/de/sotbe--overl ok ¦data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/de/green_isle--overlay.png¦ 3e0318d30f3a56481c93d236da9ded97 3ca6988963d24be3f4f6cd8be2de2296df87919 ok ¦data/campaigns/The_South_Guard/images/maps/l10n/de/tsg--overlay.png¦ b6794ada1484eef485bbede267d8f1d0 bbace6d70c9021bea33fd06eb40ae5c793099d2 ok ¦data/campaigns/Two_Brothers/images/maps/l10n/de/tb--overlay.png¦ f95afb953e44122ded647dcb4d414aa5 3ca6988963d24be3f4f6cd8be2de2296df87919 +ok ¦data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png¦ 8e6a191c8caec86b05feaf5a13f9c10e bbace6d70c9021bea33fd06eb40ae5c793099d2 fuzzy ¦data/core/images/help/l10n/de/hpxp.png¦ b0984c245040663b8f14fe1ea9f66456 48839 fuzzy ¦data/core/images/help/l10n/de/recruit.png¦ ddc425468344909e7b59065a658f3524 48839 fuzzy ¦data/core/images/help/l10n/de/tooltip.png¦ 7acf65b98543763d72276055fb16d3db 48839 @@ -63,6 +64,7 @@ ok ¦data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/gl/sotbe--overl ok ¦data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/trow-logo.png¦ 591ed63c8eac31ea6549848dbed29143 0d5aa46e7435d9c5bf2944bb447c9ac6b2f1c0a ok ¦data/campaigns/The_South_Guard/images/maps/l10n/gl/tsg--overlay.png¦ b6794ada1484eef485bbede267d8f1d0 bbace6d70c9021bea33fd06eb40ae5c793099d2 ok ¦data/campaigns/Two_Brothers/images/maps/l10n/gl/tb--overlay.png¦ f95afb953e44122ded647dcb4d414aa5 3ca6988963d24be3f4f6cd8be2de2296df87919 +ok ¦data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png¦ 8e6a191c8caec86b05feaf5a13f9c10e bbace6d70c9021bea33fd06eb40ae5c793099d2 fuzzy ¦data/core/images/help/l10n/gl/hpxp.png¦ b0984c245040663b8f14fe1ea9f66456 0d5aa46e7435d9c5bf2944bb447c9ac6b2f1c0a fuzzy ¦data/core/images/help/l10n/gl/recruit.png¦ ddc425468344909e7b59065a658f3524 0d5aa46e7435d9c5bf2944bb447c9ac6b2f1c0a fuzzy ¦data/core/images/help/l10n/gl/tooltip.png¦ 7acf65b98543763d72276055fb16d3db e08333f436470a9edc730851fe4320ff59739be @@ -121,6 +123,7 @@ ok ¦data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/pt/green_isle--o ok ¦data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/trow-logo.png¦ 591ed63c8eac31ea6549848dbed29143 48839 ok ¦data/campaigns/The_South_Guard/images/maps/l10n/pt/tsg--overlay.png¦ b6794ada1484eef485bbede267d8f1d0 bbace6d70c9021bea33fd06eb40ae5c793099d2 ok ¦data/campaigns/Two_Brothers/images/maps/l10n/pt/tb--overlay.png¦ f95afb953e44122ded647dcb4d414aa5 3ca6988963d24be3f4f6cd8be2de2296df87919 +ok ¦data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png¦ 8e6a191c8caec86b05feaf5a13f9c10e bbace6d70c9021bea33fd06eb40ae5c793099d2 fuzzy ¦data/core/images/help/l10n/pt/hpxp.png¦ b0984c245040663b8f14fe1ea9f66456 48839 fuzzy ¦data/core/images/help/l10n/pt/recruit.png¦ ddc425468344909e7b59065a658f3524 48839 fuzzy ¦data/core/images/help/l10n/pt/tooltip.png¦ 7acf65b98543763d72276055fb16d3db 52409 diff --git a/players_changelog b/players_changelog index 5f8d56b932b5..387b0eaf6ba7 100644 --- a/players_changelog +++ b/players_changelog @@ -9,8 +9,8 @@ Version 1.13.0-dev: least one add-on that may be upgraded. * Campaigns: - * Use the new bigmaps for Tale of Two Brothers, Delfadors Memoirs and the - epilogue of Legend of Wesmere. + * Use the new bigmaps for A Tale of Two Brothers, Delfadors Memoirs, The + Hammer of Thursagan and the epilogue of Legend of Wesmere. * Descent into Darkness: * Fixed various issues with player and enemy gold and income in 'Descent into Darkness'.