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

Merge pull request #11 from jleldridge/master

Browse source 
Rewrite location_set.of_pairs().
This commit is contained in:
mattsc 2013-05-15 21:25:33 -07:00
commit 9c25c08b66
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/ai/micro_ais/ais/mai_healer_support_engine.lua
View file

@ -140,12 +140,7 @@ return {
local enemy_attack_map = BC.get_attack_map(enemies)
--AH.put_labels(enemy_attack_map.units)
local avoid_locs = ai.get_avoid()
local avoid_map = LS.create()
for i,l in ipairs(avoid_locs) do
avoid_map:insert(l.x, l.y)
end
local avoid_map = LS.of_pairs(ai.get_avoid())
-- Put units back out there
for i,u in ipairs(units_MP) do wesnoth.put_unit(u.x, u.y, u) end

26
data/lua/location_set.lua
View file

@ -106,8 +106,32 @@ end
function methods:of_pairs(t)
local values = self.values
for i,v in ipairs(t) do
values[index(v[1], v[2])] = true
local value_table = {}
if (v.x) and (v.y) then
for k,val in pairs(v) do
if (k ~= "x") and (k ~= "y") then
value_table[k] = val
end
end
if (next(value_table) ~= nil) then
values[index(v.x, v.y)] = value_table
else
values[index(v.x, v.y)] = true
end
else
for k,val in pairs(v) do
if (k ~= 1) and (k ~= 2) then
value_table[k] = val
end
end
if (next(value_table) ~= nil) then
values[index(v[1], v[2])] = value_table
else
values[index(v[1], v[2])] = true
end
end
end
end