oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00
Code Wiki Activity

Respect object property hp_max field for players (#6287)

Browse source 
* Respect object property hp_max field for players
This allows modders to configure the maximal HP per player

* Statbars: Downscale bar to full 20 HP when exceeding this value
Add default max HP for players and breath constants to builtin
Document the constants

* Rename PLAYER_MAX_HP -> PLAYER_MAX_HP_DEFAULT
This commit is contained in:
SmallJoker 2017-08-23 22:32:10 +02:00 • committed by Loïc Blot
parent d01b65abeb
commit f7d50a8078
9 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/constants.h
View file

@ -90,7 +90,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define PLAYER_INVENTORY_SIZE (8 * 4)
// Maximum hit points of a player
#define PLAYER_MAX_HP 20
#define PLAYER_MAX_HP_DEFAULT 20
// Maximal breath of a player
#define PLAYER_MAX_BREATH 11

8
src/content_sao.cpp
View file

@ -782,7 +782,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
{
assert(m_peer_id != 0); // pre-condition
m_prop.hp_max = PLAYER_MAX_HP;
m_prop.hp_max = PLAYER_MAX_HP_DEFAULT;
m_prop.physical = false;
m_prop.weight = 75;
m_prop.collisionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f);
@ -799,7 +799,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
m_prop.is_visible = true;
m_prop.makes_footstep_sound = true;
m_prop.stepheight = PLAYER_DEFAULT_STEPHEIGHT * BS;
m_hp = PLAYER_MAX_HP;
m_hp = m_prop.hp_max;
}
PlayerSAO::~PlayerSAO()
@ -1235,8 +1235,8 @@ void PlayerSAO::setHP(s16 hp)
if (hp < 0)
hp = 0;
else if (hp > PLAYER_MAX_HP)
hp = PLAYER_MAX_HP;
else if (hp > m_prop.hp_max)
hp = m_prop.hp_max;
if (hp < oldhp && !g_settings->getBool("enable_damage")) {
return;

2
src/remoteplayer.cpp
View file

@ -100,7 +100,7 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
try {
sao->setHPRaw(args.getS32("hp"));
} catch(SettingNotFoundException &e) {
sao->setHPRaw(PLAYER_MAX_HP);
sao->setHPRaw(PLAYER_MAX_HP_DEFAULT);
}
try {

4
src/script/common/c_content.cpp
View file

@ -183,7 +183,9 @@ void read_object_properties(lua_State *L, int index,
if(!lua_istable(L, index))
return;
prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
int hp_max = 0;
if (getintfield(L, -1, "hp_max", hp_max))
prop->hp_max = (s16)rangelim(hp_max, 0, S16_MAX);
getboolfield(L, -1, "physical", prop->physical);
getboolfield(L, -1, "collide_with_objects", prop->collideWithObjects);

5
src/script/lua_api/l_object.cpp
View file

@ -751,6 +751,11 @@ int ObjectRef::l_set_properties(lua_State *L)
if (!prop)
return 0;
read_object_properties(L, 2, prop, getServer(L)->idef());
if (prop->hp_max < co->getHP()) {
co->setHP(prop->hp_max);
if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co);
}
co->notifyObjectPropertiesModified();
return 0;
}

2
src/server.cpp
View file

@ -2588,7 +2588,7 @@ void Server::RespawnPlayer(u16 peer_id)
<< playersao->getPlayer()->getName()
<< " respawns" << std::endl;
playersao->setHP(PLAYER_MAX_HP);
playersao->setHP(playersao->accessObjectProperties()->hp_max);
playersao->setBreath(PLAYER_MAX_BREATH);
bool repositioned = m_script->on_respawnplayer(playersao);