Merge pull request #4014 from nemaara/THOT

[THoT] Remove filler scenarios and add character
wesnoth · Apr 27, 2019 · fda67b0 · fda67b0
2 parents 2aaaca1 + 9740f0c
commit fda67b0
Show file tree

Hide file tree

Showing 30 changed files with 1,076 additions and 1,912 deletions.
diff --git a/changelog.md b/changelog.md
@@ -34,6 +34,10 @@
    * Secrets of the Ancients:
      * Added ability to recruit different kinds of walking corpses during the campaign.
      * Unit type naming convention cleanup.
+   * The Hammer of Thursagan:
+     * Removed scenarios 4 (Troll Bridge), 5 (Invaders), and 7 (Mages and Drakes)
+     * Reworked scenario 8 (Fear) and rebalanced other scenarios
+     * Added new character and updated some dialogue
    * Under the Burning Suns:
      * Refactor code in various scenarios to be more readable
      * Various bugfixes (objectives, allied vision, unit spawns, event firing)

diff --git a/data/campaigns/The_Hammer_of_Thursagan/_main.cfg b/data/campaigns/The_Hammer_of_Thursagan/_main.cfg
@@ -23,7 +23,7 @@
     # wmllint: directory spelling Kal Kartha
     description= _ "In the first years of the Northern Alliance, an expedition from Knalga seeks out their kin at Kal Kartha and to learn the fate of the legendary Hammer of Thursagan. The perils of their journey through the wild Northern Lands, though great, pale beside the evil they will face at its end.
 
-" + _"(Intermediate level, 11 scenarios.)"
+" + _"(Intermediate level, 8 scenarios.)"
 
     [about]
         title = _ "Author"

diff --git a/...Hammer_of_Thursagan/maps/06_High_Pass.map → ...Hammer_of_Thursagan/maps/04_High_Pass.map b/...Hammer_of_Thursagan/maps/06_High_Pass.map → ...Hammer_of_Thursagan/maps/04_High_Pass.map
diff --git a/data/campaigns/The_Hammer_of_Thursagan/maps/04_Troll_Bridge.map b/data/campaigns/The_Hammer_of_Thursagan/maps/04_Troll_Bridge.map
diff --git a/data/campaigns/The_Hammer_of_Thursagan/maps/05_Fear.map b/data/campaigns/The_Hammer_of_Thursagan/maps/05_Fear.map
@@ -0,0 +1,22 @@
+Gg, Md, Hh, Hh, Gg, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Gg, Ww, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg
+Gg, Md, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Ww, Md, Hh, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Gg, Ww, Ww, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Gg, Mm, Ww, Gg, Gg, Re^Gvs, Gg, Re^Gvs, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gs^Vl, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Gg, Mm, Md, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Gg, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Gg, Mm, Md, Gg, Hh, Ww, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg
+Gg, Md, Mm, Hh, Hh, Hh, Hh, Hh, Hh, Ww, Ww, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg
+Gg, Mm, Md, Md, Hh, Hh, Hh, Hh, Hh, Gg, Re^Gvs, Ww, Gs^Fp, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg
+Gg, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Re^Gvs, Re^Gvs, Re^Gvs, Ww, Ww, Gs^Fp, Ww, Gg^Vh, Re^Gvs, Re^Gvs, Ww, Gg^Efm, Gg, Gg, Ww, Ww, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg
+Gg, Hh, Hh, Hh, Gg, Hh, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Ww, Gg, Ww, Ww, Ww, Gg, Ww, Ww, Gg, Ww, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Re, Re, Re, Gg, Re
+Gg, Hh, Hh, Gg, Re, Gg, Re, Gg, Gs^Vht, Re^Gvs, Re, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Gg, Gg, Gg, Re, Ww, Gg, Ww, Ww, Gg, Re, Re, Gg, Gg, Gg, Re, Gg
+Gg, Gg, Re, Re, Gg, Re, Gg, Re, Re, Re, Gg, Re, Re, Gg, Gg, Re^Gvs, Re, Re^Gvs, Re, Re, Re^Gvs, Re, Re, Gg, Ww^Bw/, Re, Gg, Gg, Gg, Gg, Gg, Gg, Gg
+Gg, Re, Gg, Gg, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re, Re, Re, Re^Gvs, Re, Gg^Vh, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re, Ww, Gg, Ww, Gg, Gg, Gg, Gg, Gg, Gg
+Gg, Gg, Gg, Ce, 1 Ke, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, 2 Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Efm, Ww, Re^Gvs, Ww, Ww, Ww, Ww, Gg, Gg
+Gg, Hh, Gg, Ce, Ce, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Re^Gvs, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Ww, Gg
+Gg, Hh, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg^Vc, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Ww, Wo
+Gg, Md, Md, Hh, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Wo, Wo, Wo
+Gg, Md, Hh, Hh, Hh, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Efm, Gg, Gg, Gg, Gg, Wo, Wo, Wo
+Gg, Mm, Md, Hh, Hh, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Wo, Wo
+Gg, Mm, Mm, Md, Hh, Hh, Hh, Hh, Hh, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
+Gg, Mm, Md, Gg, Hh, Hh, Hh, Hh, Hh, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg^Efm, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
diff --git a/data/campaigns/The_Hammer_of_Thursagan/maps/05_Invaders.map b/data/campaigns/The_Hammer_of_Thursagan/maps/05_Invaders.map
diff --git a/...of_Thursagan/maps/09_Forbidden_Forest.map → ...of_Thursagan/maps/06_Forbidden_Forest.map b/...of_Thursagan/maps/09_Forbidden_Forest.map → ...of_Thursagan/maps/06_Forbidden_Forest.map