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

First draft on movement map exposure to Lua

Browse source
This commit is contained in:
Dmitry Kovalenko 2011-06-14 19:35:28 +00:00
parent 6d4ddb46b8
commit f87b14b9dc
2 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/ai/scenarios/scenario-lua-ai.cfg
View file

@ -312,8 +312,14 @@ function my_ai:do_moves()
--local rp = ai.get_recruitment_pattern() -- rp is used like a simple array
--wesnoth.message('pattern'.. rp[1] .. rp[2])
--wesnoth.message('TOOD: ' .. wesnoth.get_time_of_day().id)
wesnoth.message('Leader goal' .. ai.get_leader_goal().x .. ' ' .. ai.get_leader_goal().y) -- fixed
wesnoth.message('Avoid ex. ' .. #ai.get_avoid() .. ' ' ..ai.get_avoid()[1]["x"] .. " " .. ai.get_avoid()[1]["y"]) -- TOFIX
--wesnoth.message('Leader goal' .. ai.get_leader_goal().x .. ' ' .. ai.get_leader_goal().y) -- fixed
--wesnoth.message('Avoid ex. ' .. #ai.get_avoid() .. ' ' ..ai.get_avoid()[1]["x"] .. " " .. ai.get_avoid()[1]["y"]) -- fixed?
--we wesnoth.message('DSTSRC fun: ' .. #ai.get_dstsrc())
for k,v in pairs(ai.get_dstsrc()) do
for i,l in ipairs(v) do
wesnoth.message(#v)
end
end
my_leader = wesnoth.get_units({canrecruit = true, side = ai.side})[1]
x,y = ai.suitable_keep(my_leader)

48
src/ai/lua/core.cpp
View file

@ -414,6 +414,53 @@ static int cfun_ai_get_villages_per_scout(lua_State *L)
}
// End of aspect section
static void push_map_location(lua_State *L, const map_location& ml)
{
lua_createtable(L, 2, 0);
lua_pushstring(L, "x");
lua_pushinteger(L, ml.x);
lua_rawset(L, -3);
lua_pushstring(L, "y");
lua_pushinteger(L, ml.y);
lua_rawset(L, -3);
}
static int cfun_ai_get_dstsrc(lua_State *L)
{
move_map dst_src = get_readonly_context(L).get_dstsrc();
move_map::const_iterator it = dst_src.begin();
int index = 1;
lua_createtable(L, 0, 0); // the main table
do {
map_location key = it->first;
push_map_location(L, key);
lua_createtable(L, 0, 0);
while (key == it->first) {
push_map_location(L, it->second);
lua_rawseti(L, -2, index);
++index;
++it;
}
lua_settable(L, -3);
index = 1;
} while (it != dst_src.end());
return 1;
}
lua_ai_context* lua_ai_context::create(lua_State *L, char const *code, ai::engine_lua *engine)
{
int res_ai = luaL_loadstring(L, code);//stack size is now 1 [ -1: ai_context]
@ -433,6 +480,7 @@ lua_ai_context* lua_ai_context::create(lua_State *L, char const *code, ai::engin
static luaL_reg const callbacks[] = {
{ "attack", &cfun_ai_execute_attack },
{ "get_dstsrc", &cfun_ai_get_dstsrc },
// Aspects
{ "get_aggression", &cfun_ai_get_aggression },
{ "get_avoid", &cfun_ai_get_avoid },