aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +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

12
FactorioSoftmodManager.lua
View File

@@ -221,7 +221,7 @@ setmetatable(global,Manager.global.__global)
Manager.sandbox = setmetatable({
-- can not use existing keys of _G
verbose=Manager.verbose,
loaded_modules=ReadOnlyManager,
loaded_modules={}, -- this is over riden later
module_verbose=false,
module_exports=false
},{
@@ -264,19 +264,21 @@ Manager.require = setmetatable({
-- runs in a sand box becuase sandbox everything
local sandbox, success, data = Manager.sandbox(raw_require,env,path)
-- if there was no error then it assumed the path existed and returns the data
if success then return data
if success then return unpack(data)
else
-- else it assums the path was a module name and checks index for the module
if moduleIndex[path] then return rawget(Manager.loadModules,path) end
if moduleIndex[path:gsub('?','')] then return rawget(Manager.loadModules,path) end
-- if its not listed then it tries to remove a version tag and tries again
local path_no_version = path.find('@') and path:sub(1,path:find('@')-1) or path
local path_no_version = path:find('@') and path:sub(1,path:find('@')-1) or path
if moduleIndex[path_no_version] then return rawget(Manager.loadModules,path_no_version) end
-- still no then it will look for all modules that include this one in the name (like a collection)
local collection = {}
for module_name,path in pairs(moduleIndex) do
if module_name:find('@') and module_name:sub(1,module_name:find('@')-1) == path_no_version then return rawget(Manager.loadModules,module_name) end
if module_name:find(path_no_version) then
local start, _end = module_name:find(path_no_version)
collection[module_name:sub(_end)] = rawget(Manager.loadModules,module_name)
collection[module_name:sub(_end+2)] = rawget(Manager.loadModules,module_name)
end
end
-- if there is any keys in the collection the collection is returned else the errors with the require error
@@ -296,6 +298,7 @@ require = Manager.require
Manager.loadModules = setmetatable({},
{
__metatable=false,
__index=Manager.require,
__call=function(tbl)
-- ReadOnlyManager used to trigger verbose change
ReadOnlyManager.currentState = 'moduleLoad'
@@ -408,6 +411,7 @@ Manager.loadModules = setmetatable({},
end
}
)
Manager.sandbox.loaded_modules = Manager.loadModules
--- A more detailed replacement for the lua error function to allow for handlers to be added; repleaces default error so error can be used instead of Manager.error
-- @function Manager.error

15
locale/de/ExpGamingAdmin.AdminLib.cfg Normal file
View File

@@ -0,0 +1,15 @@
[ExpGamingAdmin@4-0-0]
name=Admin-Befehle
tooltip=Die mächtigsten Befehle sind hier zuhause.
no-info-file=Die Informationsdatei wurde nicht gefunden.
message=Wähle einen Spieler und eine Aktion. Stell vor dem Ausführen sicher, dass der Richtige ist!
warning=Achtung, dieser Spieler hat einen höheren Rang als du selbst, weshalb du seinen Rang nicht ändern kannst.
short-reason=Achtung, dies ist ein sehr kurzer Grund. Bitte versuche, mehr Informationen anzugeben. (Warning: The reason is too short. UPDATE)
rank-high=Dieser Spieler hat einen hohen Rang. Bitte benutze nur Ingame-Befehle gegen diese Person, wenn du dir sicher bist!
invalid=Der Spieler oder die Aktion war ungültig. Bitte versuche es noch einmal!
take-action= Ergreife Maßnahme
tooltip-ban=Banne Spieler
tooltip-kick=Kicke Spieler
tooltip-jail=Sperre Spieler ins Gefängnis
tooltip-go-to=Gehe zum Spieler
tooltip-bring=Bringe den Spieler zu dir

11
locale/de/ExpGamingAdmin.Warnings.cfg Normal file
View File

@@ -0,0 +1,11 @@
[ExpGamingAdmin-Warnings-4-0-0]
warning-given-by=This Warnings Was Given By: __1__
player-warning=__1__ was given a warning by __2__ reason: __3__
temp-ban=__1__ was temp-ban by __2__ and will remain in jail untill next reset
remove-warn=You are had a warning Removed, you have __1__ warnings, next removed in __2__
message=You Are Currently Reciving Warnings From The Script, This Will Continue Unless You Cease And Desist
reported=You Have Been Reported To The Admins By The Script, Further Acction May Be Taken If You Do Not Cease And Desist.
kick-warn=You Are On A Warning To Be KICKED, The Script Will Auto Kick If You Do Not Cease And Desist.
temp-warn=You Are On A Warning To Be TEMP BANNED, The Script Will Auto Ban If You Do Not Cease And Desist.
ban-warn=You Are On A Warning To Be BANNED, The Script Will Auto Ban If You Do Not Cease And Desist.
last-warn=YOU ARE ON A LAST WARNING TO BE BANNED, THE SCRIPT WILL AUTO BAN IF YOU DO NOT CEASE AND DESIST.

20
locale/de/ExpGamingBot.autoChat.cfg Normal file
View File

@@ -0,0 +1,20 @@
[chat-bot]
message=[Chat Bot]: __1__
rank-error=You cant use global chat commands
players-online=There are __1__ players online
players=There have been __1__ players on this map
map-time=This map has been on for __1__
line-8=Type /help <command> for more info
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (can be found through the question mark on the top left)
not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev.
softmod=A softmod is a custom scenario that runs on this server, example is the player list.
blame=Blame __1__ for what just happend!
afk=Your afk? Look at __1__ they have been afk for: __2__
links=To see links open the readme and click links.
magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)

9
locale/de/ExpGamingBot.autoMessage.cfg Normal file
View File

@@ -0,0 +1,9 @@
[chat-bot]
message=[Chat Bot]: __1__
players-online=There are __1__ players online
map-time=This map has been on for __1__
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (can be found through the question mark on the top left)

9
locale/de/ExpGamingCore.Commands.cfg Normal file
View File

@@ -0,0 +1,9 @@
[commands]
unauthorized=401 - Unbefugt: Zugang verweigert. Du hast keinen Zugriff auf diese Befehle!
invalid-inputs=ungültige Eingabe, /__1__ __2__
invalid-range=ungültige Reichweite, Min: __1__, Max: __2__
invalid-length=ungültige Länge, Max: __1__
invalid-player=ungültiger Spieler Name, __1__ , Versuche "Tab" zu benutzen, damit sich der Name automatisch vervollständigt.
offline-player=Der betroffene Spieler ist offline, Befehl konnte nicht ausgeführt werden.
dead-player=Der betroffene Spieler ist Tod, Befehl konnte nicht ausgeführt werden.
command-ran=Befehl ausgeführt.

4
locale/de/ExpGamingCore.Gui.cfg Normal file
View File

@@ -0,0 +1,4 @@
[gui]
unauthorized=401 - Unbefugt: Du hast keinen Zugriff auf diese Befehle!
cant-open=Du kannst dieses Menü nicht öffnen, Grund: __1__
cant-open-no-reason=Du kannst dieses Menü gerade nicht öffnen.

7
locale/de/ExpGamingCore.Ranking.cfg Normal file
View File

@@ -0,0 +1,7 @@
[ranking]
all-rank-print=[Alle]: __1__
rank-print=[__1__]: __2__
rank-up=__1__ wurde befördert zu __2__ von __3__
rank-down=__1__ wurde degradiert zu __2__ von __3__
rank-given=Dir wurde der Rang __1__ zugeteilt!
tag-reset=Dein Spitzname wurde aufgrund eines Rangwechsels zurückgesetzt.

5
locale/de/ExpGamingPlayer.playerList.cfg Normal file
View File

@@ -0,0 +1,5 @@
[player-list]
tooltip=Verkleinere die Spielerliste. Rechtsklicke einen Spieler für Informationen über ihn.
format-nil=__1__ - __2__
format=__1__ - __2__ - __3__
no-info-file=Es wurden keine Informationen gefunden.

21
locale/en/ExpGamingAdmin.AdminLib.cfg Normal file
View File

@@ -0,0 +1,21 @@
[ExpGamingAdmin@4-0-0]
name=Admin Commands
tooltip=Admin commands make their home here
no-info-file=No info file was found
message=Please select a player and an action to take. Make sure to choose the correct one!
warning=Warning: This player outranks you. Therefore, you cannot edit their rank.
short-reason=Warning: The reason is too short.
rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank.
invalid=The player or the action is invalid. Please try again!
take-action=Take Action
tooltip-ban=Ban Player
tooltip-kick=Kick Player
tooltip-jail=Jail Player
tooltip-go-to=Go To Player
tooltip-bring=Bring Player
temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset
report=Report Player
cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all <player_name>
low-print=__1__ has been reported by a user for: __2__
high-print=__1__ has been reported by __2__ for: __3__
cant-report=This player can't be reported.

10
locale/en/ExpGamingAdmin.Warnings.cfg Normal file
View File

@@ -0,0 +1,10 @@
[ExpGamingAdmin-Warnings-4-0-0]
warning-given-by=This warning was given by: __1__
player-warning=__1__ was given a warning by __2__ for: __3__
remove-warn=One of your warnings expired. You have __1__ warnings left, next warning will be removed in __2__
message=You are currently being warned by the system. These will continue until you cease and desist.
reported=You have been reported to the admins by the system. Further action may be taken if you do not cease and desist.
kick-warn=This is your last warning before you get kicked. The system will automatically kick you if you do not cease and desist.
temp-warn=This is your last warning before you get temporary banned. The system will automatically ban you if you do not cease and desist.
ban-warn=WARNING: This is your last warning before you get BANNED. The system will automatically BAN you if you do not cease and desist.
last-warn=WARNING: This is your last warning before you get PERMANENTLY BANNED. The system will automatically PERMANENTLY BAN you if you do not cease and desist.

47
locale/en/ExpGamingBot.autoChat.cfg Normal file
View File

@@ -0,0 +1,47 @@
[chat-bot]
message=[Chat Bot]: __1__
rank-error=You can't use global chat commands
players-online=There are __1__ players online
players=There have been __1__ players on this map
map-time=This map has been on for __1__
line-8=Type /help <command> for more info
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: https://www.explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (It can be found through the question mark on the top left)
not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev.
softmod=A softmod is a custom scenario that runs on this server, example is the player list.
redmew=We dont talk about redmew here; they beat us to 1000 members; F
blame=Blame __1__ for what just happend!
afk=Your afk? Look at __1__, that player has been afk for: __2__
links=To see links open the readme and click links.
current-evolution=Current evolution factor is __1__
magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)
loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!!
lenny=( ͡° ͜ʖ ͡°)
make-tea-1= ☕ Boiling the water... ☕
make-tea-2= ☕ __1__ your tea is done! ☕
order-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
order-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
order-pizza-3= 🍕 __1__ your pizza is here! 🍕
make-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕
make-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕
get-beer-1= 🍺 Pouring A Glass 🍺
get-beer-2= 🍻 Chears Mate 🍻
get-mead-1= Filling the drinking horn
get-mead-2= Skål!
get-snaps-1=Pouring the glasses and finding the correct song book...
get-snaps-2=Singing a song...🎤🎶
get-snaps-3=skål, my friends!
get-cocktail-1= 🍸 Inintiating mind reading unit... 🍸
get-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸
get-cocktail-3=🍸 __1__ your cocktail is done.🍸
lhd=All trains must be LHD!
food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/
get-popcorn-1=Heating the oil and waiting for the popping sound...
get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold.
wiki=You can get more information about us and the custom scenario from our wiki: https://wiki.explosivegaming.nl/
feedback=Do you have feedback? leave it at https://exp.fider.io/

9
locale/en/ExpGamingBot.autoMessage.cfg Normal file
View File

@@ -0,0 +1,9 @@
[chat-bot]
message=[Chat Bot]: __1__
players-online=There are __1__ players online
map-time=This map has been on for __1__
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: https://www.explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (It can be found through the question mark on the top left)

12
locale/en/ExpGamingCore.Commands.cfg Normal file
View File

@@ -0,0 +1,12 @@
[commands]
unauthorized=401 - Unauthorized: Access is denied due to invalid credentials
error-string-len=Invalid Length, Max: __1__
error-number=Invalid Number: Command failed to run
error-number-range=Invalid Range, Min: __1__, Max: __2__
error-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name
error-player-online=Player is offline: Command failed to run
error-player-alive=Player is dead: Command failed to run
error-player-rank=Player is of Higher Rank: Command failed to run
invalid-inputs=Invalid Input, /__1__ __2__
invalid-parse=Invalid Input, There was a problem prasing the paramaters
command-ran=Command Complete

4
locale/en/ExpGamingCore.Gui.cfg Normal file
View File

@@ -0,0 +1,4 @@
[gui]
unauthorized=401 - Unauthorized: Access is denied due to invalid credentials
cant-open=You can't open this panel right now, reason: __1__
cant-open-no-reason=You can't open this panel right now

7
locale/en/ExpGamingCore.Ranking.cfg Normal file
View File

@@ -0,0 +1,7 @@
[ranking]
all-rank-print=[Everyone]: __1__
rank-print=[__1__]: __2__
rank-up=__1__ was promoted to __2__ by __3__
rank-down=__1__ was demoted to __2__ by __3__
rank-given=You have been given the __1__ Rank!
tag-reset=Your Tag was reset due to a Rank change

2
locale/en/ExpGamingCore.Server.cfg Normal file
View File

@@ -0,0 +1,2 @@
[Server]
interface-description=Runs the given input from the script

5
locale/en/ExpGamingPlayer.playerList.cfg Normal file
View File

@@ -0,0 +1,5 @@
[player-list]
tooltip=Toggle player list, right click player for more info
format-nil=__1__ - __2__
format=__1__ - __2__ - __3__
no-info-file=No info file was found

15
locale/fr/ExpGamingAdmin.AdminLib.cfg Normal file
View File

@@ -0,0 +1,15 @@
[ExpGamingAdmin@4-0-0]
name=Commandes Admin
tooltip=Des commandes très puissantes résident ici.
no-info-file=Aucun fichier info trouvé
message=Veuillez sélectionner un joueur et une action, faites en sorte que ce soit la bonne !
warning=Attention, ce joueur est de rang supérieur au vôtre, vous ne pouvez le modifier.
short-reason=Attention, la raison indiquée est trop courte. Soyez concis mais aussi précis. (Warning: The reason is too short. UPDATE)
rank-high=Ce joueur est de rang supérieur, veuillez utiliser une commande dont vous maîtriser l'utilisation !
invalid=Le Joueur ou l'action est invalide, ré-essayez !
take-action=Agir
tooltip-ban=Bannir un Joueur
tooltip-kick=Exclure un Joueur
tooltip-jail=Emprisonner un Joueur
tooltip-go-to=Aller à la position d'un Joueur
tooltip-bring=Amener le Joueur à soi

11
locale/fr/ExpGamingAdmin.Warnings.cfg Normal file
View File

@@ -0,0 +1,11 @@
[ExpGamingAdmin-Warnings-4-0-0]
warning-given-by=This Warnings Was Given By: __1__
player-warning=__1__ was given a warning by __2__ reason: __3__
temp-ban=__1__ was temp-ban by __2__ and will remain in jail untill next reset
remove-warn=You are had a warning Removed, you have __1__ warnings, next removed in __2__
message=You Are Currently Reciving Warnings From The Script, This Will Continue Unless You Cease And Desist
reported=You Have Been Reported To The Admins By The Script, Further Acction May Be Taken If You Do Not Cease And Desist.
kick-warn=You Are On A Warning To Be KICKED, The Script Will Auto Kick If You Do Not Cease And Desist.
temp-warn=You Are On A Warning To Be TEMP BANNED, The Script Will Auto Ban If You Do Not Cease And Desist.
ban-warn=You Are On A Warning To Be BANNED, The Script Will Auto Ban If You Do Not Cease And Desist.
last-warn=YOU ARE ON A LAST WARNING TO BE BANNED, THE SCRIPT WILL AUTO BAN IF YOU DO NOT CEASE AND DESIST.

20
locale/fr/ExpGamingBot.autoChat.cfg Normal file
View File

@@ -0,0 +1,20 @@
[chat-bot]
message=[Chat Bot]: __1__
rank-error=You cant use global chat commands
players-online=There are __1__ players online
players=There have been __1__ players on this map
map-time=This map has been on for __1__
line-8=Type /help <command> for more info
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (can be found through the question mark on the top left)
not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev.
softmod=A softmod is a custom scenario that runs on this server, example is the player list.
blame=Blame __1__ for what just happend!
afk=Your afk? Look at __1__ they have been afk for: __2__
links=To see links open the readme and click links.
magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)

9
locale/fr/ExpGamingBot.autoMessage.cfg Normal file
View File

@@ -0,0 +1,9 @@
[chat-bot]
message=[Chat Bot]: __1__
players-online=There are __1__ players online
map-time=This map has been on for __1__
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (can be found through the question mark on the top left)

9
locale/fr/ExpGamingCore.Commands.cfg Normal file
View File

@@ -0,0 +1,9 @@
[commands]
unauthorized=401 - Unauthorized: Access is denied due to invalid credentials
invalid-inputs=Invalid Input, /__1__ __2__
invalid-range=Invalid Range, Min: __1__, Max: __2__
invalid-length=Invalid Length, Max: __1__
invalid-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name
offline-player=Player is offline, Command Failed To Run
dead-player=Player is dead, Command Failed To Run
command-ran=Command Complete

4
locale/fr/ExpGamingCore.Gui.cfg Normal file
View File

@@ -0,0 +1,4 @@
[gui]
unauthorized=401 - Unauthorized: Access is denied due to invalid credentials
cant-open=You can not open this panel right now, reason: __1__
cant-open-no-reason=You can not open this panel right now

7
locale/fr/ExpGamingCore.Ranking.cfg Normal file
View File

@@ -0,0 +1,7 @@
[ranking]
all-rank-print=[Everyone]: __1__
rank-print=[__1__]: __2__
rank-up=__1__ was promoted to __2__ by __3__
rank-down=__1__ was demoted to __2__ by __3__
rank-given=You have been given the __1__ Rank!
tag-reset=Your Tag was reset due to a Rank change

5
locale/fr/ExpGamingPlayer.playerList.cfg Normal file
View File

@@ -0,0 +1,5 @@
[player-list]
tooltip=Toogle player list, right click player for info
format-nil=__1__ - __2__
format=__1__ - __2__ - __3__
no-info-file=No info file was found

15
locale/nl/ExpGamingAdmin.AdminLib.cfg Normal file
View File

@@ -0,0 +1,15 @@
[ExpGamingAdmin@4-0-0]
name=Admin Commands
tooltip=Admin Commands kan je hier vinden.
no-info-file=Infobestand niet gevonden.
message=Selecteer een speler en de bijbehorende actie. Wees er zeker van dat je de correcte actie kiest.
warning=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft.
short-reason=Fout: De reden is te kort. (Warning: The reason is too short. UPDATE)
rank-high=Fout: Deze speler overtreft jouw rank.
invalid=Fout: De speler kan niet gevonden worden en/of de actie is onjuist. Probeer opnieuw!
take-action=Actie ondernemen
tooltip-ban=Ban speler
tooltip-kick=Kick speler
tooltip-jail=Jail speler
tooltip-go-to=Ga naar speler
tooltip-bring=Breng speler

11
locale/nl/ExpGamingAdmin.Warnings.cfg Normal file
View File

@@ -0,0 +1,11 @@
[ExpGamingAdmin-Warnings-4-0-0]
warning-given-by=Deze waarschuwing is gegeven door: __1__
player-warning=__1__ is gewaarschuwd door __2__ met de reden: __3__
temp-ban=__1__ is verbannen door __2__ en is gejailed tot de volgende reset.
remove-warn=Een waarschuwing is verlopen. Je hebt nu nog maar __1__ waarschuwing, volgende waarschuwing verloopt in __2__
message=Je ontvangt waarschuwingen door het systeem. Deze waarschuwingen stoppen niet tot je stopt met wat je verkeerd doet.
reported=Je bent gerapporteerd aan de administrators door het systeem. Je zal bestraft worden als je niet stopt met wat je verkeerd doet.
kick-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je gekickt wordt.
temp-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je tijdelijk verbannen wordt.
ban-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je permanent verbannen wordt.
last-warn=DIT IS JE LAATSTE WAARSCHUWING. Het systeem zal je automatisch VERBANNEN als je niet stopt met wat je verkeerd doet.

20
locale/nl/ExpGamingBot.autoChat.cfg Normal file
View File

@@ -0,0 +1,20 @@
[chat-bot]
message=[Chat Bot]: __1__
rank-error=You cant use global chat commands
players-online=There are __1__ players online
players=There have been __1__ players on this map
map-time=This map has been on for __1__
line-8=Type /help <command> for more info
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (can be found through the question mark on the top left)
not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev.
softmod=A softmod is a custom scenario that runs on this server, example is the player list.
blame=Blame __1__ for what just happend!
afk=Your afk? Look at __1__ they have been afk for: __2__
links=To see links open the readme and click links.
magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)

9
locale/nl/ExpGamingBot.autoMessage.cfg Normal file
View File

@@ -0,0 +1,9 @@
[chat-bot]
message=[Chat Bot]: __1__
players-online=There are __1__ players online
map-time=This map has been on for __1__
join-us=Please join us on:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info.
read-readme=Make sure you have read the Readme (can be found through the question mark on the top left)

9
locale/nl/ExpGamingCore.Commands.cfg Normal file
View File

@@ -0,0 +1,9 @@
[commands]
unauthorized=401 - Onbevoegd: toegang wordt geweigerd vanwege ongeldige inloggegevens
invalid-inputs=Onjuiste invoer, /__1__ __2__
invalid-range=Onjuiste radius, Min: __1__, Max: __2__
invalid-length=Onjuiste lengte, Max: __1__
invalid-player=Onjuiste naam, __1__ , probeer tab te gebruiken om de naam automatisch in te vullen
offline-player=Speler is offline.
dead-player=Speler is dood.
command-ran=Commando uitgevoerd.

4
locale/nl/ExpGamingCore.Gui.cfg Normal file
View File

@@ -0,0 +1,4 @@
[gui]
unauthorized=401 - Onbevoegd: toegang wordt geweigerd vanwege ongeldige inloggegevens
cant-open=Je kan dit momenteel niet openen. Reden: __1__
cant-open-no-reason=Je kan dit momenteel niet openen.

7
locale/nl/ExpGamingCore.Ranking.cfg Normal file
View File

@@ -0,0 +1,7 @@
[ranking]
all-rank-print=[Everyone]: __1__
rank-print=[__1__]: __2__
rank-up=__1__ is gepromoot naar __2__ door __3__
rank-down=__1__ is gedegradeerd naar __2__ door __3__
rank-given=Je rank is veranderd naar __1__
tag-reset=Je tag is gereset door een wijziging in je rank.

5
locale/nl/ExpGamingPlayer.playerList.cfg Normal file
View File

@@ -0,0 +1,5 @@
[player-list]
tooltip=Toggle speler lijst. Rechtermuisklik op een speler voor meer info
format-nil=__1__ - __2__
format=__1__ - __2__ - __3__
no-info-file=Geen infobestand gevonden.

19
locale/sv-SE/ExpGamingAdmin.AdminLib.cfg Normal file
View File

@@ -0,0 +1,19 @@
[ExpGamingAdmin@4-0-0]
name=Adminkommandon
tooltip=Adminkommando gör dit hem här
no-info-file=Ingen informationsfil kunde hittas
message=Var snäll och välj en spelare och en åtgärd att utfärda, se till att du väljer den rätta!
warning=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang.
short-reason=Warning: Skälet är för kort.
rank-high=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang.
invalid=Spelaren eller åtgärden är ogiltig. Var vänlig och försök igen!
take-action=Utför åtgärd.
tooltip-ban=Bannlys Spelare
tooltip-kick=Sparka Spelare
tooltip-jail=Fängsla Spelare
tooltip-go-to=Gå till Spelare
tooltip-bring=Hämta spelare
report=Rapportera Spelare
low-print=__1__ har blivit rapporterad av __2__ för: __3__
high-print=__1__ har blivit rapporterad av __2__ för: __3__
cant-report=Den här spelaren kan inte bli rapporterad.

10
locale/sv-SE/ExpGamingAdmin.Warnings.cfg Normal file
View File

@@ -0,0 +1,10 @@
[ExpGamingAdmin-Warnings-4-0-0]
warning-given-by=Den här varningen gavs av: __1__
player-warning=__1__ var tillfälligt bannlyst av __2__ och kommer att förbli i fängelset tills nästa återställning (reset)
remove-warn=En av dina varningar har gått ut. Du har __1__ varning kvar, nästa varning kommer at tas bort om __2__
message=Du får för nuvarande varningar av systemet. De kommer fortsätta tills du upphör med överträdelsen.
reported= Du har blivit rapporterad till administrationen av systemet. Mer påföljd kan komma att tas om du inte upphör med överträdelsen.
kick-warn=Det här är din sista varning innan du blir sparkad. Systemet kommer att automatisk sparka dig om du inte upphör med överträdelsen
temp-warn=Det här är din sista varning innan du blir tillfälligt bannlyst. Systemet kommer att automatiskt bannlysa dig om du inte upphör överträdelsen
ban-warn=VARNING: Det här är din sista varning innan du blir bannlyst. Systemet kommer att automatisk bannlysa dig om du inte upphör med överträdelsen.
last-warn=VARNING: Det här är din sista varning innan du blir permanent bannlyst. Systemet kommer att automatiskt permanent bannlysa dig om du inte upphör med överträdelsen.

25
locale/sv-SE/ExpGamingBot.autoChat.cfg Normal file
View File

@@ -0,0 +1,25 @@
[chat-bot]
message=[Chat Bot]: __1__
rank-error=Du kan inte utföra globala chat-kommandon.
players-online=Det är __1__ spelare online
players=Det har varit __1__ spelare på den här kartan
map-time=Den här kartan har varit igång under __1__
line-8=Type /help <kommando> för mer information
join-us=Var snäll och förena dig med oss:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=Vi använder oss av specialiserade kommandon, som till exempel /tag och /report, se kommandotabben i readme för mer information.
read-readme=Se till att du har läst "Readme" (Finn den genom att klicka på frågetecknet högst upp i vänstra hörnet)
not-real-dev=Cooldude2606 är dev för den här servern och gör mjukmodden ("the softmod") och är inte en factorio dev.
ssoftmod=En mjukmod ("softmod") är ett specialscenario som används på den här servern, exempelvis listan över spelare.
blame=Skyll på __1__ för vad som just hände!
afk=Är du afk (borta från tangentbordet)? Titta på __1__, den spelaren har varit afk under: __2__
links=För att se länkar, öppna readme och klicka "länkar".
magic=Frukta admin-magin (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
aids=≖ ‿ ≖Fear the aids of a public server ≖ ‿ ≖
riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)
loops=INGA LOOPAR; LOOPAR ÄR DÅLIGT; JUST INGA LOOPAR!!!!!; OM DU GJÖR EN LOOP.... DET KOMMER INTE ATT SLUTA VÄL!!!!!!!
lhd=Alla tåg skall köras med vänstertrafik!
current-evolution=Nuvarande evolutionsfaktor är __1__
wiki=Du kan få mer information om oss och scenariot på vår wiki: https://wiki.explosivegaming.nl/

10
locale/sv-SE/ExpGamingBot.autoMessage.cfg Normal file
View File

@@ -0,0 +1,10 @@
[chat-bot]
message=[Chat Bot]: __1__
players-online=Det är __1__ spelare online
map-time=Den här kartan har varit igång under __1__
join-us=Var snäll och förena dig med oss:
discord=Discord: https://discord.explosivegaming.nl
website=Website: explosivegaming.nl
custom-commands=Vi använder oss av specialiserade kommandon, som till exempel /tag och /report, se kommandotabben i readme för mer information.
read-readme=Se till att du har läst "Readme" (Finn den genom att klicka på frågetecknet högst upp i vänstra hörnet)

9
locale/sv-SE/ExpGamingCore.Commands.cfg Normal file
View File

@@ -0,0 +1,9 @@
[commands]
unauthorized=401 - Otillåten: Tillgång nekas på grund av otillräcklig säkerhetsprövning.
invalid-inputs=Igiltig inmatning, /__1__ __2__
invalid-range=Invalid räckvid, Min: __1__, Max: __2__
invalid-length=ogiltig längd, Max: __1__
invalid-player=Ogiltigt spelarnamn, __1__ , försök använda tab-tangenten för att auto-slutföra namn.
offline-player=Spelare är offline. Kommando misslyckades med att köras.
dead-player=Spelare är död. Kommando misslyckades med att köras.
command-ran=Kommandot slutfört

4
locale/sv-SE/ExpGamingCore.Gui.cfg Normal file
View File

@@ -0,0 +1,4 @@
[gui]
unauthorized=401 -Otillåten: Tillgång nekas på grund av otillräcklig säkerhetsprövning.
cant-open=Du kan inte öppna den här panelen just nu, orsak: __1__
cant-open-no-reason=Du kan inte öppna den här panelen just nu

7
locale/sv-SE/ExpGamingCore.Ranking.cfg Normal file
View File

@@ -0,0 +1,7 @@
[ranking]
all-rank-print=[Everyone]: __1__
rank-print=[__1__]: __2__
rank-up=__1__ blev befordrad till __2__ av __3__
rank-down=__1__ blev degraderad till __2__ av __3__
rank-given=Du har fått __1__ Rang!
tag-reset=Din tag blev återställd på grund av rangförändrning.

5
locale/sv-SE/ExpGamingPlayer.playerList.cfg Normal file
View File

@@ -0,0 +1,5 @@
[player-list]
tooltip=Växla spelarlista, högerklicka på spelare för mer information.
format-nil=__1__ - __2__
format=__1__ - __2__ - __3__
no-info-file=Ingen informationsfil kunde hittas

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": {}
}

