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

Merge pull request #36 from gfgtdf/master

Browse source 
added information about single hits in simulate_combat
This commit is contained in:
Alexander van Gessel 2013-07-19 15:57:46 -07:00
commit 6a2dfd208e
1 changed files with 55 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/scripting/lua.cpp
View file

@ -2835,6 +2835,56 @@ static void luaW_pushsimdata(lua_State *L, const combatant &cmb)
lua_setfield(L, -2, "hp_chance");
}
/**
* Puts a table at the top of the stack with information about the combatants' weapons.
*/
static void luaW_pushsimweapon(lua_State *L, const battle_context_unit_stats &bcustats)
{
lua_createtable(L, 0, 16);
lua_pushnumber(L, bcustats.num_blows);
lua_setfield(L, -2, "num_blows");
lua_pushnumber(L, bcustats.damage);
lua_setfield(L, -2, "damage");
lua_pushnumber(L, bcustats.chance_to_hit);
lua_setfield(L, -2, "chance_to_hit");
lua_pushboolean(L, bcustats.poisons);
lua_setfield(L, -2, "poisons");
lua_pushboolean(L, bcustats.slows);
lua_setfield(L, -2, "slows");
lua_pushboolean(L, bcustats.petrifies);
lua_setfield(L, -2, "petrifies");
lua_pushboolean(L, bcustats.plagues);
lua_setfield(L, -2, "plagues");
lua_pushstring(L, bcustats.plague_type.c_str());
lua_setfield(L, -2, "plague_type");
lua_pushboolean(L, bcustats.backstab_pos);
lua_setfield(L, -2, "backstabs");
lua_pushnumber(L, bcustats.rounds);
lua_setfield(L, -2, "rounds");
lua_pushboolean(L, bcustats.firststrike);
lua_setfield(L, -2, "firststrike");
lua_pushboolean(L, bcustats.drains);
lua_setfield(L, -2, "drains");
lua_pushnumber(L, bcustats.drain_constant);
lua_setfield(L, -2, "drain_constant");
lua_pushnumber(L, bcustats.drain_percent);
lua_setfield(L, -2, "drain_percent");
//if we called simulate_combat without giving an explicit weapon this can be useful.
lua_pushnumber(L, bcustats.attack_num);
lua_setfield(L, -2, "attack_num");
//this is NULL when there is no counter weapon
if(bcustats.weapon != NULL)
{
lua_pushstring(L, bcustats.weapon->id().c_str());
lua_setfield(L, -2, "name");
}
}
/**
* Simulates a combat between two units.
* - Arg 1: attacker userdata.
@ -2843,6 +2893,8 @@ static void luaW_pushsimdata(lua_State *L, const combatant &cmb)
* - Arg 4: optional weapon index.
* - Ret 1: attacker results.
* - Ret 2: defender results.
* - Ret 3: info about the attacker weapon.
* - Ret 4: info about the defender weapon.
*/
static int intf_simulate_combat(lua_State *L)
{
@ -2871,7 +2923,9 @@ static int intf_simulate_combat(lua_State *L)
luaW_pushsimdata(L, context.get_attacker_combatant());
luaW_pushsimdata(L, context.get_defender_combatant());
return 2;
luaW_pushsimweapon(L, context.get_attacker_stats());
luaW_pushsimweapon(L, context.get_defender_stats());
return 4;
}
/**