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

Move some AI test scenarios from data/ to data/ai/scenarios/

Browse source 
(And update them to modern syntax)
This commit is contained in:
Celtic Minstrel 2016-03-27 15:09:50 -04:00
parent 02cfb7c279
commit ba5eb7bc91
6 changed files with 33 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/_main.cfg
View file

@ -56,14 +56,9 @@
#ifdef TEST
{scenario-test.cfg}
{scenario-formula.cfg}
{scenario-formula-recruitment.cfg}
{scenario-poisoning.cfg}
{scenario-leaders.cfg}
{scenario-movethrough.cfg}
{ai/scenarios/scenario-AI_Arena_small.cfg}
{ai/scenarios/scenario-lua_ai.cfg}
{ai/scenarios/scenario-lua_ai_old_syntax.cfg}
{ai/scenarios/}
{ai/micro_ais/scenarios/}
#define DONT_RELOAD_CORE
#enddef

2
data/ai/dev/formula_ai_poisoning.cfg
View file

@ -5,7 +5,7 @@
#endif
[ai]
id=default_ai_poisoning
id=formula_ai_poisoning
description=_"Multiplayer_AI^Dev AI: Default + Poisoning (Formula AI)" # wmllint: no spellcheck
[stage]
id=main_loop

25
data/scenario-formula-recruitment.cfg → data/ai/scenarios/scenario-formula-recruitment.cfg
View file

@ -55,11 +55,28 @@ Gs^Fp , Gs^Fp , Wwf , Wwf , Mm , Rd
recruit=Spearman,Mage,Bowman,Horseman,Cavalryman,Heavy Infantryman,Fencer,Merman Fighter
gold=100
ai_algorithm=formula_ai
[ai]
[team_formula]
rulebase="{ai/formula/recruitment.fai}"
[/team_formula]
# Perhaps this should be changed to use new_recruitment
# In that case, the stages could be removed and replaced by
# this one line:
#ai_algorithm=formula_ai
[stage]
engine=fai
name=side_formulas
move="{ai/formula/recruitment.fai}"
[/stage]
[stage]
id=main_loop
name=ai_default_rca::candidate_action_evaluation_loop
{AI_CA_GOTO}
{AI_CA_MOVE_LEADER_TO_GOALS}
{AI_CA_MOVE_LEADER_TO_KEEP}
{AI_CA_COMBAT}
{AI_CA_HEALING}
{AI_CA_VILLAGES}
{AI_CA_RETREAT}
{AI_CA_MOVE_TO_TARGETS}
[/stage]
[/ai]
[/side]
[/test]

16
data/scenario-formula.cfg → data/ai/scenarios/scenario-formula.cfg
View file

@ -128,7 +128,7 @@ Gs^Fp , Gs^Fp , Wwf , Wwf , Mm , Rd
generate_name=yes
[ai]
formula="if(attack, attack, move(me.loc, me.vars.guard_loc))
where attack = choose(filter(attacks, units = [me.loc] and distance_between(me.vars.guard_loc, target) <= me.vars.guard_radius), avg_damage_inflicted)"
where attack = choose(filter(attacks, units = [me.loc] and distance_between(me.vars.guard_loc, target) <= me.vars.guard_radius), avg_damage_inflicted)"
[vars]
guard_radius=3
guard_loc="loc(8,5)"
@ -229,21 +229,23 @@ Gs^Fp , Gs^Fp , Wwf , Wwf , Mm , Rd
[/stage]
[stage]
engine=fai
name=rca_formulas
[register_candidate_move]
id=rca_formulas
name=ai_default_rca::candidate_action_evaluation_loop
[candidate_action]
engine=fai
name=scouting
type=movement
action="{ai/formula/scouting_move.fai}"
evaluation="{ai/formula/scouting_eval.fai}"
[/register_candidate_move]
[/candidate_action]
[register_candidate_move]
[candidate_action]
engine=fai
name=level_up_attack
type=attack
action="{ai/formula/level_up_attack_move.fai}"
evaluation="{ai/formula/level_up_attack_eval.fai}"
[/register_candidate_move]
[/candidate_action]
[/stage]
[/ai]
[/side]

14
data/scenario-poisoning.cfg → data/ai/scenarios/scenario-poisoning.cfg
View file

@ -137,20 +137,8 @@ Gs^Fp , Gs^Fp , Wwf , Wwf , Mm , Rd
generate_name=yes
[/unit]
ai_algorithm=formula_ai
[ai]
eval_list=yes
[register_candidate_action]
name=poisoner
type=attack
[filter]
me="filter( input, 'me', filter(me.attacks,'att',filter(att.special,'spe',contains_string(spe,'poison'))))"
target="filter( input, 'target', target.undead = 0 and target.hitpoints > 5 and index_of('poisoned',keys(target.states)) = -1)"
[/filter]
evaluation="{ai/formula/poisoner_eval.fai}"
action="{ai/formula/poisoner_attack.fai}"
[/register_candidate_action]
ai_algorithm=formula_ai_poisoning
[/ai]
[/side]
[/test]

12
projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
View file

