[micro_ai] tag setup: minor code cleanup
This commit is contained in:
mattsc
parent
7e8964c48d
commit
7578eb592a
2 changed files with 21 additions and 23 deletions
|
|
@ -31,7 +31,6 @@ function micro_ai_helper.add_CAs(side, CA_parms, CA_cfg)
|
|||
for ca in H.child_range(stage, 'candidate_action') do
|
||||
if string.find(ca.name, ai_id .. '_') then
|
||||
id_found = true
|
||||
--print('---> found CA:', ca.name, ai_id, id_found, string.find(ca.name, ai_id))
|
||||
break
|
||||
end
|
||||
end
|
||||
|
|
@ -48,7 +47,6 @@ function micro_ai_helper.add_CAs(side, CA_parms, CA_cfg)
|
|||
for mai in H.child_range(data, 'micro_ai') do
|
||||
if (mai.ai_id == ai_id) then
|
||||
id_found = true
|
||||
print('---> found [micro_ai] tag with ai_id =', ai_id)
|
||||
break
|
||||
end
|
||||
end
|
||||
|
|
@ -61,7 +59,7 @@ function micro_ai_helper.add_CAs(side, CA_parms, CA_cfg)
|
|||
end
|
||||
|
||||
-- Now add the CAs
|
||||
for i,parms in ipairs(CA_parms) do
|
||||
for _,parms in ipairs(CA_parms) do
|
||||
local ca_id = ai_id .. '_' .. parms.ca_id
|
||||
|
||||
-- Always pass the ai_id and ca_score to the eval/exec functions
|
||||
|
|
@ -95,7 +93,7 @@ function micro_ai_helper.delete_CAs(side, CA_parms)
|
|||
-- We can simply pass the one used for add_CAs(), although only the
|
||||
-- CA_parms.ca_id field is needed
|
||||
|
||||
for i,parms in ipairs(CA_parms) do
|
||||
for _,parms in ipairs(CA_parms) do
|
||||
local ca_id = CA_parms.ai_id .. '_' .. parms.ca_id
|
||||
|
||||
W.modify_ai {
|
||||
|
|
@ -106,8 +104,8 @@ function micro_ai_helper.delete_CAs(side, CA_parms)
|
|||
|
||||
-- Also need to delete variable stored in all units of the side, so that later MAIs can use these units
|
||||
local units = wesnoth.get_units { side = side }
|
||||
for i,u in ipairs(units) do
|
||||
MAIUV.delete_mai_unit_variables(u, CA_parms.ai_id)
|
||||
for _,unit in ipairs(units) do
|
||||
MAIUV.delete_mai_unit_variables(unit, CA_parms.ai_id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -133,7 +131,7 @@ function micro_ai_helper.add_aspects(side, aspect_parms)
|
|||
-- } }
|
||||
-- }
|
||||
|
||||
for i,parms in ipairs(aspect_parms) do
|
||||
for _,parms in ipairs(aspect_parms) do
|
||||
W.modify_ai {
|
||||
side = side,
|
||||
action = "add",
|
||||
|
|
@ -149,7 +147,7 @@ function micro_ai_helper.delete_aspects(side, aspect_parms)
|
|||
-- We can simply pass the one used for add_aspects(), although only the
|
||||
-- aspect_parms.aspect_id field is needed
|
||||
|
||||
for i,parms in ipairs(aspect_parms) do
|
||||
for _,parms in ipairs(aspect_parms) do
|
||||
W.modify_ai {
|
||||
side = side,
|
||||
action = "try_delete",
|
||||
|
|
@ -176,7 +174,7 @@ function micro_ai_helper.micro_ai_setup(cfg, CA_parms, required_keys, optional_k
|
|||
local CA_cfg = {}
|
||||
|
||||
-- Required keys
|
||||
for k, v in pairs(required_keys) do
|
||||
for _,v in pairs(required_keys) do
|
||||
local child = H.get_child(cfg, v)
|
||||
if (not cfg[v]) and (not child) then
|
||||
H.wml_error("[micro_ai] tag (" .. cfg.ai_type .. ") is missing required parameter: " .. v)
|
||||
|
|
@ -186,7 +184,7 @@ function micro_ai_helper.micro_ai_setup(cfg, CA_parms, required_keys, optional_k
|
|||
end
|
||||
|
||||
-- Optional keys
|
||||
for k, v in pairs(optional_keys) do
|
||||
for _,v in pairs(optional_keys) do
|
||||
CA_cfg[v] = cfg[v]
|
||||
local child = H.get_child(cfg, v)
|
||||
if child then CA_cfg[v] = child end
|
||||
|
|
|
|||
|
|
@ -124,19 +124,19 @@ function wesnoth.wml_actions.micro_ai(cfg)
|
|||
-- [unit] tags need to be dealt with separately
|
||||
cfg.id, cfg.goal_x, cfg.goal_y = {}, {}, {}
|
||||
if (cfg.action ~= 'delete') then
|
||||
for u in H.child_range(cfg, "unit") do
|
||||
if (not u.id) then
|
||||
for unit in H.child_range(cfg, "unit") do
|
||||
if (not unit.id) then
|
||||
H.wml_error("Protect Unit Micro AI [unit] tag is missing required id= key")
|
||||
end
|
||||
if (not u.goal_x) then
|
||||
if (not unit.goal_x) then
|
||||
H.wml_error("Protect Unit Micro AI [unit] tag is missing required goal_x= key")
|
||||
end
|
||||
if (not u.goal_y) then
|
||||
if (not unit.goal_y) then
|
||||
H.wml_error("Protect Unit Micro AI [unit] tag is missing required goal_y= key")
|
||||
end
|
||||
table.insert(cfg.id, u.id)
|
||||
table.insert(cfg.goal_x, u.goal_x)
|
||||
table.insert(cfg.goal_y, u.goal_y)
|
||||
table.insert(cfg.id, unit.id)
|
||||
table.insert(cfg.goal_x, unit.goal_x)
|
||||
table.insert(cfg.goal_y, unit.goal_y)
|
||||
end
|
||||
|
||||
if (not cfg.id[1]) then
|
||||
|
|
@ -156,7 +156,7 @@ function wesnoth.wml_actions.micro_ai(cfg)
|
|||
|
||||
-- attacks aspects also needs to be set separately
|
||||
local unit_ids_str = 'dummy'
|
||||
for i,id in ipairs(cfg.id) do
|
||||
for _,id in ipairs(cfg.id) do
|
||||
unit_ids_str = unit_ids_str .. ',' .. id
|
||||
end
|
||||
local aspect_parms = {
|
||||
|
|
@ -388,15 +388,15 @@ function wesnoth.wml_actions.micro_ai(cfg)
|
|||
if (cfg.action ~= 'delete') then
|
||||
-- The 'probability' tags need to be handled separately here
|
||||
cfg.type, cfg.prob = {}, {}
|
||||
for p in H.child_range(cfg, "probability") do
|
||||
if (not p.type) then
|
||||
for probability in H.child_range(cfg, "probability") do
|
||||
if (not probability.type) then
|
||||
H.wml_error("Random Recruiting Micro AI [probability] tag is missing required type= key")
|
||||
end
|
||||
if (not p.probability) then
|
||||
if (not probability.probability) then
|
||||
H.wml_error("Random Recruiting Micro AI [probability] tag is missing required probability= key")
|
||||
end
|
||||
table.insert(cfg.type, p.type)
|
||||
table.insert(cfg.prob, p.probability)
|
||||
table.insert(cfg.type, probability.type)
|
||||
table.insert(cfg.prob, probability.probability)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue