mirror of
https://github.com/ComfyFactory/ComfyFactorio.git
synced 2025-01-08 00:39:30 +02:00
Rework on player_list code organization and small changes
This commit is contained in:
MaemiKozue
parent
8eb2cd5348
commit
5a9f4ea9c2
302
player_list.lua
302
player_list.lua
@ -110,21 +110,35 @@ local function get_rank(player)
|
|||||||
return ranks[m]
|
return ranks[m]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local comparators = {
|
||||||
|
["pokes_asc"] = function (a, b) return a.pokes > b.pokes end,
|
||||||
|
["pokes_desc"] = function (a, b) return a.pokes < b.pokes end,
|
||||||
|
["total_time_played_asc"] = function (a,b) return a.total_played_ticks < b.total_played_ticks end,
|
||||||
|
["total_time_played_desc"] = function (a,b) return a.total_played_ticks > b.total_played_ticks end,
|
||||||
|
["time_played_asc"] = function (a,b) return a.played_ticks < b.played_ticks end,
|
||||||
|
["time_played_desc"] = function (a,b) return a.played_ticks > b.played_ticks end,
|
||||||
|
["name_asc"] = function (a,b) return a.name:lower() < b.name:lower() end,
|
||||||
|
["name_desc"] = function (a,b) return a.name:lower() > b.name:lower() end
|
||||||
|
}
|
||||||
|
|
||||||
|
local function get_comparator(sort_by)
|
||||||
|
return comparators[sort_by]
|
||||||
|
end
|
||||||
|
|
||||||
local function get_sorted_list(sort_by)
|
local function get_sorted_list(sort_by)
|
||||||
local player_list = {}
|
local player_list = {}
|
||||||
for i, player in pairs(game.connected_players) do
|
for i, player in pairs(game.connected_players) do
|
||||||
player_list[i] = {}
|
player_list[i] = {}
|
||||||
player_list[i].rank = get_rank(player)
|
player_list[i].rank = get_rank(player)
|
||||||
player_list[i].name = player.name
|
player_list[i].name = player.name
|
||||||
if global.player_totals then
|
|
||||||
local t = 0
|
local t = 0
|
||||||
if global.player_totals[player.name] then t = global.player_totals[player.name][1] end
|
if global.player_totals and global.player_totals[player.name] then
|
||||||
player_list[i].total_played_time = get_formatted_playtime(t + player.online_time)
|
t = global.player_totals[player.name][1]
|
||||||
player_list[i].total_played_ticks = t + player.online_time
|
|
||||||
else
|
|
||||||
player_list[i].total_played_time = get_formatted_playtime(player.online_time)
|
|
||||||
player_list[i].total_played_ticks = player.online_time
|
|
||||||
end
|
end
|
||||||
|
player_list[i].total_played_time = get_formatted_playtime(t + player.online_time)
|
||||||
|
player_list[i].total_played_ticks = t + player.online_time
|
||||||
|
|
||||||
player_list[i].played_time = get_formatted_playtime(player.online_time)
|
player_list[i].played_time = get_formatted_playtime(player.online_time)
|
||||||
player_list[i].played_ticks = player.online_time
|
player_list[i].played_ticks = player.online_time
|
||||||
if not global.player_list_pokes_counter[player.index] then global.player_list_pokes_counter[player.index] = 0 end
|
if not global.player_list_pokes_counter[player.index] then global.player_list_pokes_counter[player.index] = 0 end
|
||||||
@ -132,87 +146,14 @@ local function get_sorted_list(sort_by)
|
|||||||
player_list[i].player_index = player.index
|
player_list[i].player_index = player.index
|
||||||
end
|
end
|
||||||
|
|
||||||
for i = #player_list, 1, -1 do
|
local comparator = get_comparator(sort_by)
|
||||||
for i2 = #player_list, 1, -1 do
|
table.sort(player_list, comparator)
|
||||||
if sort_by == "pokes_asc" then
|
|
||||||
if player_list[i].pokes > player_list[i2].pokes then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if sort_by == "pokes_desc" then
|
|
||||||
if player_list[i].pokes < player_list[i2].pokes then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if sort_by == "total_time_played_asc" then
|
|
||||||
if player_list[i].total_played_ticks > player_list[i2].total_played_ticks then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if sort_by == "total_time_played_desc" then
|
|
||||||
if player_list[i].total_played_ticks < player_list[i2].total_played_ticks then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if sort_by == "time_played_asc" then
|
|
||||||
if player_list[i].played_ticks > player_list[i2].played_ticks then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if sort_by == "time_played_desc" then
|
|
||||||
if player_list[i].played_ticks < player_list[i2].played_ticks then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if sort_by == "name_asc" then
|
|
||||||
local str_byte_1 = string.byte(player_list[i].name, 1)
|
|
||||||
local str_byte_2 = string.byte(player_list[i2].name, 1)
|
|
||||||
if str_byte_1 < 97 then str_byte_1 = str_byte_1 + 32 end
|
|
||||||
if str_byte_2 < 97 then str_byte_2 = str_byte_2 + 32 end
|
|
||||||
if str_byte_1 > str_byte_2 then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if sort_by == "name_desc" then
|
|
||||||
local str_byte_1 = string.byte(player_list[i].name, 1)
|
|
||||||
local str_byte_2 = string.byte(player_list[i2].name, 1)
|
|
||||||
if str_byte_1 < 97 then str_byte_1 = str_byte_1 + 32 end
|
|
||||||
if str_byte_2 < 97 then str_byte_2 = str_byte_2 + 32 end
|
|
||||||
if str_byte_1 < str_byte_2 then
|
|
||||||
local a = player_list[i]
|
|
||||||
local b = player_list[i2]
|
|
||||||
player_list[i] = b
|
|
||||||
player_list[i2] = a
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return player_list
|
return player_list
|
||||||
end
|
end
|
||||||
|
|
||||||
local function player_list_show(player, sort_by)
|
local function player_list_show(player, sort_by)
|
||||||
|
-- Frame management
|
||||||
local frame = player.gui.left["player-list-panel"]
|
local frame = player.gui.left["player-list-panel"]
|
||||||
if frame then frame.destroy() end
|
if frame then frame.destroy() end
|
||||||
|
|
||||||
@ -226,78 +167,58 @@ local function player_list_show(player, sort_by)
|
|||||||
frame.style.bottom_padding = 8
|
frame.style.bottom_padding = 8
|
||||||
|
|
||||||
|
|
||||||
|
-- Header management
|
||||||
local t = frame.add { type = "table", name = "player_list_panel_header_table", column_count = 5 }
|
local t = frame.add { type = "table", name = "player_list_panel_header_table", column_count = 5 }
|
||||||
local label = t.add { type = "label", caption = "" }
|
for _, w in ipairs({36, 200, 160, 130, 35}) do
|
||||||
label.style.minimal_width = 36
|
local label = t.add { type = "label", caption = "" }
|
||||||
label.style.maximal_width = 36
|
label.style.minimal_width = w
|
||||||
local label = t.add { type = "label", caption = "" }
|
label.style.maximal_width = w
|
||||||
label.style.minimal_width = 200
|
end
|
||||||
label.style.maximal_width = 200
|
|
||||||
local label = t.add { type = "label", caption = "" }
|
|
||||||
label.style.minimal_width = 160
|
|
||||||
label.style.maximal_width = 160
|
|
||||||
local label = t.add { type = "label", caption = "" }
|
|
||||||
label.style.minimal_width = 130
|
|
||||||
label.style.maximal_width = 130
|
|
||||||
local label = t.add { type = "label", caption = "" }
|
|
||||||
label.style.minimal_width = 35
|
|
||||||
label.style.maximal_width = 35
|
|
||||||
|
|
||||||
local label = t.add { type = "label", name = "player_list_panel_header_1", caption = tostring(#game.connected_players) }
|
local headers = {
|
||||||
label.style.font = "default-bold"
|
[1] = "[color=0.1,0.7,0.1]" -- green
|
||||||
label.style.font_color = { r=0.10, g=0.70, b=0.10}
|
.. tostring(#game.connected_players)
|
||||||
|
.. "[/color]",
|
||||||
|
[2] = "Online"
|
||||||
|
.. " / "
|
||||||
|
.. "[color=0.7,0.1,0.1]" -- red
|
||||||
|
.. tostring(#game.players - #game.connected_players)
|
||||||
|
.. "[/color]"
|
||||||
|
.. " Offline",
|
||||||
|
[3] = "Total Time",
|
||||||
|
[4] = "Current Time",
|
||||||
|
[5] = "Poke"
|
||||||
|
}
|
||||||
|
local header_modifier = {
|
||||||
|
["name_asc"] = function (h) h[2] = symbol_asc .. h[2] end,
|
||||||
|
["name_desc"] = function (h) h[2] = symbol_desc .. h[2] end,
|
||||||
|
["total_time_played_asc"] = function (h) h[3] = symbol_asc .. h[3] end,
|
||||||
|
["total_time_played_desc"] = function (h) h[3] = symbol_desc .. h[3] end,
|
||||||
|
["time_played_asc"] = function (h) h[4] = symbol_asc .. h[4] end,
|
||||||
|
["time_played_desc"] = function (h) h[4] = symbol_desc .. h[4] end,
|
||||||
|
["pokes_asc"] = function (h) h[5] = symbol_asc .. h[5] end,
|
||||||
|
["pokes_desc"] = function (h) h[5] = symbol_desc .. h[5] end
|
||||||
|
}
|
||||||
|
header_modifier[sort_by](headers)
|
||||||
|
|
||||||
|
for k, v in ipairs(headers) do
|
||||||
|
local label = t.add {
|
||||||
|
type = "label",
|
||||||
|
name = "player_list_panel_header_" .. k,
|
||||||
|
caption = v
|
||||||
|
}
|
||||||
|
label.style.font = "default-bold"
|
||||||
|
label.style.font_color = { r=0.98, g=0.66, b=0.22 }
|
||||||
|
end
|
||||||
|
|
||||||
|
-- special style on first header
|
||||||
|
local label = t["player_list_panel_header_1"]
|
||||||
label.style.minimal_width = 36
|
label.style.minimal_width = 36
|
||||||
label.style.maximal_width = 36
|
label.style.maximal_width = 36
|
||||||
label.style.horizontal_align = "right"
|
label.style.horizontal_align = "right"
|
||||||
|
|
||||||
local str = ""
|
|
||||||
if sort_by == "name_asc" then str = symbol_asc .. " " end
|
|
||||||
if sort_by == "name_desc" then str = symbol_desc .. " " end
|
|
||||||
if #game.connected_players > 1 then
|
|
||||||
str = str .. "Players online"
|
|
||||||
else
|
|
||||||
str = str .. "Player online"
|
|
||||||
end
|
|
||||||
|
|
||||||
local tt = t.add({ type = "table", column_count = 5 })
|
|
||||||
local label = tt.add { type = "label", name = "player_list_panel_header_2", caption = str }
|
|
||||||
label.style.font = "default-bold"
|
|
||||||
label.style.font_color = { r=0.98, g=0.66, b=0.22}
|
|
||||||
|
|
||||||
if #game.connected_players ~= #game.players then
|
|
||||||
local label = tt.add { type = "label", caption = "/" }
|
|
||||||
label.style.font = "default-bold"
|
|
||||||
label.style.font_color = { r=0.98, g=0.66, b=0.22}
|
|
||||||
local label = tt.add { type = "label", caption = tostring(#game.players - #game.connected_players) }
|
|
||||||
label.style.font = "default-bold"
|
|
||||||
label.style.font_color = { r=0.70, g=0.10, b=0.10}
|
|
||||||
label.style.minimal_width = 9
|
|
||||||
local label = tt.add { type = "label", caption = " Offline" }
|
|
||||||
label.style.font = "default-bold"
|
|
||||||
label.style.font_color = { r=0.98, g=0.66, b=0.22}
|
|
||||||
end
|
|
||||||
|
|
||||||
str = ""
|
|
||||||
if sort_by == "total_time_played_asc" then str = symbol_asc .. " " end
|
|
||||||
if sort_by == "total_time_played_desc" then str = symbol_desc .. " " end
|
|
||||||
local label = t.add { type = "label", name = "player_list_panel_header_5", caption = str .. "Total Time" }
|
|
||||||
label.style.font = "default-bold"
|
|
||||||
label.style.font_color = { r=0.98, g=0.66, b=0.22}
|
|
||||||
|
|
||||||
str = ""
|
|
||||||
if sort_by == "time_played_asc" then str = symbol_asc .. " " end
|
|
||||||
if sort_by == "time_played_desc" then str = symbol_desc .. " " end
|
|
||||||
local label = t.add { type = "label", name = "player_list_panel_header_3", caption = str .. "Current Time" }
|
|
||||||
label.style.font = "default-bold"
|
|
||||||
label.style.font_color = { r=0.98, g=0.66, b=0.22}
|
|
||||||
|
|
||||||
str = ""
|
|
||||||
if sort_by == "pokes_asc" then str = symbol_asc .. " " end
|
|
||||||
if sort_by == "pokes_desc" then str = symbol_desc .. " " end
|
|
||||||
local label = t.add { type = "label", name = "player_list_panel_header_4", caption = str .. "Poke" }
|
|
||||||
label.style.font = "default-bold"
|
|
||||||
label.style.font_color = { r=0.98, g=0.66, b=0.22}
|
|
||||||
|
|
||||||
|
-- List management
|
||||||
local player_list_panel_table = frame.add { type = "scroll-pane", name = "scroll_pane", direction = "vertical", horizontal_scroll_policy = "never", vertical_scroll_policy = "auto"}
|
local player_list_panel_table = frame.add { type = "scroll-pane", name = "scroll_pane", direction = "vertical", horizontal_scroll_policy = "never", vertical_scroll_policy = "auto"}
|
||||||
player_list_panel_table.style.maximal_height = 530
|
player_list_panel_table.style.maximal_height = 530
|
||||||
|
|
||||||
@ -306,10 +227,11 @@ local function player_list_show(player, sort_by)
|
|||||||
local player_list = get_sorted_list(sort_by)
|
local player_list = get_sorted_list(sort_by)
|
||||||
|
|
||||||
for i = 1, #player_list, 1 do
|
for i = 1, #player_list, 1 do
|
||||||
|
-- Icon
|
||||||
local sprite = player_list_panel_table.add { type = "sprite", name = "player_rank_sprite_" .. i, sprite = player_list[i].rank }
|
local sprite = player_list_panel_table.add { type = "sprite", name = "player_rank_sprite_" .. i, sprite = player_list[i].rank }
|
||||||
sprite.style.minimal_width = 36
|
sprite.style.minimal_width = 36
|
||||||
|
|
||||||
|
-- Name
|
||||||
local label = player_list_panel_table.add { type = "label", name = "player_list_panel_player_names_" .. i, caption = player_list[i].name }
|
local label = player_list_panel_table.add { type = "label", name = "player_list_panel_player_names_" .. i, caption = player_list[i].name }
|
||||||
label.style.font = "default"
|
label.style.font = "default"
|
||||||
label.style.font_color = {
|
label.style.font_color = {
|
||||||
@ -320,14 +242,17 @@ local function player_list_show(player, sort_by)
|
|||||||
label.style.minimal_width = 200
|
label.style.minimal_width = 200
|
||||||
label.style.maximal_width = 200
|
label.style.maximal_width = 200
|
||||||
|
|
||||||
|
-- Total time
|
||||||
local label = player_list_panel_table.add { type = "label", name = "player_list_panel_player_total_time_played_" .. i, caption = player_list[i].total_played_time }
|
local label = player_list_panel_table.add { type = "label", name = "player_list_panel_player_total_time_played_" .. i, caption = player_list[i].total_played_time }
|
||||||
label.style.minimal_width = 160
|
label.style.minimal_width = 160
|
||||||
label.style.maximal_width = 160
|
label.style.maximal_width = 160
|
||||||
|
|
||||||
|
-- Current time
|
||||||
local label = player_list_panel_table.add { type = "label", name = "player_list_panel_player_time_played_" .. i, caption = player_list[i].played_time }
|
local label = player_list_panel_table.add { type = "label", name = "player_list_panel_player_time_played_" .. i, caption = player_list[i].played_time }
|
||||||
label.style.minimal_width = 130
|
label.style.minimal_width = 130
|
||||||
label.style.maximal_width = 130
|
label.style.maximal_width = 130
|
||||||
|
|
||||||
|
-- Poke
|
||||||
local flow = player_list_panel_table.add { type = "flow", name = "button_flow_" .. i, direction = "horizontal" }
|
local flow = player_list_panel_table.add { type = "flow", name = "button_flow_" .. i, direction = "horizontal" }
|
||||||
flow.add { type = "label", name = "button_spacer_" .. i, caption = "" }
|
flow.add { type = "label", name = "button_spacer_" .. i, caption = "" }
|
||||||
local button = flow.add { type = "button", name = "poke_player_" .. player_list[i].name, caption = player_list[i].pokes }
|
local button = flow.add { type = "button", name = "poke_player_" .. player_list[i].name, caption = player_list[i].pokes }
|
||||||
@ -352,42 +277,51 @@ local function on_gui_click(event)
|
|||||||
|
|
||||||
local player = game.players[event.element.player_index]
|
local player = game.players[event.element.player_index]
|
||||||
local name = event.element.name
|
local name = event.element.name
|
||||||
|
local actions = {
|
||||||
|
["player_list_button"] = function ()
|
||||||
|
if player.gui.left["player-list-panel"] then
|
||||||
|
player.gui.left["player-list-panel"].destroy()
|
||||||
|
else
|
||||||
|
player_list_show(player,"total_time_played_desc")
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
|
||||||
if (name == "player_list_button") then
|
["player_list_panel_header_2"] = function ()
|
||||||
if player.gui.left["player-list-panel"] then
|
if string.find(event.element.caption, symbol_desc) then
|
||||||
player.gui.left["player-list-panel"].destroy()
|
player_list_show(player,"name_asc")
|
||||||
else
|
else
|
||||||
player_list_show(player,"total_time_played_desc")
|
player_list_show(player,"name_desc")
|
||||||
end
|
end
|
||||||
end
|
end,
|
||||||
|
|
||||||
if (name == "player_list_panel_header_2") then
|
["player_list_panel_header_3"] = function ()
|
||||||
if string.find(event.element.caption, symbol_desc) then
|
if string.find(event.element.caption, symbol_desc) then
|
||||||
player_list_show(player,"name_asc")
|
player_list_show(player,"total_time_played_asc")
|
||||||
else
|
else
|
||||||
player_list_show(player,"name_desc")
|
player_list_show(player,"total_time_played_desc")
|
||||||
end
|
end
|
||||||
end
|
end,
|
||||||
if (name == "player_list_panel_header_3") then
|
|
||||||
if string.find(event.element.caption, symbol_desc) then
|
["player_list_panel_header_4"] = function ()
|
||||||
player_list_show(player,"time_played_asc")
|
if string.find(event.element.caption, symbol_desc) then
|
||||||
else
|
player_list_show(player,"time_played_asc")
|
||||||
player_list_show(player,"time_played_desc")
|
else
|
||||||
end
|
player_list_show(player,"time_played_desc")
|
||||||
end
|
end
|
||||||
if (name == "player_list_panel_header_4") then
|
end,
|
||||||
if string.find(event.element.caption, symbol_desc) then
|
|
||||||
player_list_show(player,"pokes_asc")
|
["player_list_panel_header_5"] = function ()
|
||||||
else
|
if string.find(event.element.caption, symbol_desc) then
|
||||||
player_list_show(player,"pokes_desc")
|
player_list_show(player,"pokes_asc")
|
||||||
end
|
else
|
||||||
end
|
player_list_show(player,"pokes_desc")
|
||||||
if (name == "player_list_panel_header_5") then
|
end
|
||||||
if string.find(event.element.caption, symbol_desc) then
|
|
||||||
player_list_show(player,"total_time_played_asc")
|
|
||||||
else
|
|
||||||
player_list_show(player,"total_time_played_desc")
|
|
||||||
end
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
if actions[name] then
|
||||||
|
actions[name]()
|
||||||
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if not event.element.valid then return end
|
if not event.element.valid then return end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user