Merge branch 'master' of github.com:wesnoth/wesnoth

changelog

@@ -1,11 +1,19 @@
 Version 1.13.0-dev:
  * AI:
+   * Messenger Escort Micro AI: new optional parameters [filter],
+     [filter_second] and invert_order=
+   * Messenger Escort Micro AI: bug fix for escort units blocking messenger's
+     progress
+   * Several Micro AIs: fix a variety of rarely occurring but serious bugs, such
+     as invalid savegames or disabling the AI from working for the rest of the
+     turn or after changing the Micro AI settings.
+   * Bug fix for requiring unnecessary keys for removal of several Micro AIs
    * Fixed a bug that made it impossible to change or delete Micro AIs after a
      game had been reloaded (bug #21750). This was a general bug in the RCA AI
      mechanism and applied to other CAs as well, but it was most visible in the
      Micro AIs.
-   * Messenger Micro AI: fix rare bug in attacks by messenger
-   * Patrol Micro AI: fixed bug in the attack part of this MAI
+   * Some internal reorganization of Micro AI code to facilitate customizing
+     MAIs for UMC and adding functionality from other versions of Wesnoth
  * Campaigns:
    * The Hammer of Thursagan:
      * Fixed missing objective in 'The Court of Karrag'.
@@ -54,7 +62,7 @@ Version 1.13.0-dev:
    * Fix bug #21257: Lagging animations with skip AI animations and fog/shroud.
    * Improved unicode handling on windows for characters outside the Basic
      Multilingual Plane.
-   * Fix bug #3856: The turn dialog used in hotseat MP play now applies 
+   * Fix bug #3856: The turn dialog used in hotseat MP play now applies
      a blindfold for the duration of the dialog.
    * Petrified units are no longer displayed in the "Damage versus" tooltip.
    * Fix bug #21759: "timer refreshed too often when time runs out"
@@ -63,12 +71,19 @@ Version 1.13.0-dev:
      Fixes bug #21888.
    * MP server now commits controller changes to the replay rather than updating
      as we go along. Among other things these means that players that join an
-     scenario with ai sides which has already started won't have corrupted 
-     controller types which would prevent them from successfully saving and 
-     reloading in the future. 
-     We have also moved all "controller tweaks" associated to the start of MP 
+     scenario with ai sides which has already started won't have corrupted
+     controller types which would prevent them from successfully saving and
+     reloading in the future.
+     We have also moved all "controller tweaks" associated to the start of MP
      games to server-side rather than having a mix of client and server code.
    * Fixup user-displayed strings associated to replay options, idle state
+   * OS X: mark Wesnoth as not high-resolution capable. This greatly improves
+     performance on retina devices.
+   * Upgrade Xcode project to enable both i386 and x86_64 builds
+   * Fixed problems with idle controller type in networked mp.
+   * Fix bug 21459 by making dropped sides default to idle.
+   * Fix bug 21882 by introducing "fight_on_without_leader" boolean attribute
+     of [side] tags and refactoring check_victory to use this.
 
 Version 1.11.11:
  * Add-ons server:

data/ai/micro_ais/cas/ca_big_animals.lua

@@ -1,7 +1,7 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 local LS = wesnoth.require "lua/location_set.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 
 local ca_big_animals = {}
 

data/ai/micro_ais/cas/ca_bottleneck_move.lua

@@ -2,7 +2,7 @@ local H = wesnoth.require "lua/helper.lua"
 local LS = wesnoth.require "lua/location_set.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 local BC = wesnoth.require "ai/lua/battle_calcs.lua"
-local MAISD = wesnoth.dofile "ai/micro_ais/micro_ai_self_data.lua"
+local MAISD = wesnoth.require "ai/micro_ais/micro_ai_self_data.lua"
 
 local ca_bottleneck_move = {}
 

data/ai/micro_ais/cas/ca_goto.lua

@@ -2,8 +2,8 @@ local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 local BC = wesnoth.require "ai/lua/battle_calcs.lua"
 local LS = wesnoth.require "lua/location_set.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
-local MAISD = wesnoth.dofile "ai/micro_ais/micro_ai_self_data.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAISD = wesnoth.require "ai/micro_ais/micro_ai_self_data.lua"
 
 local ca_goto = {}
 

data/ai/micro_ais/cas/ca_hang_out.lua

@@ -1,8 +1,8 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 local LS = wesnoth.require "lua/location_set.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
-local MAISD = wesnoth.dofile "ai/micro_ais/micro_ai_self_data.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAISD = wesnoth.require "ai/micro_ais/micro_ai_self_data.lua"
 
 local ca_hang_out = {}
 

data/ai/micro_ais/cas/ca_herding_herd_sheep.lua

@@ -1,10 +1,10 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 
-local ca_herding_herd_sheep = {}
-
 local herding_area = wesnoth.require "ai/micro_ais/cas/ca_herding_f_herding_area.lua"
 
+local ca_herding_herd_sheep = {}
+
 function ca_herding_herd_sheep:evaluation(ai, cfg)
     -- If dogs have moves left, and there is a sheep with moves left outside the
     -- herding area, chase it back

data/ai/micro_ais/cas/ca_herding_sheep_move.lua

@@ -2,10 +2,10 @@ local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 local LS = wesnoth.require "lua/location_set.lua"
 
-local ca_herding_sheep_move = {}
-
 local herding_area = wesnoth.require "ai/micro_ais/cas/ca_herding_f_herding_area.lua"
 
+local ca_herding_sheep_move = {}
+
 function ca_herding_sheep_move:evaluation(ai, cfg)
    -- If nothing else is to be done, the sheep do a random move
     local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second}, formula = '$this_unit.moves > 0' }

