jadedctrl/ minetest-i4
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

Hide hearts when damage ain't enabled

This commit is contained in:
Jean-Patrick Guerrero 2021-05-09 16:54:09 +02:00
parent 9ab92ba056
commit e0166288c6
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
init.lua
View File

@ -2046,7 +2046,8 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
local name = player:get_player_name() local name = player:get_player_name()
add_subtitle(fs, "player_name", 0, ctn_len, 22, true, ESC(name)) add_subtitle(fs, "player_name", 0, ctn_len, 22, true, ESC(name))
local hp = damage_enabled and (data.hp or player:get_hp()) or 20 if damage_enabled then
local hp = data.hp or player:get_hp() or 20
local half = ceil((hp / 2) % 1) local half = ceil((hp / 2) % 1)
local hearts = (hp / 2) + half local hearts = (hp / 2) + half
local heart_size = 0.35 local heart_size = 0.35
@ -2057,12 +2058,13 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
heart_size, heart_size, PNG.heart_grey) heart_size, heart_size, PNG.heart_grey)
end end
if damage_enabled then
for i = 1, hearts do for i = 1, hearts do
fs("image", heart_x + ((i - 1) * (heart_size + 0.1)), heart_h, fs("image", heart_x + ((i - 1) * (heart_size + 0.1)), heart_h,
heart_size, heart_size, heart_size, heart_size,
(half == 1 and i == floor(hearts)) and PNG.heart_half or PNG.heart) (half == 1 and i == floor(hearts)) and PNG.heart_half or PNG.heart)
end end
else
yoffset = yoffset - 0.5
end end
fs(fmt("list[current_player;craft;%f,%f;3,3;]", 0, yoffset + 1.45)) fs(fmt("list[current_player;craft;%f,%f;3,3;]", 0, yoffset + 1.45))
@ -2071,7 +2073,7 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
fmt("list[detached:i3_trash;main;%f,%f;1,1;]", 4.45, yoffset + 3.75)) fmt("list[detached:i3_trash;main;%f,%f;1,1;]", 4.45, yoffset + 3.75))
fs("image", 4.45, yoffset + 3.75, 1, 1, PNG.trash) fs("image", 4.45, yoffset + 3.75, 1, 1, PNG.trash)
local yextra = 5.5 local yextra = damage_enabled and 5.5 or 5
for i, title in ipairs(SUBCAT) do for i, title in ipairs(SUBCAT) do
local btn_name = fmt("btn_%s", title) local btn_name = fmt("btn_%s", title)
@ -2529,7 +2531,7 @@ local function get_inventory_fs(player, data, fs)
local award_list, award_list_nb local award_list, award_list_nb
local awards_unlocked = 0 local awards_unlocked = 0
local max_val = 12 local max_val = damage_enabled and 12 or 7
if __3darmor and data.subcat == 2 then if __3darmor and data.subcat == 2 then
if data.scrbar_inv >= max_val then if data.scrbar_inv >= max_val then
@ -2566,7 +2568,7 @@ local function get_inventory_fs(player, data, fs)
scrollbar[%f,0.2;0.2,%f;vertical;scrbar_inv;%u] scrollbar[%f,0.2;0.2,%f;vertical;scrbar_inv;%u]
scrollbaroptions[arrows=default;thumbsize=0;max=1000] scrollbaroptions[arrows=default;thumbsize=0;max=1000]
]], ]],
(max_val * 4) / 15, max_val, 9.8, ctn_hgt, data.scrbar_inv)) (max_val * 4) / 12, max_val, 9.8, ctn_hgt, data.scrbar_inv))
fs(fmt("scroll_container[3.9,0.2;%f,%f;scrbar_inv;vertical]", ctn_len, ctn_hgt)) fs(fmt("scroll_container[3.9,0.2;%f,%f;scrbar_inv;vertical]", ctn_len, ctn_hgt))