Merge remote-tracking branch 'origin/master' into renderpath_redo

.gitignore

@@ -17,25 +17,14 @@ cmake_install.cmake
 CPack*Config.cmake
 uninstall.cmake
 CMakeCache.txt
+install_manifest.txt
 
 # scons
 .scons-option-cache
 *sconsign.dblite
 .sconf_temp
 buildlog.txt
 
-# win32/MSVC:
-ALL_BUILD.vcproj
-INSTALL.vcproj
-PACKAGE.vcproj
-ZERO_CHECK.vcproj
-uninstall.vcproj
-projectfiles/VC*/*.user
-projectfiles/VC[12]*
-src/**/*.vcproj
-/WindowsTimeout.ilk
-/WindowsTimeout.pdb
-
 # XCode
 projectfiles/Xcode/**/build
 projectfiles/Xcode/**/Headers
@@ -55,6 +44,24 @@ projectfiles/**/*.layout
 projectfiles/**/*_build_log.html
 projectfiles/**/*objs*
 
+# Visual Studio
+projectfiles/VC*
+!projectfiles/VC12
+projectfiles/VC*/.vs/
+projectfiles/VC*/*.vc.*db
+projectfiles/VC*/*.sdf
+projectfiles/VC*/*.suo
+projectfiles/VC*/*.aps
+ALL_BUILD.vcproj
+INSTALL.vcproj
+PACKAGE.vcproj
+ZERO_CHECK.vcproj
+uninstall.vcproj
+*.vcproj.*.user
+src/**/*.vcproj
+/WindowsTimeout.ilk
+/WindowsTimeout.pdb
+
 # eclipse
 .settings
 !utils/umc_dev/org.wesnoth*/.settings/

SConstruct

@@ -371,12 +371,10 @@ if env["prereqs"]:
 
     def have_sdl_other():
         return \
-            conf.CheckSDL(require_version = SDL2_version) & \
             conf.CheckSDL("SDL2_ttf", header_file = "SDL_ttf") & \
             conf.CheckSDL("SDL2_mixer", header_file = "SDL_mixer") & \
             conf.CheckSDL("SDL2_image", header_file = "SDL_image")
 
-
     if env["libintl"]:
         def have_i18n_prereqs():
             return conf.CheckGettextLibintl()
