merged syncpoint_gettext1_12 from trunk

changelog

@@ -1,15 +1,21 @@
-CVS HEAD:
+Version 0.8.2:
  * new and improved graphics: 
    * canyons
    * signpost
+   * grassland
  * improved sound quality
- * new commands: clear, w, wq, q, debug, n
- * made it possible to exit recruiting areas in 'The Eastern Invasion: The Arena' scenario
+ * improved in-game help
+ * new "vi" commands: clear, w, wq, q, debug, n
+ * new tutorial
+ * scenario balancing for 'Son of the Black Eye' campaign:
+   * Black Flag
+   * Silent Forest
  * storyline fixes to 'The Eastern Invasion' campaign
  * scenario balancing for 'The Eastern Invasion' campaign:
-   * Weldyn under attack
+   * Weldyn Under Attack
    * The Crossing
    * Mal-Ravanals Capital
+   * The Arena
  * scenario balancing for 'The Rise of Wesnoth' campaign:
    * Temple of the Deep
    * Lizard Beach
@@ -33,15 +39,15 @@ CVS HEAD:
  * new units
    * Drake Hatchling
    * Drake Warmage
+   * Great Troll
    * Skeletal Dragon
    * Troll Hero
    * Orcish Leader
    * Orcish Sovereign
  * multiplayer improvements:
    * 'Great War' era
-   * limit to username lenght
+   * limit to username length
    * banning for multiplayer server games
- * Scenario balancing for most of 'Son of the Black Eye' scenarios
  * language fixes and polishing (english)
  * support for multi-animation attacks
  * support for per-scenario configurable village flags, sample black-eyed banner for Son of the Black Eye campaign
@@ -55,7 +61,6 @@ CVS HEAD:
  * fixed segfault when a [story] background image was not found
  * fixed narrator messages not being displayed sometimes
  * fixed autoconf macro for checking OGG support in SDL_mixer (it depended on private symbols not always included by distributions)
- * fixed game segfaulting when a message with no speaker is issued
  * fixed markovian name generation not playing well with UTF-8 names
  * fixed map border not getting changed when using [terrain] to change terrain (#9840)
  * fixed extraneous dots path (#9903)
@@ -64,10 +69,11 @@ CVS HEAD:
  * fixed bug with exiting caves in 'The Eastern Invasion: Captured' scenario
  * fixed bugs in 'The Eastern Invasion: Evacuation' scenario
  * fixed holy water in 'Heir to the Throne: Valley of Death' scenario (#9930)
- * fixed a bug where a unit moving with [move_unit_fake] segfaulted the game
  * fixed problems with cache invalidation
  * fixed file descriptor leak
  * fixed 'gender' not working with move_unit_fake
+ * fixed grüü losing experience when joining
+ * fixed units moving through water not being submerged while moving
  * terrains tiles are now cut according to the hexagonal shape, to avoid some graphical glitches
  * workaround a SDL_TTF bug that makes it crash when presented an invalid UTF-8 string
  * limited length of schema items in compressed WML to make a DoS attack harder to perform 
@@ -142,7 +148,7 @@ Version 0.8.1:
    * implemented feature to tell observers when a new player has arrived in the lobby
    * disabled observers from setting labels
    * playername checks, stripping spaces at the end of name
-   * limited maximum lenght of observer messages
+   * limited maximum length of observer messages
    * added server commands: msg, kick, ban, unban, status, metrics
  * language fixes and polishing (english)
  * updated sample translation

configure.ac

@@ -5,7 +5,7 @@
 #######################################################################
 
 AC_PREREQ([2.57])
-AC_INIT([Battle for Wesnoth], [0.8.2-CVS], [davidnwhite@optusnet.com.au], [wesnoth])
+AC_INIT([Battle for Wesnoth], [0.8.3-CVS], [davidnwhite@optusnet.com.au], [wesnoth])
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["server.wesnoth.org"], [The default server for this version])
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default server for this version])

data/game.cfg

@@ -1255,8 +1255,7 @@
 [/units]
 
 #ifdef TUTORIAL
-{tutorial.cfg}
-{tutorial2.cfg}
+{scenarios/tutorial}
 #endif
 
 {scenarios}

data/help.cfg

@@ -1,7 +1,7 @@
 [help]
 [toplevel]
-#sections=introduction,gameplay,units,abilities,traits,weapon_specials
-sections=introduction,gameplay,traits
+sections=introduction,gameplay,units,abilities,traits,weapon_specials
+#sections=introduction,gameplay,traits
 topics=about
 [/toplevel]
 

data/maps/Eastern_Invasion/Captured

@@ -4,11 +4,11 @@ WuuuWWWWWuuuuuWWWWWWWWWWWWWWWDDDWWWWmmhhgggg
 WWuWWuuuWuuuuuWWWWWWWWWWWWWuWWDWWWWWmWmmhggg
 WWWuWuuuWuuuuuWWWWWWWWWWWuuWWWWWWWWWWWWWhggg
 WuuuWWuWWWuuuWuuWWWuWWWuuWWWWWWWWWWWWWWWg1gh
-WuuuWWWWWWWWWWWWWuuuuuWWWWWWWWWWWWWWWWWuCghm
+WuuuWWWWWWWWWWWWWuuuuuWWWWWWWWWWWWWWWWWuoghm
 WuuuWuuuWWWWWWWuuuuuuuuuWWWWWWWWWuWWWuuWWWWm
-WuuuWuuuWWWWWWuuuuuCuuuuuWWWWWWWuuuuuWWWWWWm
-WuuuWWuWWuuuuWuuuuC2CuuuuuWWWWWWuuuWWWWWWWWm
-WuuuWWWWWuuuWWuuuuCCCuuuuuWuuuuWuuuWWWWWWWWm
+WuuuWuuuWWWWWWuuuuuouuuuuWWWWWWWuuuuuWWWWWWm
+WuuuWWuWWuuuuWuuuuo2ouuuuuWWWWWWuuuWWWWWWWWm
+WuuuWWWWWuuuWWuuuuooouuuuuWuuuuWuuuWWWWWWWWm
 WuuuWuuuWWuWWWuuuuuuuuuuuWWWWWWWuuuWWWWWWWWm
 WuuuWuuuWWWWWWuuuuuuuuuuuWWWWWWWuuuWWWWWWWWm
 WuuuWWuWWWWuuWWWuuuuuuuWWWWWWWWWuuuWWWWWWWWm

data/maps/Eastern_Invasion/The_Arena

@@ -1,6 +1,6 @@
-rrrrrrrrrrrrrrrrrrrrrrrrrWWCWW
-rrCrrWWWWWWWWWWWWWWWWWWWrWC2CW
-rrrWWhhhhhhhhhhhhhhhhrhhWrCCCW
+rrrrrrrrrrrrrrrrrrrrrrrrrWWoWW
+rrorrWWWWWWWWWWWWWWWWWWWrWo2oW
+rrrWWhhhhhhhhhhhhhhhhrhhWroooW
 rWWhhrrwwwwwwwwwwwwww/rrrrrhWW
 rWhrrrrrwdwwwddddww//wrwwwrhWr
 rWhgggrrrddwwwdww//wwwwwwwrhWr
