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

Rename variable

This commit is contained in:
Jean-Patrick Guerrero 2021-04-06 04:14:40 +02:00
parent a372bd8a81
commit 6fe45c0fac
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
init.lua
View File

@ -1904,7 +1904,7 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
local btn_name = fmt("btn_%s", title) local btn_name = fmt("btn_%s", title)
fs(fmt("style[btn_%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", title, fs(fmt("style[btn_%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", title,
data.equip == i and PNG[fmt("%s_hover", title)] or PNG[title], data.subcat == i and PNG[fmt("%s_hover", title)] or PNG[title],
PNG[fmt("%s_hover", title)])) PNG[fmt("%s_hover", title)]))
fs("image_button", 0.25 + ((i - 1) * 1.18), yextra - 0.2, 0.5, 0.5, "", btn_name, "") fs("image_button", 0.25 + ((i - 1) * 1.18), yextra - 0.2, 0.5, 0.5, "", btn_name, "")
@ -1912,14 +1912,14 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
end end
fs("box", 0, yextra + 0.45, ctn_len, 0.045, "#bababa50") fs("box", 0, yextra + 0.45, ctn_len, 0.045, "#bababa50")
fs("box", (data.equip - 1) * 1.18, yextra + 0.45, 1, 0.045, "#f9826c") fs("box", (data.subcat - 1) * 1.18, yextra + 0.45, 1, 0.045, "#f9826c")
local function not_installed(modname) local function not_installed(modname)
fs("hypertext", 0, yextra + 0.9, ctn_len, 0.6, "", fs("hypertext", 0, yextra + 0.9, ctn_len, 0.6, "",
fmt("<center><style color=#7bf font=mono>%s</style> not installed</center>", modname)) fmt("<center><style color=#7bf font=mono>%s</style> not installed</center>", modname))
end end
if data.equip == 1 then if data.subcat == 1 then
fs(fmt("list[detached:%s_backpack;main;0,%f;1,1;]", ESC(name), yextra + 0.7)) fs(fmt("list[detached:%s_backpack;main;0,%f;1,1;]", ESC(name), yextra + 0.7))
if not data.bag:get_stack("main", 1):is_empty() then if not data.bag:get_stack("main", 1):is_empty() then
@ -1927,7 +1927,7 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
ES("The inventory is extended by @1 slots", BAG_SIZES[data.bag_size] - INV_SIZE)) ES("The inventory is extended by @1 slots", BAG_SIZES[data.bag_size] - INV_SIZE))
end end
elseif data.equip == 2 then elseif data.subcat == 2 then
if __3darmor then if __3darmor then
fs(fmt("list[detached:%s_armor;armor;0,%f;3,2;]", ESC(name), yextra + 0.7)) fs(fmt("list[detached:%s_armor;armor;0,%f;3,2;]", ESC(name), yextra + 0.7))
@ -1939,7 +1939,7 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
not_installed("3d_armor") not_installed("3d_armor")
end end
elseif data.equip == 3 then elseif data.subcat == 3 then
if __skinsdb then if __skinsdb then
local _skins = skins.get_skinlist_for_player(name) local _skins = skins.get_skinlist_for_player(name)
local sks = {} local sks = {}
@ -1955,7 +1955,7 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
not_installed("skinsdb") not_installed("skinsdb")
end end
elseif data.equip == 4 then elseif data.subcat == 4 then
if __awards then if __awards then
yextra = yextra + 0.8 yextra = yextra + 0.8
get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlocked, award_list_nb) get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlocked, award_list_nb)
@ -1963,7 +1963,7 @@ local function get_ctn_content(fs, data, player, yoffset, ctn_len, award_list, a
not_installed("awards") not_installed("awards")
end end
elseif data.equip == 5 then elseif data.subcat == 5 then
local waypoints = {} local waypoints = {}
for _, v in ipairs(data.waypoints or {}) do for _, v in ipairs(data.waypoints or {}) do
@ -2206,7 +2206,7 @@ local function init_data(player, info)
favs = {}, favs = {},
export_counts = {}, export_counts = {},
current_tab = 1, current_tab = 1,
equip = 1, subcat = 1,
waypoint_id = 1, waypoint_id = 1,
lang_code = get_lang_code(info), lang_code = get_lang_code(info),
} }
@ -2350,14 +2350,14 @@ local function get_inventory_fs(player, data, fs)
local awards_unlocked = 0 local awards_unlocked = 0
local max_val = 15 local max_val = 15
if __3darmor and data.equip == 2 then if __3darmor and data.subcat == 2 then
if data.scrbar_inv == max_val then if data.scrbar_inv == max_val then
data.scrbar_inv = data.scrbar_inv + 9 data.scrbar_inv = data.scrbar_inv + 9
end end
max_val = max_val + 9 max_val = max_val + 9
elseif __awards and data.equip == 4 then elseif __awards and data.subcat == 4 then
award_list = awards.get_award_states(name) award_list = awards.get_award_states(name)
award_list_nb = #award_list award_list_nb = #award_list
@ -2371,7 +2371,7 @@ local function get_inventory_fs(player, data, fs)
max_val = max_val + (award_list_nb * 13) max_val = max_val + (award_list_nb * 13)
elseif data.equip == 5 then elseif data.subcat == 5 then
max_val = max_val + 3 max_val = max_val + 3
end end
@ -2476,7 +2476,7 @@ i3.new_tab {
for field in pairs(fields) do for field in pairs(fields) do
if sub(field, 1, 4) == "btn_" then if sub(field, 1, 4) == "btn_" then
data.equip = indexof(SUBCAT, sub(field, 5)) data.subcat = indexof(SUBCAT, sub(field, 5))
break break
end end
end end