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

Added damage_inflicted member to wesnoth.current.event_context (fixes #2368)

Browse source
This commit is contained in:
Charles Dang 2018-02-08 14:02:38 +11:00
parent 118eb94beb
commit d46f129d3c
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/actions/attack.cpp
View file

@ -947,6 +947,12 @@ void attack::fire_event(const std::string& n)
return;
}
// damage_inflicted is set in these two events.
// TODO: should we set this value from unit_info::damage, or continue using the WML variable?
if(n == "attacker_hits" || n == "defender_hits") {
ev_data["damage_inflicted"] = resources::gamedata->get_variable("damage_inflicted");
}
const int defender_side = d_.get_unit().side();
resources::game_events->pump().fire(n,

6
src/scripting/game_lua_kernel.cpp
View file

@ -1359,6 +1359,12 @@ int game_lua_kernel::impl_current_get(lua_State *L)
if (const config &weapon = ev.data.child("second")) {
cfg.add_child("second_weapon", weapon);
}
const config::attribute_value di = ev.data["damage_inflicted"];
if(!di.empty()) {
cfg["damage_inflicted"] = di;
}
if (ev.loc1.valid()) {
cfg["x1"] = ev.loc1.filter_loc().wml_x();
cfg["y1"] = ev.loc1.filter_loc().wml_y();