@@ -15,6 +15,6 @@ rWhrrggggfffgggggfgfrgrrwrrhWr
 rWhrggggffffggggffffgggrrrrhWr
 rWhgrggfffffggggffffffffrhhWWr
 rWhrrhggfgfgggggggfffffhhWWrrr
-WCCChWhhhhhhhhhhhhhhhhhWWrrrrr
-WC1CWrWWWWWWWWWWWWWWWWWrrrrCrr
-WWCWWrrrrrrrrrrrrrrrrrrrrrrrrr
+WooohWhhhhhhhhhhhhhhhhhWWrrrrr
+Wo1oWrWWWWWWWWWWWWWWWWWrrrrorr
+WWoWWrrrrrrrrrrrrrrrrrrrrrrrrr

data/maps/Eastern_Invasion/The_Escape_Tunnel

@@ -1,12 +1,12 @@
 vggvggvWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW
-gCCCgvWWWrrruWWWWWWWWWWWWWWWWWWWWWWWWWW
-vC3CWWWWWDrruuWWWWWuuuuuuuWWWWWWWWWWWWW
-WWWWWWWWWWWuuWWWWWDuuCuuuuuWWWWWWWWWWWW
-WWuuuWWWWWWWurWWWWuuC2CuDuWuWWWWWrruurW
-WuuCuuurruuuuurruuuuuCuuuuuuDuWuurWWWWg
-WuC1CuDuuurrrDruuuuDuuuuuuWWWWuuWWWWWWW
-WuuCuuWWWWWWuuuWWWWWuuuuWWWuurrWWuurWWW
-WWDuuWWWWWWWWruWWC4CWWWWWruruWWWuuurWWD
-WWWWWWWWWWWWWWruWuCuurWuurWuuuruuuruWWW
+gooogvWWWrrruWWWWWWWWWWWWWWWWWWWWWWWWWW
+vo3oWWWWWDrruuWWWWWuuuuuuuWWWWWWWWWWWWW
+WWWWWWWWWWWuuWWWWWDuuouuuuuWWWWWWWWWWWW
+WWuuuWWWWWWWurWWWWuuo2ouDuWuWWWWWrruurW
+WuuouuurruuuuurruuuuuouuuuuuDuWuurWWWWg
+Wuo1ouDuuurrrDruuuuDuuuuuuWWWWuuWWWWWWW
+WuuouuWWWWWWuuuWWWWWuuuuWWWuurrWWuurWWW
+WWDuuWWWWWWWWruWWo4oWWWWWruruWWWuuurWWD
+WWWWWWWWWWWWWWruWuouurWuurWuuuruuuruWWW
 WWWWWWWWWWWWWWWuuDuurururWWWWWWWWWWWWDD
 WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW

data/maps/Eastern_Invasion/Throne_Room

@@ -3,18 +3,18 @@ WRRRWRWRWWWRWRWRWRWW
 WRRRRRRRRWRRRRRRRRRW
 WRRRRRRRRWRRRRRRRRRW
 WRRRRRRRRWRRRRRRRRRW
-WRRRRRRWWCWWRRRRRRRW
-WRRRRRWCC2CCWRRRRRRW
-WRRWWRC1CCC3CRWWRRRW
-WWWRRRCCCCCCCRRRWWRW
-WCRRRRRRrrrRRRRRRRWW
-WCRRRRRRrrrRRRRRRRCW
-WCRRRRRRrrrRRRRRRRCW
-WCRRRRRRrrrRRRRRRRCW
-WCRRRRRRrrrRRRRRRRCW
-WCRRRRRRrrrRRRRRRRCW
-WCRRRRRRrrrRRRRRRRCW
-WCRRRRRRrrrRRRRRRRCW
-WCRCRCRRrrrRRCRCRCCW
-WWCWCWCRrrrRCWCWCWWW
+WRRRRRRWWoWWRRRRRRRW
+WRRRRRWoo2ooWRRRRRRW
+WRRWWRo1ooo3oRWWRRRW
+WWWRRRoooooooRRRWWRW
+WoRRRRRRrrrRRRRRRRWW
+WoRRRRRRrrrRRRRRRRoW
+WoRRRRRRrrrRRRRRRRoW
+WoRRRRRRrrrRRRRRRRoW
+WoRRRRRRrrrRRRRRRRoW
+WoRRRRRRrrrRRRRRRRoW
+WoRRRRRRrrrRRRRRRRoW
+WoRRRRRRrrrRRRRRRRoW
+WoRoRoRRrrrRRoRoRooW
+WWoWoWoRrrrRoWoWoWWW
 WWWWWWWRrrrRWWWWWWWW

data/maps/Eastern_Invasion/loyalistmap11

@@ -2,17 +2,17 @@ mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmmm
 mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWWmmmmmmmmmmmmm
 mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmm
 mhmhmhmhmhmhmmmhmmmmmmmhmhmmmhmhmhmmmmmWmmmmmmmmmmmmm
-hhhhhghghghghhhmhhhmmhhghghhhhhghgmmmWWCWWmmmmmhmhmmm
-hggghghggggggghmmhhghghghghgggggggggmWCKCWmmmghhhghhh
-ggggggggggggghhhmhgggggggghmggggggggmWCCCWmggggghgggh
-gggCgrrrrrgggggghggggggggghhhgghhggggWgWWmmwggggggggg
-grCKCgggggrrgggggggrrrgrgggggggggggggWgWwwwwgggggrrrg
-ggCCCgggggggrrgrrrrhggrgrrgrgggggggggWgWwwwwggrrrgggr
+hhhhhghghghghhhmhhhmmhhghghhhhhghgmmmWWoWWmmmmmhmhmmm
+hggghghggggggghmmhhghghghghgggggggggmWoKoWmmmghhhghhh
+ggggggggggggghhhmhgggggggghmggggggggmWoooWmggggghgggh
+gggogrrrrrgggggghggggggggghhhgghhggggWgWWmmwggggggggg
+groKogggggrrgggggggrrrgrgggggggggggggWgWwwwwgggggrrrg
+ggooogggggggrrgrrrrhggrgrrgrgggggggggWgWwwwwggrrrgggr
 ggggggggggghggrgghhmhgggggrrgrgrgrrrrWgW\\wggrrgggggr
 gggggggggghmhgggghmmhggghgggrgrgrggmgWgWww\rrgggggggg
