54078 Commits

Author SHA1 Message Date
Alarantalara
c859d0d17b Keep villages unreachable by recruited unit
If the recruited unit cannot reach the target village, try again later
2013-10-31 23:14:36 -04:00
Alarantalara
33c1e493b2 Handle more damage specials for Lua recruiting 2013-10-31 23:14:35 -04:00
mattsc
46bf12a523 Old AIs in ai/dev/: change descriptions displayed in MP selection menu
These are the AIs that are only visible in debug mode.  They were very
ambiguous and two of them were even exactly the same.
2013-10-31 15:32:21 -07:00
mattsc
9b553b86b5 Fix the old 'Default AI with poisoning formula' development AI
None of the RCA AI CAs were included, which means this was effectively
an idle AI.
2013-10-31 14:46:53 -07:00
mattsc
554a95749a battle_calcs.best_defense_map(): add parameter ignore_these_units
This is a table of enemy units whose ZoC is to be ignored for route
finding.  It is useful for determing where the enemy can move while
ignoring own units (enemies of the enemy) that have not moved yet.
2013-10-31 08:22:15 -07:00
mattsc
526debf3e9 battle_calcs.lua: remove some debug code 2013-10-31 08:17:47 -07:00
mattsc
8689543d9a Lua dummy engine: do not load debug_ai functions
Besides them being unnecessary, a warning message is otherwise also
displayed when external CAs are used and the game is not in debug mode.
2013-10-30 18:23:48 -07:00
mattsc
e18378369b ai_helper: remove unused function ai_helper.got_1_11() 2013-10-30 13:02:09 -07:00
mattsc
1d488a2c35 Rename ai/micro_ais/ais/ to ai/micro_ais/engines/
... in order to distinguish between AI files containing full engines
and those containing individual CA eval/exec functions
2013-10-30 12:55:08 -07:00
mattsc
e469df1d50 Move and rename [micro_ai] tag setup file
... to a more logical location given the recent reorganization.
2013-10-30 12:55:08 -07:00
anonymissimus
b2f3cf98a5 vc project update 2013-10-30 19:02:22 +01:00
mattsc
3989b4e140 Experimental AI: make Healer Placement CA work with new external CAs
Healer Placement is a Micro AI whose syntax was changed in the switch
to using external AIs.  This change adapts how this CA is called in the
Experimental AI (gerneric rush AI) to these changes.
2013-10-30 09:51:10 -07:00
mattsc
4e68b4eaa2 Recruiting MAI test scenario: add Rush Recruitment MAI for Side 2 2013-10-30 09:47:41 -07:00
mattsc
b826e5ead5 Micro AIs: make recruit_rushers work with new external CA method
The previous code did not allow to get the ai table to the execution
function.
2013-10-30 09:42:41 -07:00
mattsc
48917eeb2b Add local user data files to Xcode .gitignore file 2013-10-29 09:33:59 -07:00
David Mikos
3592c50c72 unit_animation debug info: fix additional frame start time reporting. 2013-10-29 14:20:32 +10:30
David Mikos
3da7fb3e93 Create debug info functions (C++) for unit_animation frames, similar to cfg debug_info. 2013-10-29 13:15:07 +10:30
mattsc
3a30675d2f Micro AIs: remove all references to AI-demos add-on 2013-10-28 17:27:14 -07:00
Alexander van Gessel
4fa7e06baf Fix [scroll] side filter behaviour
It now checks whether any of the matching sides is a local human,
rather whether they're the side whose turn it is.
2013-10-28 12:37:42 +01:00
Alexander van Gessel
87305c472b Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-10-28 01:11:48 +01:00
Alexander van Gessel
4cde487458 Add optional side filter to [scroll] 2013-10-28 01:11:39 +01:00
mattsc
c4c0c553ec Remove RCA_STAGE macro
The transport engine code in SotBE S6 was the last place to use this
macro.  Not needed any more now that external CAs are available.
2013-10-27 17:02:39 -07:00
mattsc
f4007fdbdf SotBE S6: change transport AI to use external CAs
That means that no engine definition is needed any more.
2013-10-27 16:58:56 -07:00
mattsc
122f7372f2 Update Xcode project file 2013-10-27 16:38:17 -07:00
JaMiT
f3d777360c Shift most of wmi_container::init_handlers() to the wmi class.
This leaves wmi_container as a wrapper that does not need to know
implementation details about wml_menu_item.
2013-10-27 12:13:46 -05:00
JaMiT
badec4e112 Use unsigned int for counting.
Trivial change, really just for appearances. If we ever have enough
WML menu items where this makes a difference, we're going to be
overloading something somewhere. Just not here. :)
2013-10-27 12:13:46 -05:00
JaMiT
d17b926b9e Clean up the messsages testing WMI hotkeys. 2013-10-27 12:13:46 -05:00
JaMiT
ddd0bc34e9 Convert 8-space indents to 4-space indents for consistency. 2013-10-27 12:13:46 -05:00
JaMiT
40578f7bc9 Remove an unneeded "if" statement.
When a serach for an item with a given id returns something, then
that something has the given id. There is no need to test that.
Also added some documentation as to what the search is for.
2013-10-27 12:13:46 -05:00
JaMiT
01b65ff9ba Parameter consistency between can_show() and fire_event().
(These are members of wml_menu_item.)
I opted to get rid of a parameter and use a global. Using globals
is kind of yucky, but in this case, it's basically a choice between
using the global within the procedure or using the global as a
parameter to the procedure. I chose to go with the older function's
approach.
2013-10-27 12:13:45 -05:00
JaMiT
01149e92eb Remove an unnecessary check.
wml_menu_item::can_show() already checks the last selected hex, so
no need for play_controller to worry about that check (which improves
data encapsulation -- now wml_menu_item::needs_select_ no longer needs
to be exposed to the general public).
2013-10-27 12:13:45 -05:00
JaMiT
6013a7293c Move fire_wml_menu_item_event into wml_menu_item.
This allows better encapsulation, as the play_controller no longer
needs to know details about the menu item, like the event's name.
2013-10-27 12:13:45 -05:00
JaMiT
8e1a1dd5f6 Expand the game_events namespace.
This puts wml_menu_item and wmi_container in the namespace.
It's not really an improvement at this point, but I think it will
be better in the future.
2013-10-27 12:13:45 -05:00
JaMiT
1f77cb1fc3 Split wml_menu_item and wmi_container into their own source files.
They are now under the game_events subdirectory.
2013-10-27 12:13:45 -05:00
David Mikos
2064b0c847 Shuffle sides comment spelling fix. 2013-10-27 22:48:30 +10:30
David Mikos
109928ed9b Make shuffle sides main code easier to understand. 2013-10-27 22:45:05 +10:30
David Mikos
0600563801 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-10-27 22:31:11 +10:30
David Mikos
4b531850da Shuffle sides use multimap instead of map for side child variables. 2013-10-27 22:30:12 +10:30
Nils Kneuper
d12028fb78 updated Korean translation 2013-10-27 10:42:34 +01:00
Nils Kneuper
828941902c updated Italian translation 2013-10-27 10:33:24 +01:00
Andrius Silinskas
f1d46a7a95 Updated changelog. 2013-10-27 09:23:38 +00:00
Andrius Silinskas
4fe25ad320 Added "force_lock_settings" attribute to LoW.
"force_use_map_settings" was removed since it's replaced by the
attribute mentioned above.
2013-10-27 09:13:14 +00:00
Andrius Silinskas
da65ff655b Revert "Added "controller_lock=no" for multiplayer maps."
Reverting since "controller_lock" will be set to "no" by default.

