diff --git a/data/ai/micro_ais/cas/ca_forest_animals_move.lua b/data/ai/micro_ais/cas/ca_forest_animals_move.lua index e0d2701eecc..5b240e1fce2 100644 --- a/data/ai/micro_ais/cas/ca_forest_animals_move.lua +++ b/data/ai/micro_ais/cas/ca_forest_animals_move.lua @@ -43,7 +43,7 @@ function ca_forest_animals_move:execution(cfg) -- Get the locations of all the rabbit holes wesnoth.wml_actions.store_items { variable = 'holes_wml' } - local all_items = wml.array_access.get('holes_wml') + local all_items = wml.array_variables['holes_wml'] wesnoth.wml_actions.clear_variable { name = 'holes_wml' } -- If cfg.rabbit_hole_img is set, only items with that image or halo count as holes diff --git a/data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua b/data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua index 193db451827..d85b508074f 100644 --- a/data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua +++ b/data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua @@ -16,7 +16,7 @@ function ca_forest_animals_new_rabbit:execution(cfg) -- Get the locations of all items on that map (which could be rabbit holes) wesnoth.wml_actions.store_items { variable = 'holes_wml' } - local all_items = wml.array_access.get('holes_wml') + local all_items = wml.array_variables['holes_wml'] wesnoth.wml_actions.clear_variable { name = 'holes_wml' } -- Eliminate all holes that have an enemy within 'rabbit_enemy_distance' hexes diff --git a/data/ai/micro_ais/engines/priority_target_engine.lua b/data/ai/micro_ais/engines/priority_target_engine.lua index 2d68c4f4448..bc8252c69bd 100644 --- a/data/ai/micro_ais/engines/priority_target_engine.lua +++ b/data/ai/micro_ais/engines/priority_target_engine.lua @@ -33,7 +33,7 @@ return { moves = "current", variable = "tmp_locs" } - attack_locs = wml.array_access.get("tmp_locs") + attack_locs = wml.array_variables["tmp_locs"] W.clear_variable { name = "tmp_locs" } if (#attack_locs > 0) then break end end diff --git a/data/campaigns/Eastern_Invasion/lua/bandits.lua b/data/campaigns/Eastern_Invasion/lua/bandits.lua index 6fb398aae29..ae6a40bdd0a 100644 --- a/data/campaigns/Eastern_Invasion/lua/bandits.lua +++ b/data/campaigns/Eastern_Invasion/lua/bandits.lua @@ -35,7 +35,7 @@ end local function bandits_found(x,y) local bandit_types = vars.bandit_types - local bandit_villages = wml.array_access.get("bandit_villages") + local bandit_villages = wml.array_variables["bandit_villages"] local boss_found = vars.boss_found local visited = vars.villages_visited local rand1 = helper.rand("3,4") diff --git a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg index 46abbab7bf1..88055d72f73 100644 --- a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg +++ b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg @@ -247,12 +247,12 @@ if wml.variables.target_enemies == nil then wml.variables.all_targets = wml.variables.target_loc else - local target_loc = wml.array_access.get('target_loc') - local targets = wml.array_access.get('target_enemies') + local target_loc = wml.array_variables['target_loc'] + local targets = wml.array_variables['target_enemies'] for k, v in pairs(target_loc) do table.insert(targets, v) end - wml.array_access.set('all_targets', targets) + wml.array_variables['all_targets'] = targets end >> [/lua] diff --git a/data/lua/wml-flow.lua b/data/lua/wml-flow.lua index 52940a54ed3..7bb160a92aa 100644 --- a/data/lua/wml-flow.lua +++ b/data/lua/wml-flow.lua @@ -178,7 +178,7 @@ function wml_actions.foreach(cfg) end local array_name = cfg.array or helper.wml_error "[foreach] missing required array= attribute" - local array = wml.array_access.get(array_name) + local array = wml.array_variables[array_name] if #array == 0 then return end -- empty and scalars unwanted local item_name = cfg.variable or "this_item" local this_item = utils.start_var_scope(item_name) -- if this_item is already set @@ -232,7 +232,7 @@ function wml_actions.foreach(cfg) Note that altering the array via indexing (with the index_var) is not supported; any such changes will be reverted by this line. ]] - wml.array_access.set(array_name, array) + wml.array_variables[array_name] = array end function wml_actions.switch(cfg) diff --git a/data/lua/wml-utils.lua b/data/lua/wml-utils.lua index d0f0b807cd2..eebfa370d90 100644 --- a/data/lua/wml-utils.lua +++ b/data/lua/wml-utils.lua @@ -192,7 +192,7 @@ end --note: when using these, make sure that nothing can throw over the call to end_var_scope function utils.start_var_scope(name) - local var = wml.array_access.get(name) --containers and arrays + local var = wml.array_variables[name] --containers and arrays if #var == 0 then var = wml.variables[name] end --scalars (and nil/empty) wml.variables[name] = nil return var @@ -201,7 +201,7 @@ end function utils.end_var_scope(name, var) wml.variables[name] = nil if type(var) == "table" then - wml.array_access.set(name, var) + wml.array_variables[name] = var else wml.variables[name] = var end diff --git a/data/lua/wml/set_variable.lua b/data/lua/wml/set_variable.lua index adeb7fb7c7d..323b06b04c0 100644 --- a/data/lua/wml/set_variable.lua +++ b/data/lua/wml/set_variable.lua @@ -143,7 +143,7 @@ function wesnoth.wml_actions.set_variable(cfg, variables) local string_to_join = '' - for i, element in ipairs(wml.array_access.get(array_name)) do + for i, element in ipairs(wml.array_variables[array_name]) do if element[key_name] ~= nil or (not remove_empty) then if #string_to_join > 0 then string_to_join = string_to_join .. separator diff --git a/data/test/scenarios/ai/_main.cfg b/data/test/scenarios/ai/_main.cfg index 5323fc96cc3..efad5d501fa 100644 --- a/data/test/scenarios/ai/_main.cfg +++ b/data/test/scenarios/ai/_main.cfg @@ -12,7 +12,7 @@ #define ASPECT_NOTIFICATION << -local expected = wml.array_access.get('expected') +local expected = wml.array_variables['expected'] local aspect = wml.variables['test_attribute'] if ai.aspects[aspect] ~= expected[wesnoth.current.turn].value then wml.variables['is_valid'] = false