-ggghhhghghhhhggghmmhhhghhggggggggmmWWCgWmwwwggggggggg
-ghhmmmhmhmhhggghhmmmhmhhggghhhhhhmmWCKCWmmwgggghggggg
-hmmmmmmmmmmmhhhhmmmmhmmmhhhmhmmmmmmWCCCWmmmmghhhghghh
+ggghhhghghhhhggghmmhhhghhggggggggmmWWogWmwwwggggggggg
+ghhmmmhmhmhhggghhmmmhmhhggghhhhhhmmWoKoWmmwgggghggggg
+hmmmmmmmmmmmhhhhmmmmhmmmhhhmhmmmmmmWoooWmmmmghhhghghh
 mmmmmmmmmmmmmmhmmmmmmmmmmmmmmmmmmmmmWWWmmmmmmmmmmmmmm
 mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmmmm
 mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmmmm

data/maps/Heir_To_The_Throne/Hasty_Alliance

@@ -1,9 +1,9 @@
 uuWWWWuWuuWWuWWWWWW
 uWWDWWuWWuWuWuWuWWW
 uWWWuuWuuuuuuuuuuWW
-uWWWuuuuuCuuuuuuuWW
-uWuuuuuuC3CuuuDuuWW
-WWuuuWWuCCCuuuuuuuW
+uWWWuuuuuouuuuuuuWW
+uWuuuuuuo3ouuuDuuWW
+WWuuuWWuooouuuuuuuW
 WWuuuWuuuuuuuWWuuuW
 WWWuWuuWuWWWuWWuuuW
 WuuDuuWWWWWWuuWuDuW
@@ -13,8 +13,8 @@ WWuWuWuWuuWuuWuuuuW
 WWuuWWWuWWuuuuuDuuW
 WWuuuuuuuWWWuuuuuuW
 WWuuuuuuuuWWuuuuuuW
-WuuuuuuCuuuuuuuuuWW
-WuuuuuC1CuuCuuuuuWW
-WWuuuuCuuuC2CuuuuuW
-WWuuuuuuuuCWuuuWuuu
+WuuuuuuouuuuuuuuuWW
+Wuuuuuo1ouuouuuuuWW
+WWuuuuouuuo2ouuuuuW
+WWuuuuuuuuoWuuuWuuu
 WWWWWWuuuWWWWWWWWWW

data/maps/Heir_To_The_Throne/Plunging_Into_the_Darkness

@@ -1,6 +1,6 @@
-uuuuuuuuuuuCuuuuuuuuuuuuuuuuuuu
-uuuuuuuuuuuC2Cuuuuuuuuuuuuuuuuu
-uuuuuuuuuuuuCuuuuuuuuuuuuuuuuuu
+uuuuuuuuuuuouuuuuuuuuuuuuuuuuuu
+uuuuuuuuuuuo2ouuuuuuuuuuuuuuuuu
+uuuuuuuuuuuuouuuuuuuuuuuuuuuuuu
 uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
 uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
 uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
@@ -12,14 +12,14 @@ uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
 uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
 uuuuuuuWWWWWuuuuuuuuuuuuuuuuuuu
 uuuuuWWuuuWuWWWWuuuuuuuuuuuuuuu
-uuuuuWuCuuuCuuuuWWuuuuuuuuuuuuu
-uuuuWuCCCCCCCCCCCuWuuuuuuuuuuuu
-uuuuWuCCCCCCCCCCCuWWuuuuuuuuuuu
-uuuuWWuCCCCCCCCCCuuWuuuuuuuuuuu
-uuuuWWuCCCC3CCCCCuuWuuuuuuuuuuu
-uuuuuWuCCCCCCCCCCcWuuuuuuuuuuuu
-uuuuWWuCCuuCCucccWWuuuuuuuuuuuu
-uuuuuWuuuCCuuuCWcWuuuuuuuuuuuuu
+uuuuuWuouuuouuuuWWuuuuuuuuuuuuu
+uuuuWuooooooooooouWuuuuuuuuuuuu
+uuuuWuooooooooooouWWuuuuuuuuuuu
+uuuuWWuoooooooooouuWuuuuuuuuuuu
+uuuuWWuoooo3ooooouuWuuuuuuuuuuu
+uuuuuWuoooooooooocWuuuuuuuuuuuu
+uuuuWWuoouuooucccWWuuuuuuuuuuuu
+uuuuuWuuuoouuuoWcWuuuuuuuuuuuuu
 uuuuuuWWWWuuuuuWWuuuuuuuuuuuuuu
 uuuuuuuuWWWuuuuWWuuuuuuuuuuuuuu
 uuuuuuuuuuWWuuuuWWuuuuuuuuuuuuu

data/maps/Heir_To_The_Throne/Sceptre

@@ -1,9 +1,9 @@
 uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
 uWWWWWuWuuuuuuuuuuuuuuuuuuuuuuuuuuuWWWuu
 uWWuWuWuWWuuuWuWuWWWWWWWWWuWWWWWWWWuWWWW
-uWuuuCuuuWWWWuWuWuuuuuuuuuWuWuuuuuuuuCWW
-uWuuC4CuuuuuuuuuuuuuuuuuuuuuuuuuuDuuC5CW
-uWuuCCCuuuuWuuuuuWuuuuuuuuuWuWuWuuuuCCCW
+uWuuuouuuWWWWuWuWuuuuuuuuuWuWuuuuuuuuoWW
+uWuuo4ouuuuuuuuuuuuuuuuuuuuuuuuuuDuuo5oW
+uWuuooouuuuWuuuuuWuuuuuuuuuWuWuWuuuuoooW
 uWWWuuuDWWWWWWWWuWWWuWuWuWWWWuWWWWuuuuuW
 uuuWuuuWWuuuuuWuWuuuWuWuWuuuuuuuWWuuDuWW
 uuuWuuuWuuuuuuuuuuuuuuuuuuuuuuuWWuuuuuuW
@@ -22,8 +22,8 @@ uuuWuuWuuuuuuuuuuWWuuuWWWuuuWuWuuuuWuuuW
 uuWuuuWWuWuuuWuWWuuWuWWuuuuuuuuuuuWuuuuW
 uWWuuuuuWuWWuWWuuWuuWuWWuuuuuuuuuuWuuuWu
 WuuuDuuuuuuuWuuWWuWWuuuuWWuuuuuuuWWuuuWu
-WWC2CuuuuuuuuWWuWuuuWWuuuWuuuuuuuWWuDWWu
-uWuCuuuDuuuuuuWuuuuuuuWWuuWWuuuWWuuuuWuu
+WWo2ouuuuuuuuWWuWuuuWWuuuWuuuuuuuWWuDWWu
+uWuouuuDuuuuuuWuuuuuuuWWuuWWuuuWWuuuuWuu
 uWuuuuuuuuuuuuWuuuuuuuuuWWuWuWWuuuuuuuWu
 uuWWuuuuuuuuuWWuuuuuuuuWWWuWuWWuuuuuuWWu
 uuuuWWuuuuuuuWuuuWWWWWWuuuuWWuuuuDuuuWuu
