0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AI: do not use new grab_villages CA for default AI

Browse source 
The old villages CA is quite a bit better at distributing multiple units across multiple villages. The advantage of the new grab_villages CA is that it has a variable score, sometimes grabbing villages before, and sometimes after attacks. This does not outweigh its shortcomings though.

So for now, the default AI will continue to use the previous CA, and the Experimental AI will use the new one. Thus, the two AIs are not quite identical any more (but still very similar).

I also added a todo comment that the grab_villages CA might be reinstated if it is improved.
This commit is contained in:
mattsc 2019-12-03 12:33:36 -08:00
parent 038dc2d7fe
commit 1e01df84ff
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/ai/ais/ai_default_rca.cfg
View file

@ -16,7 +16,8 @@
{AI_CA_RECRUIT_RUSHERS}
{AI_CA_CASTLE_SWITCH}
{AI_CA_RETREAT_INJURED}
{AI_CA_GRAB_VILLAGES}
# Todo: use grab_villages CA after improvements to unit/village distribution
#{AI_CA_GRAB_VILLAGES}
{AI_CA_SPREAD_POISON}
#{AI_CA_RECRUITMENT}
{AI_CA_MOVE_LEADER_TO_GOALS}

4
data/ai/dev/ai_experimental.cfg
View file

@ -4,7 +4,7 @@
{core/macros/ai_candidate_actions.cfg}
#endif
# Note: The Experimental AI and the default AI are currently identical.
# Note: The Experimental AI and the default AI are currently almost identical.
# This is a placeholder for future development.
[ai]
id=experimental_ai
@ -27,7 +27,7 @@
{AI_CA_COMBAT}
{AI_CA_PLACE_HEALERS}
{AI_CA_HEALING}
{AI_CA_VILLAGES}
#{AI_CA_VILLAGES}
{AI_CA_VILLAGE_HUNT}
{AI_CA_MOVE_TO_TARGETS}
{AI_CA_LEADER_SHARES_KEEP}

8
data/core/macros/ai.cfg
View file

@ -522,7 +522,7 @@
#define EXPERIMENTAL_AI
#deprecated 2 1.15 Use ai_algorithm=experimental_ai in the [ai] tag instead
# Note: The Experimental AI and the default AI are currently identical.
# Note: The Experimental AI and the default AI are currently almost identical.
# This is a placeholder for future development.
# Put this into the [side][ai] tag.
@ -543,7 +543,7 @@
{AI_CA_COMBAT}
{AI_CA_PLACE_HEALERS}
{AI_CA_HEALING}
{AI_CA_VILLAGES}
#{AI_CA_VILLAGES}
{AI_CA_VILLAGE_HUNT}
{AI_CA_MOVE_TO_TARGETS}
{AI_CA_LEADER_SHARES_KEEP}
@ -552,7 +552,7 @@
#enddef
#define CUSTOMIZABLE_EXPERIMENTAL_AI ARGS
# Note: The Experimental AI and the default AI are currently identical.
# Note: The Experimental AI and the default AI are currently almost identical.
# However, this macro allows the use of custom parameters.
# Use the Experimental AI with custom parameter setting
@ -583,7 +583,7 @@
{AI_CA_COMBAT}
{AI_CA_PLACE_HEALERS}
{AI_CA_HEALING}
{AI_CA_VILLAGES}
#{AI_CA_VILLAGES}
{AI_CA_VILLAGE_HUNT}
{AI_CA_MOVE_TO_TARGETS}
{AI_CA_LEADER_SHARES_KEEP}