Signs: when an arena is queueing, it now says 'queueing' instead of 'waiting'

master
Marco 2020-06-29 16:22:12 +02:00
parent b2729002ad
commit 24a139f039
5 changed files with 15 additions and 13 deletions

View File

@ -1227,8 +1227,6 @@ function arena_lib.remove_player_from_arena(p_name, reason)
end
arena.players[p_name] = nil
arena_lib.update_sign(arena)
-- se l'arena era in coda e ora ci son troppi pochi giocatori, annullo la coda
if arena.in_queue then
@ -1245,7 +1243,7 @@ function arena_lib.remove_player_from_arena(p_name, reason)
end
-- se invece è in partita, ha i team e sono rimasti solo i giocatori di un team, il loro team vince
elseif arena.in_game and arena.teams_enabled and arena.players_amount < arena.min_players * #arena.teams then
elseif arena.in_game and arena.teams_enabled and arena.players_amount < arena.min_players * #arena.teams then
local team_to_compare
@ -1278,6 +1276,9 @@ elseif arena.in_game and arena.teams_enabled and arena.players_amount < arena.mi
arena_lib.load_celebration(mod, arena, pl_name)
end
end
arena_lib.update_sign(arena)
end

View File

@ -1,4 +1,4 @@
local version = "3.3.0-dev"
local version = "3.3.0"
dofile(minetest.get_modpath("arena_lib") .. "/api.lua")
dofile(minetest.get_modpath("arena_lib") .. "/callbacks.lua")

View File

@ -1,4 +1,4 @@
# version 3.3.0-dev
# version 3.3.0
# author(s): Zughy
# reviewer(s):
# textdomain: arena_lib
@ -117,6 +117,7 @@ Get ready!=Preparati!
#Terminating=Concludendo
#Ongoing=In partita
#Loading=In caricamento
#Queueing=In coda
#Waiting=In attesa
# utils.lua

View File

@ -1,4 +1,4 @@
# version 3.3.0-dev
# version 3.3.0
# author(s):
# reviewer(s):
# textdomain: arena_lib
@ -117,6 +117,7 @@ Get ready!=
#Terminating=
#Ongoing=
#Loading=
#Queueing=
#Waiting=
# utils.lua

View File

@ -120,8 +120,6 @@ minetest.override_item("default:sign_wall", {
sign_arena.players[p_name] = nil
end
arena_lib.update_sign(sign_arena)
local players_required = get_players_required(sign_arena)
-- ...e annullo la coda se non ci sono più abbastanza persone
@ -142,6 +140,7 @@ minetest.override_item("default:sign_wall", {
arena_lib.HUD_send_msg_all("hotbar", sign_arena, arena_display_format(sign_arena, S("@1 seconds for the match to start", seconds)))
end
arena_lib.update_sign(sign_arena)
return
else
@ -180,8 +179,6 @@ minetest.override_item("default:sign_wall", {
old_arena.players[p_name] = nil
end
arena_lib.update_sign(old_arena)
local players_required = get_players_required(old_arena)
-- ...annullando la coda della precedente se non ci sono più abbastanza giocatori
@ -202,6 +199,8 @@ minetest.override_item("default:sign_wall", {
arena_lib.HUD_send_msg_all("hotbar", old_arena, arena_display_format(old_arena, S("@1 seconds for the match to start", seconds)))
end
arena_lib.update_sign(old_arena)
end
end
@ -238,9 +237,6 @@ minetest.override_item("default:sign_wall", {
sign_arena.players_amount_per_team[p_team_ID] = sign_arena.players_amount_per_team[p_team_ID] + #players_to_add
end
-- aggiorno il cartello
arena_lib.update_sign(sign_arena)
-- notifico i vari giocatori del nuovo player
for _, pl_name in pairs(players_to_add) do
if sign_arena.in_game then
@ -274,6 +270,8 @@ minetest.override_item("default:sign_wall", {
end
end
arena_lib.update_sign(sign_arena)
-- se raggiungo i giocatori massimi e la partita non è iniziata, accorcio eventualmente la durata
if sign_arena.players_amount == arena_max_players and sign_arena.in_queue then
if timer:get_timeout() - timer:get_elapsed() > 5 then
@ -423,6 +421,7 @@ function in_game_txt(arena)
if not arena.enabled then txt = "WIP"
elseif arena.in_celebration then txt = "Terminating"
elseif arena.in_loading then txt = "Loading"
elseif arena.in_queue then txt = "Queueing"
elseif arena.in_game then txt = "In progress"
else txt = "Waiting" end