Skip to content

Commit

Permalink
Merge pull request #371 from aquileia/bigmap_macro
Browse files Browse the repository at this point in the history 
Port THoT tracks to the SoF bigmap
  • Loading branch information
@Vultraz
Vultraz committed Jan 24, 2015
2 parents 370e03e + 1112187 commit 2485886
Show file tree
Hide file tree
Showing 20 changed files with 282 additions and 402 deletions.
4 changes: 2 additions & 2 deletions changelog
View file
Expand Up @@ -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'.
Expand Down
Binary file added data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 3 additions & 6 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
View file
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
View file
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
View file
Expand Up @@ -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,
Expand Down
7 changes: 2 additions & 5 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
View file
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
View file
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
View file
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
View file
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg
View file
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
View file
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
View file
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg
View file
Expand Up @@ -25,6 +25,8 @@
{EXTRA_SCENARIO_MUSIC "revelation.ogg"}
{EXTRA_SCENARIO_MUSIC "transience.ogg"}

{THOT_TRACK {JOURNEY_STAGE11}}

[side]
side=1
controller=human
Expand Down

0 comments on commit 2485886

Please sign in to comment.