data/ai/micro_ais/cas/ca_hunter.lua

@@ -1,7 +1,7 @@
 local H = wesnoth.require "lua/helper.lua"
 local W = H.set_wml_action_metatable {}
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 
 local ca_hunter = {}
 

data/ai/micro_ais/cas/ca_messenger_attack.lua

@@ -1,10 +1,10 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 
-local ca_messenger_attack = {}
-
 local messenger_next_waypoint = wesnoth.require "ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua"
 
+local ca_messenger_attack = {}
+
 local function messenger_find_enemies_in_way(unit, goal_x, goal_y)
     -- Returns the first unit on or next to the path of the messenger
     -- unit: proxy table for the messenger unit

data/ai/micro_ais/cas/ca_messenger_escort_move.lua

@@ -1,12 +1,12 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 local LS = wesnoth.require "lua/location_set.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
-
-local ca_messenger_escort_move = {}
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 
 local messenger_next_waypoint = wesnoth.require "ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua"
 
+local ca_messenger_escort_move = {}
+
 function ca_messenger_escort_move:evaluation(ai, cfg)
     -- Move escort units close to messengers, and in between messengers and enemies
     -- The messengers have moved at this time, so we don't need to exclude them,

data/ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua

@@ -1,6 +1,6 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 
 return function(cfg)
     -- Calculate next waypoint and rating for all messengers

data/ai/micro_ais/cas/ca_messenger_move.lua

@@ -1,10 +1,10 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
 
-local ca_messenger_move = {}
-
 local messenger_next_waypoint = wesnoth.require "ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua"
 
+local ca_messenger_move = {}
+
 function ca_messenger_move:evaluation(ai, cfg)
     -- Move the messenger toward goal, attack adjacent unit if possible
     -- without retaliation or little expected damage with high chance of killing the enemy

data/ai/micro_ais/cas/ca_patrol.lua

@@ -1,6 +1,6 @@
 local H = wesnoth.require "lua/helper.lua"
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 
 local ca_patrol = {}
 

data/ai/micro_ais/cas/ca_wolves_multipacks_attack.lua

@@ -1,7 +1,7 @@
 local H = wesnoth.require "lua/helper.lua"
 local W = H.set_wml_action_metatable {}
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 local LS = wesnoth.require "lua/location_set.lua"
 local WMPF = wesnoth.require "ai/micro_ais/cas/ca_wolves_multipacks_functions.lua"
 

data/ai/micro_ais/cas/ca_wolves_multipacks_functions.lua

@@ -1,6 +1,6 @@
 local H = wesnoth.require "lua/helper.lua"
 local W = H.set_wml_action_metatable {}
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 
 local wolves_multipacks_functions = {}
 

data/ai/micro_ais/cas/ca_wolves_multipacks_wander.lua

@@ -1,7 +1,7 @@
 local H = wesnoth.require "lua/helper.lua"
 local W = H.set_wml_action_metatable {}
 local AH = wesnoth.require "ai/lua/ai_helper.lua"
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 local LS = wesnoth.require "lua/location_set.lua"
 local WMPF = wesnoth.require "ai/micro_ais/cas/ca_wolves_multipacks_functions.lua"
 

data/ai/micro_ais/micro_ai_helper.lua

@@ -1,7 +1,7 @@
 local H = wesnoth.require "lua/helper.lua"
 local W = H.set_wml_action_metatable {}
 local AH = wesnoth.require("ai/lua/ai_helper.lua")
-local MAIUV = wesnoth.dofile "ai/micro_ais/micro_ai_unit_variables.lua"
+local MAIUV = wesnoth.require "ai/micro_ais/micro_ai_unit_variables.lua"
 
 local micro_ai_helper = {}
 

players_changelog

@@ -22,10 +22,12 @@ Version 1.13.0-dev:
    * Fixed halos glitching through locations that become shrouded after the
      halo is rendered for the first time.
    * OS X user data directory is now ~/Library/Application Support/Wesnoth_1.13
-   * Fix bug #3856: The turn dialog used in hotseat MP play now applies 
+   * Fix bug #3856: The turn dialog used in hotseat MP play now applies
      a blindfold for the duration of the dialog.