@@ -386,7 +384,6 @@ if env["prereqs"]:
 
     have_server_prereqs = (\
         conf.CheckCPlusPlus(gcc_version = "3.3") & \
-        have_sdl_net() & \
         conf.CheckBoost("iostreams", require_version = "1.34.1") & \
         conf.CheckBoostIostreamsGZip() & \
         conf.CheckBoostIostreamsBZip2() & \
@@ -399,7 +396,13 @@ if env["prereqs"]:
             or Warning("WARN: Base prerequisites are not met")
 
     env = conf.Finish()
-    client_env = env.Clone()
+
+    campaignd_env = env.Clone()
+    conf = campaignd_env.Configure(**configure_args)
+    have_sdl_net()
+    campaignd_env = conf.Finish()
+
+    client_env = campaignd_env.Clone()
     conf = client_env.Configure(**configure_args)
     have_client_prereqs = have_server_prereqs & have_sdl_other() & \
         conf.CheckLib("vorbisfile") & \
@@ -490,7 +493,7 @@ if not env['nls']:
 #
 print "---[applying configuration]---"
 
-for env in [test_env, client_env, env]:
+for env in [test_env, campaignd_env, client_env, env]:
     build_root="#/"
     if os.path.isabs(env["build_dir"]):
         build_root = ""
@@ -550,7 +553,7 @@ try:
 except:
     pass
 
-Export(Split("env client_env test_env have_client_prereqs have_server_prereqs have_test_prereqs"))
+Export(Split("env campaignd_env client_env test_env have_client_prereqs have_server_prereqs have_test_prereqs"))
 SConscript(dirs = Split("po doc packaging/windows packaging/systemd"))
 
 binaries = Split("wesnoth wesnothd cutter exploder campaignd test")
@@ -564,7 +567,7 @@ builds = {
 builds["glibcxx_debug"].update(builds["debug"])
 build = env["build"]
 
-for env in [test_env, client_env, env]:
+for env in [test_env, campaignd_env, client_env, env]:
     env["extra_flags_glibcxx_debug"] = env["extra_flags_debug"]
     env.AppendUnique(**builds[build])
     env.Append(CXXFLAGS = Split(os.environ.get('CXXFLAGS', [])), LINKFLAGS = Split(os.environ.get('LDFLAGS', [])))

changelog

@@ -1,15 +1,28 @@
 Version 1.13.4+dev:
+ * Campaigns:
+   * Heir to the Throne:
+     * New sprites for Li'sar.
+     * S10: Clarify objectives and change egg image on capture.
+     * S19c: Removed the undead and the swamps.
  * Graphics:
    * Updated generic portrait of Mermaid Initiate.
+   * Added generic portrait for Giant Spider.
  * Language and i18n:
-   * Updated translations:
+   * Updated translations: British English, Galician, German, Italian, Japanese,
+     Portuguese, RACV, Russian, Scottish Gaelic, Spanish
  * Removed support for SDL 1.2. SDL 2 is now the only supported version.
  * Terrains:
    * Changed terrain code of Desert Mountains from Mdy to Mdd.
  * User Interface:
    * Various design improvements to GUI2 widgets
    * New simpler GUI2 loading screen
    * New colored cursor graphics
+   * Fixed Observers icon appearing behind other top bar items in MP games on
+     horizontal UI resolutions < 1024 (bug #24455).
+   * Fixed ToD schedule progress indicator appearing behind other top bar items
+     on vertical UI resolutions < 600.
+   * Improved the dialog for choosing what to do when a player leaves in
+     multiplayer.
  * WML engine:
    * Fix some issues with [foreach]
    * Fix some issues with backstab-like weapon specials
@@ -37,6 +50,8 @@ Version 1.13.4+dev:
    * Added new keys name_generator, male_name_generator and female_name_generator
      for the [race] tag to declare a context-free grammar to describe how names
      are derived
+   * Modification tags in [modify_unit] now support delayed_variable_substitution
+     (This means [advancement], [object], and [trait] tags.)
    * AiWML:
      * Simplified aspect syntax which works for all aspects, present and future:
        * All aspects with simple values can be specified as key=value
@@ -158,10 +173,12 @@ Version 1.13.4+dev:
      * abilities - list of the IDs of all abilities
    * Additional fields in table returned by wesnoth.get_terrain_info:
      * icon, editor_image, light
-   * Additional fields in unit type proxu:
+   * Additional fields in unit type proxy:
      * race, id, alignment
      * attacks, which returns the same thing as unit.attacks
      * abilities, same as unit.abilities
+   * Additional field in side proxy:
+     * faction (read-only), faction_name (read-only)
    * LuaAI:
      * The table returned by check_*() now has a "result" field which
        gives a description of the action's result; similar to "status"
@@ -193,6 +210,8 @@ Version 1.13.4+dev:
        should return a table with keys "own" and "enemy", each of which may
        be either a unit filter table or a function which takes a unit as a
        parameter and returns true or false.
+ * Multiplayer:
+   * Hornshark Island: simplified multiplayer faction determination
  * Wesnoth formula engine:
    * Formulas in unit filters can now access nearly all unit attributes
      The following attributes were renamed (old names still work, for now):
@@ -290,6 +309,13 @@ Version 1.13.4+dev:
    * Recognize hotkey release events
    * Allow changing keybindings for scrolling the map.
    * Fix the move-to-targets candidate action of the default AI ignoring tunnels
+   * Fix two rare bugs in the goto candidate action that resulted in goto moves
+     by other units being skipped after a unit could not get to its goal.
+   * Replace wmlxgettext tool with new python3 implementation by Nobun:
+     https://github.com/AncientLich/wmlxgettext-unoff/
+   * Debug commands that create units now do so for the currently controlled
+     side instead of always side 1.
+   * Fixed bug #24696 (Nightstalk ability not working)
 
 Version 1.13.4:
  * Language and i18n:

data/campaigns/Heir_To_The_Throne/_main.cfg

@@ -47,6 +47,10 @@
     [/about]
     [about]
         title = _ "Artwork and Graphics Design"
+        [entry]
+            name = "doofus-01"
+            comment = "new Li'sar sprites"
+        [/entry]
         [entry]
             name = "Emilien Rotival (LordBob)"
             comment = "portraits (Delfador, Asheviere, Moremirmu)"

data/campaigns/Heir_To_The_Throne/maps/19c_Cliffs_of_Thoria.map

@@ -12,13 +12,13 @@ Ce, Ce, Ce, Mm^Xm, Mm^Xm, Mm, Ww, Ww, Ww, Ww, Ww, Mm, Mm^Vd, Mm, Wwf, Ww, Ww, Ww
 Ce, Ce, Rd, Gs^Fp, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Mm, Mm, Gs^Fp, Wwf, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Ww, Wwf, Ww, Ww, Ww, Ww, Wwf, Ww, Ww, Ww, Ww, Mm, Ww, Ww, Ww, Ww, Ww, Hh, Mm, Mm, Ww, Ww, Ww, Ww, Mm, Mm, Mm^Xm, Ha, Mm^Xm, Mm^Xm, Ha^Fpa, Mm^Xm, Mm^Xm, Mm^Xm
 Gs^Fp, Gs^Fp, Ww, Wwf, Ww, Ww, Wwf, Gg, Ww, Wwf, Wwf, Mm, Hh, Wwf, Ww, Wwf, Ww, Ww, Ww^Vm, Ww, Wwf, Ww, Hh, Mm, Mm, Wwf, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Mm, Mm^Vd, Hh, Wwf, Ww, Ww, Wwf, Gs^Fp, Mm^Vd, Hh, Ww, Ww, Ww^Vm, Ww, Ww, Ww, Mm, Mm, Mm^Xm, Mm, Mm, Mm, Mm^Xm, Mm^Xm
 Ww, Ww, Ww, Ww, Ww^Vm, Ww, Ww, Gs^Fp, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Hh, Mm^Vd, Mm, Mm, Ww, Ww, Ww, Wo, Ww, Ww, Ww, Mm, Wwf, Hh, Wwf, Ww, Ww, Ww, Wwf, Mm, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Hh, Hh, Mm, Mm, Mm^Xm, Mm^Xm
-Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww^Vm, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Mm, Ww, Ww, Ww, Ww^Vm, Ww, Wo, Ww, Ww, Ww, Ww, Ww^Vm, Wwf, Ww, Ww, Ww, Ww, Ww^Vm, Ww, Ww, Ww, Wwf, Wwf, Hh, Ww, Ww, Ww, Ww, Wwf, Wwf, Mm, Mm, Mm^Xm, Mm^Xm
-Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Mm, Mm, Mm, Wwf, Ww, Ww, Ww, Ww, Wwf, Hh^Fp, Mm, Mm, Mm
-Ww, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Wo, Wo, Wo, Wo, Wo, Ss, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Wo, Ww, Ww, Ww, Wo, Ww, Wo, Ww, Ww, Ww, Ww, Mm, Mm, Mm, Mm, Hh, Ww, Ww, Ww^Vm, Ww, Ww, Hh, Hh, Mm, Mm
-Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ss, Wo, Ss, Ss, Gd^Fp, Ss, Ss, Wo, Ss, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Mm, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Hh^Fp, Mm, Hh, Hh
-Wo, Wo, Ss, Wo, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Ss, Ss, Ss, Ss, Hh, Gd, Gd^Ft, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Wo, Ss, Wo, Ss, Ss, Ss, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Ww, Ww, Ww, Gs^Fp, Hh, Hh^Fp, Hh^Fp
-Ss, Ss, Ss, Ss, Gd^Ft, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd, Ss, Ss, Gd^Fp, Ss, Ss, Gd, Ss, Ss, Ss, Gd, Ss, Ss, Ss, Gd, Ss, Gd^Fp, Gd^Ft, Hh, Ss, Ss, Ww, Ww, Ww, Ww, Ww^Vm, Ww, Ww, Ww, Ww, Ww, Ww, Gs^Fp, Gs, Gs^Ft, Gs, Gs
-Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Ss, Ss, Gd^Fp, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Gd^Ft, Ss, Ss, Gd^Fp, Gd^Ft, Ss, Ss, Gd^Ft, Ss, Hh, Gd, Ss, Gs^Ft, Ss, Gd^Ft, Ss, Ww, Ww, Ww, Ww, Ww, Gd^Fp, Ww, Ss, Gs, Hh, Hh, Gd^Fp, Hh, Hh
-Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Gd^Fp, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Fp, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Fp, Ss, Ss, Ss, Ss, Ss, Gd^Fp, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ww, Hh, Ss, Ss, Ss, Hh^Fp, Hh, Hh^Fp, Gs, Hh, Gd^Ft, Gs^Ft
-Gd^Ft, Gd^Ft, Gd^Fp, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Ss, Gd^Ft, Ss, Ss, Gd^Fp, Ss, Ss, Ss, Gd^Ft, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Fp, Ss, Ss, Gd^Fp, Hh, Ss, Ss, Ss, Hh, Ss, Gd^Ft, Hh, Hh^Fp, Hh^Fp
-Gs^Ft, Gd^Ft, Gd^Fp, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Ss, Gd^Ft, Ss, Ss, Gd^Fp, Ss, Ss, Ss, Gd^Ft, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Ft, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gd^Fp, Ss, Ss, Gs^Fp, Hh, Ss, Ss, Ss, Hh, Ss, Gd^Ft, Hh, Hh^Fp, Hh^Fp
+Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww^Vm, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Ww, Ww, Ww, Ww, Ww, Ww, Mm, Ww, Ww, Ww, Ww^Vm, Ww, Wo, Ww, Ww, Ww, Ww, Ww^Vm, Wwf, Ww, Ww, Ww, Ww, Ww^Vm, Ww, Ww, Ww, Wwf, Wwf, Hh, Ww, Ww, Ww, Ww, Wwf, Wwf, Mm, Mm, Mm^Xm, Mm^Xm
+Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Mm, Ww, Mm, Mm, Mm, Mm, Mm, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Mm, Mm, Mm, Wwf, Ww, Ww, Ww, Ww, Wwf, Hh^Fp, Mm, Mm, Mm
+Ww, Ww, Mm, Ww, Mm, Ww, Wwf, Ww, Mm, Ww, Mm, Mm, Mm, Mm, Mm^Xm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm, Hh, Mm, Ww, Mm, Ww, Mm, Ww, Wwf, Ww, Hh, Ww, Mm, Ww, Ww, Ww, Mm, Ww, Mm, Ww, Ww, Ww, Ww, Mm, Mm, Mm, Mm, Hh, Ww, Ww, Ww^Vm, Ww, Ww, Hh, Hh, Mm, Mm
+Mm, Mm, Mm^Xm, Mm, Hh^Fp, Wwf, Mm^Xm, Hh, Hh, Mm, Mm^Xm, Mm, Hh, Hh^Fp, Mm^Xm, Mm, Hh, Hh, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm^Xm, Mm, Mm^Xm, Wwf, Mm^Xm, Mm, Mm^Xm, Mm, Mm^Xm, Mm, Mm, Mm, Mm^Xm, Mm, Mm, Mm, Ww, Ww, Ww, Ww, Ww, Mm, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Hh^Fp, Mm, Hh, Mm
+Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Hh, Mm^Xm, Mm^Xm, Hh^Fp, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Hh, Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Mm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Wo, Wo, Ww, Ww, Ww, Gs^Fp, Hh, Hh^Fp, Mm
+Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Hh^Fp, Mm^Xm, Mm^Xm, Mm, Mm, Mm^Xm, Hh^Fp, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Hh^Fp, Mm^Xm, Hh, Mm^Xm, Mm^Xm, Mm^Xm, Hh, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Ww, Ww, Ww, Ww, Ww^Vm, Ww, Ww, Ww, Ww, Ww, Ww, Gs^Fp, Gs, Gs^Fp, Gs, Mm
+Mm^Xm, Hh, Mm^Xm, Mm^Xm, Hh, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm, Mm^Xm, Hh^Fp, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Ww, Ww, Ww, Ww, Ww, Hh, Ww, Wwf, Wwf, Hh, Hh, Gs^Fp, Hh, Mm
+Mm^Xm, Hh^Fp, Mm^Xm, Mm^Xm, Mm^Xm, Hh, Mm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Hh^Fp, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Hh^Fp, Mm^Xm, Mm^Xm, Mm^Xm, Hh, Mm^Xm, Mm, Mm, Mm^Xm, Hh^Fp, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Ww, Mm, Hh, Mm, Hh, Hh^Fp, Hh, Hh^Fp, Gs, Mm, Mm, Ms^Xm
+Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Ms^Xm, Mm, Hh^Fp, Hh, Mm^Xm, Mm, Mm, Mm, Mm, Mm, Hh, Hh^Fp, Ms^Xm
+Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Hh^Fp