aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-29 04:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

No Errors on startup of modules

Browse Source
This commit is contained in:
Cooldude2606
2018-09-03 19:28:18 +01:00
parent e825dfe326
commit 480b548f5f
78 changed files with 631 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ExpGamingAdmin/AdminLib/control.lua
View File

@@ -31,7 +31,7 @@ function Admin.create_reason(reason,name)
if not string.find(string.lower(reason),string.lower(name)) then reason = reason..' - '..name end
if Sync and Sync.info.date ~= '0000/00/00' and not string.find(string.lower(reason),Sync.info.date) then reason = reason..' - '..Sync.info.date end
if not string.find(string.lower(reason),'appeal') then reason = reason..' - Vist www.explosivegaming.nl to appeal.' end
return reason end
return reason
end
function Admin.open(player,pre_select_player,pre_select_action)
@@ -43,7 +43,7 @@ function Admin.allowed(player)
if Ranking then
local lowest_admin_power = Ranking.get_group('Admin').lowest.power
return lowest_admin_power >= Ranking.get_rank(player).power
else return player.admin
else return player.admin end
end
function Admin.set_banned(player,set)
@@ -81,7 +81,7 @@ function Admin.clear_player(player,by_player)
if Ranking.get_rank(player).group.name == 'Jail' then Server.interface(Ranking.revert,true,player,by_player) end
if Sync then Sync.emit_embeded{
title='Player Clear',
color=Color.to_hex(defines.text_color.low),
color=Color.to_hex(defines.textcolor.low),
description='A player had their reports and warnings cleared.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,

6
modules/ExpGamingAdmin/AdminLib/softmod.json
View File

@@ -9,12 +9,10 @@
"ExpGaming",
"Admin"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"FactorioStdLib": "^0.8.0",
"ExpGamingCore.Ranking": "?^4.0.0",
"ExpGamingCore.Sync": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

4
modules/ExpGamingAdmin/Ban/control.lua
View File

@@ -6,7 +6,7 @@
-- Module Require
local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0')
local AdminGui = require('ExpGamingAdmin.AdminGui@^4.0.0')
local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0')
local Server = require('ExpGamingCore.Server@^4.0.0')
local Game = require('FactorioStdLib.Game@^0.8.0')
local Color -- FactorioStdLib.Color@^0.8.0
@@ -33,7 +33,7 @@ function Admin.ban(player,by_player,reason)
Admin.set_banned(player,true)
if Sync then Sync.emit_embeded{
title='Player Ban',
color=Color.to_hex(defines.text_color.crit),
color=Color.to_hex(defines.textcolor.crit),
description='There was a player banned.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,

8
modules/ExpGamingAdmin/Ban/softmod.json
View File

@@ -10,16 +10,14 @@
"Set",
"ExpGaming"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "?^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

6
modules/ExpGamingAdmin/ClearInventory/softmod.json
View File

@@ -12,11 +12,9 @@
"Clear",
"Inventory"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

3
modules/ExpGamingAdmin/Gui/control.lua
View File

@@ -31,7 +31,7 @@ local AdminGui = {
function AdminGui.add_button(name,caption,tooltip,callback)
AdminGui.buttons[name] = Gui.inputs.add{
type='button',
name='admin-gui-'+name,
name='admin-gui-'..name,
caption=caption,
tooltip=tooltip
}:on_event('click',function(event)
@@ -56,7 +56,6 @@ function AdminGui.draw(frame,filter_buttons)
btn.style.width = 30
end
for name,button in pairs(AdminGui.buttons) do
filter_buttons
if not filter_buttons or filter_buttons[name] then format(button:draw(frame)) end
end
return frame.player

6
modules/ExpGamingAdmin/Gui/softmod.json
View File

@@ -10,14 +10,12 @@
"Commands",
"Gui"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingCore.Gui": "^4.0.0",
"ExpGamingCore.Ranking": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0",
"ExpGamingPlayer": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

4
modules/ExpGamingAdmin/Jail/control.lua
View File

@@ -6,7 +6,7 @@
-- Module Require
local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0')
local AdminGui = require('ExpGamingAdmin.AdminGui@^4.0.0')
local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0')
local Server = require('ExpGamingCore.Server@^4.0.0')
local Ranking = require('ExpGamingCore.Ranking@^4.0.0')
local Game = require('FactorioStdLib.Game@^0.8.0')
@@ -33,7 +33,7 @@ function Admin.jail(player,by_player,reason)
local reason = Admin.create_reason(reason,by_player_name)
if Sync then Sync.emit_embeded{
title='Player Jail',
color=Color.to_hex(defines.text_color.med),
color=Color.to_hex(defines.textcolor.med),
description='There was a player jailed.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,

10
modules/ExpGamingAdmin/Jail/softmod.json
View File

@@ -10,17 +10,15 @@
"Admin",
"ExpGaming"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
"ExpGamingCore.Ranking": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0'",
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "?^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

4
modules/ExpGamingAdmin/Kick/control.lua
View File

@@ -6,7 +6,7 @@
-- Module Require
local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0')
local AdminGui = require('ExpGamingAdmin.AdminGui@^4.0.0')
local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0')
local Server = require('ExpGamingCore.Server@^4.0.0')
local Game = require('FactorioStdLib.Game@^0.8.0')
local Color -- FactorioStdLib.Color@^0.8.0
@@ -31,7 +31,7 @@ function Admin.kick(player,by_player,reason)
local reason = Admin.create_reason(reason,by_player_name)
if Sync then Sync.emit_embeded{
title='Player Kick',
color=Color.to_hex(defines.text_color.high),
color=Color.to_hex(defines.textcolor.high),
description='There was a player kicked.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,

8
modules/ExpGamingAdmin/Kick/softmod.json
View File

@@ -10,16 +10,14 @@
"Kick",
"Commands"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "?^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

8
modules/ExpGamingAdmin/Reports/control.lua
View File

@@ -44,11 +44,11 @@ local function report_message(player,by_player,reason)
local player, by_player_name = valid_players(player,by_player)
if not player then return end
if Admin.is_banned(player,true) == 'report' then return end
Ranking.print(low_rank,{'ExpGamingAdmin@4-0-0.low-print',player.name,reason},defines.text_color.info,true)
Ranking.print(high_rank,{'ExpGamingAdmin@4-0-0.high-print',player.name,by_player_name,reason},defines.text_color.med)
Ranking.print(low_rank,{'ExpGamingAdmin@4-0-0.low-print',player.name,reason},defines.textcolor.info,true)
Ranking.print(high_rank,{'ExpGamingAdmin@4-0-0.high-print',player.name,by_player_name,reason},defines.textcolor.med)
if Sync then Sync.emit_embeded{
title='Player Report',
color=Color.to_hex(defines.text_color.med),
color=Color.to_hex(defines.textcolor.med),
description='A player was reported.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,
@@ -114,7 +114,7 @@ function Admin.clear_reports(player,by_player,no_emit)
if not no_emit and Sync then
Sync.emit_embeded{
title='Player Clear',
color=Color.to_hex(defines.text_color.low),
color=Color.to_hex(defines.textcolor.low),
description='A player had their reports cleared.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,

6
modules/ExpGamingAdmin/Reports/softmod.json
View File

@@ -12,9 +12,6 @@
"Player List",
"Commands"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
@@ -22,5 +19,6 @@
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

2
modules/ExpGamingAdmin/Teleport/control.lua
View File

@@ -6,7 +6,7 @@
-- Module Require
local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0')
local AdminGui = require('ExpGamingAdmin.AdminGui@^4.0.0')
local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0')
local Game = require('FactorioStdLib.Game@^0.8.0')
-- Module Define

8
modules/ExpGamingAdmin/Teleport/softmod.json
View File

@@ -13,12 +13,10 @@
"Teleport",
"Commands"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

4
modules/ExpGamingAdmin/TempBan/control.lua
View File

@@ -28,13 +28,13 @@ function Admin.temp_ban(player,by_player,reason)
Admin.set_banned(player,'temp')
if Sync then Sync.emit_embeded{
title='Player Temp-Ban',
color=Color.to_hex(defines.text_color.high),
color=Color.to_hex(defines.textcolor.high),
description='A player was jailed.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,
['Reason:']=Admin.create_reason(reason,by_player_name)
} end
game.print({'ExpGamingAdmin@4-0-0.temp-ban',player.name,by_player_name,reason},defines.text_color.info)
game.print({'ExpGamingAdmin@4-0-0.temp-ban',player.name,by_player_name,reason},defines.textcolor.info)
if Admin.move_inventory then Admin.move_inventory(player) end
Ranking.meta.last_jail = player.name
Server.interface(Ranking.give_rank,true,player,'Jail',by_player_name)

6
modules/ExpGamingAdmin/TempBan/softmod.json
View File

@@ -11,9 +11,6 @@
"ExpGaming",
"Ranking"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
@@ -22,5 +19,6 @@
"FactorioStdLib.Color": "^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

47
modules/ExpGamingAdmin/Warnings/control.lua
View File

@@ -12,10 +12,26 @@ local Game = require('FactorioStdLib.Game@^0.8.0')
local Color = require('FactorioStdLib.Color@^0.8.0')
local Sync -- ExpGamingCore.Sync@^4.0.0
-- so it can be used during on_init
-- Local Varibles
local take_action = 8 -- below this number no action is taken, the first admin given warning jumps to this number
local remove_warnings_time = {}
local min_time_to_remove_warning = 18000 -- this is in ticks
local punishments = {
{'nothing'},
{'nothing'},
{'nothing'},
{'nothing'},
{'nothing'},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.message'},defines.textcolor.info},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.message'},defines.textcolor.info},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.kick-warn'},defines.textcolor.med},
{'kick'},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.temp-warn'},defines.textcolor.high},
{'temp-ban'},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.ban-warn'},defines.textcolor.high},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.last-warn'},defines.textcolor.crit},
{'ban'}
}
-- Module Define
local module_verbose = false
@@ -24,12 +40,13 @@ local ThisModule = {
if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end
if loaded_modules['ExpGamingAdmin.Reports@^4.0.0'] then
take_action = take_action + 1
table.insert(punishments,{'report',{'ExpGamingAdmin-Warnings@4-0-0.reported'},defines.text_color.med},take_action)
table.insert(punishments,take_action,{'report',{'ExpGamingAdmin-Warnings@4-0-0.reported'},defines.textcolor.med})
end
end,
on_post=function()
local highest = nil
for power,rank in pairs(Ranking.ranks) do
for _,rank in pairs(Ranking.ranks) do
local power = rank.power
if not highest and not rank:allowed('no-report') then highest = power-1 end
local _power = power; if highest then _power = power-highest end
if rank:allowed('no-report') then remove_warnings_time[power] = 0
@@ -41,24 +58,6 @@ local ThisModule = {
-- Global Define
local global = global{}
-- Local Varibles
local punishments = {
{'nothing'},
{'nothing'},
{'nothing'},
{'nothing'},
{'nothing'},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.message'},defines.text_color.info},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.message'},defines.text_color.info},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.kick-warn'},defines.text_color.med},
{'kick'},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.temp-warn'},defines.text_color.high},
{'temp-ban'},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.ban-warn'},defines.text_color.high},
{'message',{'ExpGamingAdmin-Warnings@4-0-0.last-warn'},defines.text_color.crit},
{'ban'}
}
-- Function Define
local function valid_players(player,by_player)
local player = Game.get_player(player)
@@ -106,7 +105,7 @@ function Admin.give_warning(player,by_player,reason,min)
warnings = warnings+1
global[player.name] = warnings
if warnings > take_action then
player_return({'ExpGamingAdmin-Warnings@4-0-0.warning-given-by',by_player_name},defines.text_color.info,player)
player_return({'ExpGamingAdmin-Warnings@4-0-0.warning-given-by',by_player_name},defines.textcolor.info,player)
game.print({'ExpGamingAdmin-Warnings@4-0-0.player-warning',player.name,by_player_name,reason})
end
give_punishment(player,by_player,reason)
@@ -119,7 +118,7 @@ function Admin.clear_warings(player,by_player,no_emit)
if not no_emit and Sync then
Sync.emit_embeded{
title='Player Clear',
color=Color.to_hex(defines.text_color.low),
color=Color.to_hex(defines.textcolor.low),
description='A player had their warnings cleared.',
['Player:']='<<inline>>'..player.name,
['By:']='<<inline>>'..by_player_name,
@@ -137,7 +136,7 @@ script.on_event(defines.events.on_tick,function(event)
if (game.tick % time_to_remove) == 0 then
global[name]=warnings-1
if global.warnings[name] > 5 then
player_return({'ExpGamingAdmin-Warnings@4-0-0.remove-warn',global[name],tick_to_display_format(time_to_remove)},defines.text_color.low,name)
player_return({'ExpGamingAdmin-Warnings@4-0-0.remove-warn',global[name],tick_to_display_format(time_to_remove)},defines.textcolor.low,name)
end
end
end

6
modules/ExpGamingAdmin/Warnings/softmod.json
View File

@@ -13,9 +13,6 @@
"Punishments",
"Ban"
],
"author": "<blank>",
"contact": "<blank>",
"license": "<blank>",
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
@@ -24,5 +21,6 @@
"FactorioStdLib.Color": "^0.8.0",
"ExpGamingAdmin.Reports": "?^4.0.0",
"ExpGamingCore.Sync": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}

43
modules/ExpGamingAdmin/softmod.json
View File

@@ -32,7 +32,8 @@
"FactorioStdLib": "^0.8.0",
"ExpGamingCore.Ranking": "?^4.0.0",
"ExpGamingCore.Sync": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"Ban": {
"name": "Ban",
@@ -48,13 +49,14 @@
],
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "?^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"ClearInventory": {
"name": "ClearInventory",
@@ -73,7 +75,8 @@
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"Gui": {
"name": "Gui",
@@ -93,7 +96,8 @@
"ExpGamingCore.Ranking": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0",
"ExpGamingPlayer": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"Jail": {
"name": "Jail",
@@ -109,14 +113,15 @@
],
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
"ExpGamingCore.Ranking": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0'",
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "?^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"Kick": {
"name": "Kick",
@@ -132,13 +137,14 @@
],
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"ExpGamingCore.Server": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "?^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"Reports": {
"name": "Reports",
@@ -161,7 +167,8 @@
"FactorioStdLib.Game": "^0.8.0",
"FactorioStdLib.Color": "^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"Teleport": {
"name": "Teleport",
@@ -180,9 +187,10 @@
],
"dependencies": {
"ExpGamingAdmin.AdminLib": "^4.0.0",
"ExpGamingAdmin.AdminGui": "^4.0.0",
"ExpGamingAdmin.Gui": "^4.0.0",
"FactorioStdLib.Game": "^0.8.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"TempBan": {
"name": "TempBan",
@@ -205,7 +213,8 @@
"FactorioStdLib.Color": "^0.8.0",
"ExpGamingCore.Sync": "?^4.0.0",
"ExpGamingAdmin.ClearInventory": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
},
"Warnings": {
"name": "Warnings",
@@ -230,7 +239,9 @@
"FactorioStdLib.Color": "^0.8.0",
"ExpGamingAdmin.Reports": "?^4.0.0",
"ExpGamingCore.Sync": "?^4.0.0"
}
},
"collection": "ExpGamingAdmin_4.0.0"
}
}
},
"dependencies": {}
}