@@ -37,12 +37,12 @@ uuuuuWuDuuuuuWuuuuuuuuWuuuuuuWuuuWuuuuuu
 uuuuuuWuWWWuuWuuuuuuuuWuuuuuuuWWWWWWuuuu
 uuuuuuWuWWWuuWuuuuuuuuWuuuuDuWWuuuuWWWWu
 uuuuuuWWuuWuuWuuuuuuuuWuuuuuuuuuuuuuuWWu
-uuuuuuuuWuuuWuuuuuuuuuWWuuuuuuDuuuuCuWWu
-uuuuuuuuWWDuWWuuuuuuuWWuuWuWuuuuuuC3CWWu
-uuuuuuuuuWWWuuWWuuuWWuuWWWWWWWuuDuCCCuWu
+uuuuuuuuWuuuWuuuuuuuuuWWuuuuuuDuuuuouWWu
+uuuuuuuuWWDuWWuuuuuuuWWuuWuWuuuuuuo3oWWu
+uuuuuuuuuWWWuuWWuuuWWuuWWWWWWWuuDuooouWu
 uuuuuuuuuuWWuDuuWWWuuuDWWuuuuuWWuuuuuWWu
-uuuuuuuuuuuWWuuCuCuuuWWuuuuuuuuuWWuuuWuu
-uuuuuuuuuuuuWWuCCCuWWuuuuuuuuuuuWuWWWuuu
-uuuuuuuuuuuuuWuC1CuWuuuuuuuuuuuuuuuuuuuu
-uuuuuuuuuuuuuuWuCuuWuuuuuuuuuuuuuuuuuuuu
+uuuuuuuuuuuWWuuououuuWWuuuuuuuuuWWuuuWuu
+uuuuuuuuuuuuWWuooouWWuuuuuuuuuuuWuWWWuuu
+uuuuuuuuuuuuuWuo1ouWuuuuuuuuuuuuuuuuuuuu
+uuuuuuuuuuuuuuWuouuWuuuuuuuuuuuuuuuuuuuu
 6uuuuuuuuuuuuuWWWWWuuuuuuuuuuuuuuuuuuuuu

data/maps/Heir_To_The_Throne/The_Lost_General

@@ -1,6 +1,6 @@
 WWWWWWWWWWWWWWuuWWWWWWWWWWWWWWWWWWWWWW
-WWWWWWWWWWWWWC2uWWWWWWWWWWWWWWWWWWWWWW
-WWWWWWWWWWWWWCCCuDWWWWWWWWWWWWWWWWWWWW
+WWWWWWWWWWWWWo2uWWWWWWWWWWWWWWWWWWWWWW
+WWWWWWWWWWWWWooouDWWWWWWWWWWWWWWWWWWWW
 WWWWWWWWWWWWWurrrWWWWWWWuuuuWWWWWWWWWW
 WWuuuWWWWWWWWuruuuWWWWWWuuuuuuWWWWWWWW
 uuuuuWWWWWWDuruuuWWWWWWuruuuuuWWWWWWWW
@@ -8,11 +8,11 @@ uuuWuuWWWWWWrruuuWWWWWWuruWWuruWWWWWWW
 uuWWuuWWWWWuruuuWWWWWWuruWWWuruWWWWWWW
 uuDWWuuuWWDuruWuuWWWWDuruWWWWuuuuuWWWW
 uuWWWuuDWWrruWWuuWWWWuuuWWWWWuruuuWWWW
-uuuWuuuWWWWruWWuuWWuuuuWWWWWWDuruCCuuu
-uuuWuuWWWWWuuuWuuWuuuuuWWWWWWuurC1Crrr
-CCuWuuWWWWWWuuuuuuuuWuuWWWWWWWuruCCuuu
-CCuuruWWWWuuuuurruuWWuuWWWuuuuruuuWWWW
-3CuuuruWWWuuuuuuruWWWWuuWWuuuuuuuuWWWW
+uuuWuuuWWWWruWWuuWWuuuuWWWWWWDuruoouuu
+uuuWuuWWWWWuuuWuuWuuuuuWWWWWWuuro1orrr
+oouWuuWWWWWWuuuuuuuuWuuWWWWWWWuruoouuu
+oouuruWWWWuuuuurruuWWuuWWWuuuuruuuWWWW
+3ouuuruWWWuuuuuuruWWWWuuWWuuuuuuuuWWWW
 WWWWuruWWuruWWWuuWWWWWuuWuuWWuuuuWWWWW
 WWWWWuruuuruWWWWuuWWWWuuWWuuWWDuWWWWWW
 WWWWWuuuuruWWWWuuWWWWWuuWuuWWWWWWWWWWW
@@ -25,6 +25,6 @@ WWWWWWWWWWsccccWDWWWWWWWWruuuuWWWWWWWW
 WWWWWWWWuuucccccWWWWWWWWWWuuuuWWWWWWWW
 WWWWWWWuDuWssWWWWWWWWWWWuWWWWWWWWWWWWW
 WWWWWWDrruuWWWWuuuuuWuuuruuWWWWWWWWWWW
-WWWWWWurrrWWWWWuuuuuunnruWWWWWWWWWWWWW
-WWWWWWWDuuDWWWWWWWWuun4nuWWWWWWWWWWWWW
-WWWWWWWWWWWWWWWWWWWWunnuWWWWWWWWWWWWWW
+WWWWWWurrrWWWWWuuuuuuooruWWWWWWWWWWWWW
+WWWWWWWDuuDWWWWWWWWuuo4ouWWWWWWWWWWWWW
+WWWWWWWWWWWWWWWWWWWWuoouWWWWWWWWWWWWWW

data/maps/The_Dark_Hordes/Underground_Pool

@@ -1,6 +1,6 @@
-C2WWWWWcWWccWWWWWWWW
-CCCWWuWW\u/WWWW3WWWW
-uWuWWuWWWuWWWWCCCuWW
+o2WWWWWcWWccWWWWWWWW
+oooWWuWW\u/WWWW3WWWW
+uWuWWuWWWuWWWWooouWW
 uWuuuuWWWuWWWWuuuuWW
 uWWWDuWuuuWWuuWWuuWW
 uuWWWuuWWuWWuuWWWWDW
@@ -17,4 +17,4 @@ uWWuWuWWuuuWWuWuWuWu
 uWDWWuWDuWuuWuWWuWWu
 uWWWWuWWuuWWuWuWWWWu
 uDuWWuuWW1WWuWWuuuWu
-WWuWDuDWCgCWuuuWuWuW
+WWuWDuDWogoWuuuWuWuW

data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg

@@ -132,7 +132,7 @@ Defeat:
 		[message]
 		id=msg6_4b
 		description=Li'sar
-		image="misc/lisar_b.png"
+		image="portraits/Heir_To_The_Throne/lisar_angry.png"
 		message= _ "This is treason! Your lies will perish with you!"
 		[/message]
 		[message]
@@ -229,7 +229,7 @@ Defeat:
 				[message]
 				id=msg6_33
 				speaker=unit