2
modules/ExpGamingBot/autoMessage/control.lua
View File

@@ -45,7 +45,7 @@ script.on_init(function(event)
end):on_event('error',function(self,err)
if Sync then Sync.emit_embeded{
title='Auto Message Error',
color=Color.to_hex(defines.text_color.bg),
color=Color.to_hex(defines.textcolor.bg),
description='Auto Message Error - Closed Thread',
Error=err
} end

18
modules/ExpGamingBot/discordAlerts/control.lua
View File

@@ -19,24 +19,24 @@ Event.register(defines.events.on_console_command,function(event)
if command == 'config' or command == 'banlist' then
Sync.emit_embeded{
title='Edit To '..data.title,
color=Color.to_hex(defines.text_color.bg),
color=Color.to_hex(defines.textcolor.bg),
description='A player edited the '..command..'.',
['By:']=data.by,
['Edit:']=table.concat(args,' ',1)
}
else
if command == 'ban' then
data.colour = Color.to_hex(defines.text_color.crit)
data.colour = Color.to_hex(defines.textcolor.crit)
data.reason = table.concat(args,' ',2)
elseif command == 'kick' then
data.colour = Color.to_hex(defines.text_color.high)
data.colour = Color.to_hex(defines.textcolor.high)
data.reason = table.concat(args,' ',2)
elseif command == 'unban' then data.colour = Color.to_hex(defines.text_color.low)
elseif command == 'mute' then data.colour = Color.to_hex(defines.text_color.med)
elseif command == 'unmute' then data.colour = Color.to_hex(defines.text_color.low)
elseif command == 'promote' then data.colour = Color.to_hex(defines.text_color.info)
elseif command == 'demote' then data.colour = Color.to_hex(defines.text_color.info)
elseif command == 'purge' then data.colour = Color.to_hex(defines.text_color.med)
elseif command == 'unban' then data.colour = Color.to_hex(defines.textcolor.low)
elseif command == 'mute' then data.colour = Color.to_hex(defines.textcolor.med)
elseif command == 'unmute' then data.colour = Color.to_hex(defines.textcolor.low)
elseif command == 'promote' then data.colour = Color.to_hex(defines.textcolor.info)
elseif command == 'demote' then data.colour = Color.to_hex(defines.textcolor.info)
elseif command == 'purge' then data.colour = Color.to_hex(defines.textcolor.med)
else return end
data.username = args[1]
if not Game.get_player(data.username) then return end

2
modules/ExpGamingCommands/admin/control.lua
View File

@@ -21,7 +21,7 @@ return {
if loaded_modules['ExpGamingAdmin.TempBan'] then verbose('ExpGamingAdmin.TempBan is installed; Loading tempban src') require(module_path..'/src/tempban',{Admin=Admin}) end
if loaded_modules['ExpGamingAdmin.Jail'] then verbose('ExpGamingAdmin.Jail is installed; Loading tempban src') require(module_path..'/src/jail',{Admin=Admin}) end
if loaded_modules['ExpGamingAdmin.Warnings'] then verbose('ExpGamingAdmin.Warnings is installed; Loading tempban src') require(module_path..'/src/warnings',{Admin=Admin}) end
if loaded_modules['ExpGamingAdmin.Reports'] then verbose('ExpGamingAdmin.Reports is installed; Loading tempban src') require(module_path..'/src/reprots',{Admin=Admin}) end
if loaded_modules['ExpGamingAdmin.Reports'] then verbose('ExpGamingAdmin.Reports is installed; Loading tempban src') require(module_path..'/src/reports',{Admin=Admin}) end
if loaded_modules['ExpGamingAdmin.ClearInventory'] then verbose('ExpGamingAdmin.ClearInventory is installed; Loading tempban src') require(module_path..'/src/clear',{Admin=Admin}) end
end
}

0
modules/ExpGamingCommands/admin/src/report.lua → modules/ExpGamingCommands/admin/src/reports.lua
View File

2
modules/ExpGamingCommands/repair/control.lua
View File

@@ -25,7 +25,7 @@ local const = 100
-- @param player the player who called the command
-- @param entity the entity which was repaired
local repairDisallow = function(player,entity)
player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player)
player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.textcolor.crit,player)
entity.destroy()
end

