Add node field to PlayerHPChangeReason table (#8368)

This commit is contained in:
Paul Ouellette 2019-04-11 15:45:39 -04:00 committed by rubenwardy
parent 1e5f2e0f13
commit 22ad820aa4
5 changed files with 39 additions and 14 deletions

@ -3738,15 +3738,16 @@ Call these functions only at load time!
giving a type - use this for custom damage types. giving a type - use this for custom damage types.
* `punch`: Was punched. `reason.object` will hold the puncher, or nil if none. * `punch`: Was punched. `reason.object` will hold the puncher, or nil if none.
* `fall` * `fall`
* `node_damage`: damage_per_second from a neighbouring node. * `node_damage`: `damage_per_second` from a neighbouring node.
`reason.node` will hold the node name or nil.
* `drown` * `drown`
* `respawn` * `respawn`
* Any of the above types may have additional fields from mods. * Any of the above types may have additional fields from mods.
* `reason.from` will be `mod` or `engine`. * `reason.from` will be `mod` or `engine`.
* `modifier`: when true, the function should return the actual `hp_change`. * `modifier`: when true, the function should return the actual `hp_change`.
Note: modifiers only get a temporary hp_change that can be modified by later modifiers. Note: modifiers only get a temporary `hp_change` that can be modified by later modifiers.
modifiers can return true as a second argument to stop the execution of further functions. Modifiers can return true as a second argument to stop the execution of further functions.
Non-modifiers receive the final hp change calculated by the modifiers. Non-modifiers receive the final HP change calculated by the modifiers.
* `minetest.register_on_dieplayer(function(ObjectRef, reason))` * `minetest.register_on_dieplayer(function(ObjectRef, reason))`
* Called when a player dies * Called when a player dies
* `reason`: a PlayerHPChangeReason table, see register_on_player_hpchange * `reason`: a PlayerHPChangeReason table, see register_on_player_hpchange

@ -1022,6 +1022,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
if (m_node_hurt_interval.step(dtime, 1.0f)) { if (m_node_hurt_interval.step(dtime, 1.0f)) {
u32 damage_per_second = 0; u32 damage_per_second = 0;
std::string nodename;
// Lowest and highest damage points are 0.1 within collisionbox // Lowest and highest damage points are 0.1 within collisionbox
float dam_top = m_prop.collisionbox.MaxEdge.Y - 0.1f; float dam_top = m_prop.collisionbox.MaxEdge.Y - 0.1f;
@ -1031,20 +1032,26 @@ void PlayerSAO::step(float dtime, bool send_recommended)
v3s16 p = floatToInt(m_base_position + v3s16 p = floatToInt(m_base_position +
v3f(0.0f, dam_height * BS, 0.0f), BS); v3f(0.0f, dam_height * BS, 0.0f), BS);
MapNode n = m_env->getMap().getNodeNoEx(p); MapNode n = m_env->getMap().getNodeNoEx(p);
damage_per_second = std::max(damage_per_second, const ContentFeatures &c = m_env->getGameDef()->ndef()->get(n);
m_env->getGameDef()->ndef()->get(n).damage_per_second); if (c.damage_per_second > damage_per_second) {
damage_per_second = c.damage_per_second;
nodename = c.name;
}
} }
// Top damage point // Top damage point
v3s16 ptop = floatToInt(m_base_position + v3s16 ptop = floatToInt(m_base_position +
v3f(0.0f, dam_top * BS, 0.0f), BS); v3f(0.0f, dam_top * BS, 0.0f), BS);
MapNode ntop = m_env->getMap().getNodeNoEx(ptop); MapNode ntop = m_env->getMap().getNodeNoEx(ptop);
damage_per_second = std::max(damage_per_second, const ContentFeatures &c = m_env->getGameDef()->ndef()->get(ntop);
m_env->getGameDef()->ndef()->get(ntop).damage_per_second); if (c.damage_per_second > damage_per_second) {
damage_per_second = c.damage_per_second;
nodename = c.name;
}
if (damage_per_second != 0 && m_hp > 0) { if (damage_per_second != 0 && m_hp > 0) {
s32 newhp = (s32)m_hp - (s32)damage_per_second; s32 newhp = (s32)m_hp - (s32)damage_per_second;
PlayerHPChangeReason reason(PlayerHPChangeReason::NODE_DAMAGE); PlayerHPChangeReason reason(PlayerHPChangeReason::NODE_DAMAGE, nodename);
setHP(newhp, reason); setHP(newhp, reason);
m_env->getGameDef()->SendPlayerHPOrDie(this, reason); m_env->getGameDef()->SendPlayerHPOrDie(this, reason);
} }

@ -401,10 +401,14 @@ struct PlayerHPChangeReason {
}; };
Type type = SET_HP; Type type = SET_HP;
ServerActiveObject *object;
bool from_mod = false; bool from_mod = false;
int lua_reference = -1; int lua_reference = -1;
// For PLAYER_PUNCH
ServerActiveObject *object = nullptr;
// For NODE_DAMAGE
std::string node;
inline bool hasLuaReference() const inline bool hasLuaReference() const
{ {
return lua_reference >= 0; return lua_reference >= 0;
@ -450,7 +454,15 @@ struct PlayerHPChangeReason {
} }
} }
PlayerHPChangeReason(Type type, ServerActiveObject *object=NULL): PlayerHPChangeReason(Type type):
type(type)
{}
PlayerHPChangeReason(Type type, ServerActiveObject *object):
type(type), object(object) type(type), object(object)
{} {}
PlayerHPChangeReason(Type type, std::string node):
type(type), node(node)
{}
}; };

@ -404,6 +404,10 @@ void ScriptApiBase::pushPlayerHPChangeReason(lua_State *L, const PlayerHPChangeR
objectrefGetOrCreate(L, reason.object); objectrefGetOrCreate(L, reason.object);
lua_setfield(L, -2, "object"); lua_setfield(L, -2, "object");
} }
if (!reason.node.empty()) {
lua_pushstring(L, reason.node.c_str());
lua_setfield(L, -2, "node");
}
} }
Server* ScriptApiBase::getServer() Server* ScriptApiBase::getServer()

@ -170,8 +170,8 @@ int ObjectRef::l_punch(lua_State *L)
ObjectRef *puncher_ref = checkobject(L, 2); ObjectRef *puncher_ref = checkobject(L, 2);
ServerActiveObject *co = getobject(ref); ServerActiveObject *co = getobject(ref);
ServerActiveObject *puncher = getobject(puncher_ref); ServerActiveObject *puncher = getobject(puncher_ref);
if (co == NULL) return 0; if (!co || !puncher)
if (puncher == NULL) return 0; return 0;
v3f dir; v3f dir;
if (lua_type(L, 5) != LUA_TTABLE) if (lua_type(L, 5) != LUA_TTABLE)
dir = co->getBasePosition() - puncher->getBasePosition(); dir = co->getBasePosition() - puncher->getBasePosition();
@ -192,7 +192,8 @@ int ObjectRef::l_punch(lua_State *L)
// If the punched is a player, and its HP changed // If the punched is a player, and its HP changed
if (src_original_hp != co->getHP() && if (src_original_hp != co->getHP() &&
co->getType() == ACTIVEOBJECT_TYPE_PLAYER) { co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co, PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, puncher)); getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co,
PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, puncher));
} }
// If the puncher is a player, and its HP changed // If the puncher is a player, and its HP changed