-				image="misc/lisar_b.png"
+				image="portraits/Heir_To_The_Throne/lisar_angry.png"
 				message= _ "I am not a child, and I do not want to talk about it! You said you would spare me, so be on your way. The northern road should be safe for you."
 				[/message]
 

data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg

@@ -50,6 +50,7 @@ Defeat:
 	side=2
 	canrecruit=1
 	team_name=undead
+	flag=terrain/undead-flag-1.png,terrain/undead-flag-2.png,terrain/undead-flag-3.png,terrain/undead-flag-4.png
 
 	{VOD_AI_PARMS}
 	{GOLD 200 300 500}
@@ -90,6 +91,7 @@ Defeat:
 	team_name=undead
 	canrecruit=1
 	recruit=Wraith,Walking Corpse
+	flag=terrain/undead-flag-1.png,terrain/undead-flag-2.png,terrain/undead-flag-3.png,terrain/undead-flag-4.png
 	{VOD_AI_PARMS}
 	{GOLD 200 500 500}
 		[ai]
@@ -117,6 +119,7 @@ Defeat:
 	description=Selda-Mana
 	side=4
 	canrecruit=1
+	flag=terrain/undead-flag-1.png,terrain/undead-flag-2.png,terrain/undead-flag-3.png,terrain/undead-flag-4.png
 	{VOD_AI_PARMS}
 	{GOLD 150 300 500}
 

data/terrain-graphics.cfg

@@ -32,7 +32,10 @@
 # Attachs graphics to each known terrain types
 #
 
-{TERRAIN_BASE                 u cave}
+{TERRAIN_BASE_PROBABILITY     u cave-floor4         10}
+{TERRAIN_BASE_PROBABILITY     u cave-floor3         2}
+{TERRAIN_BASE_PROBABILITY     u cave-floor2         10}
+{TERRAIN_BASE                 u cave-floor1}
 {TERRAIN_BASE                 W cavewall}
 {TERRAIN_BASE                 F snow-forest}
 {TERRAIN_BASE_PROBABILITY     f forest2             10}
@@ -58,9 +61,14 @@
 {TERRAIN_BASE_PROBABILITY     S snow2 30}
 {TERRAIN_BASE_PROBABILITY     S snow3 30}
 {TERRAIN_BASE                 S snow}
-{TERRAIN_BASE_PROBABILITY     g grassland-rocks     4}
-{TERRAIN_BASE_PROBABILITY     g grassland-flowers   8}
-{TERRAIN_BASE                 g grassland}
+{TERRAIN_BASE_PROBABILITY     g grassland-rocks1    2}
+{TERRAIN_BASE_PROBABILITY     g grassland-rocks2    2}
+{TERRAIN_BASE_PROBABILITY     g grassland-flowers1  3}
+{TERRAIN_BASE_PROBABILITY     g grassland-flowers2  3}
+{TERRAIN_BASE_PROBABILITY     g grassland-r1 20}
+{TERRAIN_BASE_PROBABILITY     g grassland-r2 20}
+{TERRAIN_BASE_PROBABILITY     g grassland-r3 20}
+{TERRAIN_BASE                 g grassland-r4}
 {TERRAIN_BASE                 r dirt}
 {TERRAIN_BASE                 R road}
 {TERRAIN_BASE_PROBABILITY     d desert-plant        10}
@@ -86,15 +94,15 @@
 {TERRAIN_BASE Y swampwater}
 {TERRAIN_BASE V snow}
 {TERRAIN_BASE Z coast}
-{TERRAIN_BASE v grassland}
-{TERRAIN_BASE D cave}
-{TERRAIN_BASE t grassland}
+{TERRAIN_BASE v grassland-r1}
+{TERRAIN_BASE D cave-floor1}
+{TERRAIN_BASE t grassland-r1}
 
 {BUILDING Y ({IMG       -100 village-swampwater })}
 {BUILDING V ({IMG       -100 village-snow       })}
 {BUILDING Z ({IMG       -100 village-coast      })}
 {BUILDING v ({IMG       -100 village-human      })}
-{BUILDING D ({IMG       -100 village-cave       })}
+{BUILDING D ({IMG       -100 dwarven-village    })}
 {BUILDING t ({IMG_NIGHT -100 village village-dusk,village-dusk2,village-dusk3,village-dusk4})} 
 
 #
@@ -109,19 +117,30 @@
 
 # Flags the keep, they must be flagged to be recognized by the
 # {CASTLE_AND_foo_KEEP} macros
+
 {FLAG_IF_ADJACENT K C keep-of-C keep-flag}
 {FLAG_IF_ADJACENT K n keep-of-n keep-flag}
+{FLAG_IF_ADJACENT K o keep-of-o keep-flag}
 {FLAG_REMAINING   K   keep-of-C keep-flag}
 
+#
+# Castles base terrains
+#
+
+{TERRAIN_BASE C castle}
+{TERRAIN_BASE o dwarven-castle-floor}
+{TERRAIN_BASE n dirt}
+{TERRAIN_BASE_FLAG K keep-of-C castle}
+{TERRAIN_BASE_FLAG K keep-of-o dwarven-keep-floor}
+{TERRAIN_BASE_FLAG K keep-of-n dirt}
+
 {CASTLE_AND_COMPOSED_KEEP C K castle keep}
-#{CASTLE_AND_SIMPLE_KEEP   C K gravewall}
 {CASTLE_AND_SIMPLE_KEEP   n K encampment}
 
 # Castle decorations and castle floors. Those must always be after the castles
 # are defined.
 {BUILDING_FLAG K ({IMG -100 tent}) keep-of-n}
-{CASTLE_FLOOR C K castle}
-{CASTLE_FLOOR n K dirt}
+{BUILDING_FLAG K ({IMG -100 dwarven-keep}) keep-of-o}
 
 # Forest, hills and mountains should always overlay on northern sides
 {TERRAIN_ADJACENT_NORTH    -80        m  !m   mountains}
@@ -129,21 +148,35 @@
 {TERRAIN_ADJACENT_NORTH    -80        h  !hm  hills} # No adj-north between hills and mountains
 {TERRAIN_ADJACENT_NORTH    -80        F  !F   snow-forest}
 
-# Then, standard transitions
-{TERRAIN_ADJACENT_1234        -186        uD     !uD     cave}
+# Cave and dwarven castles
+{DISABLE_TRANSITIONS W}
+{DISABLE_TRANSITIONS o}
+{TERRAIN_ADJACENT_CORNER -185        W      !WoK   !WoK    cavewall-convex}
+{TERRAIN_ADJACENT_CORNER -185        !WoK   W      W       cavewall-concave}
+{TERRAIN_ADJACENT_CORNER -185        o      !WoK   !WoK    dwarven-castle-convex}
+{TERRAIN_ADJACENT_CORNER -185        !WoK   o      o       dwarven-castle-concave}
+{TERRAIN_ADJACENT_CORNER_FLAG1 -185  K      !WoK   !WoK keep-of-o dwarven-castle-convex}
+{TERRAIN_ADJACENT_CORNER_FLAG2 -185  !WoK   K      o    keep-of-o dwarven-castle-concave}
+{TERRAIN_ADJACENT_CORNER_FLAG3 -185  !WoK   o      K    keep-of-o dwarven-castle-concave}
+{TERRAIN_ADJACENT_CORNER -185        oK     W      W       dwarven-castle-wall-convex}
+{TERRAIN_ADJACENT_CORNER -185        W      oK     oK      dwarven-castle-wall-concave}
+{TERRAIN_ADJACENT_CORNER -185        oK     W      !WoK    dwarven-castle-wall-cw}
+{TERRAIN_ADJACENT_CORNER -185        oK     !WoK   W       dwarven-castle-wall-ccw}
+
 
 # forest-to-water transitions. Place before forest-to-any.
