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

Fixup and expand cc8ec3a934

Browse source 
[skip ci]
This commit is contained in:
aquileia 2015-01-29 01:26:37 +01:00
parent 2bc587c75d
commit 504fd44747
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/ai/lua/generic_rush_engine.lua
View file

@ -93,7 +93,7 @@ return {
local leader = wesnoth.get_units {
side = wesnoth.current.side,
canrecruit = 'yes',
formula = '($this_unit.moves = $this_unit.max_moves) and ($this_unit.hitpoints = $this_unit.max_hitpoints)'
formula = '(movement_left = total_movement) and (hitpoints = max_hitpoints)'
}[1]
if not leader then
-- CA is irrelevant if no leader or the leader may have moved from another CA
@ -266,7 +266,7 @@ return {
-- Check if there are units with moves left
local units = wesnoth.get_units { side = wesnoth.current.side, canrecruit = 'no',
formula = '$this_unit.moves > 0'
formula = 'movement_left > 0'
}
if (not units[1]) then
if AH.print_eval() then AH.done_eval_messages(start_time, ca_name) end
@ -408,7 +408,7 @@ return {
-- If a unit with a poisoned weapon can make an attack, we'll do that preferentially
-- (with some exceptions)
local poisoners = AH.get_live_units { side = wesnoth.current.side,
formula = '$this_unit.attacks_left > 0',
formula = 'attacks_left > 0',
{ "filter_wml", {
{ "attack", {
{ "specials", {
@ -523,7 +523,7 @@ return {
function generic_rush:retreat_injured_units_eval()
local units = wesnoth.get_units {
side = wesnoth.current.side,
formula = '$this_unit.moves > 0'
formula = 'movement_left > 0'
}
local unit, loc = R.retreat_injured_units(units)
if unit then
@ -574,7 +574,7 @@ return {
local units = wesnoth.get_units {
side = wesnoth.current.side,
canrecruit = false,
formula = '$this_unit.moves > 0'
formula = 'movement_left > 0'
}
if not units[1] then
@ -588,7 +588,7 @@ return {
local unit = wesnoth.get_units({
side = wesnoth.current.side,
canrecruit = false,
formula = '$this_unit.moves > 0'
formula = 'movement_left > 0'
})[1]
local villages = wesnoth.get_villages()

2
data/ai/lua/move_to_any_target.lua
View file

@ -8,7 +8,7 @@ return {
local units = wesnoth.get_units {
side = wesnoth.current.side,
canrecruit = 'no',
formula = '$this_unit.moves > 0'
formula = 'movement_left > 0'
}
if (not units[1]) then

6
data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
View file

@ -7,7 +7,7 @@ local ca_ogres_flee = {}
function ca_ogres_flee:evaluation(ai, cfg, self)
local units = wesnoth.get_units { side = wesnoth.current.side,
formula = '$this_unit.moves > 0'
formula = 'movement_left > 0'
}
if (not units[1]) then return 0 end
@ -16,11 +16,11 @@ end
function ca_ogres_flee:execution(ai, cfg, self)
local units = wesnoth.get_units { side = wesnoth.current.side,
formula = '$this_unit.moves > 0'
formula = 'movement_left > 0'
}
local units_noMP = wesnoth.get_units { side = wesnoth.current.side,
formula = '$this_unit.moves = 0'
formula = 'movement_left = 0'
}
local width, height = wesnoth.get_map_size()

2
data/campaigns/Son_Of_The_Black_Eye/ai/ca_transport_S6.lua
View file

@ -11,7 +11,7 @@ local ca_transport = {}
-- Also unload units onto best hexes adjacent to landing site
function ca_transport:evaluation(ai)
local units = wesnoth.get_units { side = wesnoth.current.side, formula = '$this_unit.moves > 0' }
local units = wesnoth.get_units { side = wesnoth.current.side, formula = 'movement_left > 0' }
for i,u in ipairs(units) do
local vars = H.get_child(u.__cfg, "variables")

2
data/campaigns/The_Rise_Of_Wesnoth/ai/ca_aggressive_attack_no_suicide.lua
View file

@ -6,7 +6,7 @@ function ca_aggressive_attack_no_suicide:evaluation(ai, cfg, self)
local units = wesnoth.get_units {
side = wesnoth.current.side,
formula = "attacks_left > 0"
formula = 'attacks_left > 0'
}
--print('#units', #units)
if (not units[1]) then return 0 end

2
data/campaigns/The_Rise_Of_Wesnoth/ai/ca_retreat.lua
View file

@ -7,7 +7,7 @@ function retreat:evaluation(ai, cfg, self)
local units = wesnoth.get_units {
side = wesnoth.current.side,
formula = 'moves > 0'
formula = 'movement_left > 0'
}
--print('#units', #units)
if (not units[1]) then return 0 end