This reverts commit 6e337de3780870ef024348425cca611f3981c8ac.
2013-10-27 09:13:14 +00:00
Andrius Silinskas
5a39c6ab24 Lock MP settings by default if "force_lock_settings" was set.
Previously, "Use map settings" along with "force_use_map_settings" were used for this.
2013-10-27 09:13:14 +00:00
mattsc
afa9235fa1 MAI engine deprecation macro: add side=1 to dummy unit
This will be ignored since the [unit] tag is used inside a [side[ tag,
but this way wmllint is happy.
2013-10-26 19:18:46 -07:00
mattsc
fd29559daa Fix some indenting in AI recruiting functions 2013-10-26 19:13:35 -07:00
mattsc
354fb361d4 Micro AIs: remove all the MAI engine macros
They are not needed any more now that all MAIs were switched to using
external CAs.  For the time being, we keep the macros in place, but
they now only display deprecation messages and have no actual
functionality.
2013-10-26 18:57:08 -07:00
mattsc
6ad899cbf5 [micro_ai] tag: remove now unneeded code and comment 2013-10-26 18:33:26 -07:00
mattsc
ed10e8e8a8 [micro_ai] tag: remove code for old-style CA syntax
All Micro AIs have now been converted to using external CAs.
2013-10-26 18:31:11 -07:00
mattsc
436f36c80a Recruiting MAIs: get rid of recruiting_type= key
The previous value of recruiting_type= now goes directly into ai_type=.
 Also add syntax translation and deprecation message.
2013-10-26 18:23:55 -07:00