-{TERRAIN_ADJACENT_123   -187        f      cZp\|/  forest-to-water}
-{TERRAIN_ADJACENT_123   -187        f      s       forest-to-water}
+{TERRAIN_ADJACENT_123   -186        f      cZp\|/  forest-to-water}
+{TERRAIN_ADJACENT_123   -186        f      s       forest-to-water}
 # use forest-to-water for forest-to-dirt and forest-to-desert too
-{TERRAIN_ADJACENT_123   -187        f      r        forest-to-water}
-{TERRAIN_ADJACENT_123   -187        f      d        forest-to-water}
+#{TERRAIN_ADJACENT_123   -187        f      r        forest-to-water}
+{TERRAIN_ADJACENT_123   -186        f      d        forest-to-water}
 
-{TERRAIN_ADJACENT_123   -187        f      !f      forest}
-{TERRAIN_ADJACENT_1     -188        F      !F      snow-forest}
-{TERRAIN_ADJACENT_1     -189        m      !m      mountains}
-{TERRAIN_ADJACENT_12    -190        H      !H      snow-hills}
-{TERRAIN_ADJACENT_12    -191        h      !h      hills}
+{TERRAIN_ADJACENT_123   -186        f      !f      forest}
+{TERRAIN_ADJACENT_1     -187        F      !F      snow-forest}
+{TERRAIN_ADJACENT_1     -188        m      !m      mountains}
+{TERRAIN_ADJACENT_12    -189        H      !H      snow-hills}
+{TERRAIN_ADJACENT_12    -190        h      !h      hills}
+{TERRAIN_ADJACENT_1234  -191        uD     !uD      cave-floor}
 {TERRAIN_ADJACENT_1234  -192        SV     !SV     snow}
 {TERRAIN_ADJACENT_1234  -193        tgvX   !tgvX   grassland}
 {TERRAIN_ADJACENT_1     -194        r      !r      dirt}

data/terrain-graphics/base.cfg

@@ -1,4 +1,21 @@
 
+#define TERRAIN_BASE_FLAG LETTER FLAG IMAGE
+[terrain_graphics]
+	[tile]
+		x=0
+		y=0
+		type="{LETTER}"
+		has_flag={FLAG}
+		[image]
+			layer=-1000
+			name={IMAGE}
+		[/image]
+	[/tile]
+	no_flag="terrain-base"
+	set_flag="terrain-base"
+[/terrain_graphics]
+#enddef
+
 # Attachs an image to a single terrain tile, with a given probability.
 # example: {TERRAIN_BASE_PROBABILITY g grassland-rocks 20}
 

data/terrain-graphics/castles.cfg

@@ -56,36 +56,6 @@
 [/terrain_graphics]
 #enddef
 
-#define CASTLE_FLOOR CASTLE KEEP IMAGE
-[terrain_graphics]
-	[tile]
-		x=0
-		y=0
-		type={CASTLE}
-		no_flag=terrain-base
-		set_flag=terrain-base
-		[image]
-			layer=-1000
-			name={IMAGE}
-		[/image]
-	[/tile]
-[/terrain_graphics]
-[terrain_graphics]
-	[tile]
-		x=0
-		y=0
-		type={KEEP}
-		no_flag=terrain-base
-		set_flag=terrain-base
-		has_flag=keep-of-{CASTLE}
-		[image]
-			layer=-1000
-			name={IMAGE}
-		[/image]
-	[/tile]
-[/terrain_graphics]
-#enddef
-
 # Defines the given terrain will behave like the walls of a castles, with added
 # dynamically-drawn keeps.
 # Follows the "composed keep" model, to be documented.
@@ -299,3 +269,113 @@
 
 #enddef
 
+#define TERRAIN_ADJACENT_CORNER LAYER TERRAIN1 TERRAIN2 TERRAIN3 IMAGE
+[terrain_graphics]
+	map="
+3
+  2
+1"
+	[tile]
+		pos=1
+		type={TERRAIN1}
+	[/tile]
+	[tile]
+		pos=2
+		type={TERRAIN2}
+	[/tile]
+	[tile]
+		pos=3
+		type={TERRAIN3}
+	[/tile]
+
+	[image]
+		layer={LAYER}
+		name={IMAGE}-@R0
+	[/image]
+	rotations=ne,e,se,sw,w,nw
+[/terrain_graphics]
+#enddef
+
+#define TERRAIN_ADJACENT_CORNER_FLAG1 LAYER TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
+[terrain_graphics]
+	map="
+3
+  2
+1"
+	[tile]
+		pos=1
+		type={TERRAIN1}
+		has_flag={FLAG}
+	[/tile]
+	[tile]
+		pos=2
+		type={TERRAIN2}
+	[/tile]
+	[tile]
+		pos=3
+		type={TERRAIN3}
+	[/tile]
+
+	[image]
+		layer={LAYER}
+		name={IMAGE}-@R0
+	[/image]
+	rotations=ne,e,se,sw,w,nw
+[/terrain_graphics]
+#enddef
+
+#define TERRAIN_ADJACENT_CORNER_FLAG2 LAYER TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
+[terrain_graphics]
+	map="
+3
+  2
+1"
+	[tile]
+		pos=1
+		type={TERRAIN1}
+	[/tile]
+	[tile]
+		pos=2
+		type={TERRAIN2}
+		has_flag={FLAG}
+	[/tile]
+	[tile]
+		pos=3
+		type={TERRAIN3}
+	[/tile]
+
+	[image]
+		layer={LAYER}
+		name={IMAGE}-@R0
+	[/image]
+	rotations=ne,e,se,sw,w,nw
+[/terrain_graphics]
+#enddef
+
+#define TERRAIN_ADJACENT_CORNER_FLAG3 LAYER TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
+[terrain_graphics]
+	map="
+3
+  2
+1"
+	[tile]
+		pos=1
+		type={TERRAIN1}
+	[/tile]
+	[tile]
+		pos=2
+		type={TERRAIN2}
+	[/tile]
+	[tile]
+		pos=3
+		type={TERRAIN3}
+		has_flag={FLAG}
+	[/tile]
+
+	[image]
+		layer={LAYER}
+		name={IMAGE}-@R0
+	[/image]
+	rotations=ne,e,se,sw,w,nw
+[/terrain_graphics]
+#enddef

