better freetype check

When specifying a prefix to freetype, the check was always passing.
This removes the check, allowing to compile without specifing the option.

Adds an alternative check for freetype.

Makefile.am

@@ -14,12 +14,20 @@ if LITE
 exclude=| egrep -v '(/sounds|/music)' 
 endif
 
+# List all datafiles, ignoring junk
 finddata=(cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print ) $(exclude)
+# List all data subdirectories
 finddatadirs=(cd $(top_srcdir) && find data fonts icons images sounds -type d \! \( -name .svn -prune \) -print ) $(exclude)
+# List non-installable utility files
 findnoinst=(cd $(top_srcdir) && find utils $(findfilterflags) -print )
+# List all Header files
+findnoinst_headers=(cd $(top_srcdir) && find src -name "*.hpp" -print && find src -name "*.h" -print && find src -name "*.ii" -print && find src -name "*.i" -print )
 
+# Find files derived from the manual that should go in a distribution
 finddocdist=(cd $(top_srcdir) && find doc/manual -name "*.html" -o -name "*.css" -o -name "*.jpg" -o -name "*.txt")
+# Same list as previous, but with doc/ stripped off the front
 finddoc=($(finddocdist) | sed -e 's:doc/manual:manual:g' )
+# List all document directories
 finddocdirs=(cd $(top_srcdir)/doc && find manual -type d \! \( -name .svn -prune \) -print; )
 
 # This is a workaround to include manpage and manual translation files in the
@@ -145,7 +153,7 @@ endif
 
 dist-hook:
 	srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	( $(finddata); $(finddocdist); $(findnoinst); $(findextrapo) ) | (cd $(top_srcdir) && tar cf - -T -) | (cd $(distdir) && tar xf -)
+	( $(finddata); $(finddocdist); $(findnoinst); $(findnoinst_headers); $(findextrapo) ) | (cd $(top_srcdir) && tar cf - -T -) | (cd $(distdir) && tar xf -)
 
 dist_noinst_DATA = copyright changelog players_changelog wesnoth.dev editor.dev server.dev wesnoth.kdevelop campaign_server.dsp map_editor.dsp server.dsp wesnoth.dsp wesnoth.dsw
 

RELEASE_NOTES

@@ -11,3 +11,23 @@ is making sure that spelling/grammer/whatever is usable and that you are using
 The release team should empty this file after each release.
 
 
+***
+
+Replays work again for single-player campaign scenarios.
+
+***
+
+This release contains an important security update, fixing a
+vulnerability that could allow third-party content (such as campaigns
+downloaded from the add-on server) to execute arbitrary code with user
+account privileges.  See bug #31048 for details.  All content
+currently on the official add-on server has been inspected to confirm
+that none of it exploits this vulnerability, and the add-on server
+itself has been patched to ensure that exploits can no longer be
+uploaded.  Therefore, users of previous versions of Battle for Wesnoth
+who have received user-made content through the official add-on server
+and no other distribution channel need not fear that their system has
+been compromised.
+
+CVE-2009-0367 has been assigned to this vulnerability and may provide
+further information.

changelog

