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

Simplified code structure.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-10-31 17:24:31 +00:00
parent 064f268456
commit 5c52cf4bf9
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
data/lua/wml-tags.lua
View file

@ -383,29 +383,24 @@ function wml_actions.store_reachable_locations(cfg)
local location_filter = helper.get_child(cfg, "filter_location")
local range = cfg.range or "movement"
local moves = cfg.moves or "current"
local viewing_side = cfg.viewing_side or 0
local variable = cfg.variable or helper.wml_error "[store_reachable_locations] missing required variable= key"
local reach_param = { viewing_side = cfg.viewing_side or 0 }
if range == "vision" then
moves = "max"
reach_param.ignore_units = true
end
local reach = location_set.create()
local unit_reach = location_set.create()
for i,unit in ipairs(wesnoth.get_units(unit_filter)) do
unit_reach:clear()
if range == "movement" or range == "attack" then
if moves == "max" then
local real_moves = unit.moves
unit.moves = unit.max_moves
unit_reach = location_set.of_pairs(wesnoth.find_reach(unit, { viewing_side = viewing_side } ))
unit.moves = real_moves
else
unit_reach = location_set.of_pairs(wesnoth.find_reach(unit, { viewing_side = viewing_side } ))
end
elseif range == "vision" then
local real_moves = unit.moves
local unit_reach
if moves == "max" then
local saved_moves = unit.moves
unit.moves = unit.max_moves
unit_reach = location_set.of_pairs(wesnoth.find_reach(unit, { viewing_side = viewing_side, ignore_units = true }))
unit.moves = real_moves
unit_reach = location_set.of_pairs(wesnoth.find_reach(unit, reach_param))
unit.moves = saved_moves
else
unit_reach = location_set.of_pairs(wesnoth.find_reach(unit, reach_param))
end
if range == "vision" or range == "attack" then