data/terrain.cfg

@@ -123,7 +123,7 @@ aliasof=g
 #grassland should contain mostly plain grassland, but occasionally
 #a few rocks
 [terrain]
-image=grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland-flowers,grassland-flowers,grassland-rocks
+image=grassland-r1
 name=grassland
 char=g
 [/terrain]
@@ -209,7 +209,7 @@ light=true
 [/terrain]
 
 [terrain]
-image=cave
+image=cave-floor1
 name=cave
 char=u
 [/terrain]
@@ -242,6 +242,15 @@ unit_height_adjust=3
 recruit_onto=true
 [/terrain]
 
+[terrain]
+image=cave-floor1
+name=dwarven castle
+char=o
+aliasof=C
+unit_height_adjust=0
+recruit_onto=true
+[/terrain]
+
 [terrain]
 image=keep
 name=keep

data/tools/exploder/models/castle.cfg

@@ -9,90 +9,57 @@ cut=54,72,126,144
 cut=72,108,126,180
 #enddef
 
+#define CASTLE_MASKS NAME
 [mask]
-    name=castle-convex-ne
+    name={NAME}-ne
     image=mask-castle-ne.png
     shift=18,36
     {EVEN}
 [/mask]
 
 [mask]
-    name=castle-convex-e
+    name={NAME}-e
     image=mask-castle-e.png
     shift=36,24
     {ODD}
 [/mask]
 
 [mask]
-    name=castle-convex-se
+    name={NAME}-se
     image=mask-castle-se.png
     shift=18,24
     {EVEN}
 [/mask]
 
 [mask]
-    name=castle-convex-sw
+    name={NAME}-sw
     image=mask-castle-sw.png
     shift=36,24
     {ODD}
 [/mask]
 
 [mask]
-    name=castle-convex-w
+    name={NAME}-w
     image=mask-castle-w.png
     shift=18,24
     {EVEN}
 [/mask]
 
 [mask]
-    name=castle-convex-nw
+    name={NAME}-nw
     image=mask-castle-nw.png
     shift=36,36
     {ODD}
 [/mask]
+#enddef
 
+{CASTLE_MASKS castle-convex}
+{CASTLE_MASKS castle-concave}
+{CASTLE_MASKS wall-convex}
+{CASTLE_MASKS wall-concave}
 
-# Concave castle images
-
-[mask]
-    name=castle-concave-ne
-    image=mask-castle-ne.png
-    shift=18,36
-    {EVEN}
-[/mask]
-
-[mask]
-    name=castle-concave-e
-    image=mask-castle-e.png
-    shift=36,24
-    {ODD}
-[/mask]
-
-[mask]
-    name=castle-concave-se
-    image=mask-castle-se.png
-    shift=18,24
-    {EVEN}
-[/mask]
-
-[mask]
-    name=castle-concave-sw
-    image=mask-castle-sw.png
-    shift=36,24
-    {ODD}
-[/mask]
-
-[mask]
-    name=castle-concave-w
-    image=mask-castle-w.png
-    shift=18,24
-    {EVEN}
-[/mask]
-
-[mask]
-    name=castle-concave-nw
-    image=mask-castle-nw.png
-    shift=36,36
-    {ODD}
-[/mask]
+{CASTLE_MASKS castle-wall-convex}
+{CASTLE_MASKS castle-wall-concave}
+{CASTLE_MASKS castle-wall-cw}
+{CASTLE_MASKS castle-wall-ccw}
 

data/translations/english.cfg

@@ -7,8 +7,8 @@ version= _ "Version"
 
 date_format= _ "%a %b %d %H:%M %Y"
 
-game_prefix= _ "GamePrefix|"
-game_postfix= _ "GamePostfix|'s game"
+game_prefix= _ ""
+game_postfix= _ "'s game"
 
 heir_throne= _ "Heir to the Throne"
 hordes_undead= _ "The Dark Hordes"

data/tutorial2.cfg

@@ -1,187 +0,0 @@
-[tutorial]
-	id=tutorial2
-	name= _ "The Raiders Camp"
-	map_data="{maps/Tutorial/Tutorial2}"
-	turns=28
-
-	next_scenario=null
-
-	{DAWN}
-	{MORNING}
-	{AFTERNOON}
-	{DUSK}
-	{FIRST_WATCH}
-	{SECOND_WATCH}
-
-	objectives= _ "Victory:
-@Defeat Minueth
-Defeat:
-#Death of Konrad
-#Turns run out"
-
-	[side]
-	race=Elves
-	type=Fighter
-	description=Konrad
-	experience=0
-	side=1
-	canrecruit=1
-	recruit=Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Scout
-	facing=reverse
-	team_name=goodguys
-	controller=human
-		[unit]
-		type=Elder Mage
-		description=Delfador
-		side=1
-		x=20
-		y=5
-		ai_special=guardian
-		facing=reverse
-		[/unit]
-	[/side]
-
-	[side]
-	race=Bandits3
-	type=Outlaw
-	description=Minueth
-	side=2
-	canrecruit=1
-	recruit=Thug,Poacher,Thief,Footpad
-	gold=150
-	team_name=badguys
-		[unit]
-		type=Dark Adept
-		description=Gmmitwash
-		side=2
-		ai_special=guardian
-		x=3
-		y=20
-		[/unit]
-		[unit]
-		type=Ghoul
-		side=2
-		ai_special=guardian
-		x=4
-		y=20
-		[/unit]
-		[unit]
-		type=Ghoul
-		side=2
-		ai_special=guardian
-		x=3
-		y=19
-		[/unit]
-	[/side]
-
-	[event]
-	name=start
-		[message]
-		id=newtut2_1
-		description=Delfador
-		message= _ "Now, we have arrived at their camp. I am going to teach you about recall."
-		[/message]
-
-		[message]
-		id=newtut2_2
-		description=Korad
-		message= _ "Recall?"
-		[/message]
-
-		[message]
-		id=newtut2_3
-		description=Delfador
-		message= _ "Soldiers that have fought for you in past battles - and survived - may be called again to serve you."
-		[/message]
-
-		[message]
-		id=newtut2_4
-		description=Konrad
-		message= _ "Ahhh, I see. So I can have more experienced soldiers at my side."
-		[/message]
-
-		[message]
-		id=newtut2_5
-		description=Delfador
-		message= _ "Yes, that is the point."
-		[/message]
-	[/event]
-
-	[event]
-	name=turn 2
-		[message]
-		id=newtut2_6
-		description=Delfador
-		message= _ "I noticed that the bandits have the aid of some dark initiates and their undead minions."
-		[/message]
-		[message]
-		id=newtut2_7
-		description=Konrad
-		message= _ "Yes, I could see them. Those unholy creatures look nasty!"
-		[/message]
-
-		[message]
-		id=newtut2_8
-		description=Delfador
-		message= _ "And they are dangerous too. Their claws can poison your troops. Perhaps you should recruit some Shamans to your side."
-		[/message]
-
-		[message]
-		id=newtut2_9
-		speaker=narrator
-		image="misc/tutorial7.png"
-		message= _ "Units with healing power heal units near around them."
-		[/message]
-
-		[message]
-		id=newtut2_10
-		speaker=narrator
-		image="misc/tutorial8.png"
-		message= _ "Poisoned units lose hitpoints every turn until they are cured. 
-The heal skill can only hold off the poison's effects for one turn.
-You must use a village or a unit with the cure skill to eliminate the poison."
-
-		[/message]
-		[allow_recruit]
-		side=1
-		type=Elvish Shaman
-		[/allow_recruit]
-	[/event]
-
-	[event]
-	name=die
-		[filter]
-		description=Konrad
-		[/filter]
-		[message]
-		id=newtut2_11
-		description=Delfador
-		message= _ "A nice try, Konrad, but it seems your skills still have much to be improved."
-		[/message]
-	[/event]
-
-	[event]
-	name=die
-		[filter]
-		description=Delfador
-		[/filter]
-		[message]
-		id=newtut2_12
-		description=Delfador
-		message= _ "They caught me. You should have been more cautious."
-		[/message]
-	[/event]
-
-	[event]
-	name=die
-		[filter]
-		description=Minueth
-		[/filter]
-		[message]
-		id=newtut2_13
-		description=Delfador
-		message= _ "You have bested all your enemies, Konrad. Congratulations on your skill."
-		[/message]
-	[/event]
-[/tutorial]
-