@@ -1,6 +1,175 @@
-Post 1.4:
-* language and i18n:
-   * updated translations: Japanese
+Version 1.4.7+dev:
+ * campaigns:
+   * Descent into Darkness:
+     * Removed the custom python AI used in 'A Haunting in Winter'
+   * The Hammer of Thursagan:
+     * fixed "time over" event so dialog displays in 'High Pass'
+ * language and i18n:
+   * updated translations: French, Italian, Japanese
+ * multiplayer:
+   * server:
+     * create the fifo group accessible (instead of only user accessible)
+     * fixed bug #13099: MP lobby player list becomes inaccurate over time
+ * miscellaneous and bug fixes:
+   * AmigaOS4: Minimum stack cookie to prevent stack overflow (patch #1107)
+   * Additional screenmodes for when SDL can't guess them (patch #1108)
+   * Fixed bug #12896: Map generator does not sync between clients when
+     advancing in MP campaigns
+   * Removed support for PythonAI to handle CVE-2009-0367
+   * Backported fix for wmllint, wmlscope and wmlindent not working correctly
+     on Windows if a command line argument ends with a backslash
+   * wmllint: update paths from "portraits/core/" to "portraits/", clean up
+     get_hit_sound messages, fix endswith()s that presumed unit files use UNIX
+     newlines, backport fix for Windows files refusing to be overwritten by
+     a rename, fix second half of "duplicated attack" warning printing to
+     stdout, enable more abilities and weapon specials to be updated, fix
+     creation of unit description= and DEFENSE_ANIM lines, fix lifing of frames
+     to [attack_anim]
+
+Version 1.4.7:
+ * campaigns:
+   * Descent into Darkness
+     * fixed bats crashing through the ice in 'Beginning of Revenge' (bug
+	 #12685)
+   * Heir to the Throne:
+     * Added an idle animation for L2 Princess.
+ * graphics:
+   * new or updated unit frames: Gryphon Rider, Gryphon Master
+ * language and i18n:
+   * updated translations: Danish, Finnish, Hungarian, Italian
+ * miscellaneous and bug fixes:
+   * replace a #elif without condition with #else (debian patch #505957)
+   * fixed campaign replays (bug #12005)
+   * start-of-scenario saves are properly marked as such
+
+Version 1.4.6:
+ * language and i18n:
+   * updated translations: Czech, Danish, Finnish, French, Galician, German,
+     Hungarian, Italian, Polish, Slovak, Turkish, Valencian
+ * graphics
+   * fixed the parts of the undead flags which were not TC'd
+
+Version 1.4.5:
+ * campaigns:
+   * Sceptre of Fire
+     * Fixed a coordinate bug that caused 'Hills of the Shorbear Clan' to not
+       end when it was supposed to.
+     * Fixed a bug that allowed one to finish 'The Dragon' by defeating both
+       enemy leaders.
+ * graphics:
+   * new portraits: Silver Mages, White Mages, female Mage of Light, Arch Mages,
+     Red Mages, Dark Adepts, female Necromancer/Dark Sorceress, L1 Mages, Lich
+ * language and i18n:
+   * updated translations: Chinese (Traditional), Czech, Danish, French,
+     Galician, German, Hungarian, Italian, Lithuanian, Polish, Russian,
+     Spanish
+   * updated manpages: Hungarian
+   * updated manual: Hungarian
+   * fonts: DejaVuSans 2.26
+ * miscellaneous and bug fixes:
+   * Fixed linewrapping with not to wrap markups (bug #11946 and bug #11945)
+   * Fixed OOS bug when giving control and having move in undo stack.
+   * Fixed crash when ai moves units next to level 0 hiden unit (bug #12252)
+   * Fixed loading ai parameters. MP side defination now overwrites
+     era values (bug #12171)
+   * Fixed MP saves to transfer correct completion state to remote clients
+     when loadin game (bug #10385)
+   * Fixed the list of the unit's attacks getting cut off in the right panel
+     (bug #12297).
+
+Version 1.4.4:
+ * language and i18n:
+   * new translation: Latvian
+   * updated translations: Arabic, Catalan, Chinese (Traditional), Czech,
+     Danish, Finnish, French, Galician, German, Greek, Hungarian, Italian,
+     Japanese, Lithuanian, Polish, Russian, Serbian, Slovak
+   * langcode change: moved gl_ES to gl
+ * miscellaneous and bug fixes:
+   * Fixed timer end warning not to play in opponents turn (bug: #11517)
+   * fix bug #11630 (preventing redo and rename during opponent's turn)
+   * Added recursion preventarion to [kill] fire_event=yes [/kill]
+   * Added check whether sendfile is in glibc (debian patch #490638)
+
+Version 1.4.3:
+ * campaigns:
+   * The Rise of Wesnoth:
+     * fixed the Wesfolk Outcast line's distract ability not working
+ * language and i18n:
+   * new translations: Arabic, Friulian, Macedonian
+   * updated translations: Czech, Danish, Dutch, Estonian, Finnish, French,
+     German, Hungarian, Japanese, Polish, Russian, Serbian, Slovak, Spanish
+   * fonts: DejaVuSans 2.25
+   * manual: updated screenshots to match UI rearrangements
+ * WML engine:
+   * fix [teleport] capturing villages with the wrong side (bug #11683)
+ * campaignd
+   * made campaign server use gzip compression for networking
+   * made campaign server detect if client can receive gzipped data
+   * made campaign server use gzip for storing addons
+   * added configuraion option to choose gzip compression level
+ * miscellaneous and bug fixes:
+   * fixed parser bug that prevented loading binary data strings
+   * starting a campaign without any installed now gives an error.
+   * fixed issues with campaign info in non-compressed saved games
+     (bug #11386)
+   * Backported graceful restart feature to server
+   * Improved connection stability with slow connections.
+   * Implemented send_file to reduce memory usage when sending files
+   * Fixed a mememory leak in networking code
+   * fixed an alignement issue which caused a SIGBUS on a Sparc
+     (debian bug #426318)
+   * Fixed tokenizer not to strip CR from quoted string becaue it would destroy
+     images transfered over network
+   * added some includes to fix compilation problems with Sun Studio 12
+     (patch #1066)
+   * fixed null-pointer reference in network code
+
+Version 1.4.2:
+ * campaigns
+   * Liberty
+     * Backport r25650 to fix graphics glitch (bug 11438)
+ * language and i18n:
+   * updated translations: Chinese, Chinese (Traditional), Croatian, Czech,
+     Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Lithuanian,
+     Polish, Russian, Serbian, Slovak, Spanish, Turkish
+
+Version 1.4.1:
+ * campaigns:
+   * Fixed/enforced internal gender id of various female heroes/foes
+     (bug #11197)
+   * Under the Burning Suns:
+     * Minor cosmetic fixes
+ * graphics:
+   * Fixed broken TC on transport-galleon and drake walking corpse graphics
+   * New portraits: Elvish Sorceress
+ * language and i18n:
+   * new translation: Croatian
+   * updated translations: Chinese, Czech, Danish, Dutch, Finnish, French,
+     Galician, German, Greek, Hungarian, Italian, Lithuanian, Japanese, Polish,
+     Russian, Spanish, Swedish, Turkish, Valencian
+ * map editor:
+   * fixed not working "Update transition" and make "Delay transition update"
+     directly trigger an update when toggled off.
+ * miscellaneous and bug fixes:
+   * Removed spurious -R linker switch from command line generated by the Boost
+     M4 macros
+   * Load-game dialog displays a scenario campaign's translated name rather than
+     its internal id now
+   * wmlxgettext now print some context information about the strings
+     extracted (patch #993)
+   * added VICTORY_AND_DEFEAT_MUSIC macro and wired it in all mainline
+     scenarios that warrant such effects
+   * Fixed a border case of unit portrait advancement on which generic portraits
+     would be treated as character-specific (affected female Elvish Archer line;
+     it also theoretically affected units with [variation]s using different
+     portraits)
+   * allow configure to be started from directories other as the top dir
+     (patch #1002)
+   * learn the underlaying terrain so you'll not have a blank like in the unit
+     stats if you encounter a terain aliased to a unencountered terrain
+ * multiplayer:
+   * fixed minimap caching in the lobby screen, resulting in faster refreshs
+   * a lot work has gone into optimizing wesnothd to allow more players
 
 Version 1.4:
  * language and i18n:
@@ -44,9 +213,9 @@ Version 1.4:
      (bug #11150)
    * Fixed UI sounds toggle crash on Windows
    * when a new unit is spawned when the attacker dies and the new unit has
-     a lower number of weapons then the weapon number used in the attack an 
+     a lower number of weapons then the weapon number used in the attack an
      wml_exception was thrown (bug #10926).
-   * truncate names in the load dialog utf8 aware, might be related to 
+   * truncate names in the load dialog utf8 aware, might be related to
      bug #11186
    * fix bug #11187 play_once=yes and fix musical cross-fading
 

config.h.dummy

@@ -9,13 +9,13 @@
 #define PACKAGE_NAME "Battle for Wesnoth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 1.4"
+#define PACKAGE_STRING "Battle for Wesnoth 1.4.7"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "wesnoth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.4"
+#define PACKAGE_VERSION "1.4.7"
 
 /* Version number of package */
-#define VERSION "1.4"
+#define VERSION "1.4.7"

configure.ac

@@ -6,7 +6,7 @@
 
 AC_PREREQ([2.60])
 
-define([WESNOTH_VERSION],[1.4])
+define([WESNOTH_VERSION],[1.4.7])
 
 AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, [isaac@warp.es], [wesnoth])
 
@@ -104,7 +104,7 @@ fi
 # Make tests default in svn version
 svn_in_version=`expr match "$WESNOTH_VERSION" '.*svn'`
 test_build=yes
-if test $svn_in_version == 0 
+if test $svn_in_version = 0 
 then
 	#disabling building tests for release version
 	test_build=no
@@ -120,11 +120,6 @@ AC_ARG_ENABLE([static],
 	      [static=$enableval],
 	      [static=no])
 
-AC_ARG_ENABLE([python],
-              AS_HELP_STRING([--disable-python], [disable Python support]),
-	      [python=$enableval],
-	      [python=yes])
-
 AC_ARG_ENABLE([python_install],
               AS_HELP_STRING([--enable-python-install], [enable installation of Python developer tools]),
 	      [python_install=$enableval],
@@ -309,12 +304,6 @@ AC_ARG_ENABLE([display-revision],
 	      [svnrev=no])
 
 
-if test "x$game" = "xno"
-then
-	python=no
-	AC_MSG_WARN([*** Game build disabled, suppressing Python support.])
-fi
-
 if test "x$python" = "xno"
 then
 	python_install=no
@@ -326,6 +315,11 @@ AC_ARG_ENABLE([raw-sockets],
 	      [raw_sockets=$enableval],
 	      [raw_sockets=no])
 
+AC_ARG_ENABLE([bandwidth-monitor],
+              AS_HELP_STRING([--enable-bandwidth-monitor], [Enable bandwidth monitoring for server]),
+	      [bandwidth_monitor=$enableval],
+	      [bandwidth_monitor=no])
+
 if test "x$raw_sockets" = "xyes"
 then
 	CPPFLAGS="$CPPFLAGS -DNETWORK_USE_RAW_SOCKETS"
@@ -341,6 +335,7 @@ AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
 AM_CONDITIONAL([USESVN], [test x$svnrev = xyes])
 AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
 AM_CONDITIONAL([GCC], [test x$GXX = xyes])
+AM_CONDITIONAL([BANDWIDTH_MONITOR], [test x$bandwidth_monitor = xyes])
 AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
 AM_CONDITIONAL([INSTALLDATA], [test x$game = xyes || x$editor = xyes])
 AM_CONDITIONAL([DUMMYLOCALES], [test x$dummylocales = xyes])
@@ -474,19 +469,6 @@ if test "x$python" = "xyes"; then
 		if test "x$pythonfound" = "xyes"; then
 			AC_MSG_RESULT(yes)
 
-			PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
-
-			OLD_CPPFLAGS="$CPPFLAGS"
-			OLD_CXXFLAGS="$CXXFLAGS"
-			CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-			CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
-
-			AC_CHECK_HEADER([Python.h],
-					[],
-					[AC_MSG_WARN([*** Python include files not found! You should install Python development package. Python support disabled]); pythonfound=no])
-			CPPFLAGS="$OLD_CPPFLAGS"
-			CXXFLAGS="$OLD_CXXFLAGS"
-
 			if test "x$pythonfound" = "xyes"; then
 				AC_SUBST([PYTHON_CFLAGS])
 
@@ -705,6 +687,10 @@ LIBS="$LIBS $SDL_LIBS"
 # so recommend using fink sdl packages as a workaround
 
 ac_link="$LDPREFIX $ac_link"
+
+if test "x$game" = "xyes"
+then
+
 AC_CHECK_LIB([SDL_image],
 	     [IMG_Load],
 	     [if test -n "$LDPREFIX" -a -r `$SDL_CONFIG --prefix`/lib/libSDL_image.la
@@ -723,6 +709,9 @@ fi],
 	     [AC_MSG_ERROR([*** SDL_mixer lib not found! Get SDL_mixer from
 http://www.libsdl.org/projects/SDL_mixer/index.html])])
 
+fi
+# test "x$game" = "xyes"
+
 AC_CHECK_LIB([SDL_net],
 	     [SDLNet_Init],
 	     [if test -n "$LDPREFIX" -a -r `$SDL_CONFIG --prefix`/lib/libSDL_net.la
@@ -739,44 +728,30 @@ AC_SUBST([SDL_IMAGE_LIBS])
 AC_SUBST([SDL_MIXER_LIBS])
 AC_SUBST([SDL_NET_LIBS])
 
-# Checking for the freetype library. This was copied from the
-# config script of SDL_ttf, modified for CPPFLAGS
+# Checking for the freetype library.
 
-dnl Get the cflags and libraries from the freetype-config script
+if test "x$game" = "xyes"
+then
 
-AC_ARG_WITH([freetype-prefix],
-            AS_HELP_STRING([--with-freetype-prefix=PFX], [Prefix where FREETYPE is installed (optional)]),
-            [freetype_prefix="$withval"],
-            [freetype_prefix=""])
-
-AC_ARG_WITH([freetype-exec-prefix],
-            AS_HELP_STRING([--with-freetype-exec-prefix=PFX], [Exec prefix where FREETYPE is installed (optional)]),
-            [freetype_exec_prefix="$withval"],
-            [freetype_exec_prefix=""])
-
-if test x$freetype_exec_prefix != x ; then
-     freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
-     if test x${FREETYPE_CONFIG+set} != xset ; then
-        FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config
-     fi
+AC_PATH_PROG([PKG_CONFIG], [pkg-config], [none])
+if test "x$PKG_CONFIG" = "xnone"; then
+    AC_MSG_ERROR([*** Please install pkg-config or pkgconf])
 fi
-if test x$freetype_prefix != x ; then
-     freetype_args="$freetype_args --prefix=$freetype_prefix"
-     if test x${FREETYPE_CONFIG+set} != xset ; then
-        FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config
-     fi
-fi
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-no_freetype=""
-if test "$FREETYPE_CONFIG" = "no" ; then
-    AC_MSG_ERROR([
-*** Unable to find FreeType2 library (http://www.freetype.org/)
-])
+
+AC_MSG_CHECKING(for freetype2)
+$PKG_CONFIG --exists freetype2
+if test $? != 0 ; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([*** Unable to find FreeType2 library (https://www.freetype.org/)])
 else
-    CPPFLAGS="$CPPFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
-    FREETYPE_LIBS=`$FREETYPE_CONFIG $freetypeconf_args --libs`
+    AC_MSG_RESULT(yes)
+    CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags freetype2`"
+    FREETYPE_LIBS="`$PKG_CONFIG --libs freetype2`"
 fi
 
+fi
+# test "x$game" = "xyes"
+
 AC_SUBST([FREETYPE_LIBS])
 
 #######################################################################
@@ -800,6 +775,9 @@ AC_CHECK_HEADER([SDL.h],
 		[AC_MSG_ERROR([*** SDL include files not found!
 You should install SDL development package.])])
 
+if test "x$game" = "xyes"
+then
+
 AC_CHECK_HEADER([SDL_image.h],
 		[],
 		[AC_MSG_ERROR([*** SDL_image include files not found!
@@ -810,6 +788,9 @@ AC_CHECK_HEADER([SDL_mixer.h],
 		[AC_MSG_ERROR([*** SDL_mixer include files not found!
 You should install development package.])])
 
+fi
+# test "x$game" = "xyes"
+
 AC_CHECK_HEADER([SDL_net.h],
 		[],
 		[AC_MSG_ERROR([*** SDL_net include files not found!
@@ -845,6 +826,9 @@ AC_CHECK_FUNCS([floor socket strtoul])
 # Check for PNG support in SDL_image                                  #
 #######################################################################
 
+if test "x$game" = "xyes"
+then
+
 AC_LANG([C])
 AC_MSG_CHECKING([for PNG support in SDL_image])
 
@@ -864,7 +848,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([
 int main(int argc, char **argv)
 {
 	SDL_RWops *src;
-	char *testimage = "images/buttons/button-pressed.png";
+	char *testimage = "${srcdir}/images/buttons/button-pressed.png";
 
 	src = SDL_RWFromFile(testimage, "rb");
 	if (src == NULL) {
@@ -882,11 +866,16 @@ CPPFLAGS=$OLD_CPPFLAGS
 CFLAGS=$OLD_CFLAGS
 LIBS=$OLD_LIBS
 
+fi
+# test "x$game" = "xyes"
 
 #######################################################################
 # Check for OGG support in SDL_mixer                                  #
 #######################################################################
 
+if test "x$game" = "xyes"
+then
+
 if test "x$lite" = "xno"; then
     if test -e "data/core/music/main_menu.ogg" ; then
         AC_LANG([C])
@@ -926,6 +915,9 @@ if test "x$lite" = "xno"; then
     fi
 fi
 
+fi
+# test "x$game" = "xyes"
+
 #######################################################################
 # Check for boost iostreams                                           #
 #######################################################################

data/_main.cfg

@@ -81,11 +81,11 @@
     [/server]
     [server]
         name=_"Alternate Wesnoth Server"
-        address=games.tuxfamily.org:15000
+        address=server2.wesnoth.org:15000
     [/server]
     [server]
         name=_"Alternate Wesnoth Server"
-        address=wesnoth.debian.net:15000
+        address=server3.wesnoth.org:15000
     [/server]
 
     base_income=2
@@ -95,7 +95,7 @@
     recall_cost=20
     kill_experience=8
 
-    title="maps/mainmenu.png"
+    title="maps/mainmenu.jpg"
     logo="misc/logo.png"
     icon="wesnoth-icon.png"
     title_music="main_menu_new.ogg"

data/ais/bruteforce.py

@@ -1,531 +0,0 @@
-#!WPY
-
-import wesnoth, random
-
-##    Copyright 2006 by Michael Schmahl
-##    This code is available under the latest version of the GNU Public License.
-##    See COPYING for details.  Some inspiration and code derived from "sample.py"
-##    by allefant.
-##
-##    This is my attempt at a 'chess-like' AI.  All moves are motivated by
-##    an underlying evaluation function.  The actual eval function doesn't
-##    need to be coded, because moves can be scored and ranked based on the
-##    incremental change in the evaluation.  Unlike a chess-playing program,
-##    though, this program does no lookahead, because the branching factor
-##    is prohibitively high (potentially in the thousands), and because then
-##    the script would have to create an internal model of the game state.
-##
-##    Despite the lack of any lookahead, I still consider this AI to be
-##    chess-like because it evaluates every possible move and attack, even
-##    those that are obviously (to a human) bad.  How can a computer know
-##    that these are bad moves unless it actually checks?
-##
-##    The evaluation function is:
-##
-##    (1)     side_score = village_score
-##                         + sum(unit_score, over all units)
-##                         + positional_score
-##
-##    The value of a unit can be highly subjective, but to simplify, assume
-##    that any level-1 unit is just as valuable as any other level-1 unit.
-##    Specifically, the value of a unit will be:
-##
-##    (2)     unit_score = (1 + level + %xp)(1 + %hp)
-##
-##    Leaders are be considered three levels higher than their actual level.
-##    So a freshly-recruited level-1 unit is worth 4.0 points.  And a level-2
-##    unit with half its hitpoints remaining, but halfway to level 3, is
-##    worth 6.75 points.
-##
-##    One question is: How much is a village worth, compared to a (typical)
-##    unit?  A typical unit is worth 15 to 20 gold, because that is how much
-##    we paid for it.  A village is worth two or three gold *per turn* as
-##    long as it is held.  (The village is worth three gold when it offsets
-##    a unit's upkeep.)  So we must make some assumptions as to the value of
-##    a present gold piece, compared to a future gold piece.  Assume a decay
-##    rate of 1.5 (i.e. a gold piece one turn from now is worth two-thirds
-##    of a gold piece now).  This makes the present value of a village equal
-##    to twice its income.  If we set the value of a typical unit at 16 gold,
-##    we get that an upkeep-offsetting village is worth 1.5 points, and a
-##    supernumerary village is worth 1.0 points.  For simplicity, the value
-##    of each village is set at 1.0.
-##
-##    (3)     village_score = number of villages
-##
-##    The positional score is the most interesting term of equation (1),
-##    because that, more than anything else, will guide the AI's behavior.
-##
-##    First, we want the AI to expand to capture villages.  So, for each unit,
-##    it is scored based on how far it is from the nearest unowned or enemy
-##    village.  If the distance is zero, the unit has actually captured the
-##    village, so in that limit, the value should be equal to the village
-##    value.  As the distance approaces infinity, the score should tend
-##    toward zero.  This suggests something like:
-##
-##    (4)     village_proximity = c / (c + distance)
-##
-##    I have selected c to be equal to equal to the unit's movement.   This
-##    means that (approximately) a unit one turn away from capturing a village
-##    gets 0.5 points; two turns, 0.33 points, etc.  Although an exponential
-##    relationship would be more accurate, exponentiation is expensive, and
-##    better avoided, since thousands of moves are evaluated per turn.
-##
-##    Second, we want units to stand on defensive terrain when within range
-##    of the enemy.  The 'right' way to do this would be to count up all the
-##    potential attackers at the destination square, see how much damage they
-##    might do, and score the move based on how much damage would be dealt/
-##    prevented.  Again, this is much too slow.  I have found a reasonable
-##    approximation is:
-##
-##    (5)     exposure_penalty = -defense_modifier / 10
-##
-##    Maybe much too simple, but easy to calculate!  In future editions, perhaps
-##    I should take into account how damaged the unit is, or at least make some
-##    attempt to count the attackers.
-##
-##    Third, we want units to heal when damaged or poisoned.  Referring to
-##    equation (2), we can see that the value of healing is:
-##
-##    (6)     healing_score = healing / max_hitpoints * (1 + level + %xp)
-##
-##    We consider poison, which does 8 damage *per turn*, to be equivalent to
-##    16 points of actual damage, for the same reason a village's real value is
-##    twice its income (see above).
-##
-##    Fourth, we want units to guard villages if the enemy is in range to take
-##    them.  If, by stationing a unit on a village, we prevent the enemy from
-##    taking it, we have prevented a 2-point swing in the enemy's favor.  Again
-##    considering a decay rate of 2/3 per turn, this means the garrison value
-##    is 4/3.  But since there is no guarantee that our garrison will be
-##    successful (perhaps the enemy will take the village anyway; perhaps it is
-##    not possible to garrison all threatened villages), we will cut this in half.
-##
-##    (7)     garrison_score = 2/3
-##
-##    Fifth, we want our leader to stay near a keep.  Otherwise, any gold we
-##    might have accumulated will be wasted.  And finally, we want units to move
-##    toward the enemy leader.  These are accomplished by treating keeps as
-##    if they were unowned villages (for our leader), and the enemy leader
-##    as if it were a village (for everyone else).
-##
-##    This should be all that is required to play a decent game of Wesnoth.
-##    This AI scores quite well against the Wesnoth default AI, which may be
-##    surprising, because it uses no sophisticated tools.  There is no attempt
-##    to use any of the path-finding tools made available by the API (which
-##    would be too slow to be used thousands of times every turn).  There is
-##    no attempt to use combination attacks (meaning, that even though none of
-##    several units can favorably attack a certain target, if they all attack
-##    in the same turn, the result is likely to be favorable).  No attempt is
-##    made to assign units individually to targets.
-##
-##    Some bad behaviors may result from these shortcomings:
-##
-##    If the map is maze-like, or simply has a few corners surrounded by
-##    impassable terrain, units may get stuck.  On Cynsaun Battlefield, for
-##    example, a group of units got stuck in the middle of the river, trying
-##    to capture a village on the other side of the deep-water hexes.
-##
-##    An enemy unit may get completely surrounded by friendly units, who are
-##    weak in comparison to the enemy, and our AI will make no attempt to kill
-##    the enemy unit.  (Think six Wolf Riders surrounding an Orcish Grunt.)
-##    Usually one or more of these units will find something else to do, allowing
-##    a few Archers to take their place and start to wear down the Grunt.  Or
-##    the Grunt will attack, getting damaged in the process, and creating a
-##    chance-to-kill for one of the Wolves.
-##
-##    If there is an unoccupied village in a corner of the map, our AI will
-##    send every unit that is closer to the village than any other, to that
-##    village.  Often, only one unit is necessary.  Thus, harassing villages
-##    with scouts may be a much more viable strategy against this AI than
-##    against human players, or against the default AI.
-##
-##    For those interested in results, I have set up a tournament between my
-##    AI and the default AI.  The tournament consists of one match on each of
-##    the mainline two-player maps (except Wesbowl, naturally).  In each map,
-##    each opponent is allowed to be player 1 once.  If there is no decision
-##    after two games, two more games are played, repeating as necessary until
-##    one opponent has won the match.  All games are played with a 50-turn
-##    limit, 2 gold per village, 70% experience, and no fog.  (I think there
-##    is a bug (feature?) that AIs ignore fog, so I disabled it to improve the
-##    observer's (my) experience.)  Factions are chosen randomly.
-##
-##    Map                           W-L-D   %Win   Match result
-##    Blitz                         2-0-0    100   Win
-##    Caves of the Basilisk         4-2-0     67   Win
-##    Charge                        3-1-0     75   Win
-##    Cynsaun Battlefield (1gpv)    2-0-0    100   Win
-##    Den of Onis                   4-2-0     67   Win
-##    Hamlets                       2-0-0    100   Win
-##    Hornshark Island              0-2-0      0   Loss
-##    Meteor Lake                   2-0-0    100   Win
-##    Sablestone Delta              2-0-0    100   Win
-##    Silverhead Crossing           3-1-0     75   Win
-##    Sulla's Ruins                 2-0-0    100   Win
-##    ** Overall                   25-8-0     76   10 Wins, 1 Loss (91%)
-
-# UNIT SCORE MODIFIERS
-
-BASE_UNIT_SCORE = 1 # Base worth of a unit
-LEVEL_SCORE = 1     # Worth/level
-LEADER_SCORE = 3    # Leader worth
-FULL_XP_SCORE = 1   # How much is partial XP worth (1 is 100% XP = 1 pt)
-
-# This score is then multiplied by a factor dependant on the price of the unit
-# this makes expensive units worth more to the AI
-
-COST_SCORE = 0      #
-BASE_COST_SCORE = 1 #
-
-# Formula:
-# Base_Score = BASE_UNIT_SCORE + level * LEVEL_SCORE + is_leader * LEADER_SCORE + xp/max_xp * FULL_XP_SCORE
-# Cost_Modifier = BASE_COST_SCORE + price * COST_SCORE
-# Unit_Score(unit_k) = Base_Score * Cost_Modifier
-
-# POSITION SCORE MODIFIERS
-
-NO_MOVE_PEN = 0             # Penalty for not moving (doesn't quite work)
-NEXT_TO_ENEMY_PEN = 0       # Penalty for moving next to an enemy and not attacking
-STAND_NEXT_TO_ENEMY_PEN = 0 # Penalty for standing next to an enemy without moving or attacking
-
-# MISC SCORE MODIFIERS
-
-LEVEL_CHANCE_BONUS = 0      # How much a level-up is worth
-
-VILLAGE_SCORE = 1           # How much capturing a village is worth
-ENEMY_VILLAGE_BONUS = 1     # How much extra is an enemy village worth
-
-GARRISON_SCORE = 2.0/3      # How much defending a village is worth
-DEFENSE_FACTOR = 1.0/1000   # How much to penalize a unit for being in an attackable position
-
-HEAL_FACTOR = 1             # How much is healing worth
-HEAL_ATTACKABLE = .5        # How much relative to healing is healing when attackable worth
-HEAL_POISON = 16            # How much is healing from poison worth
-
-HP_SCALE = .1               # Unit HP/turn (for recruitment)
-
-def pos(p):
-    if p==None: return ("Nowhere")
-    return ("(%s,%s)"%(p.x+1,p.y+1))
-
-class AI:
-    def __init__(self):
-        self.get_villages()
-        self.get_keeps()
-        self.mapsize = max((wesnoth.get_map().x,wesnoth.get_map().y)) / 30.0
-        self.stats = [0,0]
-
-    def report_stats(self):
-        wesnoth.log_message("%d moves, %d fights evaluated" % (self.stats[0],self.stats[1]))
-
-    def get_villages(self):
-        self.notmyvillages = []
-        m = wesnoth.get_map()
-        for x in range(m.x):
-            for y in range(m.y):
-                loc = wesnoth.get_location(x,y)
-                if m.is_village(loc):
-                    for team in wesnoth.get_teams():
-                        if team.owns_village(loc) and not team.is_enemy:
-                            break
-                    else:
-                        self.notmyvillages.append(loc)
-
-    def get_keeps(self):
-        self.keeps = []
-        m = wesnoth.get_map()
-        for x in range(m.x):
-            for y in range(m.y):
-                loc = wesnoth.get_location(x,y)
-                if m.is_keep(loc):
-                    # If the enemy is occupying the keep, it is "off-limits" to our leader.
-                    # Otherwise, if our leader has strayed too far, it might attempt to go
-                    # to the enemy keep, which basically means we lose.
-                    if loc not in wesnoth.get_enemy_destinations_by_unit().keys():
-	                    self.keeps.append(loc)
-        
-    def recruit(self):
-        # I haven't discussed this at all.  Perhaps a few paragraphs would be in order.
-        if wesnoth.get_current_team().gold < 16: return
-        
-        # find our leader
-        leaderpos = None
-        for location,unit in wesnoth.get_units().iteritems():
-            if unit.can_recruit and unit.side == wesnoth.get_current_team().side:
-                leaderpos = location
-                break
-
-        # no leader? can't recruit
-        if leaderpos == None: return
-
-        # is our leader on a keep?  If not, move to a keep
-        # Maybe should always go to nearest keep
-        if not leaderpos in self.keeps:
-            for dest in wesnoth.get_destinations_by_unit().get(leaderpos,[]):
-                if dest in self.keeps:
-                    leaderpos = wesnoth.move_unit(leaderpos,dest)
-                    break
-
-        # is our leader on a keep now?  If not, can't recruit
-        if leaderpos not in self.keeps: return
-
-        # build up a list of recruits and scores for each
-        recruit_list = []
-        sumweights = 0
-        for recruit in wesnoth.get_current_team().recruits():
-            weight = self.recruit_score(recruit)
-            if weight < 0.01: weight = 0.01
-            recruit_list.append((recruit.name,weight))
-            sumweights += weight
-
-        # repeatedly recruit until we fail
-        while 1:
-
-            # pick a random recruit in proportion to the weights
-            r = random.uniform(0,sumweights)
-            for recruit,weight in recruit_list:
-                r -= weight
-                if r < 0: break
-
-            # just use leaderpos for the location; wesnoth will always
-            # recruit on the nearest adjacent tile
-            if not wesnoth.recruit_unit(recruit,leaderpos): break
-
-    def map_score(self,recruit):
-        # calculate average speed in hexes/turn
-        # and average defense in effective hp
-        m = wesnoth.get_map()
-        n = m.x * m.y
-
-        speed = 0.0
-        defense = 0.0
-        for x in range(m.x):
-            for y in range(m.y):
-                loc = wesnoth.get_location(x,y)
-                speed += 1.0 / recruit.movement_cost(loc)
-                defense += 100.0 / recruit.defense_modifier(loc) - 1
-
-        # speed is more important on larger maps
-        speed *= self.mapsize * recruit.movement / n
-
-        # scaled down because effective hp is over the lifetime of the unit,
-        # while other scores are based on per-turn quantities
-        defense *= HP_SCALE * recruit.hitpoints / n
-        return speed,defense
-
-    def combat_score(self,recruit):
-        # combat advantage, in hp/turn, averaged over all enemy units
-        tot = 0.0
-        n = 0
-        for loc,enem in wesnoth.get_units().iteritems():
-            if not enem.is_enemy: continue
-            n += 1
-            tot += self.combat_advantage(recruit,enem)
-            tot -= self.combat_advantage(enem,recruit)
-
-        return tot/n
-
-    def combat_advantage(self,attacker,defender):
-        # combat advantage for attacker attacking defender
-        best = 0.0
-        for weapon in attacker.attacks():
-            damage = weapon.damage * weapon.num_attacks * defender.damage_from(weapon) / 100.0
-
-            best_retal = 0.0
-            for retaliation in defender.attacks():
-                if weapon.range == retaliation.range:
-                    retal = retaliation.damage * retaliation.num_attacks * attacker.damage_from(retaliation) / 100.0
-                    if retal > best_retal: best_retal = retal
-
-            damage -= best_retal
-            if damage > best: best = damage
-
-        # scale down because not every attack hits
-        return best/2
-
-    def recruit_score(self,recruit):
-        speed,defense = self.map_score(recruit)
-        combat = self.combat_score(recruit)
-        rval = (speed + defense + combat)/recruit.cost
-        # only report "interesting" results
-        if rval > 0:
-            wesnoth.log_message("%s: (%.2f + %.2f + %.2f) / %d = %.3f" % (recruit.name,speed,defense,combat,recruit.cost,rval))
-        return rval
-
-    def do_one_move(self):
-        enemlocs = wesnoth.get_enemy_destinations_by_unit().keys()
-        self.enemdests = wesnoth.get_enemy_units_by_destination().keys()
-        bestmove = (0,None,None,None) # score,orig,dest,target
-
-        # find the best move
-        for orig in wesnoth.get_destinations_by_unit().keys():
-            # get a baseline score for this unit "standing pat"
-            base_score = self.eval_move(orig,orig)
-            for dest in wesnoth.get_destinations_by_unit()[orig]:
-                # Bug workaround -- if we have recruited this turn,
-                # get_destinations_by_unit() is incorrect
-                if dest in wesnoth.get_units().keys() and dest != orig: continue
-                score = self.eval_move(orig,dest) - base_score
-                if score > bestmove[0]:
-                    bestmove = (score,orig,dest,dest)
-                for target in wesnoth.get_adjacent_tiles(dest):
-                    if target in enemlocs:
-                        fight = self.eval_fight(wesnoth.get_units()[orig],dest,target)+score
-                        if orig == dest:
-                            fight += STAND_NEXT_TO_ENEMY_PEN + NO_MOVE_PEN
-                        else:
-                            fight += NEXT_TO_ENEMY_PEN
-                        if fight > bestmove[0]:
-                            bestmove = (fight,orig,dest,target)
-
-        if bestmove[1] == None:
-            # no move improved the position, therefore we are done
-            return False
-
-        score,orig,dest,target = bestmove
-        wesnoth.log_message("%.3f: %s->%s@%s"%(score,pos(orig),pos(dest),pos(target)))
-        if dest != orig: wesnoth.move_unit(orig,dest)
-        if dest in self.notmyvillages: self.notmyvillages.remove(dest)
-        if target != dest: wesnoth.attack_unit(dest,target)
-
-        return True
-
-    def eval_fight(self,unit,dest,target):
-        self.stats[1] += 1
-        enem = wesnoth.get_units().get(target,None)
-        if not enem: return 0
-
-        # the base value for each unit:
-        # I should give more weight to defeating a garrison
-        unit_k = (LEVEL_SCORE*unit.type().level + BASE_UNIT_SCORE + LEADER_SCORE*unit.can_recruit\
-            + FULL_XP_SCORE * unit.experience * 1.0 / unit.max_experience) * (BASE_COST_SCORE + unit.type().cost * COST_SCORE)
-        enem_k = (LEVEL_SCORE*enem.type().level + BASE_UNIT_SCORE + LEADER_SCORE*enem.can_recruit\
-            + FULL_XP_SCORE * enem.experience * 1.0 / enem.max_experience) * (BASE_COST_SCORE + enem.type().cost * COST_SCORE)
-
-        unit_hp,enem_hp = unit.attack_statistics(dest,target)
-        score = 0.0
-        for hp,p in enem_hp.iteritems():
-            score += p * (enem.hitpoints - hp) * enem_k / enem.max_hitpoints
-            if hp<=0: score += p * enem_k
-        for hp,p in unit_hp.iteritems():
-            score -= p * (unit.hitpoints - hp) * unit_k / unit.max_hitpoints
-            if hp<=0: score -= p * unit_k
-
-        enem_xp = 8*enem.type().level
-        if enem.type().level == 0:
-            enem_xp = 4
-        unit_xp = 8*unit.type().level
-        if unit.type().level == 0:
-            unit_xp = 4
-
-        if enem.type().level >= unit.max_experience - unit.experience:
-            for hp, p in unit_hp.iteritems():
-                if hp > 0: score += LEVEL_CHANCE_BONUS * p * unit_k
-        elif enem_xp >= unit.max_experience - unit.experience:
-            for hp, p in enem_hp.iteritems():
-                if hp <= 0: score += LEVEL_CHANCE_BONUS * p * unit_k
-        if unit.type().level >= enem.max_experience - enem.experience:
-            for hp, p in enem_hp.iteritems():
-                if hp > 0: score -= LEVEL_CHANCE_BONUS * p * enem_k
-        elif unit_xp >= enem.max_experience - enem.experience:
-            for hp, p in unit_hp.iteritems():
-                if hp <= 0: score += LEVEL_CHANCE_BONUS * p * enem_k
-
-        return score
-
-    def eval_move(self,orig,dest):
-        enemlocs = wesnoth.get_enemy_destinations_by_unit().keys()
-        self.stats[0] += 1
-        score = 0.0
-
-        unit = wesnoth.get_units().get(orig,None)
-        if not unit: return
-        unit_k = (LEVEL_SCORE*unit.type().level + BASE_UNIT_SCORE + LEADER_SCORE*unit.can_recruit\
-            + FULL_XP_SCORE * unit.experience * 1.0 / unit.max_experience) * (BASE_COST_SCORE + unit.type().cost * COST_SCORE)
-
-        # subtract 1 because terrain might be a factor
-        speed = unit.type().movement - 1
-
-        attackable=False
-        if dest in self.enemdests:
-            attackable = True
-        else:
-            for adj in wesnoth.get_adjacent_tiles(dest):
-                if adj in self.enemdests:
-                    attackable = True
-                    break
-
-        # capture villages
-        if dest in self.notmyvillages:
-            score += VILLAGE_SCORE
-            for team in wesnoth.get_teams():
-                if team.owns_village(dest) and team.is_enemy:
-                    score += ENEMY_VILLAGE_BONUS
-
-        bestdist=100
-        if unit.can_recruit:
-            # leader stays near keep
-            for keep in self.keeps:
-                dist=dest.distance_to(keep)
-                if dist<bestdist:
-                    bestdist=dist
-                    if dist<=1: break
-        else:
-            # everyone else moves toward enemy leader
-            for loc,enem in wesnoth.get_units().iteritems():
-                if enem.is_enemy and enem.can_recruit:
-                    dist=dest.distance_to(loc)
-                    if dist<bestdist:
-                        bestdist=dist
-                        if dist<=1: break
-        if bestdist > 1:
-            for vil in self.notmyvillages:
-                if dest==vil: continue
-                dist=dest.distance_to(vil)
-                if dist<bestdist:
-                    bestdist=dist
-                    if dist<=1: break
-        score += (1.0 * speed) / (bestdist + speed)
-
-        # healing
-        # I am ignoring the value of healers, and regenerating units.  I don't think unit abilities
-        # are correctly reported by the API, anyway.
-        if (unit.poisoned or unit.hitpoints<unit.max_hitpoints) and wesnoth.get_map().is_village(dest):
-            if unit.poisoned: healing = HEAL_POISON
-            else:
-                healing = unit.max_hitpoints-unit.hitpoints
-                if healing > 8: healing = 8
-            # reduce the healing bonus if we might get killed first
-            if attackable: healing *= HEAL_ATTACKABLE
-            score += HEAL_FACTOR * healing * unit_k / unit.max_hitpoints
-
-        if attackable:
-            # defense
-            score -= unit.defense_modifier(dest) * DEFENSE_FACTOR
-
-            # garrison
-            if wesnoth.get_map().is_village(dest): score += GARRISON_SCORE
-
-        # reduce chances of standing next to a unit without attacking for a whole turn
-        if dest == orig:
-            score -= NO_MOVE_PEN
-            for target in wesnoth.get_adjacent_tiles(dest):
-                if target in enemlocs:
-                    score -= STAND_NEXT_TO_ENEMY_PEN
-                    break
-        else:
-            for target in wesnoth.get_adjacent_tiles(dest):
-                if target in enemlocs:
-                    score -= NEXT_TO_ENEMY_PEN
-                    break
-            
-        # end mod
-
-        return score
-
-ai = AI()
-ai.recruit()
-while 1:
-    if not ai.do_one_move():
-        break
-ai.recruit()
-ai.report_stats()

data/ais/documentation.py

@@ -1,91 +0,0 @@
-#!/usr/bin/python
-
-# This is *not* a python AI, it's just run as AI so it can get access to
-# Python's runtime documentation. This documentation then simply is dumped to
-# stdout in a format ready to be pasted to the wiki.
-
-def myhelp(topic, topics):
-    """Collect all the help topics into the given list."""
-    doc = getattr(eval(topic), "__doc__")
-    subtopics = []
-    for subtopic in getattr(eval(topic), "__dict__", []):
-        if subtopic.startswith("_"): continue 
-        myhelp(topic + "." + subtopic, subtopics)
-    tc = getattr(eval(topic), "__class__", None)
-    tt = getattr(tc, "__name__", None)
-    if topic != "wesnoth.error":
-        topics.append((topic, tt, doc, subtopics))
-
-def output(topics, level):
-    """Output the given topics in wiki format, in a given heading level."""
-    color = 0
-    topics.sort()
-    for topic, tt, doc, subtopics in topics:
-        dot = topic.rfind(".")
-        if level == 1:
-            print "==", topic[dot + 1:], "module reference =="
-            print "''This is an automatically generated reference, but feel " +\
-                "free to edit it - changes will not be overwritten but " +\
-                "instead reviewed and included in the next version.''"
-            print doc or "..."
-            if subtopics:
-                funcs = []
-                others = []
-                for s in subtopics:
-                    if s[1] == "builtin_function_or_method":
-                        funcs.append(s)
-                    else:
-                        others.append(s)
-                if funcs:
-                    print "=== Functions ==="
-                    print "{|"
-                    output(funcs, 3)
-                    print "|}"
-                output(others, 2)
-        elif level == 2:
-            print "===", topic[dot + 1:], "==="
-            print doc or "..."
-            if subtopics: 
-                print "{|"
-                output(subtopics, 3)
-                print "|}"
-        elif level == 3:
-            options = " valign='top'"
-            if color: options += " bgcolor='#FBF5EA'"
-            print "|-" + options
-            color = not color
-            if tt in ["method_descriptor", "builtin_function_or_method"]:
-                suffix = ""
-                prefix = ""
-
-                if doc and doc.startswith("Parameters:"):
-                    l = doc.find("\n")
-                    if l == -1: l = len(doc) - 1
-                    suffix = "(" + doc[11:l].strip() + ")"
-                    doc = doc[l + 1:]
-                else:
-                    suffix = "()"
-
-                if doc and doc.startswith("Returns:"):
-                    l = doc.find("\n")
-                    if l == -1: l = len(doc) - 1
-                    prefix = doc[8:l].strip() + " = "
-                    doc = doc[l + 1:]
-
-                print "|'''%s()'''" % topic[dot + 1:]
-                print "|<code>%s%s%s</code>\n\n" % (prefix, topic[dot + 1:], suffix) +\
-                    (doc and doc.replace("\n", "\n\n") or "...")
-            else:
-                print "|'''%s'''\n|%s" % (topic[dot + 1:],
-                    (doc and doc.replace("\n", "\n\n") or "..."))
-
-if __name__ == "__main__":
-    import os
-    # If we are run as script, run wesnoth with the --python-api switch.
-    os.system("src/wesnoth --python-api")
-else:
-    # If we are run as a python script, output the documentation to stdout.
-    import wesnoth
-    topics = []
-    myhelp("wesnoth", topics)
-    output(topics, 1)

data/ais/parse.py

@@ -1,50 +0,0 @@
-import re, os, safe
-
-whitelisted = ["wesnoth", "heapq", "random", "math", "string", "re"]
-rex = re.compile(r"^import\s+(.*)", re.M)
-modules = {}
-
-def include(matchob):
-    """
-    Regular expression callback. Handles a single import statement, returning
-    the included code.
-    """
-    names = [x.strip() for x in matchob.group(1).split(",")]
-    r = ""
-    for name in names:
-        if name in whitelisted:
-            modules[name] = __import__(name)
-            continue
-        for path in pathes:
-            includefile = os.path.join(path, name)
-            try:
-                code = parse_file(includefile + ".py")
-                break
-            except IOError:
-                pass
-        else:
-            raise safe.SafeException("Could not include %s." % name)
-            return None
-        r += code
-    return r
-
-def parse_file(name):
-    """
-    Simple pre-parsing of scripts, all it does is allow importing other scripts.
-    """
-    abspath = os.path.abspath(name)
-    if abspath in already: return ""
-    already[abspath] = 1
-    code = file(abspath).read().replace(chr(13), "")
-    code = rex.sub(include, code)
-    return code
-
-# If you want to disable safe python, use this instead:
-#
-# def parse(name): return open(name).read(), {}
-def parse(name):
-    global already, modules
-    already = {}
-    modules = {}
-    return parse_file(name), modules
-

data/ais/safe.py

@@ -1,134 +0,0 @@
-"""An attempt at creating a safe_exec for python.
-
-This file is public domain and is not suited for any serious purpose.
-This code is not guaranteed to work. Use at your own risk!
-Beware!  Trust no one!
-
-Please e-mail philhassey@yahoo.com if you find any security holes.
-svn://www.imitationpickles.org/pysafe/trunk
-
-See README.txt, NOTES.txt, CHANGES.txt for more details.
-"""
-import compiler
-import __builtin__
-
-class SafeException(Exception):
-    """Base class for Safe Exceptions"""
-    def __init__(self,*value):
-        self.value = str(value)
-    def __str__(self):
-        return self.value
-class CheckNodeException(SafeException):
-    """AST Node class is not in the whitelist."""
-    pass
-class CheckStrException(SafeException):
-    """A string in the AST looks insecure."""
-    pass
-class RunBuiltinException(SafeException):
-    """During the run a non-whitelisted builtin was called."""
-    pass
-
-_NODE_CLASS_OK = [
-    'Add', 'And', 'AssAttr', 'AssList', 'AssName', 'AssTuple',
-    'Assert', 'Assign','AugAssign', 'Bitand', 'Bitor', 'Bitxor', 'Break',
-    'CallFunc', 'Class', 'Compare', 'Const', 'Continue',
-    'Dict', 'Discard', 'Div', 'Ellipsis', 'Expression', 'FloorDiv',
-    'For', 'Function', 'Getattr', 'If', 'Keyword',
-    'LeftShift', 'List', 'ListComp', 'ListCompFor', 'ListCompIf', 'Mod',
-    'Module', 'Mul', 'Name', 'Node', 'Not', 'Or', 'Pass', 'Power',
-    'Print', 'Printnl', 'Return', 'RightShift', 'Slice', 'Sliceobj',
-    'Stmt', 'Sub', 'Subscript', 'Tuple', 'UnaryAdd', 'UnarySub', 'While',
-    ]
-_NODE_ATTR_OK = []
-_STR_OK = ['__init__']
-_STR_NOT_CONTAIN = ['__']
-_STR_NOT_BEGIN = ['im_','func_','tb_','f_','co_',]
-
-## conservative settings
-#_NODE_ATTR_OK = ['flags']
-#_STR_NOT_CONTAIN = ['_']
-#_STR_NOT_BEGIN = []
-
-def _check_node(node):
-    if node.__class__.__name__ not in _NODE_CLASS_OK:
-        raise CheckNodeException(node.lineno,node.__class__.__name__)
-    for k,v in node.__dict__.items():
-        if k in _NODE_ATTR_OK: continue
-        if v in _STR_OK: continue
-        if type(v) not in [str,unicode]: continue
-        for s in _STR_NOT_CONTAIN:
-            if s in v: raise CheckStrException(node.lineno,k,v)
-        for s in _STR_NOT_BEGIN:
-            if v[:len(s)] == s: raise CheckStrException(node.lineno,k,v)
-    for child in node.getChildNodes():
-        _check_node(child)
-
-def _check_ast(code):
-    ast = compiler.parse(code)
-    _check_node(ast)
-
-_BUILTIN_OK = [
-    '__debug__','quit','exit',
-    'Warning',
-    'None','True','False',
-    'abs', 'bool', 'callable', 'cmp', 'complex', 'dict', 'divmod', 'filter',
-    'float', 'frozenset', 'hex', 'int', 'isinstance', 'issubclass', 'len',
-    'list', 'long', 'map', 'max', 'min', 'object', 'oct', 'pow', 'range',
-    'repr', 'round', 'set', 'slice', 'str', 'sum', 'tuple',  'xrange', 'zip',
-    ]
-
-_BUILTIN_STR = [
-    'copyright','credits','license','__name__','__doc__',
-    ]
-
-def _builtin_fnc(k):
-    def fnc(*vargs,**kargs):
-        raise RunBuiltinException(k)
-    return fnc
-_builtin_globals = None
-_builtin_globals_r = None
-def _builtin_init():
-    global _builtin_globals, _builtin_globals_r
-    if _builtin_globals != None: return
-    _builtin_globals_r = __builtin__.__dict__.copy()
-    r = _builtin_globals = {}
-    for k in __builtin__.__dict__.keys():
-        v = None
-        if k in _BUILTIN_OK: v = __builtin__.__dict__[k]
-        elif k in _BUILTIN_STR: v = ''
-        else: v = _builtin_fnc(k)
-        r[k] = v
-def _builtin_destroy():
-    _builtin_init()
-    for k,v in _builtin_globals.items():
-        __builtin__.__dict__[k] = v
-def _builtin_restore():
-    for k,v in _builtin_globals_r.items():
-        __builtin__.__dict__[k] = v
-    
-def safe_check(code):
-    """Check the code to be safe."""
-    return _check_ast(code)
-
-def safe_run(code,context=None):
-    """Exec code with only safe builtins on."""
-    if context == None: context = {}
-    
-    _builtin_destroy()
-    try:
-        #exec code in _builtin_globals,context
-        context['__builtins__'] = _builtin_globals
-        exec code in context
-        _builtin_restore()
-    except:
-        _builtin_restore()
-        raise
-
-# If you want to disable safe python, use this instead:
-#
-# def safe_exec(code, context = None): exec code in context
-def safe_exec(code, context = None):
-    """Check the code to be safe, then run it with only safe builtins on."""
-    safe_check(code)
-    safe_run(code,context)
-    

data/ais/sample.py

@@ -1,396 +0,0 @@
-#!WPY
-
-"""This is a rather simple minded example of a python AI."""
-
-import wesnoth, heapq, random
-
-def pos(location):
-    """Just a helper function for printing positions in debug messages."""
-    return "(%d, %d)" % (1 + location.x, 1 + location.y)
-
-def debug(string):
-    pass
-
-class AI:
-    """A class representing our AI."""
-
-    def __init__(self):
-        """This class is constructed once for each turn of the AI. To get
-        persistent variables across terms, which also are saved when the game is
-        saved, use set_variable and get_variable."""
-
-        self.team = wesnoth.get_current_team()
-        self.village_radius = 25
-        self.scout_villages = 3
-
-        self.recruit()
-
-        self.fight()
-
-        self.conquer()
-
-    def conquer(self):
-        """Try to capture villages."""
-        villages = self.find_villages()
-        units =  wesnoth.get_destinations_by_unit().keys()
-
-        # Construct a sorted list of (distance, unit, village) triples.
-        queue = []
-        for village in villages:
-            for unit in units:
-                d = self.get_distance(unit, village)
-                if d != None: heapq.heappush(queue, (d, unit, village))
-
-        # Now assign units to villages, and move them.
-        while queue:
-            d, unit, village = heapq.heappop(queue)
-            if unit in units and village in villages:
-                units.remove(unit)
-                villages.remove(village)
-                self.go_to(unit, village)
-
-                if not units: break
-                if not villages: break
-
-    def cumulate_damage(self, cumulated, hitpoints, new_damage):
-        cumulated2 = {}
-        for already, ap in cumulated.iteritems():
-            for hp, probability in new_damage.iteritems():
-                damage = int(already + hitpoints - hp)
-                cumulated2[damage] = cumulated2.get(damage, 0) + ap * probability
-        return cumulated2
-
-    def danger_estimate(self, unit, where, enemy):
-        """Get some crude indication about how unsafe it is for unit to get
-        attacked by enemy at where."""
-
-        scores = []
-        u = wesnoth.get_units()[unit]
-        e = wesnoth.get_units()[enemy]
-        u_defense = u.defense_modifier(wesnoth.get_map(), where)
-        e_defense = e.defense_modifier(wesnoth.get_map(), enemy)
-
-        u_bonus = 100 - (u.type().alignment - 1) * wesnoth.get_gamestatus().lawful_bonus
-        e_bonus = 100 - (e.type().alignment - 1) * wesnoth.get_gamestatus().lawful_bonus
-
-        for attack in e.attacks():
-            score = attack.damage * attack.num_attacks * e_bonus / 100
-            score *= u_defense
-            score *= u.damage_against(attack) / 100
-
-            back = []
-            for retaliation in u.attacks():
-                if attack.range == retaliation.range:
-                    x = retaliation.damage * retaliation.num_attacks * u_bonus / 100
-                    x *= e_defense
-                    x *= e.damage_against(retaliation) / 100
-                    back.append(x)
-
-            if back:
-                r = max(back)
-                score -= r
-            heapq.heappush(scores, score)
-
-        return scores[0]
-
-    def danger(self, unit, location):
-        """Try to estimate danger of moving unit to location."""
-        attackers = []
-        for enemy, destinations in wesnoth.get_enemy_destinations_by_unit():
-            for tile in wesnoth.get_adjacent_tiles(unit):
-                if tile in destinations:
-                    heuristic = danger_estimate(unitm, location, enemy)
-                    if heuristic > 0:
-                        heapq.heappush(attackers, (-heuristic, enemy, tile))
-        result = 0
-        already = {}
-        while attackers:
-            danger, enemy, tile = heapq.heappop(attackers)
-            if not already[enemy] and not already[tile]:
-                danger = -danger
-                result += danger
-                already[enemy] = 1
-                already[tile] = 1
-        return result
-
-    def fight(self):
-        """Attack enemies."""
-        enemies =  wesnoth.get_enemy_destinations_by_unit().keys()
-        units =  wesnoth.get_destinations_by_unit().keys()
-
-        # Get a list of all units we can possibly kill and their chance to kill.
-        # This is just a heuristic, ignoring ZoC and unit placement.
-        kills = []
-        for enemy in enemies:
-            e = wesnoth.get_units()[enemy]
-            k = {0: 1.0}
-            for unit, destinations in wesnoth.get_destinations_by_unit().iteritems():
-                u = wesnoth.get_units()[unit]
-                for tile in wesnoth.get_adjacent_tiles(enemy):
-                    if tile in destinations:
-                        own_hp, enemy_hp = u.attack_statistics(tile, enemy)
-                        k = self.cumulate_damage(k, e.hitpoints, enemy_hp)
-            ctk = 0
-            for damage, p in k.iteritems():
-                if damage >= e.hitpoints:
-                    ctk += p
-            if ctk:
-                heapq.heappush(kills, (-ctk, enemy))
-
-        # Now find positions from where own units can attack the to be killed
-        # enemies.
-        attacks = []
-        while kills:
-            ctk, enemy = heapq.heappop(kills)
-            e = wesnoth.get_units()[enemy]
-            ctk = -ctk
-            for tile in wesnoth.get_adjacent_tiles(enemy):
-                for unit in wesnoth.get_units_by_destination().get(tile, []):
-                    u = wesnoth.get_units()[unit]
-                    own_hp, enemy_hp = u.attack_statistics(tile, enemy)
-                    score = e.hitpoints - sum([x[0] * x[1] for x in enemy_hp.iteritems()])
-                    score -= u.hitpoints - sum([x[0] * x[1] for x in own_hp.iteritems()])
-
-                    # This is so if there are two equally good attack
-                    # possibilities, we chose the one on better terrain.
-                    score *= 50 / u.defense_modifier(tile)
-
-                    heapq.heappush(attacks, (-score, unit, tile, enemy))
-                    #print own_hp, enemy_hp
-                    debug("Score for %s at %s: %s<->%s: %f [%s]" % (u.name,
-                        pos(unit), pos(tile), pos(enemy), score, e.name))
-
-        # Now assign units to enemies, and move and attack.
-        while attacks:
-            score, unit, tile, enemy = heapq.heappop(attacks)
-            score = -score
-
-            if unit in units and enemy in enemies:
-                #try:
-                loc = wesnoth.move_unit(unit, tile)
-                #except ValueError:
-                #    loc = None
-                if loc == tile:
-                    e = wesnoth.get_units()[enemy]
-                    wesnoth.attack_unit(tile, enemy)
-                    if not e.is_valid:
-                        enemies.remove(enemy)
-                    units.remove(unit)
-                    if not units: break
-
-    def recruit(self):
-        """Recruit units."""
-
-        # Check if there is any gold left first.
-        cheapest = min([x.cost for x in self.team.recruits()])
-        if self.team.gold < cheapest: return
-
-        # Find all keeps in the map.
-        keeps = self.find_keeps()
-
-        # Find our leader.
-        leader = None
-        for location, unit in wesnoth.get_units().iteritems():
-            if unit.side == self.team.side and unit.can_recruit:
-                leader = location
-                break
-
-        # Get number of villages to capture near to the leader.
-        villages = len([x for x in self.find_villages()
-            if leader.distance_to(x) < self.village_radius])
-
-        units_recruited = int(wesnoth.get_variable("units_recruited") or 0)
-
-        def attack_score(u1, u2):
-            """Some crude score of u1 attacking u2."""
-            maxdeal = 0
-            for attack in u1.attacks():
-                deal = attack.damage * attack.num_attacks
-                deal *= u2.damage_from(attack) / 100.0
-                for defense in u2.attacks():
-                    if attack.range == defense.range:
-                        receive = defense.damage * defense.num_attacks
-                        receive *= u1.damage_from(defense) / 100.0
-                        deal -= receive
-                if deal > maxdeal: maxdeal = deal
-            return maxdeal
-
-        def recruit_score(recruit, speed, defense, aggression, resistance):
-            """Score for recruiting the given unit type."""
-            need_for_speed = 3 * (villages / self.scout_villages -
-                units_recruited)
-            if need_for_speed < 0: need_for_speed = 0
-            v = speed * need_for_speed + defense * 0.1 + aggression + resistance
-            v += 1
-            if v < 1: v = 1
-            return v
-
-        # Try to figure out which units are good in this map.
-        map = wesnoth.get_map()
-        recruits = self.team.recruits()
-        recruits_list = []
-        for recruit in recruits:
-            speed = 0.0
-            defense = 0.0
-            n = map.x * map.y
-            for y in range(map.y):
-                for x in range(map.x):
-                    location = wesnoth.get_location(x, y)
-                    speed += recruit.movement_cost(location)
-                    defense += 100 - recruit.defense_modifier(location)
-            speed = recruit.movement * n / speed
-            defense /= n
-
-            aggression = 0.0
-            resistance = 0.0
-            enemies = wesnoth.get_enemy_destinations_by_unit().keys()
-            n = len(enemies)
-            for location in enemies:
-                enemy = wesnoth.get_units()[location]
-                aggression += attack_score(recruit, enemy)
-                resistance -= attack_score(enemy, recruit)
-            aggression /= n
-            resistance /= n
-
-            debug("%s: speed: %f, defense: %f, aggression: %f, resistance: %f" %
-                (recruit.name, speed, defense, aggression, resistance)
-
-            recruits_list.append((recruit, speed, defense, aggression, resistance))
-
-        # Now recruit.
-        for location, unit in wesnoth.get_units().iteritems():
-            if unit.side == self.team.side and unit.can_recruit:
-
-                keepsort = []
-                for keep in keeps:
-                    heapq.heappush(keepsort, (location.distance_to(keep), keep))
-
-                keep = keepsort[0][1]
-
-                self.go_to(location, keep)
-                for i in range(6): # up to 6 units (TODO: can be more)
-                    # Get a random, weighted unit type from the available.
-                    heap = []
-                    total_v = 0
-                    for r in recruits_list:
-                        v = recruit_score(*r)
-                        v *= v * v
-                        total_v += v
-                        heapq.heappush(heap, (-v, r[0]))
-                    r = random.uniform(0, total_v)
-                    while 1:
-                        v, recruit = heapq.heappop(heap)
-                        debug("%d %d" % % (r, v))
-                        r += v
-                        if r <= 0: break
-
-                    # Try to recruit it on the adjacent tiles
-                    # TODO: actually, it should just use the nearest possible
-                    # location
-                    for position in wesnoth.get_adjacent_tiles(location):
-                        if wesnoth.recruit_unit(recruit.name, position):
-                            break
-                    else:
-                        # was not possible -> we're done
-                        break
-                    units_recruited += 1
-                    wesnoth.set_variable("units_recruited", str(units_recruited))
-
-    def find_villages(self):
-        """Find all villages which are unowned or owned by enemies."""
-        villages = []
-        m = wesnoth.get_map()
-        for x in range(m.x):
-            for y in range(m.y):
-                location = wesnoth.get_location(x, y)
-                if wesnoth.get_map().is_village(location):
-                    for team in wesnoth.get_teams():
-                        # does it alreadey belong to use or an ally?
-                        if team.owns_village(location) and not team.is_enemy:
-                            break
-                    else:
-                        # no, either it belongs to an enemy or to nobody
-                        villages.append(location)
-
-        return villages
-
-    def find_keeps(self):
-        """Find keep locations."""
-        keeps = []
-        m = wesnoth.get_map()
-        for x in range(m.x):
-            for y in range(m.y):
-                location = wesnoth.get_location(x, y)
-                if wesnoth.get_map().is_keep(location):
-                    keeps.append(location)
-        return keeps
-
-    def get_distance(self, location, target, must_reach = False):
-        """Find out how many turns it takes the unit at location to reach target."""
-        if location == target: return 0
-        unit = wesnoth.get_units()[location]
-        path = unit.find_path(location, target, 100)
-        extra = 0
-        if not path:
-            extra = 1
-            if must_reach: return None
-            for adjacent in wesnoth.get_adjacent_tiles(target):
-                # Consider 5 turns worth of movement of this unit.
-                path = unit.find_path(location, adjacent,
-                    unit.type().movement * 5)
-                if path: break
-            else:
-                return None
-        l = 0
-        for location in path:
-            l += unit.movement_cost(location)
-        l -= unit.movement_left
-        l /= unit.type().movement
-        l += 1 + extra
-        return l
-
-    def attack(self, location, enemy):
-        """Attack an enemy unit."""
-        wesnoth.attack_unit(location, enemy)
-
-    def go_to(self, location, target, must_reach = False):
-        """Make a unit at the given location go to the given target.
-        Returns the reached position.
-        """
-        if location == target: return location
-
-        # If target is occupied, try to go near it
-        unit_locations = wesnoth.get_units().keys()
-        if target in unit_locations:
-            if must_reach: return location
-            adjacent = wesnoth.get_adjacent_tiles(target)
-            targets = [x for x in adjacent if not x in unit_locations]
-            if targets:
-                target = targets[0]
-            else:
-                return location
-
-        # find a path
-        for l, unit in wesnoth.get_units().iteritems():
-            if location ==  l:
-                path = unit.find_path(location, target, unit.type().movement * 5)
-                break
-        else:
-            return location
-
-        if path:
-            possible_destinations = wesnoth.get_destinations_by_unit().get(location, [])
-            if must_reach:
-                if not target in path: return location
-                if not target in possible_destinations: return location
-
-            # find first reachable position in reversed path
-            path.reverse()
-
-            for p in path:
-                if p in possible_destinations and not p in unit_locations:
-                    location = wesnoth.move_unit(location, p)
-                    return location
-        return location
-
-AI()

data/campaigns/An_Orcish_Incursion/_main.cfg

@@ -20,32 +20,31 @@
     description=_"Defend the forests of the elves against the first orcs to reach the Great Continent, learning valuable tactics as you do so.
 
 (Novice level, 7 scenarios.)"
+    # Geographical and historical assumptions (ESR):
+    #
+    # As originally written by Josh Parsons, this campaign was not set in
+    # any particular time or place.  I changed it to a few years after the
+    # arrival of orcs on the Great Continent, and pinned it to the
+    # northern marches of Wesmere.  Erlornas and his troops were originally
+    # professional guards, but I've changed them to a scratch force of
+    # civilians raused by a local noble and gradually militarizing.  Thus,
+    # this becomes a story of how elves learned the nature of orcs and how
+    # to cope.
+
+    [about]
+        title = _ "Campaign Design"
+        [entry]
+            name = "Josh Parsons"
+        [/entry]
+    [/about]
+    [about]
+        title = _ "Adaptation for mainline"
+        [entry]
+            name = "Eric S. Raymond"
+        [/entry]
+    [/about]
 [/campaign]
 
-# Geographical and historical assumptions (ESR):
-#
-# As originally written by Josh Parsons, this campaign was not set in
-# any particular time or place.  I changed it to a few years after the
-# arrival of orcs on the Great Continent, and pinned it to the
-# northern marches of Wesmere.  Erlornas and his troops were originally
-# professional guards, but I've changed them to a scratch force of
-# civilians raused by a local noble and gradually militarizing.  Thus,
-# this becomes a story of how elves learned the nature of orcs and how
-# to cope.
-
-[about]
-    title = _ "Campaign Design"
-    [entry]
-        name = "Josh Parsons"
-    [/entry]
-[/about]
-[about]
-    title = _ "Adaptation for mainline"
-    [entry]
-        name = "Eric S. Raymond"
-    [/entry]
-[/about]
-
 #ifdef CAMPAIGN_AN_ORCISH_INCURSION
 [binary_path]
     path="data/campaigns/An_Orcish_Incursion"

data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/An_Orcish_Incursion/maps/defend_the_forest.map}"
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [side]
         type="Elvish Lord"

data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/An_Orcish_Incursion/maps/assassins.map}"
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [side]
         type="Elvish Lord"

data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/An_Orcish_Incursion/maps/wasteland.map}"
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [side]
         type="Elvish Lord"

data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/An_Orcish_Incursion/maps/valley_of_trolls.map}"
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
 #define AVOID_CAVEDOORS
     # The edges of the cave passages and mountains on both troll lairs.

data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/An_Orcish_Incursion/maps/linaera_the_quick.map}"
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [side]
         type="Elvish Lord"

data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/An_Orcish_Incursion/maps/a_detour_through_the_swamp.map}"
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [side]
         type="Elvish Lord"

data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/An_Orcish_Incursion/maps/showdown.map}"
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [side]
         type="Elvish Lord"

data/campaigns/Descent_Into_Darkness/ais/kamikaze.py

@@ -1,68 +0,0 @@
-#!WPY
-import wesnoth
-
-class AI:
-    def __init__(self):
-        self.do()
-
-    def do(self):
-        # loop over all enemy units
-        for enemy_loc, ed in wesnoth.get_enemy_destinations_by_unit().iteritems():
-            target_unit = wesnoth.get_units()[enemy_loc]
-            # see if unit is the leader of player's side
-            if target_unit.side == 1 and target_unit.can_recruit == 1:
-                # if so, get adjacent locations
-                for unit_loc, destinations in wesnoth.get_destinations_by_unit().iteritems():
-                    attacked_flag = False
-                    for destination in destinations:
-                        if destination.adjacent_to(enemy_loc):
-                            wesnoth.move_unit(unit_loc, destination)
-                            wesnoth.attack_unit(destination, enemy_loc)
-                            attacked_flag = True
-                            break
-                    if (not attacked_flag):
-                        new_loc = self.go_to(unit_loc, enemy_loc, False)
-                        if new_loc.adjacent_to(enemy_loc):
-                            wesnoth.attack_unit(new_loc, enemy_loc)
-                            
-    def go_to(self, location, target, must_reach = False):
-        """Make a unit at the given location go to the given target.
-        Returns the reached position.
-        """
-        if location == target: return location
-
-        # If target is occupied, try to go near it
-        unit_locations = wesnoth.get_units().keys()
-        if target in unit_locations:
-            if must_reach: return location
-            adjacent = wesnoth.get_adjacent_tiles(target)
-            targets = [x for x in adjacent if not x in unit_locations]
-            if targets:
-                target = targets[0]
-            else:
-                return location
-
-        # find a path
-        for l, unit in wesnoth.get_units().iteritems():
-            if location ==  l:
-                path = unit.find_path(location, target, 1000)
-                break
-        else:
-            return location
-
-        if path:
-            possible_destinations = wesnoth.get_destinations_by_unit().get(location, [])
-            if must_reach:
-                if not target in path: return location
-                if not target in possible_destinations: return location
-
-            # find first reachable position in reversed path
-            path.reverse()
-
-            for p in path:
-                if p in possible_destinations and not p in unit_locations:
-                    location = wesnoth.move_unit(location, p)
-                    return location
-        return location
-                    
-AI() 

data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg

@@ -8,6 +8,7 @@
     turns=15
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_SAVING_HALAL}
 

data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg

@@ -8,6 +8,7 @@
     {TURNS 29 26 23}
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_PEACEFUL_VALLEY}
 
@@ -107,7 +108,7 @@
     [/event]
 
     # Generate a random number of guards between 0 and 2 around X,Y
-#define RANDOM_GUARDS TYPE DESCRIPTION USER_DESCRIPTION SIDE X Y
+#define RANDOM_GUARDS TYPE NAME_STRING SIDE X Y
     {VARIABLE_OP number_of_guards random 0..2}
 
     {REPEAT $number_of_guards (
@@ -136,8 +137,7 @@
         [/move_unit_fake]
 
         [unit]
-            description={DESCRIPTION}
-            user_description={USER_DESCRIPTION}	# wmllint: ignore
+            user_description={NAME_STRING}	# wmllint: ignore
             type={TYPE}
             side={SIDE}
             x,y=$possible_guard_locations[$random_location_index].x,$possible_guard_locations[$random_location_index].y
@@ -169,11 +169,11 @@
             side=1
         [/filter]
 
-        {IF_VAR village_$x1,$y1|_cleared not_equals yes (
+        {IF_VAR village_$x1|_$y1|_cleared not_equals yes (
         [then]
-            {RANDOM_GUARDS (Goblin Spearman) Villager (_ "Villager") 2 $x1 $y1}
+            {RANDOM_GUARDS (Goblin Spearman) (_ "Villager") 2 $x1 $y1}
 
-            {VARIABLE village_$x1,$y1|_cleared yes}
+            {VARIABLE village_$x1|_$y1|_cleared yes}
         [/then]
 
         [else]
@@ -260,7 +260,7 @@
         [/store_villages]
 
         {FOREACH villages i}
-        {VARIABLE_OP village_var format "village_$villages[$i].x,$villages[$i].y|_cleared"}
+        {VARIABLE_OP village_var format "village_$villages[$i].x|_$villages[$i].y|_cleared"}
 
         {CLEAR_VARIABLE $village_var}
         {NEXT i}

data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg

@@ -8,6 +8,7 @@
     {TURNS 36 34 32}
 
     victory_when_enemies_defeated=yes
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_A_HAUNTING_IN_WINTER}
 
@@ -76,11 +77,6 @@
         no_leader=yes
         fog=no
         shroud=no
-        # kamikaze.py heads straight for the leader of side 1 and attacks
-        [ai]
-            ai_algorithm=python_ai
-            python_script="../campaigns/Descent_Into_Darkness/ais/kamikaze.py"
-        [/ai]
     [/side]
 
     [event]

data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg

@@ -8,6 +8,7 @@
     turns=36
 
     victory_when_enemies_defeated=yes
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_BEGINNING_OF_THE_REVENGE}
 
@@ -173,6 +174,9 @@
                 [filter_location]
                     terrain=Ai
                 [/filter_location]
+                [not]
+                    race=bats
+                [/not]
                 [not]
                     race=undead
                 [/not]

data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg

@@ -8,6 +8,7 @@
     turns=30
 
     victory_when_enemies_defeated=yes
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_ORC_WAR}
 

data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg

@@ -8,6 +8,7 @@
     turns=-1
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_RETURN_TO_HALAL}
 
@@ -47,7 +48,7 @@
         user_description=_ "Drogan"
         {GOLD 16 30 45}
         canrecruit=yes
-        recruit=Spearman,Archer
+        recruit=Spearman,Bowman
         [ai]
             aggression=0.2
             caution=0.5
@@ -63,10 +64,11 @@
         type=Frontier Baroness
         description=Dela Keshar
         user_description=_ "Dela Keshar"
+        gender=female
         gold=200
         income=25
         canrecruit=yes
-        recruit=Spearman,Archer,Swordsman,Pikeman,Longbowman,Thug,Poacher,Footpad
+        recruit=Spearman,Bowman,Swordsman,Pikeman,Longbowman,Thug,Poacher,Footpad
         profile=portraits/dela.png
         [ai]
             [protect_unit]

data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg

@@ -8,6 +8,7 @@
     {TURNS 28 26 22}
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_A_SMALL_FAVOR}
 

data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg

@@ -8,6 +8,7 @@
     {TURNS 30 27 25}
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     # no story -- this occurs immediately after the previous scenario
 

data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg

@@ -8,6 +8,7 @@
     {TURNS 30 27 25}
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     # no story -- this occurs immediately after the previous scenario
 

data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg

@@ -8,6 +8,7 @@
     turns=-1
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_ALONE_AT_LAST}
 
@@ -270,6 +271,7 @@
                 [/move_unit_fake]
                 [unit]
                     type=Frontier Baroness
+                    gender=female
                     side=4
                     x,y=21,4
                     description=Dela Keshar

data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg

@@ -8,6 +8,7 @@
     turns=-1
 
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {STORY_DESCENT_INTO_DARKNESS}
 

data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg

@@ -53,11 +53,6 @@
 
         # {SCATTER_IMAGE (terrain=Uu) 3 scenery/rubble.png}
 
-        [music]
-            name=knolls.ogg
-            ms_after=5000
-        [/music]
-
         [objectives]
             side=1
             [objective]
@@ -69,8 +64,68 @@
                 description=_ "Destruction of Mal Keshar"
             [/objective]
         [/objectives]
+        
+        [if]
+            [variable]
+                name=timesForever
+                greater_than=0
+            [/variable]
+            
+            [then]
+                # after the first repetition, we'll let the campaign really end
+                # when Malin dies
+                [event]
+                    name=die
 
+                    [filter]
+                        description="Mal Keshar"
+                    [/filter]
+                    
+                    [role]
+                        side=2
+                        [not]
+                            canrecruit=yes
+                        [/not]
+                        role=second
+                    [/role]
+                    [music]
+                        name=elvish-theme.ogg
+                        immediate=yes
+                        append=no
+                    [/music]
+                    {DIALOGUE_FAEA_END}
+                    [endlevel]
+                        result=continue_no_save
+                        next_scenario=null
+                    [/endlevel]
+                [/event]
+                
+                {VARIABLE previous_randomHero $randomHero}
+            [/then]
+            
+            [else]
+                # Normal defeat condition on the first repeat
+                {MAL_DEATH}
+                
+                {VARIABLE previous_randomHero -1}
+            [/else]
+        [/if]
+        
+        # let's pick a random hero type...
         {VARIABLE_OP randomHero random (0..4)}
+        
+        # and make sure it's not the same as last time
+        [while]
+            [variable]
+                name=randomHero
+                equals=$previous_randomHero
+            [/variable]
+            
+            [do]
+                {VARIABLE_OP randomHero random (0..4)}
+            [/do]
+        [/while]
+        
         [if]
             [variable]
                 name=randomHero
@@ -85,7 +140,17 @@
                     x,y=20,3
                     canrecruit=yes
                 [/unit]
-                {ALLOW_RECRUIT (Spearman,Swordsman,Pikeman,Bowman,Longbowman,Heavy Infantry,Shock Trooper,Mage,Red Mage,White Mage,Horseman,Knight,Lancer)}
+                {ALLOW_RECRUIT (Spearman,Swordsman,Pikeman,Bowman,Longbowman,Heavy Infantryman,Shock Trooper,Mage,Red Mage,White Mage,Horseman,Knight,Lancer)}
+
+                [music]
+                    name=loyalists.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=the_city_falls.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
         [if]
@@ -103,6 +168,11 @@
                     canrecruit=yes
                 [/unit]
                 {ALLOW_RECRUIT (Thug,Bandit,Footpad,Outlaw,Poacher,Trapper,Thief,Rogue)}
+
+                [music]
+                    name=battle.ogg
+                    append=no
+                [/music]
             [/then]
         [/if]
         [if]
@@ -119,7 +189,17 @@
                     x,y=20,3
                     canrecruit=yes
                 [/unit]
-                {ALLOW_RECRUIT (Elvish Figher,Elvish Hero,Elvish Captain,Elvish Archer,Elvish Ranger,Elvish Marksman,Elvish Shaman,Elvish Sorceress,Elvish Druid,Elvish Scout,Elvish Rider,Wose)}
+                {ALLOW_RECRUIT (Elvish Fighter,Elvish Hero,Elvish Captain,Elvish Archer,Elvish Ranger,Elvish Marksman,Elvish Shaman,Elvish Sorceress,Elvish Druid,Elvish Scout,Elvish Rider,Wose)}
+
+                [music]
+                    name=knolls.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=the_city_falls.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
         [if]
@@ -136,7 +216,17 @@
                     x,y=20,3
                     canrecruit=yes
                 [/unit]
-                {ALLOW_RECRUIT (Dwarvish Figher,Dwarvish Steelclad,Dwarvish Thunderer,Dwarvish Thunderguard,Dwarvish Stalwart,Dwarvish Guardsman,Dwarvish Ulfserker,Dwarvish Berserker,Gryphon Rider,Gryphon Master)}
+                {ALLOW_RECRUIT (Dwarvish Fighter,Dwarvish Steelclad,Dwarvish Thunderer,Dwarvish Thunderguard,Dwarvish Stalwart,Dwarvish Guardsman,Dwarvish Ulfserker,Dwarvish Berserker,Gryphon Rider,Gryphon Master)}
+
+                [music]
+                    name=battle.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=underground.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
         [if]
@@ -154,6 +244,16 @@
                     canrecruit=yes
                 [/unit]
                 {ALLOW_RECRUIT (Orcish Warrior,Orcish Slayer,Orcish Crossbowman,Troll,Troll Rocklobber)}
+
+                [music]
+                    name=northerners.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=battle.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
 
@@ -167,49 +267,26 @@
         [/gold]
         {CLEAR_VARIABLE heroGold}
 
+        # play only sad music after a few repetitions
         [if]
             [variable]
                 name=timesForever
-                greater_than=0
+                greater_than=4
             [/variable]
             [then]
-                [event]
-                    name=attack_end
-                    first_time_only=no
-                    [store_unit]
-                        variable=deathTest
-                        [filter]
-                            description="Mal Keshar"
-                        [/filter]
-                        kill=no
-                    [/store_unit]
-                    [if]
-                        [variable]
-                            name=deathTest.hitpoints
-                            less_than_equal_to=0
-                        [/variable]
-                        [then]
-                            [role]
-                                side=2
-                                [not]
-                                    canrecruit=yes
-                                [/not]
-                                role=second
-                            [/role]
-                            [music]
-                                name=elf-land.ogg
-                                play_once=yes
-                                immediate=yes
-                                ms_after=10000
-                            [/music]
-                            {DIALOGUE_FAEA_END}
-                            [endlevel]
-                                result=victory
-                                next_scenario=null
-                            [/endlevel]
-                        [/then]
-                    [/if]
-                [/event]
+                [music]
+                    name=the_king_is_dead.ogg
+                    immediate=yes
+                    append=no
+                [/music]
+                [music]
+                    name=elvish-theme.ogg
+                    append=yes
+                [/music]
+                [music]
+                    name=nunc_dimittis.ogg
+                    append=yes
+                [/music]
             [/then]
         [/if]
     [/event]
@@ -276,13 +353,9 @@
 
     # In-scenario events defined within the prestart event
 
-    # Defeat Conditions
-    {MAL_DEATH}
-
     [event]
         name=victory
         {VARIABLE_OP timesForever add 1}
-        {CLEAR_VARIABLE randomHero}
     [/event]
 
     {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}

data/campaigns/Eastern_Invasion/_main.cfg

@@ -5,6 +5,7 @@
 
 # wmlscope: set export=no
 [campaign]
+    id=Eastern_Invasion
     rank=130
     icon=units/human-loyalists/general.png~RC(magenta>red)
     name= _ "The Eastern Invasion"

data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg

@@ -11,6 +11,7 @@
     next_scenario=Escape_Tunnel
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg

@@ -10,6 +10,7 @@
     next_scenario=Unexpected_Appearance
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg

@@ -8,6 +8,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg

@@ -18,6 +18,7 @@
     next_scenario=Northern_Outpost
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg

@@ -7,6 +7,8 @@
     next_scenario=Two_Paths
     victory_when_enemies_defeated=no
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
+    
 
     {DEFAULT_SCHEDULE}
 

data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg

@@ -4,6 +4,7 @@
     name= _ "Two Paths"
     map_data="{campaigns/Eastern_Invasion/maps/Two_Paths.map}"
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
     next_scenario=Crossing
     {TURNS 18 16 14}
 

data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/07b.Undead_Crossing.cfg

@@ -8,6 +8,7 @@
     {DEFAULT_MUSIC_PLAYLIST}
 
     {DEFAULT_SCHEDULE}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg

@@ -11,6 +11,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=no
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}

data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/11.Lake_Vrug.cfg

@@ -15,6 +15,7 @@
     next_scenario=Captured
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/12.Captured.cfg

@@ -11,6 +11,7 @@
     next_scenario=Evacuation
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
@@ -173,7 +174,7 @@
                 description= _ "Death of Owaec"
                 condition=lose
             [/objective]
-            note= _ "Note: every unit not on the south side of the river when the bridge is destroyed will be lost"
+            note= _ "Note: every unit not on the south side of the river when the bridge is destroyed will be lost (including not recalled units)"
         [/objectives]
     [/event]
 

data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/17.Weldyn_Under_Attack.cfg

@@ -27,6 +27,7 @@
     next_scenario=Duel
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [side]
         type=Lieutenant

data/campaigns/Eastern_Invasion/scenarios/18b.Weldyn_Besieged.cfg

@@ -9,6 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {DEFAULT_MUSIC_PLAYLIST}
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 

data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg

@@ -7,10 +7,11 @@
     hitpoints=64
     movement_type=mounted
     movement=7
-    experience=
+    experience=150
     level=3
     alignment=lawful
-    advanceto=
+    advanceto=null
+    {AMLA_DEFAULT}
     undead_variation=mounted
     cost=50
     usage=fighter

data/campaigns/Eastern_Invasion/utils/throneroom.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-httt
+#textdomain wesnoth-ei
 # Macros for decorating the throneroom map.
 
 #define LEFT_PIKE X Y

data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg

@@ -10,6 +10,7 @@
 
     next_scenario=02_Blackwater_Port
     victory_when_enemies_defeated=no
+    {VICTORY_AND_DEFEAT_MUSIC}
 
     [event]
         name=prestart
@@ -207,6 +208,7 @@
         type=Elvish Druid
         description=Chantal
         user_description= _ "Chantal"
+        gender=female
         side=6
         canrecruit=yes
         recruit=Elvish Shaman,Elvish Archer,Elvish Fighter

data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg

@@ -4,6 +4,7 @@
     name= _ "Blackwater Port"
     map_data="{campaigns/Heir_To_The_Throne/maps/02_Blackwater_Port.map}"
     {SCENARIO_MUSIC "loyalists.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 12 12 9}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg

@@ -4,6 +4,7 @@
     name= _ "The Isle of Alduin"
     map_data="{campaigns/Heir_To_The_Throne/maps/03_The_Isle_of_Alduin.map}"
     {SCENARIO_MUSIC "wanderer.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 34 24 21}
 
     {AFTERNOON}

data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg

@@ -4,6 +4,7 @@
     name= _ "The Bay of Pearls"
     map_data="{campaigns/Heir_To_The_Throne/maps/04_The_Bay_of_Pearls.map}"
     {SCENARIO_MUSIC "battle.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 27 24 21}
 
     {DEFAULT_SCHEDULE}
@@ -250,26 +251,30 @@
                 description=Bugg
             [/have_unit]
             [then]
-                #override kills being processed after
-                #units being created if they're in the same event
-                [command]
-                    [kill]
-                        description=Bugg
-                    [/kill]
 
-                    {LOYAL_UNIT 2 (Sea Orc) 16 18 (Bugg) ( _ "Bugg")}
+				[store_unit]
+					variable=bugg_flip
+					[filter]
+						description=Bugg
+					[/filter]
+					kill=yes
+				[/store_unit]
 
-                    [message]
-                        description=Bugg
-                        message= _ "Ha ha ha! Now orcs will rule over land and sea!"
-                    [/message]
+                {LOYAL_UNIT 2 (Sea Orc) $bugg_flip.x $bugg_flip.y (Bugg) ( _ "Bugg")}
+
+				{CLEAR_VARIABLE bugg_flip}
+
+                [message]
+                    description=Bugg
+                    message= _ "Ha ha ha! Now orcs will rule over land and sea!"
+                [/message]
+
+                [message]
+                    description=Dwaba-Kukai
+                    image=portraits/James_Woo/orc-warlord2.png
+                    message= _ "(Sigh) Will someone kill this idiot for me, please?"
+                [/message]
 
-                    [message]
-                        description=Dwaba-Kukai
-                        image=portraits/James_Woo/orc-warlord2.png
-                        message= _ "(Sigh) Will someone kill this idiot for me, please?"
-                    [/message]
-                [/command]
             [/then]
         [/if]
     [/event]

data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg

@@ -4,6 +4,7 @@
     name= _ "Muff Malal's Peninsula"
     map_data="{campaigns/Heir_To_The_Throne/maps/05a_Muff_Malal_Peninsula.map}"
     {SCENARIO_MUSIC "revelation.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 27 24 21}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg

@@ -5,6 +5,7 @@
     name= _ "Isle of the Damned"
     map_data="{campaigns/Heir_To_The_Throne/maps/05b_Isle_of_the_Damned.map}"
     {SCENARIO_MUSIC "revelation.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 27 24 21}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg

@@ -4,6 +4,7 @@
     name= _ "The Siege of Elensefar"
     map_data="{campaigns/Heir_To_The_Throne/maps/06_The_Siege_of_Elensefar.map}"
     {SCENARIO_MUSIC "knolls.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 40 32 29}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg

@@ -4,6 +4,7 @@
     name= _ "Crossroads"
     map_data="{campaigns/Heir_To_The_Throne/maps/07_Crossroads.map}"
     {SCENARIO_MUSIC "battle.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 37 34 31}
 
     next_scenario=08_The_Princess_of_Wesnoth

data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg

@@ -4,6 +4,7 @@
     name= _ "The Princess of Wesnoth"
     map_data="{campaigns/Heir_To_The_Throne/maps/08_The_Princess_of_Wesnoth.map}"
     {SCENARIO_MUSIC "wanderer.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 31 28 25}
 
     {DEFAULT_SCHEDULE}
@@ -81,6 +82,7 @@
         type=Princess
         description="Li'sar"
         user_description= _ "Li'sar"
+        gender=female
         unrenamable=yes
         side=2
         canrecruit=yes

data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg

@@ -4,6 +4,7 @@
     name= _ "The Valley of Death - The Princess's Revenge"
     map_data="{campaigns/Heir_To_The_Throne/maps/09_The_Valley_of_Death.map}"
     {SCENARIO_MUSIC "northerners.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     turns=12
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg

@@ -4,6 +4,7 @@
     name= _ "Gryphon Mountain"
     map_data="{campaigns/Heir_To_The_Throne/maps/10_Gryphon_Mountain.map}"
     {SCENARIO_MUSIC "knolls.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 27 24 21}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg

@@ -4,6 +4,7 @@
     name= _ "The Ford of Abez"
     map_data="{campaigns/Heir_To_The_Throne/maps/11_The_Ford_of_Abez.map}"
     {SCENARIO_MUSIC "loyalists.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 27 24 21}
 
     {DEFAULT_SCHEDULE}
@@ -52,6 +53,7 @@
         type=Princess
         description="Li'sar"
         user_description= _ "Li'sar"
+        gender=female
         side=2
         canrecruit=yes
         recruit=Cavalryman,Swordsman,Spearman,Red Mage,Ogre,Duelist

data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg

@@ -4,6 +4,7 @@
     name= _ "Northern Winter"
     map_data="{campaigns/Heir_To_The_Throne/maps/12_Northern_Winter.map}"
     {SCENARIO_MUSIC "wanderer.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 50 40 40}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg

@@ -4,6 +4,7 @@
     name= _ "The Dwarven Doors"
     map_data="{campaigns/Heir_To_The_Throne/maps/13_The_Dwarven_Doors.map}"
     {SCENARIO_MUSIC "battle.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 26 20 15}
     victory_when_enemies_defeated=no
 
@@ -213,36 +214,38 @@
         # find a special unit
         #
         [role]
-            type=Footpad,Thug,Poacher,Outlaw,Trapper,Bandit
+            type=Footpad,Thug,Poacher,Outlaw,Trapper,Bandit,Fugitive,Ranger,Huntsman,Highwayman
             role=Outlaw_Advisor
         [/role]
         [recall]
             role=Outlaw_Advisor
         [/recall]
-        [redraw]
-        [/redraw]
-        [message]
-            role=Outlaw_Advisor
-            message= _ "My uncle used to smuggle... err... I mean... trade food for the dwarves. He could get grain carts in under the very noses of those ugly orcs."
-        [/message]
-        [message]
-            role=Outlaw_Advisor
-            message= _ "He must be hiding in one of those villages."
-        [/message]
+        
         [if]
             [have_unit]
                 role=Outlaw_Advisor
             [/have_unit]
+            
             [then]
-                {TALK_ABOUT_UNCLE}
                 [store_unit]
-                    variable=outlaw_advisor_store
                     [filter]
                         role=Outlaw_Advisor
                     [/filter]
+                    
+                    kill=no
+                    variable=outlaw_advisor_store
                 [/store_unit]
+                
                 {VARIABLE outlaw_name $outlaw_advisor_store.user_description}
-                {CLEAR_VARIABLE outlaw_advisor_store}
+                
+                [message]
+                    role=Outlaw_Advisor
+                    message= _ "My uncle used to smuggle... err... I mean... trade food for the dwarves. He could get grain carts in under the very noses of those ugly orcs."
+                [/message]
+                [message]
+                    role=Outlaw_Advisor
+                    message= _ "He must be hiding in one of those villages."
+                [/message]
             [/then]
         [/if]
     [/event]
@@ -278,6 +281,8 @@
             description=Kalenz
             message= _ "I would settle for escape, though I know not which I dread more: foul orcs or fetid caves."
         [/message]
+        
+        [allow_undo][/allow_undo]
     [/event]
 
     [event]
@@ -290,93 +295,7 @@
             message= _ "Back to the abyss, spawn of filth!"
         [/message]
     [/event]
-
-    [event]
-        name=moveto
-        first_time_only=no
-        [filter]
-            description=Uncle Somf
-        [/filter]
-        [store_unit]
-            variable=outlaw_advisor_store
-            [filter]
-                role=Outlaw_Advisor
-            [/filter]
-        [/store_unit]
-
-        # proximity check
-
-        [store_locations]
-            x=$x1
-            y=$y1
-            variable=uncle_check_loc
-            radius=1
-        [/store_locations]
-
-        # The unit we want to be next to
-
-        [store_unit]
-            variable=outlaw_advisor_store
-            [filter]
-                role=Outlaw_Advisor
-            [/filter]
-        [/store_unit]
-
-        # Iterate over each location checking to see if the outlaw
-        # target is standing next to Uncle Somf
-
-        {FOREACH uncle_check_loc i}
-        {VARIABLE_OP temp_x format $uncle_check_loc[$i].x}
-        {VARIABLE_OP temp_x multiply -1}
-        {VARIABLE_OP temp_x add $outlaw_advisor_store.x}
-        {VARIABLE_OP temp_y format $uncle_check_loc[$i].y}
-        {VARIABLE_OP temp_y multiply -1}
-        {VARIABLE_OP temp_y add $outlaw_advisor_store.y}
-        [if]
-            [variable]
-                name=temp_x
-                numerical_equals=0
-            [/variable]
-            [then]
-                [if]
-                    [variable]
-                        name=temp_y
-                        numerical_equals=0
-                    [/variable]
-                    [then]
-                        [if]
-                            [variable]
-                                name=outlaw_repartee
-                                numerical_equals=0
-                            [/variable]
-                            [then]
-                                {VARIABLE_OP message_text format (_ "How are we doing, $outlaw_name|?")}
-                                [message]
-                                    description=Uncle Somf
-                                    message=$message_text
-                                [/message]
-                                [message]
-                                    description=$outlaw_name
-                                    message= _ "The same as always, Uncle!"
-                                [/message]
-                                [message]
-                                    description=Uncle Somf
-                                    message= _ "That bad, huh?"
-                                [/message]
-                                {VARIABLE outlaw_repartee 1}
-                            [/then]
-                        [/if]
-                    [/then]
-                [/if]
-            [/then]
-        [/if]
-        {NEXT i}
-        {CLEAR_VARIABLE temp_x}
-        {CLEAR_VARIABLE temp_y}
-        {CLEAR_VARIABLE outlaw_advisor_store}
-        {CLEAR_VARIABLE uncle_check_loc}
-    [/event]
-
+    
     #
     # Finding the bandit uncle who gives you a big hint about the true exit
     #
@@ -388,58 +307,46 @@
             y=24
         [/filter]
         [if]
-            [variable]
-                name=uncle_smuggler
-                numerical_equals=1
-            [/variable]
+            [have_unit]
+                role=Outlaw_Advisor
+            [/have_unit]
             [then]
                 {LOYAL_UNIT 1 (Bandit) 18 24 (Uncle Somf) ( _ "Uncle Somf")}
-                [redraw]
-                [/redraw]
-                #
-                # The bandit's speech depends on who finds him
-                #
-                [store_unit]
-                    variable=outlaw_advisor_store
-                    [filter]
-                        role=Outlaw_Advisor
-                    [/filter]
-                [/store_unit]
-                [if]
-                    [variable]
-                        name=outlaw_advisor_store.x
-                        numerical_equals=18
-                    [/variable]
-                    [then]
-                        [if]
-                            [variable]
-                                name=outlaw_advisor_store.y
-                                numerical_equals=24
-                            [/variable]
-                            [then]
-                                {VARIABLE_OP message_text format (_ "$outlaw_name|! How have you been? I haven't seen you in years.")}
-                            [/then]
-                        [/if]
-                    [/then]
-                    [else]
-                        {VARIABLE_OP message_text format (_ "Haw! Any friend of $outlaw_name is a friend of mine too.")}
-                    [/else]
-                [/if]
-
+                
                 [message]
                     speaker=unit
                     message= _ "Who... who's here?"
                 [/message]
+                
+                #
+                # The bandit's speech depends on who finds him
+                #
+                [if]
+                    [have_unit]
+                        role=Outlaw_Advisor
+                        x,y=18,24
+                    [/have_unit]
+                    # the outlaw advisor finds Uncle Somf
+                    [then]
+                        [message]
+                            speaker=Uncle Somf
+                            message= _ "$outlaw_name|! How have you been? I haven't seen you in years."
+                        [/message]
+                    [/then]
+                    # ...or someone else finds him
+                    [else]
+                        [message]
+                            speaker=Uncle Somf
+                            message= _ "Haw! Any friend of $outlaw_name is a friend of mine too."
+                        [/message]
+                    [/else]
+                [/if]
+
                 [message]
-                    description=Uncle Somf
-                    message=$message_text
-                [/message]
-                {CLEAR_VARIABLE message_text}
-                {CLEAR_VARIABLE outlaw_advisor_store}
-                [message]
-                    description=Konrad
+                    speaker=Konrad
                     message= _ "We need to make it into the caves of the dwarves."
                 [/message]
+                
                 #
                 # The bandit divulges the true location of the entrance
                 #
@@ -450,26 +357,60 @@
                     [/variable]
                     [then]
                         [message]
-                            description=Uncle Somf
+                            speaker=Uncle Somf
                             message= _ "The mine entrances were all collapsed intentionally during the fighting. The doors, while heavily defended, remain accessible. The orcish hordes that assault them are repulsed, but you may be able to sneak in unnoticed."
                         [/message]
                     [/then]
                     [else]
                         [message]
-                            description=Uncle Somf
+                            speaker=Uncle Somf
                             message= _ "The best way is through the mine tunnels. The orcs have never found all the mine entrances, and many still lead deep underground."
                         [/message]
                     [/else]
                 [/if]
-
-                [set_variable]
-                    name=uncle_smuggler
-                    value=2
-                [/set_variable]
             [/then]
+            
+            [else]
+                [allow_undo][/allow_undo]
+            [/else]
         [/if]
     [/event]
 
+    [event]
+        name=moveto
+
+        [filter]
+            description=Uncle Somf
+            
+            [filter_adjacent]
+                role=Outlaw_Advisor
+            [/filter_adjacent]
+            
+            [or]
+                role=Outlaw_Advisor
+            
+                [filter_adjacent]
+                    description=Uncle Somf
+                [/filter_adjacent]
+            [/or]
+        [/filter]
+
+        [message]
+            speaker=Uncle Somf
+            message= _ "How are we doing, $outlaw_name|?"
+        [/message]
+        [message]
+            speaker=$outlaw_advisor_store.description
+            message= _ "The same as always, Uncle!"
+        [/message]
+        [message]
+            speaker=Uncle Somf
+            message= _ "That bad, huh?"
+        [/message]
+        
+        [allow_undo][/allow_undo]
+    [/event]
+
     #
     # When any side 1 unit reaches a possible exit, we find out if it
     # is the correct one. We don't know who will reach the exit,
@@ -702,7 +643,10 @@
         [/message]
 
         {LOYAL_UNIT 2 (Princess) 8 44 (Li'sar) ( _ "Li'sar")}
-	# wmllint: recognize Li'sar
+        [+unit]
+            gender=female
+        [/unit]
+        # wmllint: recognize Li'sar
         {LISAR_GUARD_DOORS}
         {LISAR_GUARD_DOORS}
         {LISAR_GUARD_DOORS}
@@ -714,9 +658,8 @@
             message= _ "Whew! We make our way through the dangerous fog of the mountains, and now there is all this chaos before us! Come on, men! We must make it to the caves that lie ahead of us!"
         [/message]
         {CLEAR_VARIABLE true_entrance_location}
+        {CLEAR_VARIABLE outlaw_advisor_store}
         {CLEAR_VARIABLE outlaw_name}
-        {CLEAR_VARIABLE outlaw_repartee}
-        {CLEAR_VARIABLE message_text}
     [/event]
 
     {campaigns/Heir_To_The_Throne/utils/deaths.cfg}

data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg

@@ -6,6 +6,7 @@
     [music]
         name="battle.ogg"
     [/music]
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=no
     {TURNS 19 16 13}
 

data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg

@@ -4,6 +4,7 @@
     name= _ "The Lost General"
     map_data="{campaigns/Heir_To_The_Throne/maps/15_The_Lost_General.map}"
     {SCENARIO_MUSIC "underground.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 64 60 54}
 
     {UNDERGROUND}

data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg

@@ -4,6 +4,7 @@
     name= _ "Hasty Alliance"
     map_data="{campaigns/Heir_To_The_Throne/maps/16_Hasty_Alliance.map}"
     {SCENARIO_MUSIC "underground.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 33 30 27}
 
     {DEEP_UNDERGROUND}
@@ -76,6 +77,7 @@
         controller=ai
 
         type=Princess
+        gender=female
         description="Li'sar"
         user_description= _ "Li'sar"
         facing=sw
@@ -352,7 +354,7 @@
                 description=Li'sar
             [/filter]
 
-            kill=no
+            kill=yes
             variable=stored_Lisar
         [/store_unit]
 
@@ -362,6 +364,7 @@
             user_description= _ "Li'sar"
             unrenamable=yes
             type=$stored_Lisar.type
+            gender=female
             experience=$stored_Lisar.experience
             {IS_HERO}
             random_traits=no

data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg

@@ -32,6 +32,7 @@
         [settings]
             name= _ "The Scepter of Fire"
             {DEFAULT_MUSIC_PLAYLIST}
+            {VICTORY_AND_DEFEAT_MUSIC}
             {TURNS 50 45 35}
             victory_when_enemies_defeated=no
             next_scenario=18_A_Choice_Must_Be_Made

data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg

@@ -4,6 +4,7 @@
     name= _ "A Choice Must Be Made"
     map_data="{campaigns/Heir_To_The_Throne/maps/18_A_Choice_Must_Be_Made.map}"
     {SCENARIO_MUSIC "knolls.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 33 30 27}
 
     next_scenario=19a_Snow_Plains

data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg

@@ -4,6 +4,7 @@
     name= _ "Snow Plains"
     map_data="{campaigns/Heir_To_The_Throne/maps/19a_Snow_Plains.map}"
     {SCENARIO_MUSIC "wanderer.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 43 40 37}
 
     next_scenario="20a_North_Elves"
@@ -161,13 +162,5 @@
         [/message]
     [/event]
 
-    [event]
-        name=moveto
-        [filter]
-            side=1
-            x=29
-            y=9
-        [/filter]
-        {OBJ_SWORD_FIRE 29 9 flame_sword}
-    [/event]
+    {OBJ_SWORD_FIRE 29 9 flame_sword}
 [/scenario]

data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg

@@ -4,6 +4,7 @@
     name= _ "Swamp Of Dread"
     map_data="{campaigns/Heir_To_The_Throne/maps/19b_Swamp_Of_Dread.map}"
     {SCENARIO_MUSIC "wanderer.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 33 30 27}
 
     next_scenario=20a_North_Elves

data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/Heir_To_The_Throne/maps/19c_Cliffs_of_Thoria.map}"
 
     {SCENARIO_MUSIC "battle.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 55 45 35}
 
     next_scenario="20b_Underground_Channels"

data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg

@@ -4,6 +4,7 @@
     name= _ "Home of the North Elves"
     map_data="{campaigns/Heir_To_The_Throne/maps/20a_North_Elves.map}"
     {SCENARIO_MUSIC "revelation.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 21 18 15}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg

@@ -5,6 +5,7 @@
     map_data="{campaigns/Heir_To_The_Throne/maps/20b_Underground_Channels.map}"
 
     {SCENARIO_MUSIC "battle.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 80 70 60}
 
     next_scenario="21_Elven_Council"
@@ -126,6 +127,7 @@
         type=Elvish Sylph
         description=Bona-Melodia
         user_description= _ "Bona-Melodia"
+        gender=female
         controller=ai
         canrecruit=yes
         team_name=elves

data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg

@@ -37,6 +37,7 @@
     [/side]
     [side]
         type=Elvish Lady
+        gender=female
         description=Parandra
         user_description= _ "Parandra"
         side=3

data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg

@@ -4,6 +4,7 @@
     name= _ "Return to Wesnoth"
     map_data="{campaigns/Heir_To_The_Throne/maps/22_Return_to_Wesnoth.map}"
     {SCENARIO_MUSIC "knolls.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 31 28 25}
 
     next_scenario=23_Test_of_the_Clans

data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg

@@ -4,6 +4,7 @@
     name= _ "Test of the Clan"
     map_data="{campaigns/Heir_To_The_Throne/maps/23_Test_of_the_Clans.map}"
     {SCENARIO_MUSIC "northerners.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     {TURNS 53 50 47}
 
     {DEFAULT_SCHEDULE}

data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg

@@ -4,6 +4,7 @@
     name= _ "The Battle for Wesnoth"
     map_data="{campaigns/Heir_To_The_Throne/maps/24_Battle_for_Wesnoth.map}"
     # Music is defined in prestart due to a story music key
+    {VICTORY_AND_DEFEAT_MUSIC}
     turns=60
 
     {DEFAULT_SCHEDULE}
@@ -43,7 +44,7 @@
 
     [story]
         [part]
-            music   =main_menu.ogg
+            music=main_menu.ogg
             story= _ "Here we overlook the city of Weldyn. The great city. The ancient city. The city of evil. The city of good. The city of men."
             background=story/arrival_of_the_heir.png
         [/part]
@@ -142,6 +143,7 @@
 
     [side]
         type=Dark Queen
+        gender=female
         description=Asheviere
         user_description= _ "Asheviere"
         side=5
@@ -163,7 +165,7 @@
         # {SCATTER_IMAGE (terrain=Gg) 12 scenery/oak-leaning.png}
 
         [music]
-            name="revelation.ogg"
+            name="battle.ogg"
         [/music]
         [if]
             [variable]
@@ -224,7 +226,7 @@
             message= _ "So, these rebels come at last to face me, while most of my army is off fighting the fickle clans."
         [/message]
         [message]
-            speaker=clanboss
+            role=clanboss
             message= _ "Wretched wench. Your army is tasting death as we speak. The clans have arrived to unseat you, pretender!"
         [/message]
         [message]

data/campaigns/Heir_To_The_Throne/units/Princess.cfg

@@ -37,6 +37,46 @@
         damage=11
         number=4
     [/attack]
+    [idle_anim]
+        {STANDARD_IDLE_FILTER}
+        start_time=0
+        [frame]
+            duration=100
+            image="human-princess-idle-1.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="human-princess-idle-2.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="human-princess-idle-3.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="human-princess-idle-4.png"
+        [/frame]
+        [frame]
+            duration=150
+            image="human-princess-idle-5.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="human-princess-idle-3.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="human-princess-idle-4.png"
+        [/frame]
+        [frame]
+            duration=200
+            image="human-princess-idle-5.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="human-princess-idle-6.png"
+        [/frame]
+    [/idle_anim]
     [attack_anim]
         [attack_filter]
             name=sabre

data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg

@@ -11,8 +11,18 @@
 #
 
 #define OBJ_SWORD_FIRE X Y ID
-    {PLACE_IMAGE items/flame-sword.png ({X}) ({Y})}
-    {VARIABLE sword_taken 0}
+    [event]
+        name=moveto
+
+        [filter]
+            side=1
+            x={X}
+            y={Y}
+        [/filter]
+
+        {PLACE_IMAGE items/flame-sword.png ({X}) ({Y})}
+        {VARIABLE sword_taken 0}
+    [/event]
     [event]
         name=moveto
         first_time_only=no
@@ -106,11 +116,22 @@
                             [/object]
                         [/command]
                     [/option]
+
                     [option]
                         message= _ "No"
+
+                        [command]
+                            [allow_undo]
+                            [/allow_undo]
+                        [/command]
                     [/option]
                 [/message]
             [/then]
+
+            [else]
+                [allow_undo]
+                [/allow_undo]
+            [/else]
         [/if]
     [/event]
 #enddef
@@ -160,59 +181,56 @@
                                         image="wesnoth-icon.png"
                                         message= _ "You struggle to lift and don the heavy plate. Once worn, however, it is amazingly comfortable. You have increased resistance to all physical damage!"
                                     [/message]
-                                    {VARIABLE armor_taken 1}
+
                                     [store_unit]
                                         [filter]
-                                            x,y={X},{Y}
+                                            x,y=$x1,$y1
                                         [/filter]
 
                                         kill=yes
                                         variable=void_armor_taker
                                     [/store_unit]
 
-                                    {VARIABLE void_armor_taker_heals $void_armor_taker.abilities.heals.length}
+                                    {VARIABLE armor_taken 1}
 
-                                    {VARIABLE_OP void_armor_heals_temp format "void_armor_taker.abilities.heals[$void_armor_taker_heals].id"}
-                                    {VARIABLE $void_armor_heals_temp "void_armor"}
+                                    {VARIABLE void_armor_trait_i $void_armor_taker.modifications.trait.length}
 
-                                    {VARIABLE_OP void_armor_heals_temp format "void_armor_taker.abilities.heals[$void_armor_taker_heals].name"}
-                                    {VARIABLE_OP $void_armor_heals_temp format ( _ "void armor")}
-                                    {VARIABLE_OP void_armor_heals_temp format "void_armor_taker.abilities.heals[$void_armor_taker_heals].name_inactive"}
-                                    {VARIABLE_OP $void_armor_heals_temp format ( _ "void armor")}
+                                    {VARIABLE_OP void_armor_trait format "void_armor_taker.modifications.trait[$void_armor_trait_i].id"}
+                                    {VARIABLE $void_armor_trait "void_armor"}
 
-                                    {VARIABLE_OP void_armor_heals_temp format "void_armor_taker.abilities.heals[$void_armor_taker_heals].description"}
-                                    {VARIABLE_OP $void_armor_heals_temp format ( _ "The Void Armor grants the following resistances:
+                                    {VARIABLE_OP void_armor_trait format "void_armor_taker.modifications.trait[$void_armor_trait_i].name"}
+                                    {VARIABLE_OP $void_armor_trait format ( _ "void armor")}
+
+                                    {VARIABLE_OP void_armor_trait format "void_armor_taker.modifications.trait[$void_armor_trait_i].description"}
+                                    {VARIABLE_OP $void_armor_trait format ( _ "The Void Armor grants the following resistances:
 blade:  50%
 pierce: 50%
 impact: 60%
 fire:  +10%")}
-                                    {VARIABLE_OP void_armor_heals_temp format "void_armor_taker.abilities.heals[$void_armor_taker_heals].description_inactive"}
-                                    {VARIABLE_OP $void_armor_heals_temp format ( _ "The Void Armor grants the following resistances:
-blade:  50%
-pierce: 50%
-impact: 60%
-fire:  +10%")}
-
-                                    {CLEAR_VARIABLE $void_armor_temp}
-                                    {CLEAR_VARIABLE void_armor_temp}
 
                                     [unstore_unit]
                                         variable=void_armor_taker
+                                        find_vacant=no
                                     [/unstore_unit]
 
+                                    {CLEAR_VARIABLE void_armor_trait}
+                                    {CLEAR_VARIABLE void_armor_trait_i}
                                     {CLEAR_VARIABLE void_armor_taker}
-                                    {CLEAR_VARIABLE void_armor_heals_temp}
                                 [/then]
                                 #
                                 # Set physical resistance to 50/40/40
+                                # FIXME: they are now temporarily 50/50/60
+                                # because that's what the description string
+                                # claims. Should be changed back to 50/40/40
+                                # when string freezes permit.
                                 #
                                 [effect]
                                     apply_to=resistance
                                     replace=true
                                     [resistance]
                                         blade=50
-                                        pierce=60
-                                        impact=60
+                                        pierce=50
+                                        impact=40
                                     [/resistance]
                                 [/effect]
                                 #
@@ -320,42 +338,42 @@ _f,    _f,    _f,    _f,    _f,    _f,    Re,    _f,    _f,    _f,    _f,    _f,
     _f,    _f,    _f,    _f,    Re,    _f,    _f,    _f,    _f,    _f,    _f,    Re,    Re,    Re,    Re,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    _f,    Re,    _f,    _f,    _f,    _f,    _f,    _f,    Re,    _f,    _f,    _f,    _f,    _f,    Re,    _f,    _f,    Re
     _f,    Re,    _f,    _f,    Re,    _f,    _f,    _f,    Re,    Re,    _f,    _f,    Re,    _f,   Uu^Vud,    _f,    Re,    Re,    _f,    _f,    _f,    Re,    _f,    Re,    _f,    _f,    _f,   Uu^Vud,    Re,    Uu^Uf,    _f,    _f,    _f,    Uu^Uf,    Re,    _f,    _f,    Re,    _f,    Re,    _f,   Uu^Vud,    Re,    _f,    Re,    Re,    Re,    Re,    _f,    Uu^Uf
 "
-        [rule]		# Make sure your castle is not converted
+        [rule]      # Make sure your castle is not converted
             old=Cud
             new=Re, Uu^Vud, Uh, Uu^Uf
             terrain=Cud
         [/rule]
-        [rule]		# Make sure cave walls are not converted
+        [rule]      # Make sure cave walls are not converted
             old=Xu
             new=Re, Uu^Vud, Uh, Uu^Uf
             terrain=Xu
         [/rule]
-        [rule]		# Make sure the keep is not converted
+        [rule]      # Make sure the keep is not converted
             old=Kud
             new=Re, Uu^Vud, Uh, Uu^Uf
             terrain=Kud
         [/rule]
-        [rule]		# Convert cave villages to stone villages
+        [rule]      # Convert cave villages to stone villages
             old=Vu
-            new=_f, Re, Uu^Vud, Uh, Uu^Uf	# wmllint: ignore
+            new=_f, Re, Uu^Vud, Uh, Uu^Uf   # wmllint: ignore
             terrain=Uu^Vud
         [/rule]
-        [rule]		# Add stone villages
+        [rule]      # Add stone villages
             old=Uu
             new=Uu^Vud
             terrain=Uu^Vud
         [/rule]
-        [rule]		# Add roads
+        [rule]      # Add roads
             old=Uu
             new=Re
             terrain=Re
         [/rule]
-        [rule]		# Add hilly caves
+        [rule]      # Add hilly caves
             old=Uu
             new=Uh
             terrain=Uh
         [/rule]
-        [rule]		# Add a mushroom forest
+        [rule]      # Add a mushroom forest
             old=Uu
             new=Uu^Uf
             terrain=Uu^Uf

data/campaigns/Liberty/scenarios/01_The_Raid.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=civil_disobedience
     {SCENARIO_MUSIC "northerners.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=no
 
     [label]

data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=a_strategy_of_hope
     {SCENARIO_MUSIC "loyalists.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=no
 
     [story]
@@ -265,15 +266,15 @@
             message= _ "Today we may no longer be citizens of Wesnoth. I wish it could be otherwise, but we are now outlaws."
         [/message]
 
-        {CHG_TYPE type=Footpad_Peasant Footpad}
-        {CHG_TYPE type=Outlaw_Peasant Outlaw}
-        {CHG_TYPE type=Fugitive_Peasant Fugitive}
-        {CHG_TYPE type=Thug_Peasant Thug}
-        {CHG_TYPE type=Bandit_Peasant Bandit}
-        {CHG_TYPE type=Highwayman_Peasant Highwayman}
-        {CHG_TYPE type=Poacher_Peasant Poacher}
-        {CHG_TYPE type=Trapper_Peasant Trapper}
-        {CHG_TYPE type=Huntsman_Peasant Huntsman}
+        {CHG_TYPE type=Footpad_Peasant Footpad chaotic}
+        {CHG_TYPE type=Outlaw_Peasant Outlaw chaotic}
+        {CHG_TYPE type=Fugitive_Peasant Fugitive chaotic}
+        {CHG_TYPE type=Thug_Peasant Thug chaotic}
+        {CHG_TYPE type=Bandit_Peasant Bandit chaotic}
+        {CHG_TYPE type=Highwayman_Peasant Highwayman chaotic}
+        {CHG_TYPE type=Poacher_Peasant Poacher chaotic}
+        {CHG_TYPE type=Trapper_Peasant Trapper chaotic}
+        {CHG_TYPE type=Huntsman_Peasant Huntsman chaotic}
 
         # Changing the unit type clobbers its portrait pointer if the new
         # type has a unit portrait. Make sure Baldras and Harper keep theirs.

data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=unlawful_orders
     {SCENARIO_MUSIC "wanderer.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=yes
 
     [story]
@@ -69,7 +70,7 @@
         side=3
         canrecruit=yes
         controller=ai
-        recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Troll Whelp,Troll Grunt
+        recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Troll Whelp
         [village]
             x,y=45,32
         [/village]

data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=hide_and_seek
     {SCENARIO_MUSIC "knolls.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=yes
 
     [label]
@@ -261,25 +262,25 @@
             [/unstore_unit]
         {NEXT i}
 
-        {CHG_TYPE side,type=3,Spearman Skeleton}
-        {CHG_TYPE side,type=3,Swordsman Deathblade}
-        {CHG_TYPE side,type=3,Pikeman Revenant}
-        {CHG_TYPE side,type=3,Bowman (Skeleton Archer)}
-        {CHG_TYPE side,type=3,Longbowman (Bone Shooter)}
-        {CHG_TYPE (side,type=3,Heavy Infantryman) Ghoul}
-        {CHG_TYPE (side,type=3,Shock Trooper) Necrophage}
-        {CHG_TYPE side,type=3,Mage (Dark Adept)}
-        {CHG_TYPE (side,type=3,White Mage) (Dark Sorcerer)}
-        {CHG_TYPE (side,type=3,Red Mage) (Dark Sorcerer2)}
-        {CHG_TYPE (side,type=3,Arch Mage) Lich}
-        {CHG_TYPE (side,type=3,Mage of Light) Necromancer}
-        {CHG_TYPE side,type=3,Cavalryman (Skeleton Rider)}
-        {CHG_TYPE side,type=3,Dragoon (Bone Knight)}
-        {CHG_TYPE side,type=3,Horseman (Skeleton Rider2)}
-        {CHG_TYPE side,type=3,Lancer (Bone Knight2)}
-        {CHG_TYPE side,type=3,Knight (Bone Knight3)}
-        {CHG_TYPE side,type=3,Lieutenant (Death Squire)}
-        {CHG_TYPE side,type=3,General (Death Knight)}
+        {CHG_TYPE side,type=3,Spearman Skeleton chaotic}
+        {CHG_TYPE side,type=3,Swordsman Deathblade chaotic}
+        {CHG_TYPE side,type=3,Pikeman Revenant chaotic}
+        {CHG_TYPE side,type=3,Bowman (Skeleton Archer) chaotic}
+        {CHG_TYPE side,type=3,Longbowman (Bone Shooter) chaotic}
+        {CHG_TYPE (side,type=3,Heavy Infantryman) Ghoul chaotic}
+        {CHG_TYPE (side,type=3,Shock Trooper) Necrophage chaotic}
+        {CHG_TYPE side,type=3,Mage (Dark Adept) chaotic}
+        {CHG_TYPE (side,type=3,White Mage) (Dark Sorcerer) chaotic}
+        {CHG_TYPE (side,type=3,Red Mage) (Dark Sorcerer2) chaotic}
+        {CHG_TYPE (side,type=3,Arch Mage) Lich chaotic}
+        {CHG_TYPE (side,type=3,Mage of Light) Necromancer chaotic}
+        {CHG_TYPE side,type=3,Cavalryman (Skeleton Rider) chaotic}
+        {CHG_TYPE side,type=3,Dragoon (Bone Knight) chaotic}
+        {CHG_TYPE side,type=3,Horseman (Skeleton Rider2) chaotic}
+        {CHG_TYPE side,type=3,Lancer (Bone Knight2) chaotic}
+        {CHG_TYPE side,type=3,Knight (Bone Knight3) chaotic}
+        {CHG_TYPE side,type=3,Lieutenant (Death Squire) chaotic}
+        {CHG_TYPE side,type=3,General (Death Knight) chaotic}
 
         [store_unit]
             [filter]
@@ -348,25 +349,25 @@
             [/unstore_unit]
         {NEXT i}
 
-        {CHG_TYPE side,type=3,Skeleton Spearman}
-        {CHG_TYPE side,type=3,Deathblade Swordsman}
-        {CHG_TYPE side,type=3,Revenant Pikeman}
-        {CHG_TYPE (side,type=3,Skeleton Archer) Bowman}
-        {CHG_TYPE (side,type=3,Bone Shooter) Longbowman}
-        {CHG_TYPE side,type=3,Ghoul (Heavy Infantryman)}
-        {CHG_TYPE side,type=3,Necrophage (Shock Trooper)}
-        {CHG_TYPE (side,type=3,Dark Adept) Mage}
-        {CHG_TYPE (side,type=3,Dark Sorcerer) (White Mage)}
-        {CHG_TYPE (side,type=3,Dark Sorcerer2) (Red Mage)}
-        {CHG_TYPE side,type=3,Lich (Arch Mage)}
-        {CHG_TYPE side,type=3,Necromancer (Mage of Light)}
-        {CHG_TYPE (side,type=3,Skeleton Rider) Cavalryman}
-        {CHG_TYPE (side,type=3,Bone Knight) Dragoon}
-        {CHG_TYPE (side,type=3,Skeleton Rider2) Horseman}
-        {CHG_TYPE (side,type=3,Bone Knight2) Lancer}
-        {CHG_TYPE (side,type=3,Bone Knight3) Knight}
-        {CHG_TYPE (side,type=3,Death Squire) Lieutenant}
-        {CHG_TYPE (side,type=3,Death Knight) General}
+        {CHG_TYPE side,type=3,Skeleton Spearman lawful}
+        {CHG_TYPE side,type=3,Deathblade Swordsman lawful}
+        {CHG_TYPE side,type=3,Revenant Pikeman lawful}
+        {CHG_TYPE (side,type=3,Skeleton Archer) Bowman lawful}
+        {CHG_TYPE (side,type=3,Bone Shooter) Longbowman lawful}
+        {CHG_TYPE side,type=3,Ghoul (Heavy Infantryman) lawful}
+        {CHG_TYPE side,type=3,Necrophage (Shock Trooper) lawful}
+        {CHG_TYPE (side,type=3,Dark Adept) Mage lawful}
+        {CHG_TYPE (side,type=3,Dark Sorcerer) (White Mage) lawful}
+        {CHG_TYPE (side,type=3,Dark Sorcerer2) (Red Mage) lawful}
+        {CHG_TYPE side,type=3,Lich (Arch Mage) lawful}
+        {CHG_TYPE side,type=3,Necromancer (Mage of Light) lawful}
+        {CHG_TYPE (side,type=3,Skeleton Rider) Cavalryman lawful}
+        {CHG_TYPE (side,type=3,Bone Knight) Dragoon lawful}
+        {CHG_TYPE (side,type=3,Skeleton Rider2) Horseman lawful}
+        {CHG_TYPE (side,type=3,Bone Knight2) Lancer lawful}
+        {CHG_TYPE (side,type=3,Bone Knight3) Knight lawful}
+        {CHG_TYPE (side,type=3,Death Squire) Lieutenant lawful}
+        {CHG_TYPE (side,type=3,Death Knight) General lawful}
 
         [store_unit]
             [filter]

data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=the_gray_woods
     {SCENARIO_MUSIC "loyalists.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=no
 
     [story]

data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=the_hunters
     {SCENARIO_MUSIC "underground.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=yes
 
     [story]
@@ -205,10 +206,7 @@
     #
     # Create a goodie for you to find
     # This macro creates an moveto event that gives you an object
-    # Highlight it with a glowing circle that will remain even
-    # after the item is taken.
-    #
-    {PLACE_IMAGE scenery/circle-magic-glow.png 19 30}
+
     {OBJ_HOLY_ANKH 19 30 ankh1}
 
     #

data/campaigns/Liberty/scenarios/07_The_Hunters.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=glory
     {SCENARIO_MUSIC "breaking_the_chains.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=no
 
     [story]
@@ -124,8 +125,8 @@
         [recall]
             description=Harper
         [/recall]
-        {LOYAL_UNIT 1 Outlaw Jingo ( _ "Jingo") 30 17} 
-        {LOYAL_UNIT 1 Outlaw Majel ( _ "Majel") 32 17}
+        {LOYAL_UNIT 1 Outlaw 30 17 Jingo ( _ "Jingo")} 
+        {LOYAL_UNIT 1 Outlaw 32 17 Majel ( _ "Majel")}
         # wmllint: recognize Jingo
         # wmllint: recognize Majel
     [/event]
@@ -154,7 +155,7 @@
             message= _ "The garrison. The towers of Halstead are more than a garrison, nephew, they are a fortress. They used to protect this area from the enemies of Wesnoth; I never imagined they would house the enemies of Wesnoth."
         [/message]
 
-        {LOYAL_UNIT 1 Dragoon Pitcher ( _ "Pitcher") 11 1} 
+        {LOYAL_UNIT 1 Dragoon 11 1 (Pitcher) ( _ "Pitcher")} 
         # wmllint: recognize Pitcher
 
         {MOVE_UNIT description=Pitcher 20 14}

data/campaigns/Liberty/scenarios/08_Glory.cfg

@@ -8,6 +8,7 @@
 
     next_scenario=epilog
     {SCENARIO_MUSIC "battle.ogg"}
+    {VICTORY_AND_DEFEAT_MUSIC}
     victory_when_enemies_defeated=no
 
     [story]