games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-11-27 22:38:18 +02:00
Code Issues Releases Activity

fix groups

Browse Source 
check if a group is nil
added Public.alphanumeric(value)
This commit is contained in:
Gerkiz
2020-06-23 19:33:00 +02:00
parent aeb06fdabc
commit 932a41e55e
1 changed files with 285 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
comfy_panel/group.lua
View File

@@ -1,8 +1,25 @@
-- this script adds a group button to create groups for your players -- -- this script adds a group button to create groups for your players --
local Tabs = require 'comfy_panel.main' local Tabs = require 'comfy_panel.main'
local Global = require 'utils.global'
local build_group_gui = (function (player, frame) local this = {
player_group = {},
join_spam_protection = {},
tag_groups = {},
alphanumeric = true
}
Global.register(
this,
function(t)
this = t
end
)
local Public = {}
local build_group_gui = (function(player, frame)
local group_name_width = 150 local group_name_width = 150
local description_width = 240 local description_width = 240
local members_width = 90 local members_width = 90
@@ -12,33 +29,48 @@ local build_group_gui = (function (player, frame)
frame.clear() frame.clear()
local t = frame.add({type = "table", column_count = 5}) local t = frame.add({type = 'table', column_count = 5})
local headings = {{"Title", group_name_width}, {"Description", description_width}, {"Members", members_width * member_columns}, {"", actions_width}} local headings = {
for _, h in pairs (headings) do {'Title', group_name_width},
local l = t.add({ type = "label", caption = h[1]}) {'Description', description_width},
l.style.font_color = { r=0.98, g=0.66, b=0.22} {'Members', members_width * member_columns},
l.style.font = "default-listbox" {'', actions_width}
}
for _, h in pairs(headings) do
local l = t.add({type = 'label', caption = h[1]})
l.style.font_color = {r = 0.98, g = 0.66, b = 0.22}
l.style.font = 'default-listbox'
l.style.top_padding = 6 l.style.top_padding = 6
l.style.minimal_height = 40 l.style.minimal_height = 40
l.style.minimal_width = h[2] l.style.minimal_width = h[2]
l.style.maximal_width = h[2] l.style.maximal_width = h[2]
end end
local scroll_pane = frame.add({ type = "scroll-pane", name = "scroll_pane", direction = "vertical", horizontal_scroll_policy = "never", vertical_scroll_policy = "auto"}) local scroll_pane =
frame.add(
{
type = 'scroll-pane',
name = 'scroll_pane',
direction = 'vertical',
horizontal_scroll_policy = 'never',
vertical_scroll_policy = 'auto'
}
)
scroll_pane.style.maximal_height = total_height - 50 scroll_pane.style.maximal_height = total_height - 50
scroll_pane.style.minimal_height = total_height - 50 scroll_pane.style.minimal_height = total_height - 50
local t = scroll_pane.add({type = "table", name = "groups_table", column_count = 4}) local t = scroll_pane.add({type = 'table', name = 'groups_table', column_count = 4})
for _, h in pairs (headings) do for _, h in pairs(headings) do
local l = t.add({ type = "label", caption = ""}) local l = t.add({type = 'label', caption = ''})
l.style.minimal_width = h[2] l.style.minimal_width = h[2]
l.style.maximal_width = h[2] l.style.maximal_width = h[2]
end end
for _, group in pairs (global.tag_groups) do for _, group in pairs(this.tag_groups) do
if (group.name and group.founder and group.description) then
local l = t.add({ type = "label", caption = group.name}) log(serpent.block(group))
l.style.font = "default-bold" local l = t.add({type = 'label', caption = group.name})
l.style.font = 'default-bold'
l.style.top_padding = 16 l.style.top_padding = 16
l.style.bottom_padding = 16 l.style.bottom_padding = 16
l.style.minimal_width = group_name_width l.style.minimal_width = group_name_width
@@ -47,8 +79,7 @@ local build_group_gui = (function (player, frame)
color = {r = color.r * 0.6 + 0.4, g = color.g * 0.6 + 0.4, b = color.b * 0.6 + 0.4, a = 1} color = {r = color.r * 0.6 + 0.4, g = color.g * 0.6 + 0.4, b = color.b * 0.6 + 0.4, a = 1}
l.style.font_color = color l.style.font_color = color
l.style.single_line = false l.style.single_line = false
local l = t.add({type = 'label', caption = group.description})
local l = t.add({ type = "label", caption = group.description})
l.style.top_padding = 16 l.style.top_padding = 16
l.style.bottom_padding = 16 l.style.bottom_padding = 16
l.style.minimal_width = description_width l.style.minimal_width = description_width
@@ -56,60 +87,63 @@ local build_group_gui = (function (player, frame)
l.style.font_color = {r = 0.90, g = 0.90, b = 0.90} l.style.font_color = {r = 0.90, g = 0.90, b = 0.90}
l.style.single_line = false l.style.single_line = false
local tt = t.add({ type = "table", column_count = member_columns}) local tt = t.add({type = 'table', column_count = member_columns})
for _, p in pairs (game.connected_players) do for _, p in pairs(game.connected_players) do
if group.name == global.player_group[p.name] then if group.name == this.player_group[p.name] then
local l = tt.add({ type = "label", caption = p.name}) local l = tt.add({type = 'label', caption = p.name})
local color = {r = p.color.r * 0.6 + 0.4, g = p.color.g * 0.6 + 0.4, b = p.color.b * 0.6 + 0.4, a = 1} local color = {
r = p.color.r * 0.6 + 0.4,
g = p.color.g * 0.6 + 0.4,
b = p.color.b * 0.6 + 0.4,
a = 1
}
l.style.font_color = color l.style.font_color = color
--l.style.minimal_width = members_width --l.style.minimal_width = members_width
l.style.maximal_width = members_width * 2 l.style.maximal_width = members_width * 2
end end
end end
local tt = t.add({ type = "table", name = group.name, column_count = 1}) local tt = t.add({type = 'table', name = group.name, column_count = 1})
if group.name ~= global.player_group[player.name] then if group.name ~= this.player_group[player.name] then
local b = tt.add({ type = "button", caption = "Join"}) local b = tt.add({type = 'button', caption = 'Join'})
b.style.font = "default-bold" b.style.font = 'default-bold'
b.style.minimal_width = actions_width b.style.minimal_width = actions_width
b.style.maximal_width = actions_width b.style.maximal_width = actions_width
else else
local b = tt.add({ type = "button", caption = "Leave"}) local b = tt.add({type = 'button', caption = 'Leave'})
b.style.font = "default-bold" b.style.font = 'default-bold'
b.style.minimal_width = actions_width b.style.minimal_width = actions_width
b.style.maximal_width = actions_width b.style.maximal_width = actions_width
end end
if player.admin == true or group.founder == player.name then if player.admin == true or group.founder == player.name then
local b = tt.add({ type = "button", caption = "Delete"}) local b = tt.add({type = 'button', caption = 'Delete'})
b.style.font = "default-bold" b.style.font = 'default-bold'
b.style.minimal_width = actions_width b.style.minimal_width = actions_width
b.style.maximal_width = actions_width b.style.maximal_width = actions_width
else else
local l = tt.add({ type = "label", caption = ""}) local l = tt.add({type = 'label', caption = ''})
l.style.minimal_width = actions_width l.style.minimal_width = actions_width
l.style.maximal_width = actions_width l.style.maximal_width = actions_width
end end
end end
end
local frame2 = frame.add({type = "frame", name = "frame2"}) local frame2 = frame.add({type = 'frame', name = 'frame2'})
local t = frame2.add({type = "table", name = "group_table", column_count = 3}) local t = frame2.add({type = 'table', name = 'group_table', column_count = 3})
local textfield = t.add({ type = "textfield", name = "new_group_name", text = "Name" }) local textfield = t.add({type = 'textfield', name = 'new_group_name', text = 'Name'})
textfield.style.minimal_width = 200 textfield.style.minimal_width = 200
local textfield = t.add({ type = "textfield", name = "new_group_description", text = "Description" }) local textfield = t.add({type = 'textfield', name = 'new_group_description', text = 'Description'})
textfield.style.minimal_width = 400 textfield.style.minimal_width = 400
local b = t.add({type = "button", name = "create_new_group", caption = "Create"}) local b = t.add({type = 'button', name = 'create_new_group', caption = 'Create'})
b.style.minimal_width = 150 b.style.minimal_width = 150
b.style.font = "default-bold" b.style.font = 'default-bold'
end) end)
local function refresh_gui() local function refresh_gui()
for _, p in pairs(game.connected_players) do for _, p in pairs(game.connected_players) do
local frame = Tabs.comfy_panel_get_active_frame(p) local frame = Tabs.comfy_panel_get_active_frame(p)
if frame then if frame then
if frame.name == "Groups" then if frame.name == 'Groups' then
local new_group_name = frame.frame2.group_table.new_group_name.text local new_group_name = frame.frame2.group_table.new_group_name.text
local new_group_description = frame.frame2.group_table.new_group_description.text local new_group_description = frame.frame2.group_table.new_group_description.text
@@ -125,88 +159,132 @@ end
local function on_player_joined_game(event) local function on_player_joined_game(event)
local player = game.players[event.player_index] local player = game.players[event.player_index]
if not global.player_group then global.player_group = {} end
if not global.player_group[player.name] then global.player_group[player.name] = "[Group]" end if not this.player_group[player.name] then
if not global.join_spam_protection then global.join_spam_protection = {} end this.player_group[player.name] = '[Group]'
if not global.join_spam_protection[player.name] then global.join_spam_protection[player.name] = game.tick end end
if not global.tag_groups then global.tag_groups = {} end
if not this.join_spam_protection[player.name] then
this.join_spam_protection[player.name] = game.tick
end
end
local function alphanumeric(str)
return (string.match(str, '[^%w]') ~= nil)
end end
local function on_gui_click(event) local function on_gui_click(event)
if not event then return end if not event then
if not event.element then return end return
if not event.element.valid then return end end
if not event.element then
return
end
if not event.element.valid then
return
end
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 frame = Tabs.comfy_panel_get_active_frame(player) local frame = Tabs.comfy_panel_get_active_frame(player)
if not frame then return end if not frame then
if frame.name ~= "Groups" then return end return
end
if frame.name ~= 'Groups' then
return
end
if name == "create_new_group" then if name == 'create_new_group' then
local new_group_name = frame.frame2.group_table.new_group_name.text local new_group_name = frame.frame2.group_table.new_group_name.text
local new_group_description = frame.frame2.group_table.new_group_description.text local new_group_description = frame.frame2.group_table.new_group_description.text
if new_group_name ~= "" and new_group_name ~= "Name" and new_group_description ~= "Description" then if new_group_name ~= '' and new_group_name ~= 'Name' and new_group_description ~= 'Description' then
if this.alphanumeric then
if alphanumeric(new_group_name) then
player.print('Group name is not valid.', {r = 0.90, g = 0.0, b = 0.0})
return
end
if alphanumeric(new_group_description) then
player.print('Group description is not valid.', {r = 0.90, g = 0.0, b = 0.0})
return
end
end
if string.len(new_group_name) > 64 then if string.len(new_group_name) > 64 then
player.print("Group name is too long. 64 characters maximum.", { r=0.90, g=0.0, b=0.0}) player.print('Group name is too long. 64 characters maximum.', {r = 0.90, g = 0.0, b = 0.0})
return return
end end
if string.len(new_group_description) > 128 then if string.len(new_group_description) > 128 then
player.print("Description is too long. 128 characters maximum.", { r=0.90, g=0.0, b=0.0}) player.print('Description is too long. 128 characters maximum.', {r = 0.90, g = 0.0, b = 0.0})
return return
end end
global.tag_groups[new_group_name] = {name = new_group_name, description = new_group_description, founder = player.name} this.tag_groups[new_group_name] = {
local color = {r = player.color.r * 0.7 + 0.3, g = player.color.g * 0.7 + 0.3, b = player.color.b * 0.7 + 0.3, a = 1} name = new_group_name,
game.print(player.name .. " has founded a new group!", color) description = new_group_description,
game.print('>> ' .. new_group_name, { r=0.98, g=0.66, b=0.22}) founder = player.name
game.print(new_group_description, { r=0.85, g=0.85, b=0.85}) }
local color = {
r = player.color.r * 0.7 + 0.3,
g = player.color.g * 0.7 + 0.3,
b = player.color.b * 0.7 + 0.3,
a = 1
}
game.print(player.name .. ' has founded a new group!', color)
game.print('>> ' .. new_group_name, {r = 0.98, g = 0.66, b = 0.22})
game.print(new_group_description, {r = 0.85, g = 0.85, b = 0.85})
frame.frame2.group_table.new_group_name.text = "Name" frame.frame2.group_table.new_group_name.text = 'Name'
frame.frame2.group_table.new_group_description.text = "Description" frame.frame2.group_table.new_group_description.text = 'Description'
refresh_gui() refresh_gui()
return return
end end
end end
local p = event.element.parent local p = event.element.parent
if p then p = p.parent end
if p then if p then
if p.name == "groups_table" then p = p.parent
if event.element.type == "button" and event.element.caption == "Join" then end
global.player_group[player.name] = event.element.parent.name if p then
local str = "[" .. event.element.parent.name if p.name == 'groups_table' then
str = str .. "]" if event.element.type == 'button' and event.element.caption == 'Join' then
this.player_group[player.name] = event.element.parent.name
local str = '[' .. event.element.parent.name
str = str .. ']'
player.tag = str player.tag = str
if game.tick - global.join_spam_protection[player.name] > 600 then if game.tick - this.join_spam_protection[player.name] > 600 then
local color = {r = player.color.r * 0.7 + 0.3, g = player.color.g * 0.7 + 0.3, b = player.color.b * 0.7 + 0.3, a = 1} local color = {
r = player.color.r * 0.7 + 0.3,
g = player.color.g * 0.7 + 0.3,
b = player.color.b * 0.7 + 0.3,
a = 1
}
game.print(player.name .. ' has joined group "' .. event.element.parent.name .. '"', color) game.print(player.name .. ' has joined group "' .. event.element.parent.name .. '"', color)
global.join_spam_protection[player.name] = game.tick this.join_spam_protection[player.name] = game.tick
end end
refresh_gui() refresh_gui()
return return
end end
if event.element.type == "button" and event.element.caption == "Delete" then if event.element.type == 'button' and event.element.caption == 'Delete' then
for _, p in pairs(game.players) do for _, p in pairs(game.players) do
if global.player_group[p.name] then if this.player_group[p.name] then
if global.player_group[p.name] == event.element.parent.name then if this.player_group[p.name] == event.element.parent.name then
global.player_group[p.name] = "[Group]" this.player_group[p.name] = '[Group]'
p.tag = "" p.tag = ''
end end
end end
end end
game.print(player.name .. ' deleted group "' .. event.element.parent.name .. '"') game.print(player.name .. ' deleted group "' .. event.element.parent.name .. '"')
global.tag_groups[event.element.parent.name] = nil this.tag_groups[event.element.parent.name] = nil
refresh_gui() refresh_gui()
return return
end end
if event.element.type == "button" and event.element.caption == "Leave" then if event.element.type == 'button' and event.element.caption == 'Leave' then
global.player_group[player.name] = "[Group]" this.player_group[player.name] = '[Group]'
player.tag = "" player.tag = ''
refresh_gui() refresh_gui()
return return
end end
@@ -214,9 +292,16 @@ local function on_gui_click(event)
end end
end end
comfy_panel_tabs["Groups"] = {gui = build_group_gui, admin = false} function Public.alphanumeric_only(value)
if value then
this.alphanumeric = value or false
end
end
comfy_panel_tabs['Groups'] = {gui = build_group_gui, admin = false}
local event = require 'utils.event' local event = require 'utils.event'
event.add(defines.events.on_gui_click, on_gui_click) event.add(defines.events.on_gui_click, on_gui_click)
event.add(defines.events.on_player_joined_game, on_player_joined_game) event.add(defines.events.on_player_joined_game, on_player_joined_game)
return Public