@ -87,11 +87,8 @@
91273E9C1C7BF1D8005E7F81 /* languages in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E7F1C7BF1C2005E7F81 /* languages */; };
91273E9D1C7BF1D8005E7F81 /* lua in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E801C7BF1C2005E7F81 /* lua */; };
91273E9E1C7BF1D8005E7F81 /* multiplayer in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E811C7BF1C2005E7F81 /* multiplayer */; };
91273E9F1C7BF1D8005E7F81 /* scenario-formula-recruitment.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E821C7BF1C2005E7F81 /* scenario-formula-recruitment.cfg */; };
91273EA01C7BF1D8005E7F81 /* scenario-formula.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E831C7BF1C3005E7F81 /* scenario-formula.cfg */; };
91273EA11C7BF1D8005E7F81 /* scenario-leaders.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E841C7BF1C3005E7F81 /* scenario-leaders.cfg */; };
91273EA21C7BF1D8005E7F81 /* scenario-movethrough.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E851C7BF1C3005E7F81 /* scenario-movethrough.cfg */; };
91273EA31C7BF1D8005E7F81 /* scenario-poisoning.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E861C7BF1C3005E7F81 /* scenario-poisoning.cfg */; };
91273EA41C7BF1D8005E7F81 /* scenario-test.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E871C7BF1C3005E7F81 /* scenario-test.cfg */; };
91273EA51C7BF1D8005E7F81 /* schema-gui.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E881C7BF1C4005E7F81 /* schema-gui.cfg */; };
91273EA61C7BF1D8005E7F81 /* schema.cfg in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91273E891C7BF1C4005E7F81 /* schema.cfg */; };
@ -1009,11 +1006,8 @@
91273E9C1C7BF1D8005E7F81 /* languages in Copy Data Files */,
91273E9D1C7BF1D8005E7F81 /* lua in Copy Data Files */,
91273E9E1C7BF1D8005E7F81 /* multiplayer in Copy Data Files */,
91273E9F1C7BF1D8005E7F81 /* scenario-formula-recruitment.cfg in Copy Data Files */,
91273EA01C7BF1D8005E7F81 /* scenario-formula.cfg in Copy Data Files */,
91273EA11C7BF1D8005E7F81 /* scenario-leaders.cfg in Copy Data Files */,
91273EA21C7BF1D8005E7F81 /* scenario-movethrough.cfg in Copy Data Files */,
91273EA31C7BF1D8005E7F81 /* scenario-poisoning.cfg in Copy Data Files */,
91273EA41C7BF1D8005E7F81 /* scenario-test.cfg in Copy Data Files */,
91273EA51C7BF1D8005E7F81 /* schema-gui.cfg in Copy Data Files */,
91273EA61C7BF1D8005E7F81 /* schema.cfg in Copy Data Files */,
@ -1232,11 +1226,8 @@
91273E7F1C7BF1C2005E7F81 /* languages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = languages; sourceTree = "<group>"; };
91273E801C7BF1C2005E7F81 /* lua */ = {isa = PBXFileReference; lastKnownFileType = folder; path = lua; sourceTree = "<group>"; };
91273E811C7BF1C2005E7F81 /* multiplayer */ = {isa = PBXFileReference; lastKnownFileType = folder; path = multiplayer; sourceTree = "<group>"; };
91273E821C7BF1C2005E7F81 /* scenario-formula-recruitment.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "scenario-formula-recruitment.cfg"; sourceTree = "<group>"; };
91273E831C7BF1C3005E7F81 /* scenario-formula.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "scenario-formula.cfg"; sourceTree = "<group>"; };
91273E841C7BF1C3005E7F81 /* scenario-leaders.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "scenario-leaders.cfg"; sourceTree = "<group>"; };
91273E851C7BF1C3005E7F81 /* scenario-movethrough.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "scenario-movethrough.cfg"; sourceTree = "<group>"; };
91273E861C7BF1C3005E7F81 /* scenario-poisoning.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "scenario-poisoning.cfg"; sourceTree = "<group>"; };
91273E871C7BF1C3005E7F81 /* scenario-test.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "scenario-test.cfg"; sourceTree = "<group>"; };
91273E881C7BF1C4005E7F81 /* schema-gui.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = "schema-gui.cfg"; sourceTree = "<group>"; };
91273E891C7BF1C4005E7F81 /* schema.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; path = schema.cfg; sourceTree = "<group>"; };
@ -3067,11 +3058,8 @@
91273E7F1C7BF1C2005E7F81 /* languages */,
91273E801C7BF1C2005E7F81 /* lua */,
91273E811C7BF1C2005E7F81 /* multiplayer */,
91273E821C7BF1C2005E7F81 /* scenario-formula-recruitment.cfg */,
91273E831C7BF1C3005E7F81 /* scenario-formula.cfg */,
91273E841C7BF1C3005E7F81 /* scenario-leaders.cfg */,
91273E851C7BF1C3005E7F81 /* scenario-movethrough.cfg */,
91273E861C7BF1C3005E7F81 /* scenario-poisoning.cfg */,
91273E871C7BF1C3005E7F81 /* scenario-test.cfg */,
91273E881C7BF1C4005E7F81 /* schema-gui.cfg */,
91273E891C7BF1C4005E7F81 /* schema.cfg */,