-   * Use a dropdown menu for both "skip replay" and "enter blindfold". 
+   * Use a dropdown menu for both "skip replay" and "enter blindfold".
      This fixes the mp lobby in width <= 800 resolutions. (Fix #21888.)
+   * OS X: mark Wesnoth as not high-resolution capable. This greatly improves
+     performance on retina devices.
 
 Version 1.11.11:
  * Campaigns:

projectfiles/CodeBlocks/README.txt

@@ -64,8 +64,8 @@ Compiling Wesnoth on Windows using CodeBlocks
     time, making the overall build process very slow even with fast hardware.
     If you have a multi-core processor, you may make better use of its power by
     increasing the value of the option "Number of processes for parallel
-    builds" in the Build options tab. It is recommended to set this to at least
-    the number of CPU cores your system has.
+    builds" in the Build options tab. It is recommended to set this to the
+    number of CPU cores your system has.
 
 10. Close the settings dialog.
 

projectfiles/CodeBlocks/wesnoth.cbp

@@ -208,6 +208,8 @@
 		<Unit filename="..\..\src\commandline_options.hpp" />
 		<Unit filename="..\..\src\config.cpp" />
 		<Unit filename="..\..\src\config.hpp" />
+		<Unit filename="..\..\src\config_assign.cpp" />
+		<Unit filename="..\..\src\config_assign.hpp" />
 		<Unit filename="..\..\src\config_cache.cpp" />
 		<Unit filename="..\..\src\config_cache.hpp" />
 		<Unit filename="..\..\src\construct_dialog.cpp" />
@@ -862,15 +864,22 @@
 		<Unit filename="..\..\src\race.hpp" />
 		<Unit filename="..\..\src\random.cpp" />
 		<Unit filename="..\..\src\random.hpp" />
+		<Unit filename="..\..\src\random_new.cpp" />
+		<Unit filename="..\..\src\random_new.hpp" />
+		<Unit filename="..\..\src\random_new_deterministic.cpp" />
+		<Unit filename="..\..\src\random_new_deterministic.hpp" />
+		<Unit filename="..\..\src\random_new_synced.cpp" />
+		<Unit filename="..\..\src\random_new_synced.hpp" />
 		<Unit filename="..\..\src\replay.cpp" />
 		<Unit filename="..\..\src\replay.hpp" />
+		<Unit filename="..\..\src\replay_helper.cpp" />
+		<Unit filename="..\..\src\replay_helper.hpp" />
 		<Unit filename="..\..\src\replay_controller.cpp" />
 		<Unit filename="..\..\src\replay_controller.hpp" />
 		<Unit filename="..\..\src\reports.cpp" />
 		<Unit filename="..\..\src\reports.hpp" />
 		<Unit filename="..\..\src\resources.cpp" />
 		<Unit filename="..\..\src\resources.hpp" />
-		<Unit filename="..\..\src\rng.hpp" />
 		<Unit filename="..\..\src\save_blocker.cpp" />
 		<Unit filename="..\..\src\save_blocker.hpp" />
 		<Unit filename="..\..\src\savegame.cpp" />
@@ -888,6 +897,8 @@
 		<Unit filename="..\..\src\sdl\alpha.cpp" />
 		<Unit filename="..\..\src\sdl\alpha.hpp" />
 		<Unit filename="..\..\src\sdl\compat.hpp" />
+		<Unit filename="..\..\src\sdl\exception.cpp" />
+		<Unit filename="..\..\src\sdl\exception.hpp" />
 		<Unit filename="..\..\src\sdl_utils.cpp" />
 		<Unit filename="..\..\src\sdl_utils.hpp" />
 		<Unit filename="..\..\src\serialization\binary_or_text.cpp" />
@@ -916,6 +927,7 @@
 		<Unit filename="..\..\src\side_filter.cpp" />
 		<Unit filename="..\..\src\side_filter.hpp" />
 		<Unit filename="..\..\src\simple_rng.hpp" />
+		<Unit filename="..\..\src\simple_rng.cpp" />
 		<Unit filename="..\..\src\sound.cpp" />
 		<Unit filename="..\..\src\sound.hpp" />
 		<Unit filename="..\..\src\sound_music_track.cpp" />
@@ -936,6 +948,12 @@
 		<Unit filename="..\..\src\storyscreen\render.hpp" />
 		<Unit filename="..\..\src\strftime.cpp" />
 		<Unit filename="..\..\src\strftime.hpp" />
+		<Unit filename="..\..\src\synced_checkup.cpp" />
+		<Unit filename="..\..\src\synced_checkup.hpp" />
+		<Unit filename="..\..\src\synced_commands.cpp" />
+		<Unit filename="..\..\src\synced_commands.hpp" />
+		<Unit filename="..\..\src\synced_context.cpp" />
+		<Unit filename="..\..\src\synced_context.hpp" />
 		<Unit filename="..\..\src\team.cpp" />
 		<Unit filename="..\..\src\team.hpp" />
 		<Unit filename="..\..\src\terrain.cpp" />