4
modules/ExpGamingCommands/repair/src/tempban.lua
View File

@@ -1,7 +1,7 @@
-- not_luadoc=true
local temp_ban = require('ExpGamingAdmin.TempBan')
return function repairDisallow(player,entity)
player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player)
return function(player,entity)
player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.textcolor.crit,player)
temp_ban(player,'<server>','Attempt To Repair A Banned Item')
entity.destroy()
end

2
modules/ExpGamingPlayer/afkKick/control.lua
View File

@@ -33,6 +33,6 @@ return {
on_init=function(self)
if loaded_modules['ExpGamingCore.Ranking'] then Ranking = require('ExpGamingCore.Ranking') end
if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end
if loaded_modules['ExpGamingCore.Server'] then require(module_path..'/src/server.lua',Sync) end
if loaded_modules['ExpGamingCore.Server'] then require(module_path..'/src/server',Sync) end
end
}

3
modules/ExpGamingPlayer/afkKick/src/server.lua
View File

@@ -1,4 +1,5 @@
local Sync = Sync
local Server = require('ExpGamingCore.Server@^4.0.0')
Event[defines.events.on_tick] = nil
script.on_init(function(event)
Server.new_thread{
@@ -15,7 +16,7 @@ script.on_init(function(event)
if Sync then
Sync.emit_embeded{
title='Auto Kick Error',
color=Color.to_hex(defines.text_color.bg),
color=Color.to_hex(defines.textcolor.bg),
description='Auto Kick Error - Closed Thread',
Error=err
}

2
modules/ExpGamingPlayer/playerInfo/control.lua
View File

@@ -49,5 +49,5 @@ return setmetatable({
if loaded_modules['ExpGamingCore.Ranking'] then Ranking = require('ExpGamingCore.Ranking') end
end
},{
__call=function(self) self.get_player_info(...) end
__call=function(self,...) self.get_player_info(...) end
})

51
modules/index.lua Normal file
View File

@@ -0,0 +1,51 @@
-- not_luadoc=true
--- Used to index the files to be loaded
return {
['FactorioStdLib.String@^0.8.0']='./modules/FactorioStdLib/String',
['FactorioStdLib.Table@^0.8.0']='./modules/FactorioStdLib/Table',
['FactorioStdLib.Color@^0.8.0']='./modules/FactorioStdLib/Color',
['FactorioStdLib.Game@^0.8.0']='./modules/FactorioStdLib/Game',
['FactorioStdLib.Table@0.8.0']='./modules/FactorioStdLib/Table',
['FactorioStdLib.String@0.8.0']='./modules/FactorioStdLib/String',
['FactorioStdLib.Game@0.8.0']='./modules/FactorioStdLib/Game',
['FactorioStdLib.Color@0.8.0']='./modules/FactorioStdLib/Color',
['ExpGamingLib@^4.0.0']='./modules/ExpGamingLib',
['ExpGamingLib@4.0.0']='./modules/ExpGamingLib',
['ExpGamingCore.Commands@4.0.0']='./modules/ExpGamingCore/Commands',
['ExpGamingCore.Server@4.0.0']='./modules/ExpGamingCore/Server',
['ExpGamingCore.Ranking@^4.0.0']='./modules/ExpGamingCore/Ranking',
['ExpGamingCore.Ranking@4.0.0']='./modules/ExpGamingCore/Ranking',
['ExpGamingBot.autoChat@4.0.0']='./modules/ExpGamingBot/autoChat',
['ExpGamingCore.Server@^4.0.0']='./modules/ExpGamingCore/Server',
['ExpGamingCommands.tags@4.0.0']='./modules/ExpGamingCommands/tags',
['ExpGamingCore.Commands@^4.0.0']='./modules/ExpGamingCore/Commands',
['ExpGamingCommands.kill@4.0.0']='./modules/ExpGamingCommands/kill',
['ExpGamingCommands.home@4.0.0']='./modules/ExpGamingCommands/home',
['ExpGamingCommands.cheatMode@4.0.0']='./modules/ExpGamingCommands/cheatMode',
['ExpGamingCommands.bonus@4.0.0']='./modules/ExpGamingCommands/bonus',
['ExpGamingCore.Gui@^4.0.0']='./modules/ExpGamingCore/Gui',
['ExpGamingCore.Gui@4.0.0']='./modules/ExpGamingCore/Gui',
['ExpGamingCore.Sync@^4.0.0']='./modules/ExpGamingCore/Sync',
['ExpGamingPlayer.playerList@4.0.0']='./modules/ExpGamingPlayer/playerList',
['ExpGamingPlayer.playerInfo@4.0.0']='./modules/ExpGamingPlayer/playerInfo',
['ExpGamingCore.Sync@4.0.0']='./modules/ExpGamingCore/Sync',
['ExpGamingBot.discordAlerts@4.0.0']='./modules/ExpGamingBot/discordAlerts',
['ExpGamingBot.autoMessage@4.0.0']='./modules/ExpGamingBot/autoMessage',
['ExpGamingPlayer.afkKick@4.0.0']='./modules/ExpGamingPlayer/afkKick',
['ExpGamingAdmin.AdminLib@^4.0.0']='./modules/ExpGamingAdmin/AdminLib',
['ExpGamingAdmin.AdminLib@4.0.0']='./modules/ExpGamingAdmin/AdminLib',
['ExpGamingAdmin.Warnings@4.0.0']='./modules/ExpGamingAdmin/Warnings',
['ExpGamingAdmin.Reports@4.0.0']='./modules/ExpGamingAdmin/Reports',
['ExpGamingAdmin.ClearInventory@4.0.0']='./modules/ExpGamingAdmin/ClearInventory',
['ExpGamingAdmin.TempBan@4.0.0']='./modules/ExpGamingAdmin/TempBan',
['ExpGamingCommands.repair@4.0.0']='./modules/ExpGamingCommands/repair',
['ExpGamingAdmin.Gui@^4.0.0']='./modules/ExpGamingAdmin/Gui',
['ExpGamingAdmin.Gui@4.0.0']='./modules/ExpGamingAdmin/Gui',
['ExpGamingAdmin.Teleport@^4.0.0']='./modules/ExpGamingAdmin/Teleport',
['ExpGamingAdmin.Teleport@4.0.0']='./modules/ExpGamingAdmin/Teleport',
['ExpGamingCommands.teleport@4.0.0']='./modules/ExpGamingCommands/teleport',
['ExpGamingAdmin.Kick@4.0.0']='./modules/ExpGamingAdmin/Kick',
['ExpGamingAdmin.Jail@4.0.0']='./modules/ExpGamingAdmin/Jail',
['ExpGamingCommands.admin@4.0.0']='./modules/ExpGamingCommands/admin',
['ExpGamingAdmin.Ban@4.0.0']='./modules/ExpGamingAdmin/Ban',
}

4
softmod.json
View File

@@ -12,7 +12,9 @@
"FactorioStdLib.Table": "^0.8.0",
"FactorioStdLib": "^0.8.0",
"ExpGamingCommands": "^4.0.0",
"ExpGamingPlayer": "^4.0.0"
"ExpGamingPlayer": "^4.0.0",
"ExpGamingAdmin": "^4.0.0",
"ExpGamingBot": "^4.0.0"
},
"dependencies": {}
}

4
to convert/Addons/Admin/base-damage.lua
View File

@@ -26,7 +26,7 @@ Event.register(defines.events.on_entity_damaged,function(event)
_damage()[player.index][1] = _damage()[player.index][1]+event.final_damage_amount
if _damage()[player.index][2] < event.tick-300 then
_damage()[player.index][2] = event.tick
player_return({'base-damage.used'},defines.text_color.med,player)
player_return({'base-damage.used'},defines.textcolor.med,player)
Admin.give_warning(player,'<server>','Damaged something inside the base. Total Delt: '.._damage()[player.index][1],4)
end
end)
@@ -38,7 +38,7 @@ Event.register(defines.events.on_player_ammo_inventory_changed,function(event)
if not _damage()[player.index] then _damage()[player.index] = {0,0} end
if found > 0 then
Admin.move_item_to_spawn({name='atomic-bomb',count=found},player.surface)
player_return({'base-damage.nuke'},defines.text_color.med,player)
player_return({'base-damage.nuke'},defines.textcolor.med,player)
if _damage()[player.index][2] < event.tick-300 then
_damage()[player.index][2] = event.tick
Admin.give_warning(player,'<server>','Nukes are not allowed for your rank.',4)

6
to convert/Addons/Admin/inventory-search.lua
View File

@@ -41,9 +41,9 @@ local inventorys = {
local _root_tree = {low_items=low_items,med_items=med_items,high_items=high_items}
local function take_action(player,item_name,category)
if category == 'low_items' then player_return({'inventory-search.low',item_name},defines.text_color.med,player)
elseif category == 'med_items' then player_return({'inventory-search.med',item_name},defines.text_color.high,player) Admin.give_warning(player,'<server>','Found A Banned Item',5)
elseif category == 'high_items' then player_return({'inventory-search.high',item_name},defines.text_color.crit,player) Admin.temp_ban(player,'<server>','Found A Banned Item')
if category == 'low_items' then player_return({'inventory-search.low',item_name},defines.textcolor.med,player)
elseif category == 'med_items' then player_return({'inventory-search.med',item_name},defines.textcolor.high,player) Admin.give_warning(player,'<server>','Found A Banned Item',5)
elseif category == 'high_items' then player_return({'inventory-search.high',item_name},defines.textcolor.crit,player) Admin.temp_ban(player,'<server>','Found A Banned Item')
else return end
end

4
to convert/Addons/Admin/tree-decon.lua
View File

@@ -42,9 +42,9 @@ Event.register(-1,function(event)
if not chache[2] then
chache[2] = true
local player = Game.get_player(event)
player_return({'tree-decon.player-print'},defines.text_color.crit,player)
player_return({'tree-decon.player-print'},defines.textcolor.crit,player)
local rank = Ranking.get_group('Admin').lowest
Ranking.print(rank,{'tree-decon.rank-print',player.name},defines.text_color.info)
Ranking.print(rank,{'tree-decon.rank-print',player.name},defines.textcolor.info)
Admin.give_warning(player,'<server>','Trying To Decon The Base')
end
self.data.clear = game.tick + 10

4
to convert/Addons/Guis/polls.lua
View File

@@ -34,8 +34,8 @@ function _poll_end(self)
poll.voted = nil
table.insert(_polls().old,poll)
_polls().active[uuid] = nil
game.print({'polls.end',poll.question},defines.text_color.info)
game.print({'polls.winner',highest[1]},defines.text_color.info)
game.print({'polls.end',poll.question},defines.textcolor.info)
game.print({'polls.winner',highest[1]},defines.textcolor.info)
end
local function _poll_data(question,answers)

8
to convert/Addons/Guis/warp-system.lua
View File

@@ -96,9 +96,9 @@ commands.add_command('make-warp', 'Make a warp point at your location', {'name',
if not game.player then return end
local position = game.player.position
local name = args.name
if game.player.gui.top[name] then player_return({'warp-system.name-used'},defines.text_color.med) return commands.error end
if _warps().warps[name] then player_return({'warp-system.name-used'},defines.text_color.med) return commands.error end
if position.x^2 + position.y^2 < 100 then player_return({'warp-system.too-close'},defines.text_color.med) return commands.error end
if game.player.gui.top[name] then player_return({'warp-system.name-used'},defines.textcolor.med) return commands.error end
if _warps().warps[name] then player_return({'warp-system.name-used'},defines.textcolor.med) return commands.error end
if position.x^2 + position.y^2 < 100 then player_return({'warp-system.too-close'},defines.textcolor.med) return commands.error end
-- to do add a test for all warps
make_warp_point(position,game.player.surface,game.player.force,name)
end)
@@ -205,7 +205,7 @@ Event.register(defines.events.on_tick,function(event)
for index,time in pairs(_warps().cooldowns) do
if time > 0 then
_warps().cooldowns[index] = time-1
if _warps().cooldowns[index] == 0 then player_return({'warp-system.cooldown-zero'},defines.text_color.low,index) end
if _warps().cooldowns[index] == 0 then player_return({'warp-system.cooldown-zero'},defines.textcolor.low,index) end
end
end
end)