BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Consistently use "health points" (#10868)

Browse Source
This commit is contained in:
Zughy 2021-01-27 19:42:02 +01:00 committed by GitHub
parent 8dae7b47fc
commit 44a9510c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/lua_api.txt
View File

@ -6221,8 +6221,8 @@ object you are working with still exists.
* `time_from_last_punch` = time since last punch action of the puncher * `time_from_last_punch` = time since last punch action of the puncher
* `direction`: can be `nil` * `direction`: can be `nil`
* `right_click(clicker)`; `clicker` is another `ObjectRef` * `right_click(clicker)`; `clicker` is another `ObjectRef`
* `get_hp()`: returns number of hitpoints (2 * number of hearts) * `get_hp()`: returns number of health points
* `set_hp(hp, reason)`: set number of hitpoints (2 * number of hearts). * `set_hp(hp, reason)`: set number of health points
* See reason in register_on_player_hpchange * See reason in register_on_player_hpchange
* Is limited to the range of 0 ... 65535 (2^16 - 1) * Is limited to the range of 0 ... 65535 (2^16 - 1)
* For players: HP are also limited by `hp_max` specified in the player's * For players: HP are also limited by `hp_max` specified in the player's

2
src/constants.h
View File

@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// Size of player's main inventory // Size of player's main inventory
#define PLAYER_INVENTORY_SIZE (8 * 4) #define PLAYER_INVENTORY_SIZE (8 * 4)
// Default maximum hit points of a player // Default maximum health points of a player
#define PLAYER_MAX_HP_DEFAULT 20 #define PLAYER_MAX_HP_DEFAULT 20
// Default maximal breath of a player // Default maximal breath of a player

2
util/wireshark/minetest.lua
View File

@ -873,7 +873,7 @@ end
-- TOCLIENT_HP -- TOCLIENT_HP
do do
local f_hp = ProtoField.uint16("minetest.server.hp", "Hitpoints", base.DEC) local f_hp = ProtoField.uint16("minetest.server.hp", "Health points", base.DEC)
minetest_server_commands[0x33] = { minetest_server_commands[0x33] = {
"HP", 4, "HP", 4,