data/units/Battle_Princess.cfg

@@ -5,7 +5,7 @@ race=human
 image=human-battleprincess.png
 image_defensive=human-battleprincess-defend.png
 image_leading=human-battleprincess-leading.png
-profile=misc/lisar.png
+profile=portraits/Heir_To_The_Throne/lisar.png
 hitpoints=52
 movement_type=elusivefoot
 movement=6

data/units/Commander.cfg

@@ -6,7 +6,7 @@ image=konrad-commander.png
 image_defensive=konrad-commander-defend.png
 image_defensive_long=konrad-commander-ranged-defend.png
 image_leading=konrad-commander-leading.png
-profile=misc/konrad.png
+profile=portraits/Heir_To_The_Throne/konrad.png
 hitpoints=45
 ability=leadership
 movement_type=smallfoot

data/units/Elder_Mage.cfg

@@ -4,7 +4,7 @@ name= _ "Elder Mage"
 race=human
 image=elder-mage.png
 image_defensive=elder-mage-defend.png
-profile=misc/delfador.png
+profile=portraits/Heir_To_The_Throne/delfador.png
 hitpoints=55
 movement_type=smallfoot
     [resistance]

data/units/Elvish_Lord.cfg

@@ -4,7 +4,7 @@ name= _ "Elvish Lord"
 race=elf
 image=elvish-lord.png
 image_defensive=elvish-lord-defend.png
-profile=misc/kalenz.png
+profile=portraits/Heir_To_The_Throne/kalenz.png
 hitpoints=58
 movement_type=woodland
 movement=6

data/units/Elvish_Shaman.cfg

@@ -6,7 +6,7 @@ gender=female
 image=elvish-shaman.png
 image_defensive=elvish-shaman-defend.png
 image_healing=null
-image_halo_healing=elvish-shaman-heal1.png:70,elvish-shaman-heal2.png:70,elvish-shaman-heal3.png:70,elvish-shaman-heal4.png:70,elvish-shaman-heal5.png:70
+image_halo_healing=elvish-shaman-heal1.png:70,elvish-shaman-heal2.png:70,elvish-shaman-heal3.png:70,elvish-shaman-heal4.png:70,elvish-shaman-heal5.png:70,elvish-shaman-heal6.png:70,elvish-shaman-heal7.png:70,elvish-shaman-heal8.png:70,elvish-shaman-heal9.png:70
 hitpoints=26
 ability=heals
 movement_type=woodland
@@ -54,7 +54,7 @@ get_hit_sound=female-hit.wav
 		[missile_frame]
 		begin=-250
 		end=0
-		image=projectiles/entangle.png
+		image=entangle.png
 		[/missile_frame]
 	[/attack]
 [/unit]

data/units/Fighter.cfg

@@ -4,7 +4,7 @@ name= _ "Fighter"
 race=human
 image=konrad-fighter.png
 image_defensive=konrad-fighter-defend.png
-profile=misc/konrad.png
+profile=portraits/Heir_To_The_Throne/konrad.png
 hitpoints=32
 movement_type=smallfoot
 movement=6

data/units/Lord.cfg

@@ -5,7 +5,7 @@ race=human
 image=konrad-lord.png
 image_defensive=konrad-lord-defend.png
 image_leading=konrad-lord-leading.png
-profile=misc/konrad.png
+profile=portraits/Heir_To_The_Throne/konrad.png
 hitpoints=68
 ability=leadership
 movement_type=smallfoot

data/units/Orcish_Ruler.cfg

@@ -23,6 +23,11 @@ get_hit_sound=orc-hit.wav
 	range=short
 	damage=9
 	number=3
+		[frame]
+		begin=-100
+		end=0
+		image=orcish-ruler-attack.png
+		[/frame]
 		[sound]
 		time=-250
 		sound=sword-swish.wav

data/units/Orcish_Sovereign.cfg

@@ -2,7 +2,8 @@
 id=Orcish Sovereign
 name= _ "Orcish Sovereign"
 race=orc
-image=orcish-ruler.png
+image=orcish-sovereign.png
+image_defensive=orcish-sovereign-defend.png
 #profile=misc/kapoue.png
 hitpoints=75
 ability=leadership
@@ -22,6 +23,16 @@ get_hit_sound=orc-hit.wav
 	range=short
 	damage=10
 	number=4
+		[frame]
+		begin=-150
+		end=-100
+		image=orcish-sovereign-attack1.png
+		[/frame]
+		[frame]
+		begin=-100
+		end=0
+		image=orcish-sovereign-attack2.png
+		[/frame]
 		[sound]
 		time=-250
 		sound=sword-swish.wav

data/units/Princess.cfg

@@ -5,7 +5,7 @@ race=human
 image=human-princess.png
 image_defensive=human-princess-defend.png
 image_leading=human-princess-leading.png
-profile=misc/lisar.png
+profile=portraits/Heir_To_The_Throne/lisar.png
 hitpoints=48
 movement_type=elusivefoot
 movement=6

data/units/Youth.cfg

@@ -4,7 +4,7 @@ name= _ "Youth"
 race=human
 image=konrad-young.png
 image_defensive=konrad-young-defend.png
-profile=misc/konrad.png
+profile=portraits/Heir_To_The_Throne/konrad.png
 hitpoints=20
 movement_type=smallfoot
 movement=4