Remove (now) pointless afters to change hotbar items
parent
39d2803d26
commit
c015c8c2c4
|
@ -23,12 +23,8 @@ minetest.register_tool("arena_lib:editor_players", {
|
||||||
user:get_meta():set_int("arena_lib_editor.players_number", 2)
|
user:get_meta():set_int("arena_lib_editor.players_number", 2)
|
||||||
|
|
||||||
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Players | num to set: @1 (left/right click slot #3 to change)", 2))
|
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Players | num to set: @1 (left/right click slot #3 to change)", 2))
|
||||||
|
arena_lib.give_players_tools(user:get_inventory(), mod, arena)
|
||||||
minetest.after(0, function()
|
|
||||||
arena_lib.give_players_tools(user:get_inventory(), mod, arena)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -47,12 +43,8 @@ minetest.register_tool("arena_lib:editor_spawners", {
|
||||||
user:get_meta():set_int("arena_lib_editor.team_ID", 1)
|
user:get_meta():set_int("arena_lib_editor.team_ID", 1)
|
||||||
|
|
||||||
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Spawners | sel. ID: @1 (right click slot #2 to change)", 1))
|
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Spawners | sel. ID: @1 (right click slot #2 to change)", 1))
|
||||||
|
arena_lib.give_spawners_tools(user)
|
||||||
minetest.after(0, function()
|
|
||||||
arena_lib.give_spawners_tools(user)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -66,14 +58,9 @@ minetest.register_tool("arena_lib:editor_signs", {
|
||||||
on_drop = function() end,
|
on_drop = function() end,
|
||||||
|
|
||||||
on_use = function(itemstack, user)
|
on_use = function(itemstack, user)
|
||||||
|
|
||||||
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("One sign per arena"))
|
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("One sign per arena"))
|
||||||
|
arena_lib.give_signs_tools(user)
|
||||||
minetest.after(0, function()
|
|
||||||
arena_lib.give_signs_tools(user)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -87,14 +74,9 @@ minetest.register_tool("arena_lib:editor_customise", {
|
||||||
on_drop = function() end,
|
on_drop = function() end,
|
||||||
|
|
||||||
on_use = function(itemstack, user)
|
on_use = function(itemstack, user)
|
||||||
|
|
||||||
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Pimp my arena"))
|
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Pimp my arena"))
|
||||||
|
arena_lib.give_customise_tools(user)
|
||||||
minetest.after(0, function()
|
|
||||||
arena_lib.give_customise_tools(user)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -111,9 +93,7 @@ minetest.register_tool("arena_lib:editor_settings", {
|
||||||
|
|
||||||
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Arena settings"))
|
arena_lib.HUD_send_msg("hotbar", user:get_player_name(), S("Arena settings"))
|
||||||
|
|
||||||
minetest.after(0, function()
|
arena_lib.give_settings_tools(user)
|
||||||
arena_lib.give_settings_tools(user)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
@ -149,9 +129,7 @@ minetest.register_tool("arena_lib:editor_return", {
|
||||||
on_drop = function() end,
|
on_drop = function() end,
|
||||||
|
|
||||||
on_use = function(itemstack, user)
|
on_use = function(itemstack, user)
|
||||||
minetest.after(0, function()
|
arena_lib.show_main_editor(user)
|
||||||
arena_lib.show_main_editor(user)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -45,11 +45,9 @@ function arena_lib.register_editor_section(mod, def)
|
||||||
|
|
||||||
local inv = user:get_inventory()
|
local inv = user:get_inventory()
|
||||||
|
|
||||||
minetest.after(0, function()
|
inv:set_list("main", item_list)
|
||||||
inv:set_list("main", item_list)
|
inv:set_stack("main", 7, "arena_lib:editor_return")
|
||||||
inv:set_stack("main", 7, "arena_lib:editor_return")
|
inv:set_stack("main", 8, "arena_lib:editor_quit")
|
||||||
inv:set_stack("main", 8, "arena_lib:editor_quit")
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
@ -177,11 +175,7 @@ function arena_lib.quit_editor(player)
|
||||||
player:override_day_night_ratio(lighting.light)
|
player:override_day_night_ratio(lighting.light)
|
||||||
|
|
||||||
-- restituisco l'inventario
|
-- restituisco l'inventario
|
||||||
minetest.after(0, function()
|
player:get_inventory():set_list("main", inv)
|
||||||
if not minetest.get_player_by_name(p_name) then return end
|
|
||||||
player:get_inventory():set_list("main", inv)
|
|
||||||
end)
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,8 @@ minetest.register_node("arena_lib:players_min", {
|
||||||
|
|
||||||
if not arena_lib.change_players_amount(user:get_player_name(), mod, arena_name, players_amount, nil, true) then return end
|
if not arena_lib.change_players_amount(user:get_player_name(), mod, arena_name, players_amount, nil, true) then return end
|
||||||
|
|
||||||
-- aggiorno lo stack se il cambio è andato a buon fine
|
-- aggiorno la quantità se il cambio è andato a buon fine
|
||||||
minetest.after(0, function()
|
user:set_wielded_item("arena_lib:players_min " .. players_amount)
|
||||||
user:set_wielded_item("arena_lib:players_min " .. players_amount)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -59,10 +57,8 @@ minetest.register_node("arena_lib:players_max", {
|
||||||
|
|
||||||
if not arena_lib.change_players_amount(user:get_player_name(), mod, arena_name, nil, players_amount, true) then return end
|
if not arena_lib.change_players_amount(user:get_player_name(), mod, arena_name, nil, players_amount, true) then return end
|
||||||
|
|
||||||
-- aggiorno lo stack se il cambio è andato a buon fine
|
-- aggiorno la quantità se il cambio è andato a buon fine
|
||||||
minetest.after(0, function()
|
user:set_wielded_item("arena_lib:players_max " .. players_amount)
|
||||||
user:set_wielded_item("arena_lib:players_max " .. players_amount)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -105,9 +101,7 @@ minetest.register_tool("arena_lib:players_teams_on", {
|
||||||
|
|
||||||
arena_lib.toggle_teams_per_arena(user:get_player_name(), mod, arena_name, 0, true)
|
arena_lib.toggle_teams_per_arena(user:get_player_name(), mod, arena_name, 0, true)
|
||||||
|
|
||||||
minetest.after(0, function()
|
user:get_inventory():set_stack("main", 5, "arena_lib:players_teams_off")
|
||||||
user:get_inventory():set_stack("main", 5, "arena_lib:players_teams_off")
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -128,9 +122,7 @@ minetest.register_tool("arena_lib:players_teams_off", {
|
||||||
|
|
||||||
arena_lib.toggle_teams_per_arena(user:get_player_name(), mod, arena_name, 1, true)
|
arena_lib.toggle_teams_per_arena(user:get_player_name(), mod, arena_name, 1, true)
|
||||||
|
|
||||||
minetest.after(0, function()
|
user:get_inventory():set_stack("main", 5, "arena_lib:players_teams_on")
|
||||||
user:get_inventory():set_stack("main", 5, "arena_lib:players_teams_on")
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -84,9 +84,7 @@ minetest.register_craftitem("arena_lib:timer", {
|
||||||
|
|
||||||
arena_lib.set_timer(placer:get_player_name(), mod, arena_name, -1, true)
|
arena_lib.set_timer(placer:get_player_name(), mod, arena_name, -1, true)
|
||||||
|
|
||||||
minetest.after(0, function()
|
inv:set_stack("main", 1, "arena_lib:timer_off")
|
||||||
inv:set_stack("main", 1, "arena_lib:timer_off")
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -661,9 +661,7 @@ function override_hotbar(player, mod, arena)
|
||||||
table.insert(tools, #tools, "arena_lib:spectate_join")
|
table.insert(tools, #tools, "arena_lib:spectate_join")
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.after(0, function()
|
player:hud_set_hotbar_image("arenalib_gui_hotbar" .. #tools .. ".png")
|
||||||
player:hud_set_hotbar_image("arenalib_gui_hotbar" .. #tools .. ".png")
|
player:hud_set_hotbar_itemcount(#tools)
|
||||||
player:hud_set_hotbar_itemcount(#tools)
|
player:get_inventory():set_list("main", tools)
|
||||||
player:get_inventory():set_list("main", tools)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -92,12 +92,10 @@ minetest.register_tool("arena_lib:spectate_join", {
|
||||||
on_drop = function() end,
|
on_drop = function() end,
|
||||||
|
|
||||||
on_use = function(itemstack, user)
|
on_use = function(itemstack, user)
|
||||||
minetest.after(0, function() -- after sennò non rimuove quest'oggetto
|
local p_name = user:get_player_name()
|
||||||
local p_name = user:get_player_name()
|
local mod = arena_lib.get_mod_by_player(p_name)
|
||||||
local mod = arena_lib.get_mod_by_player(p_name)
|
local arena_ID = arena_lib.get_arenaID_by_player(p_name)
|
||||||
local arena_ID = arena_lib.get_arenaID_by_player(p_name)
|
arena_lib.join_arena(mod, p_name, arena_ID)
|
||||||
arena_lib.join_arena(mod, p_name, arena_ID)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
@ -113,9 +111,7 @@ minetest.register_tool("arena_lib:spectate_quit", {
|
||||||
on_drop = function() end,
|
on_drop = function() end,
|
||||||
|
|
||||||
on_use = function(itemstack, user)
|
on_use = function(itemstack, user)
|
||||||
minetest.after(0, function() -- after sennò non rimuove quest'oggetto
|
arena_lib.remove_player_from_arena(user:get_player_name(), 3)
|
||||||
arena_lib.remove_player_from_arena(user:get_player_name(), 3)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue