From cef921e7ed28355e54e2aa78bdde2f4c8e45cfc6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 13:26:43 +0000 Subject: [PATCH 001/392] Adding the player list --- Addons/Guis/player-list.lua | 41 +++++++++++++++++++++++++++++++++++++ Addons/load.lua | 11 +++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 Addons/Guis/player-list.lua diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua new file mode 100644 index 00000000..f0bab2bb --- /dev/null +++ b/Addons/Guis/player-list.lua @@ -0,0 +1,41 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local function _global(reset) + global.addons = not reset and global.addons or {} + global.addons.player_list = not reset and global.addons.player_list or {update=0,delay=10} + return global.addons.player_list +end + +local function queue_update(tick) + local data = _global() + local tick = tick or game.tick + if tick + data.delay > data.update then + data.update = tick + data.delay + end +end + +Gui.left.add{ + name='player-list', + caption='entity/player', + tooltip='Toggles the player list', + draw=function(frame) + frame.caption = '' + local player_list = frame.add{ + name="scroll", + type = "scroll-pane", + direction = "vertical", + vertical_scroll_policy="always", + horizontal_scroll_policy="never" + } + + end, + open_on_join=true +} \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 0cd6ac7e..a5a24f2d 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -8,4 +8,13 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- --- this file will just contain all the diffrent requires \ No newline at end of file +-- this file will just contain all the diffrent requires + +-- admin dir + +-- commands dir + +-- guis dir +require('Guis/player-list') + +-- other \ No newline at end of file From 7d9a647ff9049774f1409967be7f3a3b5f2dd02b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 13:53:18 +0000 Subject: [PATCH 002/392] Testing Player List --- Addons/Guis/player-list.lua | 42 ++++++++++++++++++++++++++++++++----- locale/en/player-list.cfg | 4 ++++ 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 locale/en/player-list.cfg diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index f0bab2bb..c6f95f4a 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -10,13 +10,17 @@ Discord: https://discord.gg/r6dC2uK local function _global(reset) global.addons = not reset and global.addons or {} - global.addons.player_list = not reset and global.addons.player_list or {update=0,delay=10} + global.addons.player_list = not reset and global.addons.player_list or {update=0,delay=10,intervial=54000} return global.addons.player_list end +local function update() + Gui.left.update('player-list') +end + local function queue_update(tick) local data = _global() - local tick = tick or game.tick + local tick = is_type(tick,'table') and tick.tick or is_type(tick,'number') and tick or game.tick if tick + data.delay > data.update then data.update = tick + data.delay end @@ -25,7 +29,7 @@ end Gui.left.add{ name='player-list', caption='entity/player', - tooltip='Toggles the player list', + tooltip={'player-list.tooltip'}, draw=function(frame) frame.caption = '' local player_list = frame.add{ @@ -35,7 +39,35 @@ Gui.left.add{ vertical_scroll_policy="always", horizontal_scroll_policy="never" } - + for _,rank in pairs(Ranking._ranks()) do + for _,player in pairs(rank:get_players(true)) do + if rank.short_hand == '' then + player_list.add{ + type='label', + style='caption_style', + caption={'player-list.format-nil',tick_to_display_format(player.online_time),player.name} + }.style.font_color = rank.colour + else + player_list.add{ + type='label', + style='caption_style', + caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand} + }.style.font_color = rank.colour + end + end + end end, open_on_join=true -} \ No newline at end of file +} + +Event.register(defines.events.on_tick,function(event) + local data = _global() + if event.tick > data.update then + update() + data.update = event.tick + data.intervial + end +end) + +Event.register(defines.events.on_player_joined_game,queue_update) +Event.register(defines.events.on_player_left_game,queue_update) +Event.register(defines.events.rank_change,queue_update) \ No newline at end of file diff --git a/locale/en/player-list.cfg b/locale/en/player-list.cfg new file mode 100644 index 00000000..66af1947 --- /dev/null +++ b/locale/en/player-list.cfg @@ -0,0 +1,4 @@ +[player-list] +tooltip=Toggles The PLayer List +format-nil=__1__ - __2__ +format=__1__ - __2__ - __3__ \ No newline at end of file From 90a53647f3ba31f66745a44eb1a7338346aaa727 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 14:00:59 +0000 Subject: [PATCH 003/392] Trying to fix player list --- Addons/playerRanks.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index de337563..d6836c54 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -40,9 +40,19 @@ local groups = Ranking._groups(true) local ranks = Ranking._ranks(true) groups['Root']:edit('allow',false,{ - ['testing']=true + ['player-list']=true }) -ranks['Root']:edit('test',true,'testing') +groups['Admin']:edit('allow',false,{ + ['player-list']=true +}) +groups['User']:edit('allow',false,{ + ['player-list']=true +}) +groups['Jail']:edit('allow',false,{ + +}) + + groups['Root']:add_rank{ name='Owner', From 10c8cfdc7e26183601bb4b2ead6eedc957e06bff Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 14:27:08 +0000 Subject: [PATCH 004/392] Fixed Player List Update --- Addons/Guis/player-list.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index c6f95f4a..a433a1ea 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -21,7 +21,7 @@ end local function queue_update(tick) local data = _global() local tick = is_type(tick,'table') and tick.tick or is_type(tick,'number') and tick or game.tick - if tick + data.delay > data.update then + if tick + data.delay > data.update - data.intervial then data.update = tick + data.delay end end @@ -44,13 +44,13 @@ Gui.left.add{ if rank.short_hand == '' then player_list.add{ type='label', - style='caption_style', + style='caption_label', caption={'player-list.format-nil',tick_to_display_format(player.online_time),player.name} }.style.font_color = rank.colour else player_list.add{ type='label', - style='caption_style', + style='caption_label', caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand} }.style.font_color = rank.colour end From 479fa71bf943df4e4629a1b4c2bd18f699a5c9cc Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 15:25:44 +0000 Subject: [PATCH 005/392] Added Readme Gui --- Addons/Guis/readme.lua | 77 ++++++++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 9 +++-- locale/en/readme.cfg | 22 ++++++++++++ 4 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 Addons/Guis/readme.lua create mode 100644 locale/en/readme.cfg diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua new file mode 100644 index 00000000..85a4372c --- /dev/null +++ b/Addons/Guis/readme.lua @@ -0,0 +1,77 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +Gui.center.add{ + name='readme', + caption='utility/questionmark', + tooltip={'readme.tooltip'} +}:add_tab('guildlines',{'readme.tab1-name'},{'readme.tab1-tooltip'},function(frame) + for i = 1,10 do + local line = frame.add{ + type='label', + caption={'readme.tab1-line'..tostring(i)} + } + line.style.maximal_width = 480 + line.style.single_line = false + end +end):add_tab('chat',{'readme.tab2-name'},{'readme.tab2-tooltip'},function(frame) + local line = frame.add{ + type='label', + caption={'readme.tab2-singleline'} + } + line.style.maximal_width = 480 + line.style.single_line = false +end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(frame) + local line = frame.add{ + type='label', + caption={'readme.tab3-singleline'} + } + line.style.maximal_width = 480 + line.style.single_line = false + local table = frame.add{name='command_table',type='table',column_count=2} + table.add{ + type='label', + caption={'readme.tab3-col1'} + } + table.add{ + type='label', + caption={'readme.tab3-col2'} + } + table.draw_vertical_lines = true + table.draw_horizontal_line_after_headers = true + for _,command in pairs(Commands.get_commands(frame.player_index)) do + table.add{ + type='label', + caption='/'..comand.name + } + local help = table.add{ + type='label', + caption=command.help, + } + help.style.width = 400 + help.style.single_line = false + end +end) + +Event.register(defines.events.on_player_created,function(event) + if not player.admin then + local player = Game.get_player(event) + script.raise_event(defines.events.on_gui_click,{ + name=defines.events.on_gui_click, + tick=event.tick, + element=mod_gui.get_button_flow(player).readme, + player_index=player.index, + button=defines.mouse_button_type.left, + alt=false, + control=false, + shift=false + }) + end +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index a5a24f2d..f31e4d32 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -16,5 +16,6 @@ Discord: https://discord.gg/r6dC2uK -- guis dir require('Guis/player-list') +require('Guis/readme') -- other \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index d6836c54..1c0095ae 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -40,13 +40,16 @@ local groups = Ranking._groups(true) local ranks = Ranking._ranks(true) groups['Root']:edit('allow',false,{ - ['player-list']=true + ['player-list']=true, + ['readme']=true }) groups['Admin']:edit('allow',false,{ - ['player-list']=true + ['player-list']=true, + ['readme']=true }) groups['User']:edit('allow',false,{ - ['player-list']=true + ['player-list']=true, + ['readme']=true }) groups['Jail']:edit('allow',false,{ diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg new file mode 100644 index 00000000..6c206386 --- /dev/null +++ b/locale/en/readme.cfg @@ -0,0 +1,22 @@ +[readme] +tooltip=Open the readme gui that opens when you first join. +tab1-name=Guild Lines +tab1-tooltip=These are the guildlines you should follow +tab1-line1=Welcome to the Explosive Gaming Community! +tab1-line2= +tab1-line3=Here are some guidelines to keep this Server fun for everyone: +tab1-line4=- Hacking / cheating / abusing bugs will not be tolerated. +tab1-line5=- Be polite and use common sense. +tab1-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. +tab1-line7=- Do not remove stuff without even trying to talk / ask about it. +tab1-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +tab1-line9= +tab1-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! +tab2-name=How To Chat +tab2-tooltip=How to chat in factorio with default key config +tab2-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. +tab3-name=Commands +tab3-tooltip=These are the commands you can use +tab3-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown +tab3-col1=Command Name +tab3-col2=Command Help \ No newline at end of file From 3c82545470c7a0dc36cc6161699d27c93e1c7523 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 15:27:46 +0000 Subject: [PATCH 006/392] Still tring to fix commands tab --- Addons/Guis/readme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 85a4372c..8ccd408b 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -46,7 +46,7 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr } table.draw_vertical_lines = true table.draw_horizontal_line_after_headers = true - for _,command in pairs(Commands.get_commands(frame.player_index)) do + for _,command in pairs(commands.get_commands(frame.player_index)) do table.add{ type='label', caption='/'..comand.name From 736ab5e3b1251a0e81575cbd3321517585b2fed2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 15:35:15 +0000 Subject: [PATCH 007/392] Working readme Gui --- Addons/Guis/readme.lua | 12 ++++++------ Addons/load.lua | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 8ccd408b..e6664784 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -49,20 +49,20 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr for _,command in pairs(commands.get_commands(frame.player_index)) do table.add{ type='label', - caption='/'..comand.name + caption='/'..command.name } - local help = table.add{ + local discription = table.add{ type='label', - caption=command.help, + caption=command.description, } - help.style.width = 400 - help.style.single_line = false + discription.style.width = 400 + discription.style.single_line = false end end) Event.register(defines.events.on_player_created,function(event) + local player = Game.get_player(event) if not player.admin then - local player = Game.get_player(event) script.raise_event(defines.events.on_gui_click,{ name=defines.events.on_gui_click, tick=event.tick, diff --git a/Addons/load.lua b/Addons/load.lua index f31e4d32..73dac323 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -15,7 +15,7 @@ Discord: https://discord.gg/r6dC2uK -- commands dir -- guis dir -require('Guis/player-list') require('Guis/readme') +require('Guis/player-list') -- other \ No newline at end of file From d1880fecbdd4861dd7f6dc638e9d292bc3a3efb9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 15:39:27 +0000 Subject: [PATCH 008/392] Fixed readme not opening on join --- Addons/Guis/readme.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index e6664784..e0140aef 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -60,9 +60,9 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr end end) -Event.register(defines.events.on_player_created,function(event) +Event.register(defines.events.on_player_joined_game,function(event) local player = Game.get_player(event) - if not player.admin then + if not player.admin and player.online_time < 60 then script.raise_event(defines.events.on_gui_click,{ name=defines.events.on_gui_click, tick=event.tick, From 7a8b2b409bfa4a175aa0d476c5a991bbdb48c6d7 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 16:08:53 +0000 Subject: [PATCH 009/392] Added info to readme --- Addons/Guis/readme.lua | 57 ++++++++++++++++++++++++++++++++---------- locale/en/readme.cfg | 25 +++++++++++++++++- 2 files changed, 68 insertions(+), 14 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index e0140aef..486b08c7 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -8,33 +8,32 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- +local function format_480(label) + label.style.maximal_width = 480 + label.style.single_line = false +end + Gui.center.add{ name='readme', caption='utility/questionmark', tooltip={'readme.tooltip'} }:add_tab('guildlines',{'readme.tab1-name'},{'readme.tab1-tooltip'},function(frame) for i = 1,10 do - local line = frame.add{ + format_480(frame.add{ type='label', caption={'readme.tab1-line'..tostring(i)} - } - line.style.maximal_width = 480 - line.style.single_line = false + }) end end):add_tab('chat',{'readme.tab2-name'},{'readme.tab2-tooltip'},function(frame) - local line = frame.add{ + format_480(frame.add{ type='label', caption={'readme.tab2-singleline'} - } - line.style.maximal_width = 480 - line.style.single_line = false + }) end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(frame) - local line = frame.add{ + format_480(frame.add{ type='label', caption={'readme.tab3-singleline'} - } - line.style.maximal_width = 480 - line.style.single_line = false + }) local table = frame.add{name='command_table',type='table',column_count=2} table.add{ type='label', @@ -46,7 +45,7 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr } table.draw_vertical_lines = true table.draw_horizontal_line_after_headers = true - for _,command in pairs(commands.get_commands(frame.player_index)) do + for _,command in pairs(commands.get_commands(frame)) do table.add{ type='label', caption='/'..command.name @@ -58,6 +57,38 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr discription.style.width = 400 discription.style.single_line = false end +end):add_tab('links',{'readme.tab4-name'},{'readme.tab4-tooltip'},function(frame) + local function format(text_box) + text_box.style.minimal_width=400 + text_box.read_only = true + text_box.word_wrap = true + text_box.selectable = true + end + for i = 1,4 do + frame.add{ + type="label", + caption={'readme.tab4-cap'..tostring(i)} + } + format(frame.add{ + type='text-box', + text={'readme.tab4-link'..tostring(i)} + }) + end +end):add_tab('servers'.{'readme.tab5-name'},{'readme.tab5-tooltip'},function(frame) + format_480(frame.add{ + type='label', + caption={'readme.tab5-singleline'} + }) + for i = 1,6 do + frame.add{ + type='label', + caption={'readme.tab5-format',tostring(i),{'readme.tab5-cap'..tostring(i)}} + } + format_480(frame.add{ + type='label', + caption={'readme.tab5-des'..tostring(i)} + }) + end end) Event.register(defines.events.on_player_joined_game,function(event) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index 6c206386..8e913169 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -19,4 +19,27 @@ tab3-name=Commands tab3-tooltip=These are the commands you can use tab3-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown tab3-col1=Command Name -tab3-col2=Command Help \ No newline at end of file +tab3-col2=Command Help +tab4-name=Links +tab4-tooltip=Helpful links for ways to get in touch +tab4-cap1=Discord voice and chat server: +tab4-link1=https://discord.me/explosivegaming +tab4-cap2=Our website: +tab4-link2=https://explosivegaming.nl +tab4-cap3=Steam: +tab4-link3=http://steamcommunity.com/groups/tntexplosivegaming +tab4-cap4=Patreon: +tab4-link4=https://www.patreon.com/badgamernl +tab5-singleline=Welcome to the Explosive Gaming Community! +tab5-cap1=Public +tab5-des1=A place for all players, this map reset every 24h. +tab5-cap2=Standard +tab5-des2=Before you play make sure you understand the game, reset every 48h. +tab5-cap3=Pro +tab5-des3=A pure mega base server, reset every 7 days and a password is needed to join. +tab5-cap4=Modded +tab5-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. +tab5-cap5=Events +tab5-des5=Sometimes we hold events, may require a password, join discord for more info. +tab5-cap6=Donator +tab5-des6=For those people who have two much money and give us some. Anything goes per request. \ No newline at end of file From 281f5f92aff99ebc31b190fb60cc95590ceb339f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 28 Dec 2017 16:30:30 +0000 Subject: [PATCH 010/392] Readme with info included --- Addons/Guis/readme.lua | 30 +++++++++++++++++++++--------- locale/en/readme.cfg | 7 +++---- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 486b08c7..1164a5b1 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -18,10 +18,12 @@ Gui.center.add{ caption='utility/questionmark', tooltip={'readme.tooltip'} }:add_tab('guildlines',{'readme.tab1-name'},{'readme.tab1-tooltip'},function(frame) - for i = 1,10 do + for i = 1,10 do + local style=nil; if i == 1 then style = 'caption_label' end format_480(frame.add{ type='label', - caption={'readme.tab1-line'..tostring(i)} + caption={'readme.tab1-line'..tostring(i)}, + style=style }) end end):add_tab('chat',{'readme.tab2-name'},{'readme.tab2-tooltip'},function(frame) @@ -37,15 +39,17 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr local table = frame.add{name='command_table',type='table',column_count=2} table.add{ type='label', - caption={'readme.tab3-col1'} + caption={'readme.tab3-col1'}, + style='caption_label' } table.add{ type='label', - caption={'readme.tab3-col2'} + caption={'readme.tab3-col2'}, + style='caption_label' } table.draw_vertical_lines = true table.draw_horizontal_line_after_headers = true - for _,command in pairs(commands.get_commands(frame)) do + for _,command in pairs(commands.get_commands(frame.player_index)) do table.add{ type='label', caption='/'..command.name @@ -58,6 +62,12 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr discription.style.single_line = false end end):add_tab('links',{'readme.tab4-name'},{'readme.tab4-tooltip'},function(frame) + local links={ + 'https://discord.me/explosivegaming', + 'https://explosivegaming.nl', + 'http://steamcommunity.com/groups/tntexplosivegaming', + 'https://www.patreon.com/badgamernl' + } local function format(text_box) text_box.style.minimal_width=400 text_box.read_only = true @@ -67,14 +77,15 @@ end):add_tab('links',{'readme.tab4-name'},{'readme.tab4-tooltip'},function(frame for i = 1,4 do frame.add{ type="label", - caption={'readme.tab4-cap'..tostring(i)} + caption={'readme.tab4-cap'..tostring(i)}, + style='caption_label' } format(frame.add{ type='text-box', - text={'readme.tab4-link'..tostring(i)} + text=links[i] }) end -end):add_tab('servers'.{'readme.tab5-name'},{'readme.tab5-tooltip'},function(frame) +end):add_tab('servers',{'readme.tab5-name'},{'readme.tab5-tooltip'},function(frame) format_480(frame.add{ type='label', caption={'readme.tab5-singleline'} @@ -82,7 +93,8 @@ end):add_tab('servers'.{'readme.tab5-name'},{'readme.tab5-tooltip'},function(fra for i = 1,6 do frame.add{ type='label', - caption={'readme.tab5-format',tostring(i),{'readme.tab5-cap'..tostring(i)}} + caption={'readme.tab5-format',tostring(i),{'readme.tab5-cap'..tostring(i)}}, + style='caption_label' } format_480(frame.add{ type='label', diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index 8e913169..b99bf97e 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -23,14 +23,13 @@ tab3-col2=Command Help tab4-name=Links tab4-tooltip=Helpful links for ways to get in touch tab4-cap1=Discord voice and chat server: -tab4-link1=https://discord.me/explosivegaming tab4-cap2=Our website: -tab4-link2=https://explosivegaming.nl tab4-cap3=Steam: -tab4-link3=http://steamcommunity.com/groups/tntexplosivegaming tab4-cap4=Patreon: -tab4-link4=https://www.patreon.com/badgamernl +tab5-name=Servers +tab5-tooltip=Info on our other servers tab5-singleline=Welcome to the Explosive Gaming Community! +tab5-format=S__1__: __2__ tab5-cap1=Public tab5-des1=A place for all players, this map reset every 24h. tab5-cap2=Standard From 373f294dcf2180408cf841f102d1a17bbe618393 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 30 Dec 2017 14:39:26 +0000 Subject: [PATCH 011/392] Added A Full Rule List --- Addons/Guis/readme.lua | 42 ++++++++++------ locale/en/readme.cfg | 108 +++++++++++++++++++++++++---------------- 2 files changed, 94 insertions(+), 56 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 1164a5b1..6833ea15 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -17,34 +17,35 @@ Gui.center.add{ name='readme', caption='utility/questionmark', tooltip={'readme.tooltip'} -}:add_tab('guildlines',{'readme.tab1-name'},{'readme.tab1-tooltip'},function(frame) +}:add_tab('guildlines',{'readme.guildlines-name'},{'readme.guildlines-tooltip'},function(frame) for i = 1,10 do local style=nil; if i == 1 then style = 'caption_label' end format_480(frame.add{ type='label', - caption={'readme.tab1-line'..tostring(i)}, + caption={'readme.guildlines-line'..tostring(i)}, style=style }) end -end):add_tab('chat',{'readme.tab2-name'},{'readme.tab2-tooltip'},function(frame) +end):add_tab('chat',{'readme.chat-name'},{'readme.chat-tooltip'},function(frame) format_480(frame.add{ type='label', - caption={'readme.tab2-singleline'} + caption={'readme.chat-singleline'} }) -end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(frame) +end):add_tab('commands',{'readme.commands-name'},{'readme.commands-tooltip'},function(frame) format_480(frame.add{ type='label', - caption={'readme.tab3-singleline'} + caption={'readme.commands-singleline'} }) + Gui.bar(frame,480) local table = frame.add{name='command_table',type='table',column_count=2} table.add{ type='label', - caption={'readme.tab3-col1'}, + caption={'readme.commands-col1'}, style='caption_label' } table.add{ type='label', - caption={'readme.tab3-col2'}, + caption={'readme.commands-col2'}, style='caption_label' } table.draw_vertical_lines = true @@ -61,7 +62,7 @@ end):add_tab('commands',{'readme.tab3-name'},{'readme.tab3-tooltip'},function(fr discription.style.width = 400 discription.style.single_line = false end -end):add_tab('links',{'readme.tab4-name'},{'readme.tab4-tooltip'},function(frame) +end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(frame) local links={ 'https://discord.me/explosivegaming', 'https://explosivegaming.nl', @@ -77,7 +78,7 @@ end):add_tab('links',{'readme.tab4-name'},{'readme.tab4-tooltip'},function(frame for i = 1,4 do frame.add{ type="label", - caption={'readme.tab4-cap'..tostring(i)}, + caption={'readme.links-cap'..tostring(i)}, style='caption_label' } format(frame.add{ @@ -85,20 +86,33 @@ end):add_tab('links',{'readme.tab4-name'},{'readme.tab4-tooltip'},function(frame text=links[i] }) end -end):add_tab('servers',{'readme.tab5-name'},{'readme.tab5-tooltip'},function(frame) +end):add_tab('servers',{'readme.servers-name'},{'readme.servers-tooltip'},function(frame) format_480(frame.add{ type='label', - caption={'readme.tab5-singleline'} + caption={'readme.servers-singleline'} }) + Gui.bar(frame,480) for i = 1,6 do frame.add{ type='label', - caption={'readme.tab5-format',tostring(i),{'readme.tab5-cap'..tostring(i)}}, + caption={'readme.servers-format',tostring(i),{'readme.servers-cap'..tostring(i)}}, style='caption_label' } format_480(frame.add{ type='label', - caption={'readme.tab5-des'..tostring(i)} + caption={'readme.servers-des'..tostring(i)} + }) + end +end):add_tab('rules',{'readme.rules-name'},{'readme.rules-tooltip'},function(frame) + format_480(frame.add{ + type='label', + caption={'readme.rules-singleline'} + }) + Gui.bar(frame,480) + for i = 1,20 do + format_480(frame.add{ + type='label', + caption={'readme.rules-format',i,{'readme.rules-rule'..tostring(i)}} }) end end) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index b99bf97e..f2ada42e 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -1,44 +1,68 @@ [readme] tooltip=Open the readme gui that opens when you first join. -tab1-name=Guild Lines -tab1-tooltip=These are the guildlines you should follow -tab1-line1=Welcome to the Explosive Gaming Community! -tab1-line2= -tab1-line3=Here are some guidelines to keep this Server fun for everyone: -tab1-line4=- Hacking / cheating / abusing bugs will not be tolerated. -tab1-line5=- Be polite and use common sense. -tab1-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -tab1-line7=- Do not remove stuff without even trying to talk / ask about it. -tab1-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. -tab1-line9= -tab1-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -tab2-name=How To Chat -tab2-tooltip=How to chat in factorio with default key config -tab2-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. -tab3-name=Commands -tab3-tooltip=These are the commands you can use -tab3-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -tab3-col1=Command Name -tab3-col2=Command Help -tab4-name=Links -tab4-tooltip=Helpful links for ways to get in touch -tab4-cap1=Discord voice and chat server: -tab4-cap2=Our website: -tab4-cap3=Steam: -tab4-cap4=Patreon: -tab5-name=Servers -tab5-tooltip=Info on our other servers -tab5-singleline=Welcome to the Explosive Gaming Community! -tab5-format=S__1__: __2__ -tab5-cap1=Public -tab5-des1=A place for all players, this map reset every 24h. -tab5-cap2=Standard -tab5-des2=Before you play make sure you understand the game, reset every 48h. -tab5-cap3=Pro -tab5-des3=A pure mega base server, reset every 7 days and a password is needed to join. -tab5-cap4=Modded -tab5-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. -tab5-cap5=Events -tab5-des5=Sometimes we hold events, may require a password, join discord for more info. -tab5-cap6=Donator -tab5-des6=For those people who have two much money and give us some. Anything goes per request. \ No newline at end of file +guildlines-name=Guild Lines +guildlines-tooltip=These are the guildlines you should follow +guildlines-line1=Welcome to the Explosive Gaming Community! +guildlines-line2= +guildlines-line3=Here are some guidelines to keep this Server fun for everyone: +guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. +guildlines-line5=- Be polite and use common sense. +guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. +guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. +guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line9= +guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! +chat-name=How To Chat +chat-tooltip=How to chat in factorio with default key config +chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. +commands-name=Commands +commands-tooltip=These are the commands you can use +commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown +commands-col1=Command Name +commands-col2=Command Help +links-name=Links +links-tooltip=Helpful links for ways to get in touch +links-cap1=Discord voice and chat server: +links-cap2=Our website: +links-cap3=Steam: +links-cap4=Patreon: +servers-name=Servers +servers-tooltip=Info on our other servers +servers-singleline=Welcome to the Explosive Gaming Community! +servers-format=S__1__: __2__ +servers-cap1=Public +servers-des1=A place for all players, this map reset every 24h. +servers-cap2=Standard +servers-des2=Before you play make sure you understand the game, reset every 48h. +servers-cap3=Pro +servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. +servers-cap4=Modded +servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. +servers-cap5=Events +servers-des5=Sometimes we hold events, may require a password, join discord for more info. +servers-cap6=Donator +servers-des6=For those people who have two much money and give us some. Anything goes per request. +rules-name=All Rules +rules-tooltip=A full list of rules for the server +rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. +rules-format=__1__) __2__ +rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. +rules-rule2=Any bugs or exploits found should be reported. (no creative items) +rules-rule3=Do not disrespect any player in the server. +rules-rule4=Do not take every item frmo a belt or via logics request, share resources. +rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. +rules-rule6=Do not laydown or remove concrete or stone with bots without permission. +rules-rule7=Do not use active provider chests without permission. +rules-rule8=Do not use speakers on global or with alearts without permission. +rules-rule9=Do not remove/move major parts of the factory without permission. +rules-rule10=Do not walk in player random direction for no reason(to save map size). +rules-rule11=Do not remove stuff just because you dont like it, tell people first. +rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. +rules-rule13=Do not make train roundabouts. Or any loops of any kind. +rules-rule14=When using trains use the same size that others have used. +rules-rule15=Trains are Left Hand Drive (LHD) only. +rules-rule16=Do not complain about lag, low fps and low ups or other things like that. +rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. +rules-rule18=Do not advertise other servers unless you are a trusted server owner. +rules-rule19=Report any one who breaks the rules. +rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file From fb36c388f7c8888356ac49a9212060e59f7a5433 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 30 Dec 2017 16:46:51 +0000 Subject: [PATCH 012/392] Changed the format of the labels --- Addons/Guis/readme.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 6833ea15..4f2d9260 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -8,8 +8,8 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -local function format_480(label) - label.style.maximal_width = 480 +local function format_label(label) + label.style.maximal_width = 475 label.style.single_line = false end @@ -20,19 +20,19 @@ Gui.center.add{ }:add_tab('guildlines',{'readme.guildlines-name'},{'readme.guildlines-tooltip'},function(frame) for i = 1,10 do local style=nil; if i == 1 then style = 'caption_label' end - format_480(frame.add{ + format_label(frame.add{ type='label', caption={'readme.guildlines-line'..tostring(i)}, style=style }) end end):add_tab('chat',{'readme.chat-name'},{'readme.chat-tooltip'},function(frame) - format_480(frame.add{ + format_label(frame.add{ type='label', caption={'readme.chat-singleline'} }) end):add_tab('commands',{'readme.commands-name'},{'readme.commands-tooltip'},function(frame) - format_480(frame.add{ + format_label(frame.add{ type='label', caption={'readme.commands-singleline'} }) @@ -87,7 +87,7 @@ end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(fra }) end end):add_tab('servers',{'readme.servers-name'},{'readme.servers-tooltip'},function(frame) - format_480(frame.add{ + format_label(frame.add{ type='label', caption={'readme.servers-singleline'} }) @@ -98,19 +98,19 @@ end):add_tab('servers',{'readme.servers-name'},{'readme.servers-tooltip'},functi caption={'readme.servers-format',tostring(i),{'readme.servers-cap'..tostring(i)}}, style='caption_label' } - format_480(frame.add{ + format_label(frame.add{ type='label', caption={'readme.servers-des'..tostring(i)} }) end end):add_tab('rules',{'readme.rules-name'},{'readme.rules-tooltip'},function(frame) - format_480(frame.add{ + format_label(frame.add{ type='label', caption={'readme.rules-singleline'} }) Gui.bar(frame,480) for i = 1,20 do - format_480(frame.add{ + format_label(frame.add{ type='label', caption={'readme.rules-format',i,{'readme.rules-rule'..tostring(i)}} }) From ab114dd7d31848feaba4f84e0ea7a6bf3a166944 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 30 Dec 2017 17:09:05 +0000 Subject: [PATCH 013/392] Changed Lable Format --- Addons/Guis/readme.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 4f2d9260..7f90e744 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -9,7 +9,7 @@ Discord: https://discord.gg/r6dC2uK --Please Only Edit Below This Line----------------------------------------------------------- local function format_label(label) - label.style.maximal_width = 475 + label.style.maximal_width = 480 label.style.single_line = false end @@ -48,6 +48,7 @@ end):add_tab('commands',{'readme.commands-name'},{'readme.commands-tooltip'},fun caption={'readme.commands-col2'}, style='caption_label' } + table.style.width = 480 table.draw_vertical_lines = true table.draw_horizontal_line_after_headers = true for _,command in pairs(commands.get_commands(frame.player_index)) do @@ -59,7 +60,7 @@ end):add_tab('commands',{'readme.commands-name'},{'readme.commands-tooltip'},fun type='label', caption=command.description, } - discription.style.width = 400 + discription.style.maximal_width = 400 discription.style.single_line = false end end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(frame) From 10e5de7763938c80f58f762cce65bc48a3523d86 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 31 Dec 2017 17:58:10 +0000 Subject: [PATCH 014/392] Added Rocket List --- Addons/Guis/rockets.lua | 70 +++++++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + locale/en/rockets.cfg | 9 ++++++ 3 files changed, 80 insertions(+) create mode 100644 Addons/Guis/rockets.lua create mode 100644 locale/en/rockets.cfg diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua new file mode 100644 index 00000000..0c86d99f --- /dev/null +++ b/Addons/Guis/rockets.lua @@ -0,0 +1,70 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local function _global(reset) + global.addons = not reset and global.addons or {} + global.addons.rockets = not reset and global.addons.rockets or {first=0,last=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0}} + return global.addons.rockets +end +Gui.left.add{ + name='rockets', + caption='item/rocket-silo', + tooltip={'rockets.tooltip'}, + draw=function(frame) + frame.caption = {'rocket-gui.name'} + local data = _global() + local satellites = player.force.get_item_launched('satellite') + local time = {'rockets.nan'} + if satellites == 1 then time = tick_to_display_format(game.tick) data.first = game.tick data.last = game.tick + elseif satellites > 1 then tick_to_display_format((game.tick-data.first)/satellites) data.last = game.tick end + frame.add{ + type='label', + caption={'rockets.sent',satellites} + } + frame.add{ + type='label', + caption={'rockets.first',tick_to_display_format(data.fist)} + } + frame.add{ + type='label', + caption={'rockets.last',tick_to_display_format(data.last)} + } + frame.add{ + type='label', + caption={'rockets.time',time} + } + frame.add{ + type='label', + caption={'rockets.milestones'}, + style='caption_label' + } + local milestones = { + type='flow', + direction='vertical' + } + for milestone,time in pairs(data.milestones) do + local milestone = tonumber(milestone:match('%d+')) + if time == 0 and satellites == milestone then + data.milestones['m'..milestone] = data.last + time = data.last + Gui.left.open('rockets') + end + local _time = {'rockets.nan'} + if time > 0 then _time = tick_to_display_format(time) end + milestones.add{ + type='label', + caption={'rockets.format',tostring(milestone),time} + } + end + end, + can_open=function(player) return player.force.get_item_launched('satellite') > 0 end +} + +Event.register(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 73dac323..6871eee8 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -17,5 +17,6 @@ Discord: https://discord.gg/r6dC2uK -- guis dir require('Guis/readme') require('Guis/player-list') +require('Guis/rockets') -- other \ No newline at end of file diff --git a/locale/en/rockets.cfg b/locale/en/rockets.cfg new file mode 100644 index 00000000..52ed1b4a --- /dev/null +++ b/locale/en/rockets.cfg @@ -0,0 +1,9 @@ +[rockets] +name=Rocket Info +tooltip=List of details about the rockets sent. +nan=NaN +sent=Rockets Sent: __1__ +first=First Lanuched At: __1__ +last=Last Launch Took: __1__ +time=Average Launch Time: __1__ +milestones=Milestones: \ No newline at end of file From d0084a7d80cd72dbdac70fa298c2c4aafb1f7eb3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 31 Dec 2017 18:09:36 +0000 Subject: [PATCH 015/392] Added Allowed --- Addons/playerRanks.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 1c0095ae..23693016 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -41,15 +41,18 @@ local ranks = Ranking._ranks(true) groups['Root']:edit('allow',false,{ ['player-list']=true, - ['readme']=true + ['readme']=true, + ['rockets']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, - ['readme']=true + ['readme']=true, + ['rockets']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, - ['readme']=true + ['readme']=true, + ['rockets']=true }) groups['Jail']:edit('allow',false,{ From 36b7c4dc56c28a3e5729c679e60acf6cdd89ec27 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 31 Dec 2017 18:11:49 +0000 Subject: [PATCH 016/392] Added Reson to cant open --- Addons/Guis/rockets.lua | 5 ++++- locale/en/rockets.cfg | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index 0c86d99f..6fee313e 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -64,7 +64,10 @@ Gui.left.add{ } end end, - can_open=function(player) return player.force.get_item_launched('satellite') > 0 end + can_open=function(player) + if player.force.get_item_launched('satellite') > 0 then return true + else return {'rockets.none'} end + end } Event.register(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) \ No newline at end of file diff --git a/locale/en/rockets.cfg b/locale/en/rockets.cfg index 52ed1b4a..a01cea31 100644 --- a/locale/en/rockets.cfg +++ b/locale/en/rockets.cfg @@ -1,6 +1,7 @@ [rockets] name=Rocket Info tooltip=List of details about the rockets sent. +none=No rockets have been sent yet. nan=NaN sent=Rockets Sent: __1__ first=First Lanuched At: __1__ From 630e476733903da958afa1046d101f29c3fc04ce Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 31 Dec 2017 18:18:03 +0000 Subject: [PATCH 017/392] Fixed Errors in gui --- Addons/Guis/rockets.lua | 9 +++++---- Addons/load.lua | 2 +- locale/en/rockets.cfg | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index 6fee313e..968e95e9 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -18,7 +18,8 @@ Gui.left.add{ caption='item/rocket-silo', tooltip={'rockets.tooltip'}, draw=function(frame) - frame.caption = {'rocket-gui.name'} + frame.caption = {'rockets.name'} + local player = Game.get_player(frame.player_index) local data = _global() local satellites = player.force.get_item_launched('satellite') local time = {'rockets.nan'} @@ -34,7 +35,7 @@ Gui.left.add{ } frame.add{ type='label', - caption={'rockets.last',tick_to_display_format(data.last)} + caption={'rockets.last',tick_to_display_format(game.tick-data.last)} } frame.add{ type='label', @@ -45,7 +46,7 @@ Gui.left.add{ caption={'rockets.milestones'}, style='caption_label' } - local milestones = { + local milestones = frame.add{ type='flow', direction='vertical' } @@ -60,7 +61,7 @@ Gui.left.add{ if time > 0 then _time = tick_to_display_format(time) end milestones.add{ type='label', - caption={'rockets.format',tostring(milestone),time} + caption={'rockets.format',tostring(milestone),_time} } end end, diff --git a/Addons/load.lua b/Addons/load.lua index 6871eee8..0784d62a 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -16,7 +16,7 @@ Discord: https://discord.gg/r6dC2uK -- guis dir require('Guis/readme') -require('Guis/player-list') require('Guis/rockets') +require('Guis/player-list') -- other \ No newline at end of file diff --git a/locale/en/rockets.cfg b/locale/en/rockets.cfg index a01cea31..22daf8c2 100644 --- a/locale/en/rockets.cfg +++ b/locale/en/rockets.cfg @@ -7,4 +7,5 @@ sent=Rockets Sent: __1__ first=First Lanuched At: __1__ last=Last Launch Took: __1__ time=Average Launch Time: __1__ -milestones=Milestones: \ No newline at end of file +milestones=Milestones: +format=__1__: __2__ \ No newline at end of file From d1cb15c72e61a2eb8b4b09f3abf6a9434a1041d0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 31 Dec 2017 19:19:08 +0000 Subject: [PATCH 018/392] Fixed a few bugs --- Addons/Guis/rockets.lua | 22 +++++++++++++++++----- locale/en/rockets.cfg | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index 968e95e9..5ca8fb1f 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -10,7 +10,7 @@ Discord: https://discord.gg/r6dC2uK local function _global(reset) global.addons = not reset and global.addons or {} - global.addons.rockets = not reset and global.addons.rockets or {first=0,last=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0}} + global.addons.rockets = not reset and global.addons.rockets or {update=0,first=0,_last=0,last=0,fastest=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0}} return global.addons.rockets end Gui.left.add{ @@ -23,24 +23,35 @@ Gui.left.add{ local data = _global() local satellites = player.force.get_item_launched('satellite') local time = {'rockets.nan'} - if satellites == 1 then time = tick_to_display_format(game.tick) data.first = game.tick data.last = game.tick - elseif satellites > 1 then tick_to_display_format((game.tick-data.first)/satellites) data.last = game.tick end + if satellites == 1 then time = tick_to_display_format(game.tick) + elseif satellites > 1 then time = tick_to_display_format((game.tick-data.first)/satellites) end + if satellites ~= data.update then + data.update = satellites + if data.first == 0 then data.first = game.tick end + data._last = data.last + data.last = game.tick + if data.last-data._last < data.fastest or data.fastest == 0 then data.fastest = data.last-data._last end + end frame.add{ type='label', caption={'rockets.sent',satellites} } frame.add{ type='label', - caption={'rockets.first',tick_to_display_format(data.fist)} + caption={'rockets.first',tick_to_display_format(data.first)} } frame.add{ type='label', - caption={'rockets.last',tick_to_display_format(game.tick-data.last)} + caption={'rockets.last',tick_to_display_format(data.last-data._last)} } frame.add{ type='label', caption={'rockets.time',time} } + frame.add{ + type='label', + caption={'rockets.fastest',tick_to_display_format(data.fastest)} + } frame.add{ type='label', caption={'rockets.milestones'}, @@ -63,6 +74,7 @@ Gui.left.add{ type='label', caption={'rockets.format',tostring(milestone),_time} } + if time == 0 then break end end end, can_open=function(player) diff --git a/locale/en/rockets.cfg b/locale/en/rockets.cfg index 22daf8c2..be434056 100644 --- a/locale/en/rockets.cfg +++ b/locale/en/rockets.cfg @@ -7,5 +7,6 @@ sent=Rockets Sent: __1__ first=First Lanuched At: __1__ last=Last Launch Took: __1__ time=Average Launch Time: __1__ +fastest=Fastest Launch: __1__ milestones=Milestones: format=__1__: __2__ \ No newline at end of file From 7fd12119cef14c983651747f812f8c02086c5bcb Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 31 Dec 2017 19:45:45 +0000 Subject: [PATCH 019/392] Added Science Gui --- Addons/Guis/science.lua | 78 +++++++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + locale/en/science.cfg | 13 +++++++ 3 files changed, 92 insertions(+) create mode 100644 Addons/Guis/science.lua create mode 100644 locale/en/science.cfg diff --git a/Addons/Guis/science.lua b/Addons/Guis/science.lua new file mode 100644 index 00000000..abfa097d --- /dev/null +++ b/Addons/Guis/science.lua @@ -0,0 +1,78 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local science_packs = { + 'science-pack-1', + 'science-pack-2', + 'science-pack-3', + 'military-science-pack', + 'production-science-pack', + 'high-tech-science-pack', + 'space-science-pack' +} + +local function _global(reset) + global.addons = not reset and global.addons or {} + global.addons.science = not reset and global.addons.science or {update=0,_update,made={0,0,0,0,0,0,0},_made={0,0,0,0,0,0,0}} + return global.addons.science +end + +Gui.left.add{ + name='science', + caption='item/lab', + tooltip={'science.tooltip'}, + draw=function(frame) + local data = _global() + local player = Game.get_player(frame.player_index) + frame.caption = {'science.name'} + frame.add{ + type='label', + caption={'science.total'}, + style='caption_label' + } + local totals = frame.add{ + type='flow', + direction='vertical' + } + frame.add{ + type='label', + caption={'science.time'}, + style='caption_lable' + } + local times = frame.add{ + type='flow', + direction='vertical' + } + if data.update < game.time-100 then + data._update = data.update + data._made = data.made + for i,name in pairs(science_packs) do + data.made[i] = player.force.item_production_statistics.get_input_count(name) + end + data.update = game.tick + end + for i,name in pairs(science_packs) do + local made = data.made[i] + if made > 0 then + totals.add{ + type='label', + caption={'science.format',{'science.'..name},made} + } + local _made = string.format('%.2f',(made-data._made[i])/((data.update-data._update)/(3600*game.speed))) + times.add{ + type='label', + caption={'science.format',{'science.'..name},_made} + } + end + end + end +} + +Event.register(defines.events.on_research_finished, function(event) Gui.left.update('science') end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 0784d62a..cc87faf3 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -16,6 +16,7 @@ Discord: https://discord.gg/r6dC2uK -- guis dir require('Guis/readme') +require('Guis/science') require('Guis/rockets') require('Guis/player-list') diff --git a/locale/en/science.cfg b/locale/en/science.cfg new file mode 100644 index 00000000..48a0b8ca --- /dev/null +++ b/locale/en/science.cfg @@ -0,0 +1,13 @@ +[science] +name=Science Info +tooltip=List of details about science packs. +total=Packs Made: +time=Packs Per Minute: +format=__1__: __2__ +science-pack-1=Red +science-pack-2=Green +science-pack-3=Blue +military-science-pack=Military +production-science-pack=Production +high-tech-science-pack=High Tech +space-science-pack=Space \ No newline at end of file From 6cd2aea238f1ffb62feb3db23e13abce52606eba Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 01:47:21 +0000 Subject: [PATCH 020/392] Fixed a few bugs in science info --- Addons/Guis/science.lua | 18 +++++++++++++----- Addons/playerRanks.lua | 9 ++++++--- locale/en/science.cfg | 3 ++- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Addons/Guis/science.lua b/Addons/Guis/science.lua index abfa097d..1bca2004 100644 --- a/Addons/Guis/science.lua +++ b/Addons/Guis/science.lua @@ -20,7 +20,7 @@ local science_packs = { local function _global(reset) global.addons = not reset and global.addons or {} - global.addons.science = not reset and global.addons.science or {update=0,_update,made={0,0,0,0,0,0,0},_made={0,0,0,0,0,0,0}} + global.addons.science = not reset and global.addons.science or {_base={update=0,_update=0,made={0,0,0,0,0,0,0},_made={0,0,0,0,0,0,0}}} return global.addons.science end @@ -31,6 +31,10 @@ Gui.left.add{ draw=function(frame) local data = _global() local player = Game.get_player(frame.player_index) + if not data[player.force.name] then + data[player.force.name] = table.deepcopy(data._base) + end + data = data[player.force.name] frame.caption = {'science.name'} frame.add{ type='label', @@ -44,15 +48,15 @@ Gui.left.add{ frame.add{ type='label', caption={'science.time'}, - style='caption_lable' + style='caption_label' } local times = frame.add{ type='flow', direction='vertical' } - if data.update < game.time-100 then + if data.update < game.tick-100 then data._update = data.update - data._made = data.made + data._made = table.deepcopy(data.made) for i,name in pairs(science_packs) do data.made[i] = player.force.item_production_statistics.get_input_count(name) end @@ -72,7 +76,11 @@ Gui.left.add{ } end end + end, + can_open=function(player) + if player.force.item_production_statistics.get_input_count('science-pack-1') > 0 then return true + else return {'science.none'} end end } -Event.register(defines.events.on_research_finished, function(event) Gui.left.update('science') end) \ No newline at end of file +Event.register(defines.events.on_research_finished,function(event) Gui.left.update('science') end) \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 23693016..a0133765 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -42,17 +42,20 @@ local ranks = Ranking._ranks(true) groups['Root']:edit('allow',false,{ ['player-list']=true, ['readme']=true, - ['rockets']=true + ['rockets']=true, + ['science']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, ['readme']=true, - ['rockets']=true + ['rockets']=true, + ['science']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, ['readme']=true, - ['rockets']=true + ['rockets']=true, + ['science']=true }) groups['Jail']:edit('allow',false,{ diff --git a/locale/en/science.cfg b/locale/en/science.cfg index 48a0b8ca..f42dbc94 100644 --- a/locale/en/science.cfg +++ b/locale/en/science.cfg @@ -10,4 +10,5 @@ science-pack-3=Blue military-science-pack=Military production-science-pack=Production high-tech-science-pack=High Tech -space-science-pack=Space \ No newline at end of file +space-science-pack=Space +none=No science packs have been made yet. \ No newline at end of file From 8dd37291fbfe65da902c60ee60095f7740dc18ba Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 02:47:56 +0000 Subject: [PATCH 021/392] WIP Task List --- Addons/Guis/tasklist.lua | 120 +++++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 13 ++++- locale/en/tasklist.cfg | 3 + 4 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 Addons/Guis/tasklist.lua create mode 100644 locale/en/tasklist.cfg diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua new file mode 100644 index 00000000..94f41396 --- /dev/null +++ b/Addons/Guis/tasklist.lua @@ -0,0 +1,120 @@ +--[[ + Explosive Gaming + + This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local function _global(reset) + global.addons = not reset and global.addons or {} + global.addons.tasklist = not reset and global.addons.tasklist or {tasks={},_edit={}} + return global.addons.tasklist +end + +local edit = Gui.inputs.add{ + name='tasklist-edit', + type='button', + caption='utility/rename_icon_normal' +}:on_event('click',function(event) + local text_flow = event.element.parent.parent.text_flow + if text_flow.text.type == 'label' then + _global()._edit[event.player_index]._editing[text_flow.parent.name]=true + local text = text_flow.text.caption + text_flow.clear() + local _text = text_flow.add{ + name='text', + type='textfield', + text=text + } + _text.style.width = 100 + event.element.sprite = 'utility/enter' + elseif text_flow.text.type == 'textfield' then + local text = text_flow.text.text + _global()._edit[event.player_index]._editing[text_flow.parent.name]=false + _global()._edit[event.player_index]._tasks[text_flow.parent.name]=text + text_flow.parent.parent.clear() + _draw(text_flow.parent.parent) + end +end) + +local remove = Gui.inputs.add{ + name='tasklist-remove', + type='button', + caption='utility/remove' +} + +local add = Gui.inputs.add{ + name='tasklist-add', + type='button', + caption='add' +} + +local function _draw(frame) + frame.caption = {'tasklist.name'} + local data = _global() + local player = Game.get_player(frame.player_index) + local rank = Ranking.get_rank(player) + for i,task in pairs(_tasks(player)) do + local flow = frame.add{ + name=i-- use parent and children so there dont colidide with each other + type='flow', + direction='horizontal' + } + local text_flow = flow.add{ + name='text_flow', + type='flow', + direction='horizontal' + } + text_flow.add{ + name='text', + type='label', + caption=task + } + local button_flow = flow.add{ + type='flow', + direction='horizontal' + } + if rank:allowed('edit-tasklist') then + edit:draw(button_flow) + remove:draw(button_flow) + add:draw(button_flow) + end + end + if rank:allowed('edit-tasklist') then + if not data._edit[player.index] then data._edit[player.index] = {_edit=false,_tasks={},_editing={}} end + end +end + +local function _tasks(player) + local player = Game.get_player(player) + local data = _global()._edit[player.index] + if not data then return _global().tasks end + local _edit = false + for _,v in pairs(data._editing) do + if v == true then + _edit = true + break + end + end + if data._edit and not _edit then + _global().tasks = table.deepcopy(data._tasks) + data._edit = false + Gui.left.update('tasklist') + elseif not data._edit and _edit then + data.tasks = table.deepcopy(_global()._tasks) + data._edit = true + elseif _edit then return data._tasks + else return _global().tasks + end +end + +Gui.left.add{ + name='tasklist', + caption='utility/not_enough_repair_packs_icon', + tooltip={'tasklist.tooltip'}, + draw=_draw, + open_on_join=true +} \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index cc87faf3..f7464d26 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -19,5 +19,6 @@ require('Guis/readme') require('Guis/science') require('Guis/rockets') require('Guis/player-list') +require('Guis/tasklist') -- other \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index a0133765..5a9de9ef 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -43,19 +43,22 @@ groups['Root']:edit('allow',false,{ ['player-list']=true, ['readme']=true, ['rockets']=true, - ['science']=true + ['science']=true, + ['tasklist']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, ['readme']=true, ['rockets']=true, - ['science']=true + ['science']=true, + ['tasklist']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, ['readme']=true, ['rockets']=true, - ['science']=true + ['science']=true, + ['tasklist']=true }) groups['Jail']:edit('allow',false,{ @@ -121,6 +124,10 @@ groups['User']:add_rank{ power=4 } +ranks['Member']:edit('allow',false,{ + ['edit-tasklist']=true +}) + Ranking._base_preset{ ['badgamernl']='Owner', ['arty714']='Community Manager', diff --git a/locale/en/tasklist.cfg b/locale/en/tasklist.cfg new file mode 100644 index 00000000..669a048b --- /dev/null +++ b/locale/en/tasklist.cfg @@ -0,0 +1,3 @@ +[tasklist] +name=Task List +tooltip=What jobs need to be done round the factory. From bd534210f9316a0dc776fe759da25eeed5b674ac Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 13:23:20 +0000 Subject: [PATCH 022/392] More Edits --- Addons/Guis/tasklist.lua | 54 ++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index 94f41396..5e87955c 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -10,7 +10,7 @@ Discord: https://discord.gg/r6dC2uK local function _global(reset) global.addons = not reset and global.addons or {} - global.addons.tasklist = not reset and global.addons.tasklist or {tasks={},_edit={}} + global.addons.tasklist = not reset and global.addons.tasklist or {tasks={},_edit={},_base={_edit=false,_tasks={},_editing={}}} return global.addons.tasklist end @@ -20,8 +20,9 @@ local edit = Gui.inputs.add{ caption='utility/rename_icon_normal' }:on_event('click',function(event) local text_flow = event.element.parent.parent.text_flow + local data = _global()._edit[frame.player_index] if text_flow.text.type == 'label' then - _global()._edit[event.player_index]._editing[text_flow.parent.name]=true + data._editing[text_flow.parent.name]=true local text = text_flow.text.caption text_flow.clear() local _text = text_flow.add{ @@ -33,33 +34,67 @@ local edit = Gui.inputs.add{ event.element.sprite = 'utility/enter' elseif text_flow.text.type == 'textfield' then local text = text_flow.text.text - _global()._edit[event.player_index]._editing[text_flow.parent.name]=false - _global()._edit[event.player_index]._tasks[text_flow.parent.name]=text + data._editing[text_flow.parent.name]=false + data._tasks[text_flow.parent.name]=text text_flow.parent.parent.clear() _draw(text_flow.parent.parent) end end) +local function _edit(frame) + local element = edit:draw() + local text_flow = element.parent.parent.text_flow + local data = _global()._edit[frame.player_index] + if data._editing[text_flow.parent.name] then + local text = text_flow.text.caption + text_flow.clear() + local _text = text_flow.add{ + name='text', + type='textfield', + text=text + } + _text.style.width = 100 + element.sprite = 'utility/enter' + end +end + local remove = Gui.inputs.add{ name='tasklist-remove', type='button', caption='utility/remove' -} +}:on_event('click',function(event) + local frame = event.element.parent.parent.parent + local data = _global()._edit[event.player_index] + table.remove(data._tasks,frame.name) + table.remove(data._editing,frame.name) + frame.clear() + _draw(frame) +end) local add = Gui.inputs.add{ name='tasklist-add', type='button', caption='add' -} +}:on_event('click',function(event) + local frame = event.element.parent.parent.parent + local data = _global()._edit[event.player_index] + table.insert(data._tasks,frame.name,'New Value') + table.insert(data._editing,frame.name,true) + frame.clear() + _draw(frame) +end) local function _draw(frame) frame.caption = {'tasklist.name'} local data = _global() local player = Game.get_player(frame.player_index) local rank = Ranking.get_rank(player) + if rank:allowed('edit-tasklist') then + if not data._edit[player.index] then data._edit[player.index] = data._base end + end for i,task in pairs(_tasks(player)) do local flow = frame.add{ - name=i-- use parent and children so there dont colidide with each other + name=i type='flow', direction='horizontal' } @@ -78,14 +113,11 @@ local function _draw(frame) direction='horizontal' } if rank:allowed('edit-tasklist') then - edit:draw(button_flow) + _edit(button_flow) remove:draw(button_flow) add:draw(button_flow) end end - if rank:allowed('edit-tasklist') then - if not data._edit[player.index] then data._edit[player.index] = {_edit=false,_tasks={},_editing={}} end - end end local function _tasks(player) From b4ab65b1a720890f4c5993b7d3f6e80f1a0c4aaf Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 13:42:02 +0000 Subject: [PATCH 023/392] Trying To find error --- Addons/Guis/tasklist.lua | 83 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index 5e87955c..ff37a5fa 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -37,7 +37,7 @@ local edit = Gui.inputs.add{ data._editing[text_flow.parent.name]=false data._tasks[text_flow.parent.name]=text text_flow.parent.parent.clear() - _draw(text_flow.parent.parent) + Gui.left.update('tasklist',event.player_index) end end) @@ -67,8 +67,7 @@ local remove = Gui.inputs.add{ local data = _global()._edit[event.player_index] table.remove(data._tasks,frame.name) table.remove(data._editing,frame.name) - frame.clear() - _draw(frame) + Gui.left.update('tasklist',event.player_index) end) local add = Gui.inputs.add{ @@ -80,46 +79,9 @@ local add = Gui.inputs.add{ local data = _global()._edit[event.player_index] table.insert(data._tasks,frame.name,'New Value') table.insert(data._editing,frame.name,true) - frame.clear() - _draw(frame) + Gui.left.update('tasklist',event.player_index) end) -local function _draw(frame) - frame.caption = {'tasklist.name'} - local data = _global() - local player = Game.get_player(frame.player_index) - local rank = Ranking.get_rank(player) - if rank:allowed('edit-tasklist') then - if not data._edit[player.index] then data._edit[player.index] = data._base end - end - for i,task in pairs(_tasks(player)) do - local flow = frame.add{ - name=i - type='flow', - direction='horizontal' - } - local text_flow = flow.add{ - name='text_flow', - type='flow', - direction='horizontal' - } - text_flow.add{ - name='text', - type='label', - caption=task - } - local button_flow = flow.add{ - type='flow', - direction='horizontal' - } - if rank:allowed('edit-tasklist') then - _edit(button_flow) - remove:draw(button_flow) - add:draw(button_flow) - end - end -end - local function _tasks(player) local player = Game.get_player(player) local data = _global()._edit[player.index] @@ -147,6 +109,43 @@ Gui.left.add{ name='tasklist', caption='utility/not_enough_repair_packs_icon', tooltip={'tasklist.tooltip'}, - draw=_draw, + draw=function(frame) + frame.caption = {'tasklist.name'} + local data = _global() + local player = Game.get_player(frame.player_index) + local rank = Ranking.get_rank(player) + if rank:allowed('edit-tasklist') then + if not data._edit[player.index] then data._edit[player.index] = data._base end + end + for i,task in pairs(_tasks(player)) do + local flow = frame.add{ + name=i + type='flow', + direction='horizontal' + } + local text_flow = flow.add{ + name='text_flow', + type='flow', + direction='horizontal' + } + text_flow.add{ + name='text', + type='label', + caption=task + } + local button_flow = flow.add{ + type='flow', + direction='horizontal' + } + if rank:allowed('edit-tasklist') then + _edit(button_flow) + remove:draw(button_flow) + add:draw(button_flow) + end + end + if #_tasks(player) == 0 then + add:draw(button_flow) + end + end, open_on_join=true } \ No newline at end of file From 603278f43f32772e29b715f9674cded4e9648549 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 13:45:29 +0000 Subject: [PATCH 024/392] Fixed Error in sytax --- Addons/Guis/tasklist.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index ff37a5fa..3eebdc69 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -119,7 +119,7 @@ Gui.left.add{ end for i,task in pairs(_tasks(player)) do local flow = frame.add{ - name=i + name=i, type='flow', direction='horizontal' } From 16204a4bc74517c5920d5f10b9bfca33b9784d5c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 14:49:26 +0000 Subject: [PATCH 025/392] Tasklist Done --- Addons/Guis/tasklist.lua | 84 ++++++++++++++++++++++++---------------- Addons/load.lua | 2 +- locale/en/tasklist.cfg | 1 + 3 files changed, 53 insertions(+), 34 deletions(-) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index 3eebdc69..fa22c5ae 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -20,40 +20,33 @@ local edit = Gui.inputs.add{ caption='utility/rename_icon_normal' }:on_event('click',function(event) local text_flow = event.element.parent.parent.text_flow - local data = _global()._edit[frame.player_index] - if text_flow.text.type == 'label' then - data._editing[text_flow.parent.name]=true - local text = text_flow.text.caption - text_flow.clear() - local _text = text_flow.add{ - name='text', - type='textfield', - text=text - } - _text.style.width = 100 - event.element.sprite = 'utility/enter' - elseif text_flow.text.type == 'textfield' then - local text = text_flow.text.text - data._editing[text_flow.parent.name]=false - data._tasks[text_flow.parent.name]=text - text_flow.parent.parent.clear() + local data = _global()._edit[event.player_index] + if not data._edit then data._tasks = table.deepcopy(_global().tasks) end + if text_flow.input.type == 'label' then + data._editing[tonumber(text_flow.parent.name)]=true + Gui.left.update('tasklist',event.player_index) + elseif text_flow.input.type == 'textfield' then + local text = text_flow.input.text + data._editing[tonumber(text_flow.parent.name)]=false + data._tasks[tonumber(text_flow.parent.name)]=text Gui.left.update('tasklist',event.player_index) end end) local function _edit(frame) - local element = edit:draw() + local element = edit:draw(frame) local text_flow = element.parent.parent.text_flow local data = _global()._edit[frame.player_index] - if data._editing[text_flow.parent.name] then - local text = text_flow.text.caption + data._tasks[text_flow.parent.name]=text + if data._editing[tonumber(text_flow.parent.name)] then + local text = text_flow.input.caption text_flow.clear() local _text = text_flow.add{ - name='text', + name='input', type='textfield', text=text } - _text.style.width = 100 + _text.style.width = 200 element.sprite = 'utility/enter' end end @@ -63,22 +56,32 @@ local remove = Gui.inputs.add{ type='button', caption='utility/remove' }:on_event('click',function(event) - local frame = event.element.parent.parent.parent + local frame = event.element.parent.parent local data = _global()._edit[event.player_index] - table.remove(data._tasks,frame.name) - table.remove(data._editing,frame.name) + if data._edit then + table.remove(data._tasks,tonumber(frame.name)) + table.remove(data._editing,tonumber(frame.name)) + else + table.remove(_global().tasks,tonumber(frame.name)) + end Gui.left.update('tasklist',event.player_index) end) local add = Gui.inputs.add{ name='tasklist-add', type='button', - caption='add' + caption='utility/add' }:on_event('click',function(event) - local frame = event.element.parent.parent.parent + local frame = event.element.parent.parent local data = _global()._edit[event.player_index] - table.insert(data._tasks,frame.name,'New Value') - table.insert(data._editing,frame.name,true) + if data._edit then + table.insert(data._tasks,tonumber(frame.name)+1,'New Value') + table.insert(data._editing,tonumber(frame.name)+1,true) + else + data._tasks = table.deepcopy(_global().tasks) + table.insert(data._tasks,tonumber(frame.name)+1,'New Value') + table.insert(data._editing,tonumber(frame.name)+1,true) + end Gui.left.update('tasklist',event.player_index) end) @@ -95,11 +98,12 @@ local function _tasks(player) end if data._edit and not _edit then _global().tasks = table.deepcopy(data._tasks) - data._edit = false + _global()._edit[player.index] = table.deepcopy(_global()._base) Gui.left.update('tasklist') + return _global().tasks elseif not data._edit and _edit then - data.tasks = table.deepcopy(_global()._tasks) data._edit = true + return data._tasks elseif _edit then return data._tasks else return _global().tasks end @@ -115,7 +119,7 @@ Gui.left.add{ local player = Game.get_player(frame.player_index) local rank = Ranking.get_rank(player) if rank:allowed('edit-tasklist') then - if not data._edit[player.index] then data._edit[player.index] = data._base end + if not data._edit[player.index] then data._edit[player.index] = table.deepcopy(data._base) end end for i,task in pairs(_tasks(player)) do local flow = frame.add{ @@ -129,7 +133,7 @@ Gui.left.add{ direction='horizontal' } text_flow.add{ - name='text', + name='input', type='label', caption=task } @@ -144,8 +148,22 @@ Gui.left.add{ end end if #_tasks(player) == 0 then + local flow = frame.add{ + name=0, + type='flow', + direction='horizontal' + } + local button_flow = flow.add{ + type='flow', + direction='horizontal' + } add:draw(button_flow) end end, + can_open=function(player) + local rank = Ranking.get_rank(player) + if rank:allowed('edit-tasklist') or #_global().tasks > 0 then return true + else return {'tasklist.none'} end + end, open_on_join=true } \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index b4fcc41e..b33145af 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -local return_err = false +local return_err = true local _require = require local function require(path) local success, err = pcall(_require,path) diff --git a/locale/en/tasklist.cfg b/locale/en/tasklist.cfg index 669a048b..1e2baa06 100644 --- a/locale/en/tasklist.cfg +++ b/locale/en/tasklist.cfg @@ -1,3 +1,4 @@ [tasklist] name=Task List tooltip=What jobs need to be done round the factory. +none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file From 3fc4d0e87464b2ccfd7771f83687e5b0768105cc Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 14:50:36 +0000 Subject: [PATCH 026/392] Fixed One Bug --- Addons/Guis/tasklist.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index fa22c5ae..8578b3f1 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -63,6 +63,7 @@ local remove = Gui.inputs.add{ table.remove(data._editing,tonumber(frame.name)) else table.remove(_global().tasks,tonumber(frame.name)) + Gui.left.update('tasklist') end Gui.left.update('tasklist',event.player_index) end) From d35fda6803481b97294a2a48a56ec44795a395e3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 15:05:38 +0000 Subject: [PATCH 027/392] Added Smaller Buttons --- Addons/Guis/tasklist.lua | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index 8578b3f1..4a412a45 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -35,10 +35,14 @@ end) local function _edit(frame) local element = edit:draw(frame) + element.style.height = 20 + element.style.width = 20 local text_flow = element.parent.parent.text_flow local data = _global()._edit[frame.player_index] - data._tasks[text_flow.parent.name]=text - if data._editing[tonumber(text_flow.parent.name)] then + data._tasks[text_flow.parent.name]=text + if data._editing[tonumber(text_flow.parent.name)] then + element.style.height = 30 + element.style.width = 30 local text = text_flow.input.caption text_flow.clear() local _text = text_flow.add{ @@ -144,11 +148,22 @@ Gui.left.add{ } if rank:allowed('edit-tasklist') then _edit(button_flow) - remove:draw(button_flow) - add:draw(button_flow) + local element = remove:draw(button_flow) + element.style.height = 20 + element.style.width = 20 + local _element = add:draw(button_flow) + _element.style.height = 20 + _element.style.width = 20 + if data._edit[player.index]._editing[i] then + element.style.height = 30 + element.style.width = 30 + _element.style.height = 30 + _element.style.width = 30 + end end end if #_tasks(player) == 0 then + frame.style.visible = rank:allowed('edit-tasklist') local flow = frame.add{ name=0, type='flow', From 27732a28bb3629aa9d158b9535bf3317953d8343 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 15:26:35 +0000 Subject: [PATCH 028/392] Few Changes to how it looks --- Addons/Guis/tasklist.lua | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index 4a412a45..91860415 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -119,7 +119,16 @@ Gui.left.add{ caption='utility/not_enough_repair_packs_icon', tooltip={'tasklist.tooltip'}, draw=function(frame) - frame.caption = {'tasklist.name'} + frame.caption = '' + local title = frame.add{ + type='flow', + direction='horizontal' + } + title.add{ + type='label', + caption={'tasklist.name'}, + style='caption_label' + } local data = _global() local player = Game.get_player(frame.player_index) local rank = Ranking.get_rank(player) @@ -148,24 +157,19 @@ Gui.left.add{ } if rank:allowed('edit-tasklist') then _edit(button_flow) - local element = remove:draw(button_flow) - element.style.height = 20 - element.style.width = 20 - local _element = add:draw(button_flow) - _element.style.height = 20 - _element.style.width = 20 if data._edit[player.index]._editing[i] then + local element = remove:draw(button_flow) element.style.height = 30 element.style.width = 30 + local _element = add:draw(button_flow) _element.style.height = 30 _element.style.width = 30 end end end - if #_tasks(player) == 0 then - frame.style.visible = rank:allowed('edit-tasklist') - local flow = frame.add{ - name=0, + if rank:allowed('edit-tasklist') then + local flow = title.add{ + name=#_tasks(player), type='flow', direction='horizontal' } @@ -173,8 +177,11 @@ Gui.left.add{ type='flow', direction='horizontal' } - add:draw(button_flow) + local element = add:draw(button_flow) + element.style.height = 20 + element.style.width = 20 end + if #_tasks(player) == 0 and not rank:allowed('edit-tasklist') then frame.style.visible = false end end, can_open=function(player) local rank = Ranking.get_rank(player) From fbebff372d8922cb06c669bcfbfd9428d9056747 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 22:44:35 +0000 Subject: [PATCH 029/392] Adding Rank Changer --- Addons/Guis/rank-changer.lua | 18 ++++++++++++++++++ Addons/load.lua | 1 + locale/en/rank-changer.cfg | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 Addons/Guis/rank-changer.lua create mode 100644 locale/en/rank-changer.cfg diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua new file mode 100644 index 00000000..378db168 --- /dev/null +++ b/Addons/Guis/rank-changer.lua @@ -0,0 +1,18 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +Gui.center.add{ + name='rank-changer', + caption='Gui Center', + tooltip='Just a gui test', + draw=function(frame) + + end +} \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index b33145af..2eb88f36 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -26,5 +26,6 @@ require('Guis/science') require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') +require('Guis/rank-changer') -- other \ No newline at end of file diff --git a/locale/en/rank-changer.cfg b/locale/en/rank-changer.cfg new file mode 100644 index 00000000..c17254d8 --- /dev/null +++ b/locale/en/rank-changer.cfg @@ -0,0 +1,3 @@ +[rank-changer] +name=Rank Changer +tooltip=Change the rank of a player below you. \ No newline at end of file From 2ea3487a681555b8ef9c328af70b7a1120d08b2b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 23:08:35 +0000 Subject: [PATCH 030/392] Added Player-info --- Addons/Admin/player-info.lua | 35 +++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + locale/en/player_info.cfg | 8 ++++++++ 3 files changed, 44 insertions(+) create mode 100644 Addons/Admin/player-info.lua create mode 100644 locale/en/player_info.cfg diff --git a/Addons/Admin/player-info.lua b/Addons/Admin/player-info.lua new file mode 100644 index 00000000..9b9025a7 --- /dev/null +++ b/Addons/Admin/player-info.lua @@ -0,0 +1,35 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +function get_player_info(player,frame) + local player = Game.get_player(player) + if not player then return {} end + local _player = {} + _player.index = player.index + _player.name = player.name + _player.online = player.connected + _player.tag = player.tag + _player.color = player.color + _player.admin = player.admin + _player.online_time = player.online_time + _player.rank = Ranking.get_rank(player).name + _player.group = Ranking.get_group(player).name + if frame then + local frame = frame.add{type='frame',direction='vertical',style='image_frame'} + frame.add{type='label',caption={'player-info.name',_player.index,_player.name},style='caption_label'} + local _online = {'player-info.yes'}; if _player.online then _admin = {'player-info.no'} end + frame.add{type='label',caption={'player-info.online',_online,tick_to_display_format(_player.online_time)}} + local _admin = {'player-info.yes'}; if _player.admin then _admin = {'player-info.no'} end + frame.add{type='label',caption={'player-info.admin',_admin}} + frame.add{type='label',caption={'player-info.group',_player.group}} + frame.add{type='label',caption={'player-info.rank',_player.rank}} + end + return _player +end \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 2eb88f36..8b4a2c26 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -17,6 +17,7 @@ end -- this file will just contain all the diffrent requires -- admin dir +require('Asmin/player-info') -- commands dir diff --git a/locale/en/player_info.cfg b/locale/en/player_info.cfg new file mode 100644 index 00000000..834ebb19 --- /dev/null +++ b/locale/en/player_info.cfg @@ -0,0 +1,8 @@ +[player-info] +yes=Yes +no=No +name=[__1__] __2__ +online=Is Online: __1__ (__2__) +admin=Has Admin: __1__ +group=In User Group: __1__ +rank=Has Rank: __1__ \ No newline at end of file From e3b4ad3a42596cc983fa64caf49ff77cb3b1d839 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 23:50:47 +0000 Subject: [PATCH 031/392] Added Rank Changer --- Addons/Guis/rank-changer.lua | 117 ++++++++++++++++++++++++++++++++++- locale/en/rank-changer.cfg | 7 ++- 2 files changed, 120 insertions(+), 4 deletions(-) diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua index 378db168..9ce247ad 100644 --- a/Addons/Guis/rank-changer.lua +++ b/Addons/Guis/rank-changer.lua @@ -8,11 +8,122 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- +local function get_player_info(player,frame) + frame.add{ + type='label', + caption={'rank-changer.no-info-file'} + } +end + +local function _players(_player,root_frame,state) + local players = {'Select Player'} + local _players = state and game.players or game.connected_players + for _,player in pairs(_players) do + if player.name ~= _player.name then + table.insert(players,player.name) + end + end + return players +end + +local online_check = Gui.inputs.add_checkbox('online-check-rank-change',false,'Show Offline',false,function(player,element) + element.parent['player-drop-down-rank-change'].items = _players(player,element.parent,true) + element.parent['player-drop-down-rank-change'].selected_index = 1 +end,function(player,element) + element.parent['player-drop-down-rank-change'].items = _players(player,element.parent,false) + element.parent['player-drop-down-rank-change'].selected_index = 1 +end) + +local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-rank-change',_players,1,function(player,selected,items,element) + local player_info_flow = element.parent.parent.info_flow + player_info_flow.clear() + if selected == 'Select Player' then return + else get_player_info(selected,player_info_flow) end + local rank = Ranking.get_rank(player) + local _rank = Ranking.get_rank(selected) + if rank.power >= _rank.power then element.parent.parent.warning.caption = {'rank-change.warning'} + else element.parent.parent.warning.caption = '' end + element.parent.parent.player = selected +end) + +local function _ranks(player) + local ranks = {'Select Rank'} + local _rank = Raning.get_rank(player) + for _,rank in pairs(Ranking._ranks) do + if rank.power > _rank.power then + table.insert(ranks,rank.name) + end + end + return ranks +end + +local rank_drop_down = Gui.inputs.add_drop_down('rank-drop-down-rank-change',_ranks,1,function(player,selected,items,element) + element.parent.parent.rank = selected +end) + +local set_rank = Gui.inputs.add{ + type='button', + name='rank-change-set', + caption={'ranking.set-rank'} +}:on_event('click',function(event) + local dropdowns = event.element.parent + local rank = Ranking.get_rank(event) + local _rank = Ranking.get_rank(dropdowns.rank) + local _player = Game.get_player(dropdowns.player) + if not _player or not _rank then element.parent.parent.warning.caption = {'rank-change.invalid'} return end + if rank.power >= _rank.power then element.parent.parent.warning.caption = {'rank-change.rank-high'} return end + Ranking.give_rank(_player,_rank,event) + Gui.center.clear(event) +end) + Gui.center.add{ name='rank-changer', - caption='Gui Center', - tooltip='Just a gui test', + caption='utility/circuit_network_panel', + tooltip={'rank-changer.tooltip'}, draw=function(frame) - + frame.caption={'rank-changer.name'} + local frame = frame.add{ + type='flow', + direction='horizontal' + } + local dropdowns = frame.add{ + type='flow', + direction='vertical' + } + local player_info_flow = frame.add{ + name='info_flow', + type='flow', + direction='vertical' + } + player_info_flow.style.height = 200 + player_info_flow.style.width = 200 + local label = frame.add{ + type='label', + caption={'rank-changer.message'} + } + label.style.single_line = false + label.style.width = 200 + online_check:draw(dropdowns) + player_drop_down:draw(dropdowns) + rank_drop_down:draw(dropdowns) + local label = frame.add{ + name='warning' + type='label', + caption='', + style='bold_red_label' + } + label.style.single_line = false + label.style.width = 200 + set_rank:draw(dropdowns) + frame.add{ + name='player' + type='label', + caption='' + }.style.visible = false + frame.add{ + name='rank' + type='label', + caption='' + }.style.visible = false end } \ No newline at end of file diff --git a/locale/en/rank-changer.cfg b/locale/en/rank-changer.cfg index c17254d8..424f8163 100644 --- a/locale/en/rank-changer.cfg +++ b/locale/en/rank-changer.cfg @@ -1,3 +1,8 @@ [rank-changer] name=Rank Changer -tooltip=Change the rank of a player below you. \ No newline at end of file +tooltip=Change the rank of a player below you. +no-info-file=No info file was found +message=Please select a player and a rank, you can you give ranks to people below you. +warning=Warning, this player is a higher rank so you cant change their rank. +rank-high=This player is a higher rank, rank change failed! +invalid=The player or the rank is invalid please try again! From cb5d415c41edde4e7abbd54d3fe16dc44ef7c83a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 1 Jan 2018 23:56:14 +0000 Subject: [PATCH 032/392] Fixed A Few Bugs --- Addons/Guis/rank-changer.lua | 6 +++--- Addons/load.lua | 2 +- Addons/playerRanks.lua | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua index 9ce247ad..87cd1fcd 100644 --- a/Addons/Guis/rank-changer.lua +++ b/Addons/Guis/rank-changer.lua @@ -107,7 +107,7 @@ Gui.center.add{ player_drop_down:draw(dropdowns) rank_drop_down:draw(dropdowns) local label = frame.add{ - name='warning' + name='warning', type='label', caption='', style='bold_red_label' @@ -116,12 +116,12 @@ Gui.center.add{ label.style.width = 200 set_rank:draw(dropdowns) frame.add{ - name='player' + name='player', type='label', caption='' }.style.visible = false frame.add{ - name='rank' + name='rank', type='label', caption='' }.style.visible = false diff --git a/Addons/load.lua b/Addons/load.lua index 8b4a2c26..cc8390e2 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -17,7 +17,7 @@ end -- this file will just contain all the diffrent requires -- admin dir -require('Asmin/player-info') +require('Admin/player-info') -- commands dir diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 5a9de9ef..995c87d9 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -44,14 +44,16 @@ groups['Root']:edit('allow',false,{ ['readme']=true, ['rockets']=true, ['science']=true, - ['tasklist']=true + ['tasklist']=true, + ['rank-changer']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, ['readme']=true, ['rockets']=true, ['science']=true, - ['tasklist']=true + ['tasklist']=true, + ['rank-changer']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, From b130ad41fec516eee9cfefe1adb0f847adbf90d0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 2 Jan 2018 00:45:35 +0000 Subject: [PATCH 033/392] Change to player info --- Addons/Admin/player-info.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/player-info.lua b/Addons/Admin/player-info.lua index 9b9025a7..0246092e 100644 --- a/Addons/Admin/player-info.lua +++ b/Addons/Admin/player-info.lua @@ -23,10 +23,12 @@ function get_player_info(player,frame) _player.group = Ranking.get_group(player).name if frame then local frame = frame.add{type='frame',direction='vertical',style='image_frame'} + frame.style.width = 200 + frame.style.height = 150 frame.add{type='label',caption={'player-info.name',_player.index,_player.name},style='caption_label'} - local _online = {'player-info.yes'}; if _player.online then _admin = {'player-info.no'} end + local _online = {'player-info.no'}; if _player.online then _online = {'player-info.yes'} end frame.add{type='label',caption={'player-info.online',_online,tick_to_display_format(_player.online_time)}} - local _admin = {'player-info.yes'}; if _player.admin then _admin = {'player-info.no'} end + local _admin = {'player-info.no'}; if _player.admin then _admin = {'player-info.yes'} end frame.add{type='label',caption={'player-info.admin',_admin}} frame.add{type='label',caption={'player-info.group',_player.group}} frame.add{type='label',caption={'player-info.rank',_player.rank}} From d579544d95b0043f3d3e160875e67b977be12aed Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 2 Jan 2018 00:58:48 +0000 Subject: [PATCH 034/392] Edits to rank chander --- Addons/Guis/rank-changer.lua | 33 +++++++++++++++++---------------- locale/en/rank-changer.cfg | 1 + 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua index 87cd1fcd..dc69f4d8 100644 --- a/Addons/Guis/rank-changer.lua +++ b/Addons/Guis/rank-changer.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -local function get_player_info(player,frame) +local get_player_info = get_player_info or function(player,frame) frame.add{ type='label', caption={'rank-changer.no-info-file'} @@ -35,21 +35,21 @@ end,function(player,element) end) local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-rank-change',_players,1,function(player,selected,items,element) + element.parent.parent.player.caption = selected local player_info_flow = element.parent.parent.info_flow player_info_flow.clear() if selected == 'Select Player' then return else get_player_info(selected,player_info_flow) end local rank = Ranking.get_rank(player) local _rank = Ranking.get_rank(selected) - if rank.power >= _rank.power then element.parent.parent.warning.caption = {'rank-change.warning'} - else element.parent.parent.warning.caption = '' end - element.parent.parent.player = selected + if rank.power >= _rank.power then element.parent.warning.caption = {'rank-changer.warning'} + else element.parent.warning.caption = '' end end) local function _ranks(player) local ranks = {'Select Rank'} - local _rank = Raning.get_rank(player) - for _,rank in pairs(Ranking._ranks) do + local _rank = Ranking.get_rank(player) + for _,rank in pairs(Ranking._ranks()) do if rank.power > _rank.power then table.insert(ranks,rank.name) end @@ -58,20 +58,21 @@ local function _ranks(player) end local rank_drop_down = Gui.inputs.add_drop_down('rank-drop-down-rank-change',_ranks,1,function(player,selected,items,element) - element.parent.parent.rank = selected + element.parent.parent.rank.caption = selected end) local set_rank = Gui.inputs.add{ type='button', name='rank-change-set', - caption={'ranking.set-rank'} + caption={'rank-changer.set-rank'} }:on_event('click',function(event) local dropdowns = event.element.parent - local rank = Ranking.get_rank(event) - local _rank = Ranking.get_rank(dropdowns.rank) - local _player = Game.get_player(dropdowns.player) - if not _player or not _rank then element.parent.parent.warning.caption = {'rank-change.invalid'} return end - if rank.power >= _rank.power then element.parent.parent.warning.caption = {'rank-change.rank-high'} return end + local rank = Ranking.get_rank(event.player_index) + local _rank = Ranking.get_rank(dropdowns.parent.rank.caption) + local _player = Game.get_player(dropdowns.parent.player.caption) + if not _player or not _rank then dropdowns.warning.caption = {'rank-changer.invalid'} return end + local __rank = Ranking.get_rank(_player) + if rank.power >= __rank.power then dropdowns.warning.caption = {'rank-changer.rank-high'} return end Ranking.give_rank(_player,_rank,event) Gui.center.clear(event) end) @@ -80,7 +81,7 @@ Gui.center.add{ name='rank-changer', caption='utility/circuit_network_panel', tooltip={'rank-changer.tooltip'}, - draw=function(frame) + draw=function(self,frame) frame.caption={'rank-changer.name'} local frame = frame.add{ type='flow', @@ -97,7 +98,7 @@ Gui.center.add{ } player_info_flow.style.height = 200 player_info_flow.style.width = 200 - local label = frame.add{ + local label = dropdowns.add{ type='label', caption={'rank-changer.message'} } @@ -106,7 +107,7 @@ Gui.center.add{ online_check:draw(dropdowns) player_drop_down:draw(dropdowns) rank_drop_down:draw(dropdowns) - local label = frame.add{ + local label = dropdowns.add{ name='warning', type='label', caption='', diff --git a/locale/en/rank-changer.cfg b/locale/en/rank-changer.cfg index 424f8163..bbc7a51b 100644 --- a/locale/en/rank-changer.cfg +++ b/locale/en/rank-changer.cfg @@ -6,3 +6,4 @@ message=Please select a player and a rank, you can you give ranks to people belo warning=Warning, this player is a higher rank so you cant change their rank. rank-high=This player is a higher rank, rank change failed! invalid=The player or the rank is invalid please try again! +set-rank=Set Player Rank From cba7e63d7afd0040a10d4cadfea6a759f1a5ffab Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 3 Jan 2018 00:15:28 +0000 Subject: [PATCH 035/392] Added Camera to player info --- Addons/Admin/player-info.lua | 7 +++++-- Addons/Guis/rank-changer.lua | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/player-info.lua b/Addons/Admin/player-info.lua index 0246092e..b911620b 100644 --- a/Addons/Admin/player-info.lua +++ b/Addons/Admin/player-info.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -function get_player_info(player,frame) +function get_player_info(player,frame,add_cam) local player = Game.get_player(player) if not player then return {} end local _player = {} @@ -24,7 +24,7 @@ function get_player_info(player,frame) if frame then local frame = frame.add{type='frame',direction='vertical',style='image_frame'} frame.style.width = 200 - frame.style.height = 150 + frame.style.height = 275 frame.add{type='label',caption={'player-info.name',_player.index,_player.name},style='caption_label'} local _online = {'player-info.no'}; if _player.online then _online = {'player-info.yes'} end frame.add{type='label',caption={'player-info.online',_online,tick_to_display_format(_player.online_time)}} @@ -32,6 +32,9 @@ function get_player_info(player,frame) frame.add{type='label',caption={'player-info.admin',_admin}} frame.add{type='label',caption={'player-info.group',_player.group}} frame.add{type='label',caption={'player-info.rank',_player.rank}} + if add_cam then + Gui.cam_link{entity=player.character,frame=frame,width=200,height=75,zoom=0.5} + end end return _player end \ No newline at end of file diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua index dc69f4d8..a8d7d6e1 100644 --- a/Addons/Guis/rank-changer.lua +++ b/Addons/Guis/rank-changer.lua @@ -39,7 +39,7 @@ local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-rank-change' local player_info_flow = element.parent.parent.info_flow player_info_flow.clear() if selected == 'Select Player' then return - else get_player_info(selected,player_info_flow) end + else get_player_info(selected,player_info_flow,true) end local rank = Ranking.get_rank(player) local _rank = Ranking.get_rank(selected) if rank.power >= _rank.power then element.parent.warning.caption = {'rank-changer.warning'} From 8a9485a958db39b7c9024798e41d7433269033ea Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 3 Jan 2018 18:51:57 +0000 Subject: [PATCH 036/392] Added auto link to the player info --- Addons/Admin/player-info.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/player-info.lua b/Addons/Admin/player-info.lua index b911620b..d9d03245 100644 --- a/Addons/Admin/player-info.lua +++ b/Addons/Admin/player-info.lua @@ -33,7 +33,7 @@ function get_player_info(player,frame,add_cam) frame.add{type='label',caption={'player-info.group',_player.group}} frame.add{type='label',caption={'player-info.rank',_player.rank}} if add_cam then - Gui.cam_link{entity=player.character,frame=frame,width=200,height=75,zoom=0.5} + Gui.cam_link{entity=player.character,frame=frame,width=200,height=75,zoom=0.5,respawn_open=true} end end return _player From 336bbed051cbd1ffe85e199679e0fc8c5ce03497 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 3 Jan 2018 21:30:33 +0000 Subject: [PATCH 037/392] Added Admin Buttons --- Addons/Admin/admin.lua | 147 +++++++++++++++++++++++++++++++++++++++++ Addons/load.lua | 2 + locale/en/admin.cfg | 10 +++ 3 files changed, 159 insertions(+) create mode 100644 Addons/Admin/admin.lua create mode 100644 locale/en/admin.cfg diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua new file mode 100644 index 00000000..4f7a4bf3 --- /dev/null +++ b/Addons/Admin/admin.lua @@ -0,0 +1,147 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +Admin = Admin or {} + +local function append_name(reason,player) + local name = Game.get_player(player).name + local reason = reason or 'No Reason' + if not string.find(string.lower(reason),string.lower(name)) then return reason..' - '..name + else return reason end +end + +local function open(player,pre_select_player,pre_select_action) + if Admin.center then Gui.center.clear(player) Admin.center.open(player,pre_select_player,pre_select_action) end +end + +function Admin.allowed(player) + local player = Game.get_player(player) + return player.admin +end + +function Admin.btn_flow(frame,buttons) + local frame = frame.add{ + type='flow', + name='admin' + } + frame.add{ + type='label', + caption='', + name='player' + }.style.visible = false + local function format(btn) + btn.style.height = 30 + btn.style.width = 30 + end + if not buttons or buttons.ban then format(Admin.ban_btn:draw(frame)) end + if not buttons or buttons.kick then format(Admin.kick_btn:draw(frame)) end + if not buttons or buttons.jail then format(Admin.jail_btn:draw(frame)) end + if not buttons or buttons.go_to then format(Admin.go_to_btn:draw(frame)) end + if not buttons or buttons.bring then format(Admin.bring_btn:draw(frame)) end + return frame.player +end + +function Admin.take_action(action,player,by_player,reason) + if action == 'Ban' then Admin.ban(player,by_player,reason) + elseif action == 'Kick' then Admin.kick(player,by_player,reason) + elseif action == 'Jail' then Admin.jail(player,by_player,reason) + elseif action == 'Go To' then Admin.go_to(player,by_player) + elseif action == 'Bring' then Admin.bring(player,by_player) + end +end + +Admin.ban_btn = Gui.inputs.add{ + type='button', + name='admin-ban', + caption='utility/danger_icon' +}:on_event('click',function(event) + local parent = event.element.parent + pre_select_player = parent.player and parent.player.caption or nil + open(event.player_index,pre_select_player,'Ban') +end) + +function Admin.ban(player,by_player,reason) + local player = Game.get_player(player) + local _player = Game.get_player(by_player) + local reason = append_name(reason,_player) + local color = Color.to_hex(defines.text_color.crit) + discord_emit{title='Player Ban',color=color,description='There was a player banned.',['Player:']='<>'..player.name,['By:']='<>'.._player.name,['Reason:']=reason} + game.ban_player(player,reason) +end + +Admin.kick_btn = Gui.inputs.add{ + type='button', + name='admin-kick', + caption='utility/warning_icon' +}:on_event('click',function(event) + local parent = event.element.parent + pre_select_player = parent.player and parent.player.caption or nil + open(event.player_index,pre_select_player,'Kick') +end) + +function Admin.kick(player,by_player,reason) + local player = Game.get_player(player) + local _player = Game.get_player(by_player) + local reason = append_name(reason,_player) + local color = Color.to_hex(defines.text_color.high) + discord_emit{title='Player Kick',color=color,description='There was a player kicked.',['Player:']='<>'..player.name,['By:']='<>'.._player.name,['Reason:']=reason} + game.kick_player(player,reason) +end + +Admin.jail_btn = Gui.inputs.add{ + type='button', + name='admin-jail', + caption='utility/clock' +}:on_event('click',function(event) + local parent = event.element.parent + pre_select_player = parent.player and parent.player.caption or nil + open(event.player_index,pre_select_player,'Jail') +end) + +function Admin.jail(player,by_player,reason) + local player = Game.get_player(player) + local _player = Game.get_player(by_player) + local reason = append_name(reason,_player) + local color = Color.to_hex(defines.text_color.med) + discord_emit{title='Player Jail',color=color,description='There was a player jailed.',['Player:']=player.name,['By:']='<>'.._player.name,['Reason:']=reason} + Ranking.give_rank(player,'Jail',_player) +end + +Admin.go_to_btn = Gui.inputs.add{ + type='button', + name='admin-go-to', + caption='utility/export_slot' +}:on_event('click',function(event) + local parent = event.element.parent + pre_select_player = parent.player and parent.player.caption or nil + Admin.go_to(pre_select_player,event.player_index) +end) + +function Admin.go_to(player,by_player) + local player = Game.get_player(player) + local _player = Game.get_player(by_player) + _player.teleport(player.surface.find_non_colliding_position('player',player.position,32,1),player.surface) +end + +Admin.bring_btn = Gui.inputs.add{ + type='button', + name='admin-bring', + caption='utility/import_slot' +}:on_event('click',function(event) + local parent = event.element.parent + pre_select_player = parent.player and parent.player.caption or nil + Admin.bring(pre_select_player,event.player_index) +end) + +function Admin.bring(player,by_player) + local player = Game.get_player(player) + local _player = Game.get_player(by_player) + player.teleport(_player.surface.find_non_colliding_position('player',_player.position,32,1),_player.surface) +end \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index cc8390e2..11b66d23 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -18,6 +18,7 @@ end -- admin dir require('Admin/player-info') +require('Admin/admin') -- used with Guis/admin-gui, but can work without -- commands dir @@ -28,5 +29,6 @@ require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') require('Guis/rank-changer') +require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin -- other \ No newline at end of file diff --git a/locale/en/admin.cfg b/locale/en/admin.cfg new file mode 100644 index 00000000..025cd2eb --- /dev/null +++ b/locale/en/admin.cfg @@ -0,0 +1,10 @@ +[admin-commands] +name=Admin Commands +tooltip=Very powerful 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 chose the correct one! +warning=Warning, this player is a higher rank so you cant change their rank. +short-reason=Warning, this is a short reason please think i it could be made more clear. +rank-high=This player is a higher rank, please use in game command if you are sure about this! +invalid=The player or the action is invalid please try again! +take-action=Take Action From 163f9573aecff5308d2882dcd9f72fde1968ed12 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 3 Jan 2018 21:30:50 +0000 Subject: [PATCH 038/392] Added Admin Gui --- Addons/Guis/admin-gui.lua | 173 ++++++++++++++++++++++++++++++++++++++ Addons/playerRanks.lua | 6 +- 2 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 Addons/Guis/admin-gui.lua diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua new file mode 100644 index 00000000..aea2b09d --- /dev/null +++ b/Addons/Guis/admin-gui.lua @@ -0,0 +1,173 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +Admin = Admin or {} + +local get_player_info = get_player_info or function(player,frame) + frame.add{ + type='label', + caption={'admin-commands.no-info-file'} + } +end + +local function _players(_player,root_frame,state) + local players = {'Select Player'} + local _players = state and game.players or game.connected_players + for _,player in pairs(_players) do + if player.name ~= _player.name then + table.insert(players,player.name) + end + end + return players +end + +local online_check = Gui.inputs.add_checkbox('online-check-admin-commands',false,'Show Offline',false,function(player,element) + element.parent['player-drop-down-admin-commands'].items = _players(player,element.parent,true) + element.parent['player-drop-down-admin-commands'].selected_index = 1 +end,function(player,element) + element.parent['player-drop-down-admin-commands'].items = _players(player,element.parent,false) + element.parent['player-drop-down-admin-commands'].selected_index = 1 +end) + +local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-admin-commands',_players,1,function(player,selected,items,element) + element.parent.parent.player.caption = selected + local player_info_flow = element.parent.parent.info_flow + player_info_flow.clear() + if selected == 'Select Player' then return + else get_player_info(selected,player_info_flow,true) end + local rank = Ranking.get_rank(player) + local _rank = Ranking.get_rank(selected) + if rank.power >= _rank.power then element.parent.warning.caption = {'admin-commands.warning'} + else element.parent.warning.caption = '' end +end) + +local reason_input = Gui.inputs.add_text('reason-input-admin-commands',false,'Enter Reason',function(player,text,element) + if string.len(text) < 20 then + element.parent.warning.caption = {'admin-commands.short-reason'} + else + element.parent.warning.caption = '' + end +end) + +local function _actions(player) + return { + 'Select Action', + 'GoTo', + 'Bring', + 'Jail', + 'Kick', + 'Ban' + } +end + +local action_drop_down = Gui.inputs.add_drop_down('action-drop-down-rank-change',_actions,1,function(player,selected,items,element) + element.parent.parent.action.caption = selected + if selected == 'Jail' or selected == 'Kick' or selected == 'Ban' then + element.parent['reason-input-admin-commands'].style.visible = true + else + element.parent['reason-input-admin-commands'].style.visible = false + end +end) + +local take_action = Gui.inputs.add{ + type='button', + name='admin-commands-take', + caption={'admin-commands.take-action'} +}:on_event('click',function(event) + local dropdowns = event.element.parent + local rank = Ranking.get_rank(event.player_index) + local _action= dropdowns.parent.action.caption ~= 'Select Action' and dropdowns.parent.action.caption or nil + local _player = Game.get_player(dropdowns.parent.player.caption) + if not _player or not _action then dropdowns.warning.caption = {'admin-commands.invalid'} return end + local _rank = Ranking.get_rank(_player) + if rank.power >= _rank.power then dropdowns.warning.caption = {'admin-commands.rank-high'} return end + local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text + Admin.take_action(_action,_player,event.player_index,_reason) + Gui.center.clear(event) +end) + +Admin.center = Gui.center.add{ + name='admin-commands', + caption='utility/danger_icon', + tooltip={'admin-commands.tooltip'}, + open=function(event,pre_select_player,pre_select_action) + local _player = Game.get_player(pre_select_player) + local player = Game.get_player(event) + local _center = Gui._get_data('center')['admin-commands'] + local center_flow = Gui.center.get_flow(player) + if center_flow[_center.name] then Gui.center.clear(player) return end + local center_frame = center_flow.add{ + name=_center.name, + type='frame', + direction='vertical', + style=mod_gui.frame_style + } + -- only edit i made was passing diffrent arguments to the draw function + local success, err = pcall(_center.draw,center_frame,_player,pre_select_action) + if not success then error(err) end + player.opened=center_frame + end, + draw=function(frame,pre_select_player,pre_select_action) + frame.caption={'admin-commands.name'} + local frame = frame.add{ + type='flow', + direction='horizontal' + } + local dropdowns = frame.add{ + type='flow', + direction='vertical' + } + local player_info_flow = frame.add{ + name='info_flow', + type='flow', + direction='vertical' + } + player_info_flow.style.height = 200 + player_info_flow.style.width = 200 + local label = dropdowns.add{ + type='label', + caption={'admin-commands.message'} + } + label.style.single_line = false + label.style.width = 200 + online_check:draw(dropdowns) + local _drop = player_drop_down:draw(dropdowns) + Gui.set_dropdown_index(_drop,pre_select_player.name) + local _drop = action_drop_down:draw(dropdowns) + Gui.set_dropdown_index(_drop,pre_select_action) + local _text = reason_input:draw(dropdowns) + if pre_select_action == 'Jail' or pre_select_action == 'Kick' or pre_select_action == 'Ban' then + _text.style.visible = true else _text.style.visible = false + end + if pre_select_player then get_player_info(pre_select_player,player_info_flow,true) end + _text.style.width = 200 + local label = dropdowns.add{ + name='warning', + type='label', + caption='', + style='bold_red_label' + } + label.style.single_line = false + label.style.width = 200 + take_action:draw(dropdowns) + local _caption = pre_select_player and pre_select_player.name or '' + frame.add{ + name='player', + type='label', + caption=_caption + }.style.visible = false + local _caption = pre_select_action or '' + frame.add{ + name='action', + type='label', + caption=_caption + }.style.visible = false + end +} \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 995c87d9..04ca9388 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -45,7 +45,8 @@ groups['Root']:edit('allow',false,{ ['rockets']=true, ['science']=true, ['tasklist']=true, - ['rank-changer']=true + ['rank-changer']=true, + ['admin-commands']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -53,7 +54,8 @@ groups['Admin']:edit('allow',false,{ ['rockets']=true, ['science']=true, ['tasklist']=true, - ['rank-changer']=true + ['rank-changer']=true, + ['admin-commands']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, From f97c455c12cd97fc04308effcaea73f7f04c2e20 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 3 Jan 2018 21:31:04 +0000 Subject: [PATCH 039/392] Added rmb on player list --- Addons/Guis/player-list.lua | 37 +++++++++++++++++++++++++++++++++++-- locale/en/player-list.cfg | 5 +++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index a433a1ea..bd9b8734 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -14,6 +14,13 @@ local function _global(reset) return global.addons.player_list end +local get_player_info = get_player_info or function(player,frame) + frame.add{ + type='label', + caption={'player-list.no-info-file'} + } +end + local function update() Gui.left.update('player-list') end @@ -26,6 +33,15 @@ local function queue_update(tick) end end +local back_btn = Gui.inputs.add{ + type='button', + caption='utility/enter', + name='player-list-back' +}:on_event('click',function(event) + event.element.parent.parent.scroll.style.visible = true + event.element.parent.destroy() +end) + Gui.left.add{ name='player-list', caption='entity/player', @@ -41,15 +57,18 @@ Gui.left.add{ } for _,rank in pairs(Ranking._ranks()) do for _,player in pairs(rank:get_players(true)) do + local flow = player_list.add{type='flow'} if rank.short_hand == '' then - player_list.add{ + flow.add{ type='label', + name=player.name, style='caption_label', caption={'player-list.format-nil',tick_to_display_format(player.online_time),player.name} }.style.font_color = rank.colour else - player_list.add{ + flow.add{ type='label', + name=player.name, style='caption_label', caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand} }.style.font_color = rank.colour @@ -68,6 +87,20 @@ Event.register(defines.events.on_tick,function(event) end end) +Event.register(defines.events.on_gui_click,function(event) + if event.element and event.element.valid + and event.element.parent and event.element.parent.parent and event.element.parent.parent.parent + and event.element.parent.parent.parent.name == 'player-list' then else return end + if event.button == defines.mouse_button_type.right then else return end + local player_list = event.element.parent.parent.parent + player_list.scroll.style.visible = false + local flow = player_list.add{type='flow',direction='vertical'} + back_btn:draw(flow) + get_player_info(event.element.name,flow,true) + if event.player_index == Game.get_player(event.element.name).index then return end + if Admin and Admin.allowed(event.player_index) then Admin.btn_flow(flow).caption = event.element.name end +end) + Event.register(defines.events.on_player_joined_game,queue_update) Event.register(defines.events.on_player_left_game,queue_update) Event.register(defines.events.rank_change,queue_update) \ No newline at end of file diff --git a/locale/en/player-list.cfg b/locale/en/player-list.cfg index 66af1947..9adacd4d 100644 --- a/locale/en/player-list.cfg +++ b/locale/en/player-list.cfg @@ -1,4 +1,5 @@ [player-list] -tooltip=Toggles The PLayer List +tooltip=Toogle player list, right click player for info format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ \ No newline at end of file +format=__1__ - __2__ - __3__ +no-info-file=No info file was found \ No newline at end of file From 7c3f94ffd683ab11060c564a35494d87a006e49f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 3 Jan 2018 22:23:11 +0000 Subject: [PATCH 040/392] Adding Game Settings Gui --- Addons/Guis/game-settings.lua | 10 ++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 Addons/Guis/game-settings.lua diff --git a/Addons/Guis/game-settings.lua b/Addons/Guis/game-settings.lua new file mode 100644 index 00000000..c01e0648 --- /dev/null +++ b/Addons/Guis/game-settings.lua @@ -0,0 +1,10 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + diff --git a/Addons/load.lua b/Addons/load.lua index 11b66d23..4562beb4 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -30,5 +30,6 @@ require('Guis/player-list') require('Guis/tasklist') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin +require('Guis/game-settings') -- other \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 04ca9388..85834a56 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -128,6 +128,10 @@ groups['User']:add_rank{ power=4 } +rank['Admin']:edit('allow',false,{ + ['game-settings']=true +}) + ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true }) From 545a17d22aa31d420234603970ce53a55b98149b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 3 Jan 2018 23:48:42 +0000 Subject: [PATCH 041/392] Adding game settings gui --- Addons/Guis/game-settings.lua | 137 ++++++++++++++++++++++++++++++++++ locale/en/game-settings.cfg | 12 +++ 2 files changed, 149 insertions(+) create mode 100644 locale/en/game-settings.cfg diff --git a/Addons/Guis/game-settings.lua b/Addons/Guis/game-settings.lua index c01e0648..1ce06ae5 100644 --- a/Addons/Guis/game-settings.lua +++ b/Addons/Guis/game-settings.lua @@ -8,3 +8,140 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- +--{type='slider',object='',key='',name='',min=x,max=y} +--{type='function',object='',key='',name='',param={}} +local basic_settings = { + -- mining + -- crafting + -- running + -- build distance + -- reach + -- bot speed + -- lab speed + -- stack bonus +} + +local advanced_settings = { + -- hotbar count + -- inventory size + -- mining prog + -- game speed + -- force crc -function + -- save game -function + -- reset force -function + -- reload effects -function + -- kill bitters -function + -- re chart map -function +} + +local personal_settings = { + -- craft speed + -- mining speed + -- running speed + -- build distance + -- reach distance + -- quick bar count + -- inventory slots +} + +local _root_list = {basic_settings=basic_settings,advanced_settings=advanced_settings,personal_settings=personal_settings} + +local function _get_data(root_frame) + local object = root_frame.name + local key = root_frame.setting_name.caption + local data = _root_list[object] and _root_list[object][key] + return data +end + +local function _object_list(player) return {game=game,player=player,force=player.force} end + +for name,group in pairs(_root_list) do + for key,setting in pairs(group) do + if key ~= '_loaded' and key ~= key then + local _added = nil + if setting.type == 'slider' then + _added = Gui.inputs.add_slider('game-settings-'..setting.name,'horizontal',setting.min,setting.max, + function(player,root_frame) + local data = _get_data(root_frame) + local objects = _object_list(player) + local object = objects[data.object] + return object[data.key] or nil + end, + function(player,value,percent,element) + local data = _get_data(element.parent) + local objects = _object_list(player) + local object = objects[data.object] + object[key] = value + element.parent.counter.caption = tostring(value) + end + ) + elseif setting.type == 'function' then + _added = Gui.add_check('game-settings-'..setting.name,true,nil,false,function(player,element) + local data = _get_data(element.parent) + local objects = _object_list(player) + local object = objects[data.object] + pcall(object[data.key],unpack(data.params)) + end) + end + setting._loaded = _added + setting._group = name + end + end +end + +local function _draw_setting(frame,setting) + local frame = frame.add{ + type='flow', + name=setting._group + } + frame.add{ + type='label', + caption={'game-settings.effect-'..setting.name}, + style='caption_label' + } + frame.add{ + type='label', + caption=settings.name, + name='setting_name' + } + if setting.type == 'slider' then + local slider = setting._loaded:draw(frame) + frame.add{ + type='label', + name='counter', + caption=tostring(slider.value) + } + elseif setting.type == 'function' then + setting._loaded:draw(frame) + end +end + +Gui.center.add{ + name='game-settings', + caption='utility/no_building_material_icon', + tooltip={'game-settings.tooltip'} +}:add_tab('basic',{'game-settings.basic-name'},{'game-settings.basic-name'},function(frame) + for _,setting in pairs(basic_settings) do + frame.add{ + type='label', + caption={'game-settings.basic-message'} + } + _draw_setting(frame,setting) + end +end):add_tab('advanced',{'game-settings.advanced-name'},{'game-settings.advanced-tooltip'},function(frame) + for _,setting in pairs(advanced_settings) do + frame.add{ + type='label', + caption={'game-settings.advanced-message'} + } + _draw_setting(frame,setting) + end +end):add_tab('personal',{'game-settings.personal-name'},{'game-settings.personal-tooltip'},function(frame) + for _,setting in pairs(personal_settings) do + frame.add{ + type='label', + caption={'game-settings.personal-message'} + } + _draw_setting(frame,setting) + end +end) \ No newline at end of file diff --git a/locale/en/game-settings.cfg b/locale/en/game-settings.cfg new file mode 100644 index 00000000..dd6fad1f --- /dev/null +++ b/locale/en/game-settings.cfg @@ -0,0 +1,12 @@ +[game-settings] +name=Game Settings +tooltip=Allows for editing of the game settings, please use resposibliy. +basic-name=Basic Settings +basic-tooltip=These settings are safe to change with no large effects. +basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. +advanced-name=Advanced Settings +advanced-tooltip=These settings should be left alone unless you know what you are doing. +advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. +personal-name=Personal Settings +personal-tooltip=These will only effect you, if you are spoted you are on your own. +personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. \ No newline at end of file From fd308286decd60190db1ddbe2960f20c183ed5b3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 4 Jan 2018 00:41:27 +0000 Subject: [PATCH 042/392] Adding Game Settings Gui Works --- Addons/Guis/game-settings.lua | 97 ++++++++++++++++++----------------- Addons/playerRanks.lua | 2 +- locale/en/game-settings.cfg | 6 ++- 3 files changed, 55 insertions(+), 50 deletions(-) diff --git a/Addons/Guis/game-settings.lua b/Addons/Guis/game-settings.lua index 1ce06ae5..fe23d79a 100644 --- a/Addons/Guis/game-settings.lua +++ b/Addons/Guis/game-settings.lua @@ -11,8 +11,8 @@ Discord: https://discord.gg/r6dC2uK --{type='slider',object='',key='',name='',min=x,max=y} --{type='function',object='',key='',name='',param={}} local basic_settings = { - -- mining - -- crafting + {type='slider',object='force',key='manual_mining_speed_modifier',name='mining-speed',min=0,max=10}, + {type='slider',object='force',key='manual_crafting_speed_modifier',name='craft-speed',min=0,max=10} -- running -- build distance -- reach @@ -22,12 +22,12 @@ local basic_settings = { } local advanced_settings = { - -- hotbar count + {type='slider',object='force',key='quickbar_count',name='quickbar-count',min=1,max=5}, -- inventory size -- mining prog -- game speed -- force crc -function - -- save game -function + {type='function',object='game',key='server_save',name='save'} -- reset force -function -- reload effects -function -- kill bitters -function @@ -35,8 +35,8 @@ local advanced_settings = { } local personal_settings = { - -- craft speed - -- mining speed + {type='slider',object='player',key='character_mining_speed_modifier',name='mining-speed',min=0,max=10}, + {type='slider',object='player',key='character_crafting_speed_modifier',name='craft-speed',min=0,max=10} -- running speed -- build distance -- reach distance @@ -49,47 +49,48 @@ local _root_list = {basic_settings=basic_settings,advanced_settings=advanced_set local function _get_data(root_frame) local object = root_frame.name local key = root_frame.setting_name.caption - local data = _root_list[object] and _root_list[object][key] - return data + for _,setting in pairs(_root_list[object]) do + if key == setting.key then return setting end + end end local function _object_list(player) return {game=game,player=player,force=player.force} end for name,group in pairs(_root_list) do for key,setting in pairs(group) do - if key ~= '_loaded' and key ~= key then - local _added = nil - if setting.type == 'slider' then - _added = Gui.inputs.add_slider('game-settings-'..setting.name,'horizontal',setting.min,setting.max, - function(player,root_frame) - local data = _get_data(root_frame) - local objects = _object_list(player) - local object = objects[data.object] - return object[data.key] or nil - end, - function(player,value,percent,element) - local data = _get_data(element.parent) - local objects = _object_list(player) - local object = objects[data.object] - object[key] = value - element.parent.counter.caption = tostring(value) - end - ) - elseif setting.type == 'function' then - _added = Gui.add_check('game-settings-'..setting.name,true,nil,false,function(player,element) + local _added = nil + if setting.type == 'slider' then + _added = Gui.inputs.add_slider('game-settings-'..setting.name,'horizontal',setting.min,setting.max, + function(player,root_frame) + local data = _get_data(root_frame) + local objects = _object_list(player) + local object = objects[data.object] + return object[data.key] or 1 + end, + function(player,value,percent,element) local data = _get_data(element.parent) local objects = _object_list(player) local object = objects[data.object] - pcall(object[data.key],unpack(data.params)) - end) - end - setting._loaded = _added - setting._group = name + object[data.key] = value + element.parent.counter.caption = tostring(value) + end + ) + elseif setting.type == 'function' then + _added = Gui.inputs.add_checkbox('game-settings-'..setting.name,true,nil,false,function(player,element) + local data = _get_data(element.parent) + local objects = _object_list(player) + local object = objects[data.object] + pcall(object[data.key],unpack(data.params)) + end) + if not setting.params then setting.params = {} end end + setting._loaded = _added + setting._group = name end end local function _draw_setting(frame,setting) + local frame = frame.add{type='flow'} local frame = frame.add{ type='flow', name=setting._group @@ -101,15 +102,15 @@ local function _draw_setting(frame,setting) } frame.add{ type='label', - caption=settings.name, + caption=setting.key, name='setting_name' - } + }.style.visible = false if setting.type == 'slider' then local slider = setting._loaded:draw(frame) frame.add{ type='label', name='counter', - caption=tostring(slider.value) + caption=tostring(slider.slider_value) } elseif setting.type == 'function' then setting._loaded:draw(frame) @@ -121,27 +122,27 @@ Gui.center.add{ caption='utility/no_building_material_icon', tooltip={'game-settings.tooltip'} }:add_tab('basic',{'game-settings.basic-name'},{'game-settings.basic-name'},function(frame) + frame.add{ + type='label', + caption={'game-settings.basic-message'} + }.style.single_line = false for _,setting in pairs(basic_settings) do - frame.add{ - type='label', - caption={'game-settings.basic-message'} - } _draw_setting(frame,setting) end end):add_tab('advanced',{'game-settings.advanced-name'},{'game-settings.advanced-tooltip'},function(frame) + frame.add{ + type='label', + caption={'game-settings.advanced-message'} + }.style.single_line = false for _,setting in pairs(advanced_settings) do - frame.add{ - type='label', - caption={'game-settings.advanced-message'} - } _draw_setting(frame,setting) end end):add_tab('personal',{'game-settings.personal-name'},{'game-settings.personal-tooltip'},function(frame) + frame.add{ + type='label', + caption={'game-settings.personal-message'} + }.style.single_line = false for _,setting in pairs(personal_settings) do - frame.add{ - type='label', - caption={'game-settings.personal-message'} - } _draw_setting(frame,setting) end end) \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 85834a56..1fc1fe70 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -128,7 +128,7 @@ groups['User']:add_rank{ power=4 } -rank['Admin']:edit('allow',false,{ +ranks['Admin']:edit('allow',false,{ ['game-settings']=true }) diff --git a/locale/en/game-settings.cfg b/locale/en/game-settings.cfg index dd6fad1f..e9468aac 100644 --- a/locale/en/game-settings.cfg +++ b/locale/en/game-settings.cfg @@ -9,4 +9,8 @@ advanced-tooltip=These settings should be left alone unless you know what you ar advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. personal-name=Personal Settings personal-tooltip=These will only effect you, if you are spoted you are on your own. -personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. \ No newline at end of file +personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. +effect-mining-speed=Mining Speed +effect-craft-speed=Crafting Speed +effect-quickbar-count=Quickbar Count +effect-save=Save Game \ No newline at end of file From 4b283a2a12bbb1bb7e23c6bd58fd731bfdce87fe Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 4 Jan 2018 13:16:35 +0000 Subject: [PATCH 043/392] Added All Settings To Game Settings --- Addons/Guis/game-settings.lua | 90 ++++++++++++++++++++++++----------- locale/en/game-settings.cfg | 17 ++++++- 2 files changed, 78 insertions(+), 29 deletions(-) diff --git a/Addons/Guis/game-settings.lua b/Addons/Guis/game-settings.lua index fe23d79a..949a494f 100644 --- a/Addons/Guis/game-settings.lua +++ b/Addons/Guis/game-settings.lua @@ -12,36 +12,36 @@ Discord: https://discord.gg/r6dC2uK --{type='function',object='',key='',name='',param={}} local basic_settings = { {type='slider',object='force',key='manual_mining_speed_modifier',name='mining-speed',min=0,max=10}, - {type='slider',object='force',key='manual_crafting_speed_modifier',name='craft-speed',min=0,max=10} - -- running - -- build distance - -- reach - -- bot speed - -- lab speed - -- stack bonus + {type='slider',object='force',key='manual_crafting_speed_modifier',name='craft-speed',min=0,max=10}, + {type='slider',object='force',key='character_running_speed_modifier',name='running-speed',min=0,max=10}, + {type='slider',object='force',key='character_build_distance_bonus',name='build-distance',min=0,max=50}, + {type='slider',object='force',key='character_reach_distance_bonus',name='reach-distance',min=0,max=50}, + {type='slider',object='force',key='worker_robots_speed_modifier',name='bot-speed',min=0,max=10}, + {type='slider',object='force',key='laboratory_speed_modifier',name='lab-speed',min=0,max=10}, + {type='slider',object='force',key='stack_inserter_capacity_bonus',name='stack-bonus',min=1,max=30} } local advanced_settings = { {type='slider',object='force',key='quickbar_count',name='quickbar-count',min=1,max=5}, - -- inventory size - -- mining prog - -- game speed - -- force crc -function - {type='function',object='game',key='server_save',name='save'} - -- reset force -function - -- reload effects -function - -- kill bitters -function - -- re chart map -function + {type='slider',object='force',key='character_inventory_slots_bonus',name='inventory-size',min=0,max=1000}, + {type='slider',object='force',key='mining_drill_productivity_bonus',name='mining-prod',min=0,max=10}, + {type='slider',object='game',key='speed',name='game-speed',min=0.01,max=5}, + {type='function',object='game',key='server_save',name='save'}, + {type='function',object='force',key='reset_technology_effects',name='reload-effects'}, + {type='function',object='enemy',key='kill_all_units',name='kill-biters'}, + {type='function',object='force',key='rechart',name='reload-map'}, + {type='function',object='game',key='force_crc',name='crc'}, + {type='function',object='force',key='reset',name='reset-force'} } local personal_settings = { {type='slider',object='player',key='character_mining_speed_modifier',name='mining-speed',min=0,max=10}, - {type='slider',object='player',key='character_crafting_speed_modifier',name='craft-speed',min=0,max=10} - -- running speed - -- build distance - -- reach distance - -- quick bar count - -- inventory slots + {type='slider',object='player',key='character_crafting_speed_modifier',name='craft-speed',min=0,max=10}, + {type='slider',object='player',key='character_running_speed_modifier',name='running-speed',min=0,max=10}, + {type='slider',object='player',key='character_build_distance_bonus',name='build-distance',min=0,max=50}, + {type='slider',object='player',key='character_reach_distance_bonus',name='reach-distance',min=0,max=50}, + {type='slider',object='player',key='character_inventory_slots_bonus',name='inventory-size',min=0,max=1000}, + {type='slider',object='player',key='quickbar_count_bonus',name='quickbar-count',min=0,max=5} } local _root_list = {basic_settings=basic_settings,advanced_settings=advanced_settings,personal_settings=personal_settings} @@ -54,7 +54,7 @@ local function _get_data(root_frame) end end -local function _object_list(player) return {game=game,player=player,force=player.force} end +local function _object_list(player) return {game=game,player=player,force=player.force,enemy=game.forces['enemy']} end for name,group in pairs(_root_list) do for key,setting in pairs(group) do @@ -71,16 +71,27 @@ for name,group in pairs(_root_list) do local data = _get_data(element.parent) local objects = _object_list(player) local object = objects[data.object] - object[data.key] = value - element.parent.counter.caption = tostring(value) + local _caption = string.format('%.2f',value); if value > 2 then _caption = string.format('%.2f',math.floor(value)) end + object[data.key] = tonumber(_caption) + element.parent.counter.caption = _caption end ) elseif setting.type == 'function' then _added = Gui.inputs.add_checkbox('game-settings-'..setting.name,true,nil,false,function(player,element) - local data = _get_data(element.parent) + local data = _get_data(element.parent.parent) local objects = _object_list(player) local object = objects[data.object] pcall(object[data.key],unpack(data.params)) + Server.new_thread{ + timeout=60, + data=element + }:on_event('timeout',function(self) + if self.data and self.data.valid then + element.parent.parent['game-settings-are-you-sure'].state = false + self.data.parent.style.visible = false + self.data.state = false + end + end):open() end) if not setting.params then setting.params = {} end end @@ -89,6 +100,19 @@ for name,group in pairs(_root_list) do end end +local are_you_sure = Gui.inputs.add_checkbox('game-settings-are-you-sure',true,nil,false,function(player,element) + element.parent.sure.style.visible = true + Server.new_thread{ + timeout=600, + data=element + }:on_event('timeout',function(self) + if self.data and self.data.valid then + self.data.state = false + self.data.parent.sure.style.visible = false + end + end):open() +end) + local function _draw_setting(frame,setting) local frame = frame.add{type='flow'} local frame = frame.add{ @@ -107,13 +131,23 @@ local function _draw_setting(frame,setting) }.style.visible = false if setting.type == 'slider' then local slider = setting._loaded:draw(frame) + slider.style.width = 300 + local _caption = string.format('%.2f',slider.slider_value); if slider.slider_value > 2 then _caption = tostring(math.floor(slider.slider_value)) end frame.add{ type='label', name='counter', - caption=tostring(slider.slider_value) + caption=_caption } elseif setting.type == 'function' then - setting._loaded:draw(frame) + are_you_sure:draw(frame) + local flow = frame.add{type='flow',name='sure'} + flow.style.visible = false + flow.add{ + type='label', + caption={'game-settings.sure'}, + style='bold_red_label' + } + setting._loaded:draw(flow) end end diff --git a/locale/en/game-settings.cfg b/locale/en/game-settings.cfg index e9468aac..cfbcc6e9 100644 --- a/locale/en/game-settings.cfg +++ b/locale/en/game-settings.cfg @@ -10,7 +10,22 @@ advanced-message=Please do not touch these settings at all unless you know 100% personal-name=Personal Settings personal-tooltip=These will only effect you, if you are spoted you are on your own. personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. +sure=Are You Sure! effect-mining-speed=Mining Speed effect-craft-speed=Crafting Speed +effect-running-speed=Running Speed +effect-build-distance=Build Distance +effect-reach-distance=Reach Distance +effect-bot-speed=Bot Speed +effect-lab-speed=Lab Speed +effect-stack-bonus=Stack Bonus effect-quickbar-count=Quickbar Count -effect-save=Save Game \ No newline at end of file +effect-inventory-size=Inventory Size +effect-mining-prod=Mining Productivity +effect-game-speed=Game Speed +effect-save=Save Game +effect-reload-effects=Reload Effects +effect-reload-map=Reload Minimap +effect-kill-biters=Kill Biters +effect-crc=Force CRC Check +effect-reset-force=Reset Force \ No newline at end of file From 388c0eee205e5f6adeac8f315a6e0ecd6e4b38f9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 4 Jan 2018 13:24:36 +0000 Subject: [PATCH 044/392] Fixed Bug In Admin Gui --- Addons/Guis/admin-gui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index aea2b09d..034a57a9 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -139,7 +139,7 @@ Admin.center = Gui.center.add{ label.style.width = 200 online_check:draw(dropdowns) local _drop = player_drop_down:draw(dropdowns) - Gui.set_dropdown_index(_drop,pre_select_player.name) + if pre_select_player then Gui.set_dropdown_index(_drop,pre_select_player.name) end local _drop = action_drop_down:draw(dropdowns) Gui.set_dropdown_index(_drop,pre_select_action) local _text = reason_input:draw(dropdowns) From ab58b640bce10904794d5b5c9dda8cd5543b5477 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 4 Jan 2018 14:09:07 +0000 Subject: [PATCH 045/392] Added Discord Logging --- Addons/Admin/admin.lua | 31 ++++++++++++++++++----- Addons/Admin/discord.lua | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 Addons/Admin/discord.lua diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 4f7a4bf3..2d270034 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -71,8 +71,14 @@ function Admin.ban(player,by_player,reason) local player = Game.get_player(player) local _player = Game.get_player(by_player) local reason = append_name(reason,_player) - local color = Color.to_hex(defines.text_color.crit) - discord_emit{title='Player Ban',color=color,description='There was a player banned.',['Player:']='<>'..player.name,['By:']='<>'.._player.name,['Reason:']=reason} + discord_emit{ + title='Player Ban', + color=Color.to_hex(defines.text_color.crit), + description='There was a player banned.', + ['Player:']='<>'..player.name, + ['By:']='<>'.._player.name, + ['Reason:']=reason + } game.ban_player(player,reason) end @@ -90,8 +96,14 @@ function Admin.kick(player,by_player,reason) local player = Game.get_player(player) local _player = Game.get_player(by_player) local reason = append_name(reason,_player) - local color = Color.to_hex(defines.text_color.high) - discord_emit{title='Player Kick',color=color,description='There was a player kicked.',['Player:']='<>'..player.name,['By:']='<>'.._player.name,['Reason:']=reason} + discord_emit{ + title='Player Kick', + color=Color.to_hex(defines.text_color.high), + description='There was a player kicked.', + ['Player:']='<>'..player.name, + ['By:']='<>'.._player.name, + ['Reason:']=reason + } game.kick_player(player,reason) end @@ -109,8 +121,15 @@ function Admin.jail(player,by_player,reason) local player = Game.get_player(player) local _player = Game.get_player(by_player) local reason = append_name(reason,_player) - local color = Color.to_hex(defines.text_color.med) - discord_emit{title='Player Jail',color=color,description='There was a player jailed.',['Player:']=player.name,['By:']='<>'.._player.name,['Reason:']=reason} + discord_emit{ + title='Player Jail', + color=Color.to_hex(defines.text_color.med), + description='There was a player jailed.', + ['Player:']=player.name, + ['By:']='<>'.._player.name, + ['Reason:']=reason + } + Ranking._presets().last_jail = player.name Ranking.give_rank(player,'Jail',_player) end diff --git a/Addons/Admin/discord.lua b/Addons/Admin/discord.lua new file mode 100644 index 00000000..3b3fb063 --- /dev/null +++ b/Addons/Admin/discord.lua @@ -0,0 +1,53 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +Event.register(defines.events.on_console_command,function(event) + local command = event.command + local args = {} + if event.parameters then for word in event.parameters:gmatch('%S+') do table.insert(args,word) end end + local data = {} + data.title = string.gsub(command,'^%l',string.upper) + data.by = event.player_index and game.players[event.player_index].name or '' + if command == 'config' or command == 'banlist' then + discord_emit{ + title='Edit To '..data.title, + color=Color.to_hex(defines.text_color.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.reason = table.concat(args,' ',2) + elseif command == 'kick' then + data.colour = Color.to_hex(defines.text_color.med) + 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) + else return end + data.username = args[1] + if not Game.get_player(data.username) then return end + if string.sub(command,-1) == 'e' then data.command = command..'d' else data.command = command..'ed' end + data.reason = data.reason or 'No Reason Required' + discord_emit{ + title='Player '..data.title, + color=data.colour, + description='There was a player '..data.command..'.', + ['Player:']='<>'..data.username, + ['By:']='<>'..data.by, + ['Reason:']=data.reason + } + end +end) \ No newline at end of file From b1165cfa00275a39528605584516f5891e36024e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 4 Jan 2018 14:26:06 +0000 Subject: [PATCH 046/392] Fixed Reason and Added To Load --- Addons/Admin/discord.lua | 2 +- Addons/load.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/discord.lua b/Addons/Admin/discord.lua index 3b3fb063..815e3a0d 100644 --- a/Addons/Admin/discord.lua +++ b/Addons/Admin/discord.lua @@ -40,7 +40,7 @@ Event.register(defines.events.on_console_command,function(event) data.username = args[1] if not Game.get_player(data.username) then return end if string.sub(command,-1) == 'e' then data.command = command..'d' else data.command = command..'ed' end - data.reason = data.reason or 'No Reason Required' + data.reason = data.reason and not data.reason == '' or 'No Reason Required' discord_emit{ title='Player '..data.title, color=data.colour, diff --git a/Addons/load.lua b/Addons/load.lua index 4562beb4..6015ea0b 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -19,6 +19,7 @@ end -- admin dir require('Admin/player-info') require('Admin/admin') -- used with Guis/admin-gui, but can work without +require('Admin/discord') -- commands dir From 45d7323e55f32faa7d5c4eb3f60b25215a64f1a9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 13:10:10 +0000 Subject: [PATCH 047/392] Added Lots of Commands --- Addons/Commands/cheat-mode.lua | 15 +++++++++++++++ Addons/Commands/kill.lua | 22 ++++++++++++++++++++++ Addons/Commands/repair.lua | 29 +++++++++++++++++++++++++++++ Addons/Commands/tags.lua | 30 ++++++++++++++++++++++++++++++ Addons/Commands/tp.lua | 21 +++++++++++++++++++++ Addons/load.lua | 5 +++++ Addons/playerRanks.lua | 18 +++++++++++++++++- 7 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 Addons/Commands/cheat-mode.lua create mode 100644 Addons/Commands/kill.lua create mode 100644 Addons/Commands/repair.lua create mode 100644 Addons/Commands/tags.lua create mode 100644 Addons/Commands/tp.lua diff --git a/Addons/Commands/cheat-mode.lua b/Addons/Commands/cheat-mode.lua new file mode 100644 index 00000000..33a2a45e --- /dev/null +++ b/Addons/Commands/cheat-mode.lua @@ -0,0 +1,15 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +commands.add_command('cheat-mode', 'Toggles cheat mode for a player', {'player'}, function(event,args) + local player = Game.get_player(args.player) + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + player.cheat_mode = player.cheat_mode and false or true +end) \ No newline at end of file diff --git a/Addons/Commands/kill.lua b/Addons/Commands/kill.lua new file mode 100644 index 00000000..d1a788b8 --- /dev/null +++ b/Addons/Commands/kill.lua @@ -0,0 +1,22 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +commands.add_command('kill', 'Kills a player, must be either yourself (/kill self) or a person of a lower rank.', {'player'}, function(event,args) + local _player = Game.get_player(event) + local player = Game.get_player(args.player) + if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if _player.name == player.name or args.player == 'self' then + if _player.connected then else player_return({'commands.offline-player'}) return commands.error end + if _player.character then _player.character.die() else player_return({'commands.dead-player'}) return commands.error end + elseif Ranking.get_rank(player).power > Ranking.get_rank(_player).power then + if player.connected then else player_return({'commands.offline-player'}) return commands.error end + if player.character then player.character.die() else player_return({'commands.dead-player'}) return commands.error end + else player_return({'commands.unauthorized'}) return commands.error end +end) \ No newline at end of file diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua new file mode 100644 index 00000000..b5c80961 --- /dev/null +++ b/Addons/Commands/repair.lua @@ -0,0 +1,29 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local const = 100 +-- given const = 100: admin+ has unlimited, admin has 100, mod has 50, member has 20 + +commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area', {'range'}, function(event,args) + local range = tonumber(args.range) + local rank = Ranking.get_rank(event) + local highest_admin_power = Ranking.get_group('Admin').highest.power-1 + local max_range = rank.power-highest_admin_power > 0 and const/(rank.power-highest_admin_power) or nil + local center = Game.get_player(event) and Game.get_player(event).position or {x=0,y=0} + if not range or max_range and range > max_range then player_return({'commands.invalid-range',0,math.floor(max_range)}) return commands.error end + for x = -range-2, range+2 do + for y = -range-2, range+2 do + if x^2+y^2 < range^2 then + for key, entity in pairs(player.surface.find_entities_filtered({area={{x,y},{x+1,y+1}},type ='entity-ghost'})) do entity.revive() end + for key, entity in pairs(player.surface.find_entities({{x,y},{x+1,y+1}})) do if entity.health then entity.health = 10000 end end + end + end + end +end) \ No newline at end of file diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua new file mode 100644 index 00000000..51f5a0c8 --- /dev/null +++ b/Addons/Commands/tags.lua @@ -0,0 +1,30 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local const = 20 +-- this is the max lenth of a tag + +commands.add_command('tag', 'Give yourself a custom tag, use /tag-clear self, to remove tag.', {'tag',true}, function(event,args) + local player = Game.get_player(args.player) + local rank = Ranking.get_rank(player) + if string.len(args.tag) > const then player_return({'commands.invalid-length',const}) return commands.error end + player.tag = rank.tag..' - '..args.tag +end) + +commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self)', {'player'}, function(event,args) + local _player = Game.get_player(event) + local _rank = Ranking.get_rank(_player) + local player = Game.get_player(args.player) + local rank = Ranking.get_rank(player) + if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if _player.name == player.name or args.player == 'self' then _player.tag = _rank.tag + elseif _rank.power < rank.power then player.tag = rank.tag + else player_return({'commands.unauthorized'}) return commands.error end +end) \ No newline at end of file diff --git a/Addons/Commands/tp.lua b/Addons/Commands/tp.lua new file mode 100644 index 00000000..fdd4a74b --- /dev/null +++ b/Addons/Commands/tp.lua @@ -0,0 +1,21 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +commands.add_command('go-to', 'Go to a player\'s location', {'player'}, function(event,args) + local player = Game.get_player(args.player) + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + Admin.go_to(player,event) +end) + +commands.add_command('bring', 'Bring a player to your location', {'player'}, function(event,args) + local player = Game.get_player(args.player) + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + Admin.bring(player,event) +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 6015ea0b..f1194a97 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -22,6 +22,11 @@ require('Admin/admin') -- used with Guis/admin-gui, but can work without require('Admin/discord') -- commands dir +require('Commands/cheat-mode') +require('Commands/kill') +require('Commands/repair') +require('Commands/tags') +require('Commands/tp') -- requires Admin/admin -- guis dir require('Guis/readme') diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 1fc1fe70..a724befc 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -128,12 +128,28 @@ groups['User']:add_rank{ power=4 } +ranks['Developer']:edit('allow',false,{ + ['cheat-mode']=true +}) + ranks['Admin']:edit('allow',false,{ ['game-settings']=true }) +ranks['Mod']:edit('allow',false,{ + ['tp']=true, + ['bring']=true +}) ranks['Member']:edit('allow',false,{ - ['edit-tasklist']=true + ['edit-tasklist']=true, + ['repair']=true +}) +ranks['Regular']:edit('allow',false,{ + ['kill']=true +}) +ranks['Guest']:edit('allow',false,{ + ['tag']=true, + ['tag-clear']=true }) Ranking._base_preset{ From 78a0e74e3a5b2b132d4aab5e86674a4c9287b78a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 13:16:57 +0000 Subject: [PATCH 048/392] Moved where the ranks are made in playreRanks --- Addons/playerRanks.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index a724befc..eed6e790 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -37,7 +37,6 @@ http://lua-api.factorio.com/latest/defines.html#defines.input_action -- see ExpCore/ranks.lua for examples - you add your own and edit pre-made ones here. local groups = Ranking._groups(true) -local ranks = Ranking._ranks(true) groups['Root']:edit('allow',false,{ ['player-list']=true, @@ -128,6 +127,8 @@ groups['User']:add_rank{ power=4 } +local ranks = Ranking._ranks(true) + ranks['Developer']:edit('allow',false,{ ['cheat-mode']=true }) From 6863fd6da830ec97136a6607d938e95804e31d6c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 13:21:02 +0000 Subject: [PATCH 049/392] Fixed Go To --- Addons/playerRanks.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index eed6e790..0f9ebeed 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -137,7 +137,7 @@ ranks['Admin']:edit('allow',false,{ ['game-settings']=true }) ranks['Mod']:edit('allow',false,{ - ['tp']=true, + ['go-to']=true, ['bring']=true }) From b7d574ba6b51ae4724a53b7208af42d279ff96c2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 13:28:49 +0000 Subject: [PATCH 050/392] Fixed Self Bug --- Addons/Commands/kill.lua | 3 +-- Addons/Commands/tags.lua | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/kill.lua b/Addons/Commands/kill.lua index d1a788b8..6d68f03b 100644 --- a/Addons/Commands/kill.lua +++ b/Addons/Commands/kill.lua @@ -12,8 +12,7 @@ commands.add_command('kill', 'Kills a player, must be either yourself (/kill sel local _player = Game.get_player(event) local player = Game.get_player(args.player) if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if _player.name == player.name or args.player == 'self' then - if _player.connected then else player_return({'commands.offline-player'}) return commands.error end + if args.player == 'self' or _player.name == player.name then if _player.character then _player.character.die() else player_return({'commands.dead-player'}) return commands.error end elseif Ranking.get_rank(player).power > Ranking.get_rank(_player).power then if player.connected then else player_return({'commands.offline-player'}) return commands.error end diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua index 51f5a0c8..c4ac3758 100644 --- a/Addons/Commands/tags.lua +++ b/Addons/Commands/tags.lua @@ -24,7 +24,7 @@ commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/ta local player = Game.get_player(args.player) local rank = Ranking.get_rank(player) if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if _player.name == player.name or args.player == 'self' then _player.tag = _rank.tag + if args.player == 'self' or _player.name == player.name then _player.tag = _rank.tag elseif _rank.power < rank.power then player.tag = rank.tag else player_return({'commands.unauthorized'}) return commands.error end end) \ No newline at end of file From b1f9302982bebff5dfc0804732f4f3d844e3e8c0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 13:43:20 +0000 Subject: [PATCH 051/392] Fixed All Commands --- Addons/Commands/cheat-mode.lua | 2 +- Addons/Commands/repair.lua | 9 +++++---- Addons/Commands/tags.lua | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Addons/Commands/cheat-mode.lua b/Addons/Commands/cheat-mode.lua index 33a2a45e..a53ac99d 100644 --- a/Addons/Commands/cheat-mode.lua +++ b/Addons/Commands/cheat-mode.lua @@ -11,5 +11,5 @@ Discord: https://discord.gg/r6dC2uK commands.add_command('cheat-mode', 'Toggles cheat mode for a player', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - player.cheat_mode = player.cheat_mode and false or true + if player.cheat_mode == true then player.cheat_mode = false else player.cheat_mode = true end end) \ No newline at end of file diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index b5c80961..961f59a5 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -13,16 +13,17 @@ local const = 100 commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area', {'range'}, function(event,args) local range = tonumber(args.range) - local rank = Ranking.get_rank(event) + local player = Game.get_player(event) + local rank = Ranking.get_rank(player) local highest_admin_power = Ranking.get_group('Admin').highest.power-1 local max_range = rank.power-highest_admin_power > 0 and const/(rank.power-highest_admin_power) or nil - local center = Game.get_player(event) and Game.get_player(event).position or {x=0,y=0} + local center = player and player.position or {x=0,y=0} if not range or max_range and range > max_range then player_return({'commands.invalid-range',0,math.floor(max_range)}) return commands.error end for x = -range-2, range+2 do for y = -range-2, range+2 do if x^2+y^2 < range^2 then - for key, entity in pairs(player.surface.find_entities_filtered({area={{x,y},{x+1,y+1}},type ='entity-ghost'})) do entity.revive() end - for key, entity in pairs(player.surface.find_entities({{x,y},{x+1,y+1}})) do if entity.health then entity.health = 10000 end end + for key, entity in pairs(player.surface.find_entities_filtered({area={{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}},type='entity-ghost'})) do entity.revive() end + for key, entity in pairs(player.surface.find_entities({{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}})) do if entity.health then entity.health = 10000 end end end end end diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua index c4ac3758..6f4d3297 100644 --- a/Addons/Commands/tags.lua +++ b/Addons/Commands/tags.lua @@ -12,7 +12,7 @@ local const = 20 -- this is the max lenth of a tag commands.add_command('tag', 'Give yourself a custom tag, use /tag-clear self, to remove tag.', {'tag',true}, function(event,args) - local player = Game.get_player(args.player) + local player = Game.get_player(event) local rank = Ranking.get_rank(player) if string.len(args.tag) > const then player_return({'commands.invalid-length',const}) return commands.error end player.tag = rank.tag..' - '..args.tag From b1bfee8549ce170002b285c3d0a9bdc4895a958b Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 5 Jan 2018 14:00:01 +0000 Subject: [PATCH 052/392] Added All StandAlone Scripts --- StandAlone/colours.lua | 21 ++++ StandAlone/health.lua | 30 +++++ StandAlone/load.lua | 7 +- StandAlone/spawn.lua | 212 ++++++++++++++++++++++++++++++++++ StandAlone/starting-items.lua | 31 +++++ 5 files changed, 299 insertions(+), 2 deletions(-) create mode 100644 StandAlone/colours.lua create mode 100644 StandAlone/health.lua create mode 100644 StandAlone/spawn.lua create mode 100644 StandAlone/starting-items.lua diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua new file mode 100644 index 00000000..a1649a82 --- /dev/null +++ b/StandAlone/colours.lua @@ -0,0 +1,21 @@ + +-- made by cooldude - we are lazy and we want to always have the same colour, also uses std lib to auto assign random colours + +local default_colours = { + BADgamerNL={r=255,g=20,b=147}, + arty714={r=150,g=68,b=161}, + Cooldude2606={r=57,g=192,b=207}, + mark9064={r=99,g=0,b=255}, + eissturm={r=25,g=25,b=112} +} + +Event.register(defines.events.on_player_created, function(event) + local player = game.players[event.player_index] + local colours = table.keys(defines.color) + player.color = defines.color[colours[math.random(#colours)]] + if default_colours[player.name] then + local c = default_colours[player.name] + player.color = Color.from_rgb(c.r,c.g,c.b) + end + player.chat_color = player.color +end) diff --git a/StandAlone/health.lua b/StandAlone/health.lua new file mode 100644 index 00000000..3ce961db --- /dev/null +++ b/StandAlone/health.lua @@ -0,0 +1,30 @@ + +-- not made by cooldude :O - still i just copyed from a mod and made a few editing +-- https://mods.factorio.com/mods/chocolateTthunder/Show_Health +-- edits include: tick limit to avoid lag, only shows health when it is lost + + +Event.register(defines.events.on_tick, function(event) + if not (event.tick % 15 == 0) then return end + for _,player in pairs(game.connected_players) do + if player.character then + if player.character.health == nil then return end + local index = player.index + local health = math.ceil(player.character.health) + if global.player_health == nil then global.player_health = {} end + if global.player_health[index] == nil then global.player_health[index] = health end + if global.player_health[index] ~= health then + if health < global.player_health[index] then + if health > 200 then + player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=(health), position= {player.position.x, player.position.y-2}} + elseif health > 100 then + player.surface.create_entity{name="flying-text", color={r = 1, g = 1, b = 0}, text=(health), position= {player.position.x, player.position.y-2}} + else + player.surface.create_entity{name="flying-text", color={b = 0.1, r= 1, g = 0, a = 0.8}, text=(health), position= {player.position.x, player.position.y-2}} + end + end + global.player_health[index] = health + end + end + end +end) \ No newline at end of file diff --git a/StandAlone/load.lua b/StandAlone/load.lua index 0cd6ac7e..2f6fd4a9 100644 --- a/StandAlone/load.lua +++ b/StandAlone/load.lua @@ -7,5 +7,8 @@ Any changes that you may make to the code are yours but that does not make the s Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- - --- this file will just contain all the diffrent requires \ No newline at end of file +-- this file will just contain all the diffrent requires +require('colours') +require('health') +require('spawn') +require('starting-items') \ No newline at end of file diff --git a/StandAlone/spawn.lua b/StandAlone/spawn.lua new file mode 100644 index 00000000..df4bdd29 --- /dev/null +++ b/StandAlone/spawn.lua @@ -0,0 +1,212 @@ + +-- made by cooldude - this makes a spawn area and auto refill turents to protect the afk people, idk what it is at this point, but feel ffree to try and make it yours + +--[[ +note for positions +{-1,-1} {0,-1} {1,-1} +{-1,0} {0,0} {1,0} +{-1,1} {0,1} {1,1} +--]] +local tile_positions = { + {-49,-3},{-49,-2},{-49,1},{-49,2},{-49,5},{-49,6},{-48,-4},{-48,-3},{-48,-2},{-48,1},{-48,2},{-48,5},{-48,6},{-48,7},{-47,-7},{-47,-6},{-47,-5},{-47,-4},{-47,-3},{-47,-2},{-47,5},{-47,6},{-47,7},{-47,8},{-47,9},{-47,10},{-46,-8},{-46,-7},{-46,-6},{-46,-5}, + {-46,-4},{-46,-3},{-46,-2},{-46,-1},{-46,4},{-46,5},{-46,6},{-46,7},{-46,8},{-46,9},{-46,10},{-46,11},{-45,-17},{-45,-16},{-45,-15},{-45,-14},{-45,-13},{-45,-12},{-45,-9},{-45,-8},{-45,-7},{-45,-2},{-45,-1},{-45,0},{-45,1},{-45,2},{-45,3},{-45,4},{-45,5},{-45,10}, + {-45,11},{-45,12},{-45,15},{-45,16},{-45,17},{-45,18},{-45,19},{-45,20},{-44,-18},{-44,-17},{-44,-16},{-44,-15},{-44,-14},{-44,-13},{-44,-12},{-44,-9},{-44,-8},{-44,-1},{-44,0},{-44,1},{-44,2},{-44,3},{-44,4},{-44,11},{-44,12},{-44,15},{-44,16},{-44,17},{-44,18},{-44,19}, + {-44,20},{-44,21},{-43,-19},{-43,-18},{-43,-17},{-43,-1},{-43,0},{-43,1},{-43,2},{-43,3},{-43,4},{-43,20},{-43,21},{-43,22},{-42,-19},{-42,-18},{-42,-1},{-42,0},{-42,1},{-42,2},{-42,3},{-42,4},{-42,21},{-42,22},{-41,-25},{-41,-24},{-41,-19},{-41,-18},{-41,-13},{-41,-12}, + {-41,-11},{-41,-10},{-41,-5},{-41,-4},{-41,7},{-41,8},{-41,13},{-41,14},{-41,15},{-41,16},{-41,21},{-41,22},{-41,27},{-41,28},{-40,-26},{-40,-25},{-40,-24},{-40,-20},{-40,-19},{-40,-18},{-40,-13},{-40,-12},{-40,-11},{-40,-10},{-40,-5},{-40,-4},{-40,7},{-40,8},{-40,13},{-40,14}, + {-40,15},{-40,16},{-40,21},{-40,22},{-40,23},{-40,27},{-40,28},{-40,29},{-39,-27},{-39,-26},{-39,-25},{-39,-24},{-39,-21},{-39,-20},{-39,-19},{-39,-13},{-39,-12},{-39,-5},{-39,-4},{-39,-3},{-39,-2},{-39,-1},{-39,0},{-39,1},{-39,2},{-39,3},{-39,4},{-39,5},{-39,6},{-39,7}, + {-39,8},{-39,15},{-39,16},{-39,22},{-39,23},{-39,24},{-39,27},{-39,28},{-39,29},{-39,30},{-38,-27},{-38,-26},{-38,-25},{-38,-24},{-38,-21},{-38,-20},{-38,-13},{-38,-12},{-38,-5},{-38,-4},{-38,-3},{-38,-2},{-38,-1},{-38,0},{-38,1},{-38,2},{-38,3},{-38,4},{-38,5},{-38,6}, + {-38,7},{-38,8},{-38,15},{-38,16},{-38,23},{-38,24},{-38,27},{-38,28},{-38,29},{-38,30},{-37,-17},{-37,-16},{-37,-13},{-37,-12},{-37,-11},{-37,-10},{-37,-4},{-37,-3},{-37,-2},{-37,-1},{-37,0},{-37,3},{-37,4},{-37,5},{-37,6},{-37,7},{-37,13},{-37,14},{-37,15},{-37,16}, + {-37,19},{-37,20},{-36,-17},{-36,-16},{-36,-13},{-36,-12},{-36,-11},{-36,-10},{-36,-9},{-36,-3},{-36,-2},{-36,-1},{-36,0},{-36,3},{-36,4},{-36,5},{-36,6},{-36,12},{-36,13},{-36,14},{-36,15},{-36,16},{-36,19},{-36,20},{-35,-29},{-35,-28},{-35,-23},{-35,-22},{-35,-17},{-35,-16}, + {-35,-12},{-35,-11},{-35,-10},{-35,-9},{-35,-8},{-35,11},{-35,12},{-35,13},{-35,14},{-35,15},{-35,19},{-35,20},{-35,25},{-35,26},{-35,31},{-35,32},{-34,-30},{-34,-29},{-34,-28},{-34,-23},{-34,-22},{-34,-17},{-34,-16},{-34,-15},{-34,-11},{-34,-10},{-34,-9},{-34,-8},{-34,11},{-34,12}, + {-34,13},{-34,14},{-34,18},{-34,19},{-34,20},{-34,25},{-34,26},{-34,31},{-34,32},{-34,33},{-33,-31},{-33,-30},{-33,-29},{-33,-28},{-33,-23},{-33,-22},{-33,-16},{-33,-15},{-33,-14},{-33,-5},{-33,-4},{-33,-1},{-33,0},{-33,3},{-33,4},{-33,7},{-33,8},{-33,17},{-33,18},{-33,19}, + {-33,25},{-33,26},{-33,31},{-33,32},{-33,33},{-33,34},{-32,-32},{-32,-31},{-32,-30},{-32,-29},{-32,-28},{-32,-27},{-32,-23},{-32,-22},{-32,-21},{-32,-15},{-32,-14},{-32,-6},{-32,-5},{-32,-4},{-32,-1},{-32,0},{-32,3},{-32,4},{-32,7},{-32,8},{-32,9},{-32,17},{-32,18},{-32,24}, + {-32,25},{-32,26},{-32,30},{-32,31},{-32,32},{-32,33},{-32,34},{-32,35},{-31,-33},{-31,-32},{-31,-31},{-31,-30},{-31,-29},{-31,-28},{-31,-27},{-31,-26},{-31,-22},{-31,-21},{-31,-20},{-31,-19},{-31,-18},{-31,-11},{-31,-10},{-31,-9},{-31,-8},{-31,-7},{-31,-6},{-31,-5},{-31,-1},{-31,0}, + {-31,1},{-31,2},{-31,3},{-31,4},{-31,8},{-31,9},{-31,10},{-31,11},{-31,12},{-31,13},{-31,14},{-31,21},{-31,22},{-31,23},{-31,24},{-31,25},{-31,29},{-31,30},{-31,31},{-31,32},{-31,33},{-31,34},{-31,35},{-31,36},{-30,-33},{-30,-32},{-30,-31},{-30,-30},{-30,-29},{-30,-28}, + {-30,-27},{-30,-26},{-30,-21},{-30,-20},{-30,-19},{-30,-18},{-30,-11},{-30,-10},{-30,-9},{-30,-8},{-30,-7},{-30,-6},{-30,-1},{-30,0},{-30,1},{-30,2},{-30,3},{-30,4},{-30,9},{-30,10},{-30,11},{-30,12},{-30,13},{-30,14},{-30,21},{-30,22},{-30,23},{-30,24},{-30,29},{-30,30}, + {-30,31},{-30,32},{-30,33},{-30,34},{-30,35},{-30,36},{-29,-37},{-29,-36},{-29,-30},{-29,-29},{-29,-28},{-29,-27},{-29,-26},{-29,-15},{-29,-14},{-29,-10},{-29,-9},{-29,-8},{-29,-7},{-29,10},{-29,11},{-29,12},{-29,13},{-29,17},{-29,18},{-29,29},{-29,30},{-29,31},{-29,32},{-29,33}, + {-29,39},{-29,40},{-28,-38},{-28,-37},{-28,-36},{-28,-29},{-28,-28},{-28,-27},{-28,-26},{-28,-16},{-28,-15},{-28,-14},{-28,-9},{-28,-8},{-28,11},{-28,12},{-28,17},{-28,18},{-28,19},{-28,29},{-28,30},{-28,31},{-28,32},{-28,39},{-28,40},{-28,41},{-27,-39},{-27,-38},{-27,-37},{-27,-36}, + {-27,-23},{-27,-22},{-27,-19},{-27,-18},{-27,-17},{-27,-16},{-27,-15},{-27,-5},{-27,-4},{-27,-1},{-27,0},{-27,1},{-27,2},{-27,3},{-27,4},{-27,7},{-27,8},{-27,18},{-27,19},{-27,20},{-27,21},{-27,22},{-27,25},{-27,26},{-27,39},{-27,40},{-27,41},{-27,42},{-26,-39},{-26,-38}, + {-26,-37},{-26,-36},{-26,-24},{-26,-23},{-26,-22},{-26,-19},{-26,-18},{-26,-17},{-26,-16},{-26,-6},{-26,-5},{-26,-4},{-26,-1},{-26,0},{-26,1},{-26,2},{-26,3},{-26,4},{-26,7},{-26,8},{-26,9},{-26,19},{-26,20},{-26,21},{-26,22},{-26,25},{-26,26},{-26,27},{-26,39},{-26,40}, + {-26,41},{-26,42},{-25,-33},{-25,-32},{-25,-31},{-25,-30},{-25,-25},{-25,-24},{-25,-23},{-25,-22},{-25,-19},{-25,-18},{-25,-17},{-25,-9},{-25,-8},{-25,-7},{-25,-6},{-25,-5},{-25,-4},{-25,-1},{-25,0},{-25,1},{-25,2},{-25,3},{-25,4},{-25,7},{-25,8},{-25,9},{-25,10},{-25,11}, + {-25,12},{-25,20},{-25,21},{-25,22},{-25,25},{-25,26},{-25,27},{-25,28},{-25,33},{-25,34},{-25,35},{-25,36},{-24,-33},{-24,-32},{-24,-31},{-24,-30},{-24,-29},{-24,-25},{-24,-24},{-24,-23},{-24,-22},{-24,-19},{-24,-18},{-24,-9},{-24,-8},{-24,-7},{-24,-6},{-24,-5},{-24,-4},{-24,-1}, + {-24,0},{-24,1},{-24,2},{-24,3},{-24,4},{-24,7},{-24,8},{-24,9},{-24,10},{-24,11},{-24,12},{-24,21},{-24,22},{-24,25},{-24,26},{-24,27},{-24,28},{-24,32},{-24,33},{-24,34},{-24,35},{-24,36},{-23,-37},{-23,-36},{-23,-30},{-23,-29},{-23,-28},{-23,-19},{-23,-18},{-23,-15}, + {-23,-14},{-23,-9},{-23,-8},{-23,-7},{-23,-6},{-23,-5},{-23,0},{-23,1},{-23,2},{-23,3},{-23,8},{-23,9},{-23,10},{-23,11},{-23,12},{-23,17},{-23,18},{-23,21},{-23,22},{-23,31},{-23,32},{-23,33},{-23,39},{-23,40},{-22,-38},{-22,-37},{-22,-36},{-22,-29},{-22,-28},{-22,-19}, + {-22,-18},{-22,-15},{-22,-14},{-22,-13},{-22,-9},{-22,-8},{-22,-7},{-22,-6},{-22,1},{-22,2},{-22,9},{-22,10},{-22,11},{-22,12},{-22,16},{-22,17},{-22,18},{-22,21},{-22,22},{-22,31},{-22,32},{-22,39},{-22,40},{-22,41},{-21,-41},{-21,-40},{-21,-39},{-21,-38},{-21,-37},{-21,-29}, + {-21,-28},{-21,-25},{-21,-24},{-21,-23},{-21,-22},{-21,-21},{-21,-20},{-21,-19},{-21,-18},{-21,-15},{-21,-14},{-21,-13},{-21,-12},{-21,-3},{-21,-2},{-21,5},{-21,6},{-21,15},{-21,16},{-21,17},{-21,18},{-21,21},{-21,22},{-21,23},{-21,24},{-21,25},{-21,26},{-21,27},{-21,28},{-21,31}, + {-21,32},{-21,40},{-21,41},{-21,42},{-21,43},{-21,44},{-20,-42},{-20,-41},{-20,-40},{-20,-39},{-20,-38},{-20,-29},{-20,-28},{-20,-25},{-20,-24},{-20,-23},{-20,-22},{-20,-21},{-20,-20},{-20,-19},{-20,-18},{-20,-15},{-20,-14},{-20,-13},{-20,-12},{-20,-3},{-20,-2},{-20,-1},{-20,4},{-20,5}, + {-20,6},{-20,15},{-20,16},{-20,17},{-20,18},{-20,21},{-20,22},{-20,23},{-20,24},{-20,25},{-20,26},{-20,27},{-20,28},{-20,31},{-20,32},{-20,41},{-20,42},{-20,43},{-20,44},{-20,45},{-19,-43},{-19,-42},{-19,-41},{-19,-35},{-19,-34},{-19,-33},{-19,-32},{-19,-25},{-19,-24},{-19,-23}, + {-19,-15},{-19,-14},{-19,-13},{-19,-9},{-19,-8},{-19,-7},{-19,-6},{-19,-2},{-19,-1},{-19,0},{-19,1},{-19,2},{-19,3},{-19,4},{-19,5},{-19,9},{-19,10},{-19,11},{-19,12},{-19,16},{-19,17},{-19,18},{-19,26},{-19,27},{-19,28},{-19,35},{-19,36},{-19,37},{-19,38},{-19,44}, + {-19,45},{-19,46},{-18,-43},{-18,-42},{-18,-35},{-18,-34},{-18,-33},{-18,-32},{-18,-31},{-18,-26},{-18,-25},{-18,-24},{-18,-15},{-18,-14},{-18,-10},{-18,-9},{-18,-8},{-18,-7},{-18,-6},{-18,-1},{-18,0},{-18,1},{-18,2},{-18,3},{-18,4},{-18,9},{-18,10},{-18,11},{-18,12},{-18,13}, + {-18,17},{-18,18},{-18,27},{-18,28},{-18,29},{-18,34},{-18,35},{-18,36},{-18,37},{-18,38},{-18,45},{-18,46},{-17,-43},{-17,-42},{-17,-32},{-17,-31},{-17,-30},{-17,-27},{-17,-26},{-17,-25},{-17,-21},{-17,-20},{-17,-19},{-17,-18},{-17,-17},{-17,-16},{-17,-15},{-17,-14},{-17,-11},{-17,-10}, + {-17,-9},{-17,-8},{-17,-7},{-17,-6},{-17,0},{-17,1},{-17,2},{-17,3},{-17,9},{-17,10},{-17,11},{-17,12},{-17,13},{-17,14},{-17,17},{-17,18},{-17,19},{-17,20},{-17,21},{-17,22},{-17,23},{-17,24},{-17,28},{-17,29},{-17,30},{-17,33},{-17,34},{-17,35},{-17,45},{-17,46}, + {-16,-43},{-16,-42},{-16,-31},{-16,-30},{-16,-27},{-16,-26},{-16,-21},{-16,-20},{-16,-19},{-16,-18},{-16,-17},{-16,-16},{-16,-15},{-16,-14},{-16,-11},{-16,-10},{-16,-9},{-16,-8},{-16,-7},{-16,-6},{-16,1},{-16,2},{-16,9},{-16,10},{-16,11},{-16,12},{-16,13},{-16,14},{-16,17},{-16,18}, + {-16,19},{-16,20},{-16,21},{-16,22},{-16,23},{-16,24},{-16,29},{-16,30},{-16,33},{-16,34},{-16,45},{-16,46},{-15,-43},{-15,-42},{-15,-39},{-15,-38},{-15,-37},{-15,-36},{-15,-35},{-15,-34},{-15,-20},{-15,-19},{-15,-18},{-15,-17},{-15,-10},{-15,-9},{-15,-8},{-15,-7},{-15,-3},{-15,-2}, + {-15,1},{-15,2},{-15,5},{-15,6},{-15,10},{-15,11},{-15,12},{-15,13},{-15,20},{-15,21},{-15,22},{-15,23},{-15,37},{-15,38},{-15,39},{-15,40},{-15,41},{-15,42},{-15,45},{-15,46},{-14,-43},{-14,-42},{-14,-39},{-14,-38},{-14,-37},{-14,-36},{-14,-35},{-14,-34},{-14,-33},{-14,-19}, + {-14,-18},{-14,-9},{-14,-8},{-14,-4},{-14,-3},{-14,-2},{-14,1},{-14,2},{-14,5},{-14,6},{-14,7},{-14,11},{-14,12},{-14,21},{-14,22},{-14,36},{-14,37},{-14,38},{-14,39},{-14,40},{-14,41},{-14,42},{-14,45},{-14,46},{-13,-39},{-13,-38},{-13,-35},{-13,-34},{-13,-33},{-13,-32}, + {-13,-29},{-13,-28},{-13,-15},{-13,-14},{-13,-5},{-13,-4},{-13,-3},{-13,-2},{-13,5},{-13,6},{-13,7},{-13,8},{-13,17},{-13,18},{-13,31},{-13,32},{-13,35},{-13,36},{-13,37},{-13,38},{-13,41},{-13,42},{-12,-39},{-12,-38},{-12,-35},{-12,-34},{-12,-33},{-12,-32},{-12,-29},{-12,-28}, + {-12,-27},{-12,-16},{-12,-15},{-12,-14},{-12,-13},{-12,-5},{-12,-4},{-12,-3},{-12,-2},{-12,5},{-12,6},{-12,7},{-12,8},{-12,16},{-12,17},{-12,18},{-12,19},{-12,30},{-12,31},{-12,32},{-12,35},{-12,36},{-12,37},{-12,38},{-12,41},{-12,42},{-11,-43},{-11,-42},{-11,-34},{-11,-33}, + {-11,-32},{-11,-29},{-11,-28},{-11,-27},{-11,-26},{-11,-23},{-11,-22},{-11,-21},{-11,-20},{-11,-17},{-11,-16},{-11,-15},{-11,-14},{-11,-13},{-11,-12},{-11,-9},{-11,-8},{-11,1},{-11,2},{-11,11},{-11,12},{-11,15},{-11,16},{-11,17},{-11,18},{-11,19},{-11,20},{-11,23},{-11,24},{-11,25}, + {-11,26},{-11,29},{-11,30},{-11,31},{-11,32},{-11,35},{-11,36},{-11,37},{-11,45},{-11,46},{-10,-44},{-10,-43},{-10,-42},{-10,-33},{-10,-32},{-10,-29},{-10,-28},{-10,-27},{-10,-26},{-10,-23},{-10,-22},{-10,-21},{-10,-20},{-10,-17},{-10,-16},{-10,-15},{-10,-14},{-10,-13},{-10,-12},{-10,-9}, + {-10,-8},{-10,-7},{-10,0},{-10,1},{-10,2},{-10,3},{-10,10},{-10,11},{-10,12},{-10,15},{-10,16},{-10,17},{-10,18},{-10,19},{-10,20},{-10,23},{-10,24},{-10,25},{-10,26},{-10,29},{-10,30},{-10,31},{-10,32},{-10,35},{-10,36},{-10,45},{-10,46},{-10,47},{-9,-45},{-9,-44}, + {-9,-43},{-9,-29},{-9,-28},{-9,-27},{-9,-23},{-9,-22},{-9,-21},{-9,-20},{-9,-17},{-9,-16},{-9,-15},{-9,-14},{-9,-13},{-9,-8},{-9,-7},{-9,-6},{-9,-5},{-9,-1},{-9,0},{-9,1},{-9,2},{-9,3},{-9,4},{-9,8},{-9,9},{-9,10},{-9,11},{-9,16},{-9,17},{-9,18}, + {-9,19},{-9,20},{-9,23},{-9,24},{-9,25},{-9,26},{-9,30},{-9,31},{-9,32},{-9,46},{-9,47},{-9,48},{-8,-45},{-8,-44},{-8,-30},{-8,-29},{-8,-28},{-8,-24},{-8,-23},{-8,-22},{-8,-21},{-8,-20},{-8,-17},{-8,-16},{-8,-15},{-8,-14},{-8,-7},{-8,-6},{-8,-5},{-8,-4}, + {-8,-1},{-8,0},{-8,1},{-8,2},{-8,3},{-8,4},{-8,7},{-8,8},{-8,9},{-8,10},{-8,17},{-8,18},{-8,19},{-8,20},{-8,23},{-8,24},{-8,25},{-8,26},{-8,27},{-8,31},{-8,32},{-8,33},{-8,47},{-8,48},{-7,-45},{-7,-44},{-7,-39},{-7,-38},{-7,-37},{-7,-36}, + {-7,-31},{-7,-30},{-7,-29},{-7,-25},{-7,-24},{-7,-23},{-7,-22},{-7,-21},{-7,-11},{-7,-10},{-7,-7},{-7,-6},{-7,-5},{-7,-4},{-7,7},{-7,8},{-7,9},{-7,10},{-7,13},{-7,14},{-7,24},{-7,25},{-7,26},{-7,27},{-7,28},{-7,32},{-7,33},{-7,34},{-7,39},{-7,40}, + {-7,41},{-7,42},{-7,47},{-7,48},{-6,-46},{-6,-45},{-6,-44},{-6,-39},{-6,-38},{-6,-37},{-6,-36},{-6,-35},{-6,-31},{-6,-30},{-6,-25},{-6,-24},{-6,-23},{-6,-22},{-6,-12},{-6,-11},{-6,-10},{-6,-6},{-6,-5},{-6,8},{-6,9},{-6,13},{-6,14},{-6,15},{-6,25},{-6,26}, + {-6,27},{-6,28},{-6,33},{-6,34},{-6,38},{-6,39},{-6,40},{-6,41},{-6,42},{-6,47},{-6,48},{-6,49},{-5,-47},{-5,-46},{-5,-45},{-5,-44},{-5,-37},{-5,-36},{-5,-35},{-5,-34},{-5,-19},{-5,-18},{-5,-13},{-5,-12},{-5,-11},{-5,-10},{-5,-1},{-5,0},{-5,1},{-5,2}, + {-5,3},{-5,4},{-5,13},{-5,14},{-5,15},{-5,16},{-5,21},{-5,22},{-5,37},{-5,38},{-5,39},{-5,40},{-5,47},{-5,48},{-5,49},{-5,50},{-4,-47},{-4,-46},{-4,-45},{-4,-44},{-4,-43},{-4,-37},{-4,-36},{-4,-35},{-4,-34},{-4,-19},{-4,-18},{-4,-17},{-4,-13},{-4,-12}, + {-4,-11},{-4,-10},{-4,-2},{-4,-1},{-4,0},{-4,1},{-4,2},{-4,3},{-4,4},{-4,5},{-4,13},{-4,14},{-4,15},{-4,16},{-4,20},{-4,21},{-4,22},{-4,37},{-4,38},{-4,39},{-4,40},{-4,46},{-4,47},{-4,48},{-4,49},{-4,50},{-3,-44},{-3,-43},{-3,-42},{-3,-41}, + {-3,-40},{-3,-37},{-3,-36},{-3,-35},{-3,-34},{-3,-31},{-3,-30},{-3,-29},{-3,-28},{-3,-25},{-3,-24},{-3,-23},{-3,-22},{-3,-18},{-3,-17},{-3,-16},{-3,-7},{-3,-6},{-3,-3},{-3,-2},{-3,-1},{-3,0},{-3,3},{-3,4},{-3,5},{-3,6},{-3,9},{-3,10},{-3,19},{-3,20}, + {-3,21},{-3,25},{-3,26},{-3,27},{-3,28},{-3,31},{-3,32},{-3,33},{-3,34},{-3,37},{-3,38},{-3,39},{-3,40},{-3,43},{-3,44},{-3,45},{-3,46},{-3,47},{-2,-43},{-2,-42},{-2,-41},{-2,-40},{-2,-37},{-2,-36},{-2,-35},{-2,-34},{-2,-31},{-2,-30},{-2,-29},{-2,-28}, + {-2,-25},{-2,-24},{-2,-23},{-2,-22},{-2,-21},{-2,-17},{-2,-16},{-2,-15},{-2,-8},{-2,-7},{-2,-6},{-2,-3},{-2,-2},{-2,-1},{-2,0},{-2,3},{-2,4},{-2,5},{-2,6},{-2,9},{-2,10},{-2,11},{-2,18},{-2,19},{-2,20},{-2,24},{-2,25},{-2,26},{-2,27},{-2,28}, + {-2,31},{-2,32},{-2,33},{-2,34},{-2,37},{-2,38},{-2,39},{-2,40},{-2,43},{-2,44},{-2,45},{-2,46},{-1,-47},{-1,-46},{-1,-43},{-1,-42},{-1,-41},{-1,-40},{-1,-37},{-1,-36},{-1,-29},{-1,-28},{-1,-25},{-1,-24},{-1,-23},{-1,-22},{-1,-21},{-1,-20},{-1,-17},{-1,-16}, + {-1,-15},{-1,-14},{-1,-13},{-1,-12},{-1,-9},{-1,-8},{-1,-7},{-1,-6},{-1,-3},{-1,-2},{-1,5},{-1,6},{-1,9},{-1,10},{-1,11},{-1,12},{-1,15},{-1,16},{-1,17},{-1,18},{-1,19},{-1,20},{-1,23},{-1,24},{-1,25},{-1,26},{-1,27},{-1,28},{-1,31},{-1,32}, + {-1,39},{-1,40},{-1,43},{-1,44},{-1,45},{-1,46},{-1,49},{-1,50},{0,-47},{0,-46},{0,-43},{0,-42},{0,-41},{0,-40},{0,-37},{0,-36},{0,-29},{0,-28},{0,-25},{0,-24},{0,-23},{0,-22},{0,-21},{0,-20},{0,-17},{0,-16},{0,-15},{0,-14},{0,-13},{0,-12}, + {0,-9},{0,-8},{0,-7},{0,-6},{0,-3},{0,-2},{0,5},{0,6},{0,9},{0,10},{0,11},{0,12},{0,15},{0,16},{0,17},{0,18},{0,19},{0,20},{0,23},{0,24},{0,25},{0,26},{0,27},{0,28},{0,31},{0,32},{0,39},{0,40},{0,43},{0,44}, + {0,45},{0,46},{0,49},{0,50},{1,-43},{1,-42},{1,-41},{1,-40},{1,-37},{1,-36},{1,-35},{1,-34},{1,-31},{1,-30},{1,-29},{1,-28},{1,-25},{1,-24},{1,-23},{1,-22},{1,-21},{1,-17},{1,-16},{1,-15},{1,-8},{1,-7},{1,-6},{1,-3},{1,-2},{1,-1}, + {1,0},{1,3},{1,4},{1,5},{1,6},{1,9},{1,10},{1,11},{1,18},{1,19},{1,20},{1,24},{1,25},{1,26},{1,27},{1,28},{1,31},{1,32},{1,33},{1,34},{1,37},{1,38},{1,39},{1,40},{1,43},{1,44},{1,45},{1,46},{2,-44},{2,-43}, + {2,-42},{2,-41},{2,-40},{2,-37},{2,-36},{2,-35},{2,-34},{2,-31},{2,-30},{2,-29},{2,-28},{2,-25},{2,-24},{2,-23},{2,-22},{2,-18},{2,-17},{2,-16},{2,-7},{2,-6},{2,-3},{2,-2},{2,-1},{2,0},{2,3},{2,4},{2,5},{2,6},{2,9},{2,10}, + {2,19},{2,20},{2,21},{2,25},{2,26},{2,27},{2,28},{2,31},{2,32},{2,33},{2,34},{2,37},{2,38},{2,39},{2,40},{2,43},{2,44},{2,45},{2,46},{2,47},{3,-47},{3,-46},{3,-45},{3,-44},{3,-43},{3,-37},{3,-36},{3,-35},{3,-34},{3,-19}, + {3,-18},{3,-17},{3,-13},{3,-12},{3,-11},{3,-10},{3,-2},{3,-1},{3,0},{3,1},{3,2},{3,3},{3,4},{3,5},{3,13},{3,14},{3,15},{3,16},{3,20},{3,21},{3,22},{3,37},{3,38},{3,39},{3,40},{3,46},{3,47},{3,48},{3,49},{3,50}, + {4,-47},{4,-46},{4,-45},{4,-44},{4,-37},{4,-36},{4,-35},{4,-34},{4,-19},{4,-18},{4,-13},{4,-12},{4,-11},{4,-10},{4,-1},{4,0},{4,1},{4,2},{4,3},{4,4},{4,13},{4,14},{4,15},{4,16},{4,21},{4,22},{4,37},{4,38},{4,39},{4,40}, + {4,47},{4,48},{4,49},{4,50},{5,-46},{5,-45},{5,-44},{5,-39},{5,-38},{5,-37},{5,-36},{5,-35},{5,-31},{5,-30},{5,-25},{5,-24},{5,-23},{5,-22},{5,-12},{5,-11},{5,-10},{5,-6},{5,-5},{5,8},{5,9},{5,13},{5,14},{5,15},{5,25},{5,26}, + {5,27},{5,28},{5,33},{5,34},{5,38},{5,39},{5,40},{5,41},{5,42},{5,47},{5,48},{5,49},{6,-45},{6,-44},{6,-39},{6,-38},{6,-37},{6,-36},{6,-31},{6,-30},{6,-29},{6,-25},{6,-24},{6,-23},{6,-22},{6,-21},{6,-11},{6,-10},{6,-7},{6,-6}, + {6,-5},{6,-4},{6,7},{6,8},{6,9},{6,10},{6,13},{6,14},{6,24},{6,25},{6,26},{6,27},{6,28},{6,32},{6,33},{6,34},{6,39},{6,40},{6,41},{6,42},{6,47},{6,48},{7,-45},{7,-44},{7,-30},{7,-29},{7,-28},{7,-24},{7,-23},{7,-22}, + {7,-21},{7,-20},{7,-17},{7,-16},{7,-15},{7,-14},{7,-7},{7,-6},{7,-5},{7,-4},{7,-1},{7,0},{7,1},{7,2},{7,3},{7,4},{7,7},{7,8},{7,9},{7,10},{7,17},{7,18},{7,19},{7,20},{7,23},{7,24},{7,25},{7,26},{7,27},{7,31}, + {7,32},{7,33},{7,47},{7,48},{8,-45},{8,-44},{8,-43},{8,-29},{8,-28},{8,-27},{8,-23},{8,-22},{8,-21},{8,-20},{8,-17},{8,-16},{8,-15},{8,-14},{8,-13},{8,-8},{8,-7},{8,-6},{8,-5},{8,-1},{8,0},{8,1},{8,2},{8,3},{8,4},{8,8}, + {8,9},{8,10},{8,11},{8,16},{8,17},{8,18},{8,19},{8,20},{8,23},{8,24},{8,25},{8,26},{8,30},{8,31},{8,32},{8,46},{8,47},{8,48},{9,-44},{9,-43},{9,-42},{9,-33},{9,-32},{9,-29},{9,-28},{9,-27},{9,-26},{9,-23},{9,-22},{9,-21}, + {9,-20},{9,-17},{9,-16},{9,-15},{9,-14},{9,-13},{9,-12},{9,-9},{9,-8},{9,-7},{9,0},{9,1},{9,2},{9,3},{9,10},{9,11},{9,12},{9,15},{9,16},{9,17},{9,18},{9,19},{9,20},{9,23},{9,24},{9,25},{9,26},{9,29},{9,30},{9,31}, + {9,32},{9,35},{9,36},{9,45},{9,46},{9,47},{10,-43},{10,-42},{10,-34},{10,-33},{10,-32},{10,-29},{10,-28},{10,-27},{10,-26},{10,-23},{10,-22},{10,-21},{10,-20},{10,-17},{10,-16},{10,-15},{10,-14},{10,-13},{10,-12},{10,-9},{10,-8},{10,1},{10,2},{10,11}, + {10,12},{10,15},{10,16},{10,17},{10,18},{10,19},{10,20},{10,23},{10,24},{10,25},{10,26},{10,29},{10,30},{10,31},{10,32},{10,35},{10,36},{10,37},{10,45},{10,46},{11,-39},{11,-38},{11,-35},{11,-34},{11,-33},{11,-32},{11,-29},{11,-28},{11,-27},{11,-16}, + {11,-15},{11,-14},{11,-13},{11,-5},{11,-4},{11,-3},{11,-2},{11,5},{11,6},{11,7},{11,8},{11,16},{11,17},{11,18},{11,19},{11,30},{11,31},{11,32},{11,35},{11,36},{11,37},{11,38},{11,41},{11,42},{12,-39},{12,-38},{12,-35},{12,-34},{12,-33},{12,-32}, + {12,-29},{12,-28},{12,-15},{12,-14},{12,-5},{12,-4},{12,-3},{12,-2},{12,5},{12,6},{12,7},{12,8},{12,17},{12,18},{12,31},{12,32},{12,35},{12,36},{12,37},{12,38},{12,41},{12,42},{13,-43},{13,-42},{13,-39},{13,-38},{13,-37},{13,-36},{13,-35},{13,-34}, + {13,-33},{13,-19},{13,-18},{13,-9},{13,-8},{13,-4},{13,-3},{13,-2},{13,1},{13,2},{13,5},{13,6},{13,7},{13,11},{13,12},{13,21},{13,22},{13,36},{13,37},{13,38},{13,39},{13,40},{13,41},{13,42},{13,45},{13,46},{14,-43},{14,-42},{14,-39},{14,-38}, + {14,-37},{14,-36},{14,-35},{14,-34},{14,-20},{14,-19},{14,-18},{14,-17},{14,-10},{14,-9},{14,-8},{14,-7},{14,-3},{14,-2},{14,1},{14,2},{14,5},{14,6},{14,10},{14,11},{14,12},{14,13},{14,20},{14,21},{14,22},{14,23},{14,37},{14,38},{14,39},{14,40}, + {14,41},{14,42},{14,45},{14,46},{15,-43},{15,-42},{15,-31},{15,-30},{15,-27},{15,-26},{15,-21},{15,-20},{15,-19},{15,-18},{15,-17},{15,-16},{15,-15},{15,-14},{15,-11},{15,-10},{15,-9},{15,-8},{15,-7},{15,-6},{15,1},{15,2},{15,9},{15,10},{15,11},{15,12}, + {15,13},{15,14},{15,17},{15,18},{15,19},{15,20},{15,21},{15,22},{15,23},{15,24},{15,29},{15,30},{15,33},{15,34},{15,45},{15,46},{16,-43},{16,-42},{16,-32},{16,-31},{16,-30},{16,-27},{16,-26},{16,-25},{16,-21},{16,-20},{16,-19},{16,-18},{16,-17},{16,-16}, + {16,-15},{16,-14},{16,-11},{16,-10},{16,-9},{16,-8},{16,-7},{16,-6},{16,0},{16,1},{16,2},{16,3},{16,9},{16,10},{16,11},{16,12},{16,13},{16,14},{16,17},{16,18},{16,19},{16,20},{16,21},{16,22},{16,23},{16,24},{16,28},{16,29},{16,30},{16,33}, + {16,34},{16,35},{16,45},{16,46},{17,-43},{17,-42},{17,-35},{17,-34},{17,-33},{17,-32},{17,-31},{17,-26},{17,-25},{17,-24},{17,-15},{17,-14},{17,-10},{17,-9},{17,-8},{17,-7},{17,-6},{17,-1},{17,0},{17,1},{17,2},{17,3},{17,4},{17,9},{17,10},{17,11}, + {17,12},{17,13},{17,17},{17,18},{17,27},{17,28},{17,29},{17,34},{17,35},{17,36},{17,37},{17,38},{17,45},{17,46},{18,-43},{18,-42},{18,-41},{18,-35},{18,-34},{18,-33},{18,-32},{18,-25},{18,-24},{18,-23},{18,-15},{18,-14},{18,-13},{18,-9},{18,-8},{18,-7}, + {18,-6},{18,-2},{18,-1},{18,0},{18,1},{18,2},{18,3},{18,4},{18,5},{18,9},{18,10},{18,11},{18,12},{18,16},{18,17},{18,18},{18,26},{18,27},{18,28},{18,35},{18,36},{18,37},{18,38},{18,44},{18,45},{18,46},{19,-42},{19,-41},{19,-40},{19,-39}, + {19,-38},{19,-29},{19,-28},{19,-25},{19,-24},{19,-23},{19,-22},{19,-21},{19,-20},{19,-19},{19,-18},{19,-15},{19,-14},{19,-13},{19,-12},{19,-3},{19,-2},{19,-1},{19,4},{19,5},{19,6},{19,15},{19,16},{19,17},{19,18},{19,21},{19,22},{19,23},{19,24},{19,25}, + {19,26},{19,27},{19,28},{19,31},{19,32},{19,41},{19,42},{19,43},{19,44},{19,45},{20,-41},{20,-40},{20,-39},{20,-38},{20,-37},{20,-29},{20,-28},{20,-25},{20,-24},{20,-23},{20,-22},{20,-21},{20,-20},{20,-19},{20,-18},{20,-15},{20,-14},{20,-13},{20,-12},{20,-3}, + {20,-2},{20,5},{20,6},{20,15},{20,16},{20,17},{20,18},{20,21},{20,22},{20,23},{20,24},{20,25},{20,26},{20,27},{20,28},{20,31},{20,32},{20,40},{20,41},{20,42},{20,43},{20,44},{21,-38},{21,-37},{21,-36},{21,-29},{21,-28},{21,-19},{21,-18},{21,-15}, + {21,-14},{21,-13},{21,-9},{21,-8},{21,-7},{21,-6},{21,1},{21,2},{21,9},{21,10},{21,11},{21,12},{21,16},{21,17},{21,18},{21,21},{21,22},{21,31},{21,32},{21,39},{21,40},{21,41},{22,-37},{22,-36},{22,-30},{22,-29},{22,-28},{22,-19},{22,-18},{22,-15}, + {22,-14},{22,-9},{22,-8},{22,-7},{22,-6},{22,-5},{22,0},{22,1},{22,2},{22,3},{22,8},{22,9},{22,10},{22,11},{22,12},{22,17},{22,18},{22,21},{22,22},{22,31},{22,32},{22,33},{22,39},{22,40},{23,-33},{23,-32},{23,-31},{23,-30},{23,-29},{23,-25}, + {23,-24},{23,-23},{23,-22},{23,-19},{23,-18},{23,-9},{23,-8},{23,-7},{23,-6},{23,-5},{23,-4},{23,-1},{23,0},{23,1},{23,2},{23,3},{23,4},{23,7},{23,8},{23,9},{23,10},{23,11},{23,12},{23,21},{23,22},{23,25},{23,26},{23,27},{23,28},{23,32}, + {23,33},{23,34},{23,35},{23,36},{24,-33},{24,-32},{24,-31},{24,-30},{24,-25},{24,-24},{24,-23},{24,-22},{24,-19},{24,-18},{24,-17},{24,-9},{24,-8},{24,-7},{24,-6},{24,-5},{24,-4},{24,-1},{24,0},{24,1},{24,2},{24,3},{24,4},{24,7},{24,8},{24,9}, + {24,10},{24,11},{24,12},{24,20},{24,21},{24,22},{24,25},{24,26},{24,27},{24,28},{24,33},{24,34},{24,35},{24,36},{25,-39},{25,-38},{25,-37},{25,-36},{25,-24},{25,-23},{25,-22},{25,-19},{25,-18},{25,-17},{25,-16},{25,-6},{25,-5},{25,-4},{25,-1},{25,0}, + {25,1},{25,2},{25,3},{25,4},{25,7},{25,8},{25,9},{25,19},{25,20},{25,21},{25,22},{25,25},{25,26},{25,27},{25,39},{25,40},{25,41},{25,42},{26,-39},{26,-38},{26,-37},{26,-36},{26,-23},{26,-22},{26,-19},{26,-18},{26,-17},{26,-16},{26,-15},{26,-5}, + {26,-4},{26,-1},{26,0},{26,1},{26,2},{26,3},{26,4},{26,7},{26,8},{26,18},{26,19},{26,20},{26,21},{26,22},{26,25},{26,26},{26,39},{26,40},{26,41},{26,42},{27,-38},{27,-37},{27,-36},{27,-29},{27,-28},{27,-27},{27,-26},{27,-16},{27,-15},{27,-14}, + {27,-9},{27,-8},{27,11},{27,12},{27,17},{27,18},{27,19},{27,29},{27,30},{27,31},{27,32},{27,39},{27,40},{27,41},{28,-37},{28,-36},{28,-30},{28,-29},{28,-28},{28,-27},{28,-26},{28,-15},{28,-14},{28,-10},{28,-9},{28,-8},{28,-7},{28,10},{28,11},{28,12}, + {28,13},{28,17},{28,18},{28,29},{28,30},{28,31},{28,32},{28,33},{28,39},{28,40},{29,-33},{29,-32},{29,-31},{29,-30},{29,-29},{29,-28},{29,-27},{29,-26},{29,-21},{29,-20},{29,-19},{29,-18},{29,-11},{29,-10},{29,-9},{29,-8},{29,-7},{29,-6},{29,-1},{29,0}, + {29,1},{29,2},{29,3},{29,4},{29,9},{29,10},{29,11},{29,12},{29,13},{29,14},{29,21},{29,22},{29,23},{29,24},{29,29},{29,30},{29,31},{29,32},{29,33},{29,34},{29,35},{29,36},{30,-33},{30,-32},{30,-31},{30,-30},{30,-29},{30,-28},{30,-27},{30,-26}, + {30,-22},{30,-21},{30,-20},{30,-19},{30,-18},{30,-11},{30,-10},{30,-9},{30,-8},{30,-7},{30,-6},{30,-5},{30,-1},{30,0},{30,1},{30,2},{30,3},{30,4},{30,8},{30,9},{30,10},{30,11},{30,12},{30,13},{30,14},{30,21},{30,22},{30,23},{30,24},{30,25}, + {30,29},{30,30},{30,31},{30,32},{30,33},{30,34},{30,35},{30,36},{31,-32},{31,-31},{31,-30},{31,-29},{31,-28},{31,-27},{31,-23},{31,-22},{31,-21},{31,-15},{31,-14},{31,-6},{31,-5},{31,-4},{31,-1},{31,0},{31,3},{31,4},{31,7},{31,8},{31,9},{31,17}, + {31,18},{31,24},{31,25},{31,26},{31,30},{31,31},{31,32},{31,33},{31,34},{31,35},{32,-31},{32,-30},{32,-29},{32,-28},{32,-23},{32,-22},{32,-16},{32,-15},{32,-14},{32,-5},{32,-4},{32,-1},{32,0},{32,3},{32,4},{32,7},{32,8},{32,17},{32,18},{32,19}, + {32,25},{32,26},{32,31},{32,32},{32,33},{32,34},{33,-30},{33,-29},{33,-28},{33,-23},{33,-22},{33,-17},{33,-16},{33,-15},{33,-11},{33,-10},{33,-9},{33,-8},{33,11},{33,12},{33,13},{33,14},{33,18},{33,19},{33,20},{33,25},{33,26},{33,31},{33,32},{33,33}, + {34,-29},{34,-28},{34,-23},{34,-22},{34,-17},{34,-16},{34,-12},{34,-11},{34,-10},{34,-9},{34,-8},{34,11},{34,12},{34,13},{34,14},{34,15},{34,19},{34,20},{34,25},{34,26},{34,31},{34,32},{35,-17},{35,-16},{35,-13},{35,-12},{35,-11},{35,-10},{35,-9},{35,-3}, + {35,-2},{35,-1},{35,0},{35,3},{35,4},{35,5},{35,6},{35,12},{35,13},{35,14},{35,15},{35,16},{35,19},{35,20},{36,-17},{36,-16},{36,-13},{36,-12},{36,-11},{36,-10},{36,-4},{36,-3},{36,-2},{36,-1},{36,0},{36,3},{36,4},{36,5},{36,6},{36,7}, + {36,13},{36,14},{36,15},{36,16},{36,19},{36,20},{37,-27},{37,-26},{37,-25},{37,-24},{37,-21},{37,-20},{37,-13},{37,-12},{37,-5},{37,-4},{37,-3},{37,-2},{37,-1},{37,0},{37,1},{37,2},{37,3},{37,4},{37,5},{37,6},{37,7},{37,8},{37,15},{37,16}, + {37,23},{37,24},{37,27},{37,28},{37,29},{37,30},{38,-27},{38,-26},{38,-25},{38,-24},{38,-21},{38,-20},{38,-19},{38,-13},{38,-12},{38,-5},{38,-4},{38,-3},{38,-2},{38,-1},{38,0},{38,1},{38,2},{38,3},{38,4},{38,5},{38,6},{38,7},{38,8},{38,15}, + {38,16},{38,22},{38,23},{38,24},{38,27},{38,28},{38,29},{38,30},{39,-26},{39,-25},{39,-24},{39,-20},{39,-19},{39,-18},{39,-13},{39,-12},{39,-11},{39,-10},{39,-5},{39,-4},{39,7},{39,8},{39,13},{39,14},{39,15},{39,16},{39,21},{39,22},{39,23},{39,27}, + {39,28},{39,29},{40,-25},{40,-24},{40,-19},{40,-18},{40,-13},{40,-12},{40,-11},{40,-10},{40,-5},{40,-4},{40,7},{40,8},{40,13},{40,14},{40,15},{40,16},{40,21},{40,22},{40,27},{40,28},{41,-19},{41,-18},{41,-1},{41,0},{41,1},{41,2},{41,3},{41,4}, + {41,21},{41,22},{42,-19},{42,-18},{42,-17},{42,-1},{42,0},{42,1},{42,2},{42,3},{42,4},{42,20},{42,21},{42,22},{43,-18},{43,-17},{43,-16},{43,-15},{43,-14},{43,-13},{43,-12},{43,-9},{43,-8},{43,-1},{43,0},{43,1},{43,2},{43,3},{43,4},{43,11}, + {43,12},{43,15},{43,16},{43,17},{43,18},{43,19},{43,20},{43,21},{44,-17},{44,-16},{44,-15},{44,-14},{44,-13},{44,-12},{44,-9},{44,-8},{44,-7},{44,-2},{44,-1},{44,0},{44,1},{44,2},{44,3},{44,4},{44,5},{44,10},{44,11},{44,12},{44,15},{44,16}, + {44,17},{44,18},{44,19},{44,20},{45,-8},{45,-7},{45,-6},{45,-5},{45,-4},{45,-3},{45,-2},{45,-1},{45,4},{45,5},{45,6},{45,7},{45,8},{45,9},{45,10},{45,11},{46,-7},{46,-6},{46,-5},{46,-4},{46,-3},{46,-2},{46,5},{46,6},{46,7},{46,8}, + {46,9},{46,10},{47,-4},{47,-3},{47,-2},{47,1},{47,2},{47,5},{47,6},{47,7},{48,-3},{48,-2},{48,1},{48,2},{48,5},{48,6} +} + +local entitys = { + {"stone-wall",-10,-6},{"stone-wall",-10,-5},{"stone-wall",-10,-4},{"stone-wall",-10,-3},{"stone-wall",-10,-2},{"stone-wall",-10,-1},{"stone-wall",-10,0},{"stone-wall",-10,3},{"stone-wall",-10,4},{"stone-wall",-10,5}, + {"stone-wall",-10,6},{"stone-wall",-10,7},{"stone-wall",-10,8},{"stone-wall",-10,9},{"stone-wall",-8,-8},{"small-lamp",-8,-4},{"small-lamp",-8,-1},{"iron-chest",-8,0},{"iron-chest",-8,3},{"small-lamp",-8,4}, + {"small-lamp",-8,7},{"stone-wall",-8,11},{"stone-wall",-7,-8},{"small-electric-pole",-7,-2},{"iron-chest",-7,0},{"iron-chest",-7,3},{"small-electric-pole",-7,5},{"stone-wall",-7,11},{"stone-wall",-6,-8},{"small-lamp",-6,-6}, + {"iron-chest",-6,0},{"iron-chest",-6,3},{"small-lamp",-6,9},{"stone-wall",-6,11},{"stone-wall",-5,-8},{"small-lamp",-5,-1},{"iron-chest",-5,0},{"iron-chest",-5,3},{"small-lamp",-5,4},{"stone-wall",-5,11}, + {"stone-wall",-4,-8},{"small-electric-pole",-4,-5},{"iron-chest",-4,0},{"iron-chest",-4,3},{"small-electric-pole",-4,8},{"stone-wall",-4,11},{"stone-wall",-3,-8},{"small-lamp",-3,-6},{"small-lamp",-3,-3},{"small-lamp",-3,6}, + {"small-lamp",-3,9},{"stone-wall",-3,11},{"stone-wall",-2,-8},{"iron-chest",-2,-6},{"iron-chest",-2,-5},{"iron-chest",-2,-4},{"iron-chest",-2,-3},{"iron-chest",-2,-2},{"iron-chest",-2,5},{"iron-chest",-2,6}, + {"iron-chest",-2,7},{"iron-chest",-2,8},{"iron-chest",-2,9},{"stone-wall",-2,11},{"stone-wall",1,-8},{"iron-chest",1,-6}, + {"iron-chest",1,-5},{"iron-chest",1,-4},{"iron-chest",1,-3},{"iron-chest",1,-2},{"iron-chest",1,5},{"iron-chest",1,6},{"iron-chest",1,7},{"iron-chest",1,8},{"iron-chest",1,9},{"stone-wall",1,11}, + {"stone-wall",2,-8},{"small-lamp",2,-6},{"small-lamp",2,-3},{"small-lamp",2,6},{"small-lamp",2,9},{"stone-wall",2,11},{"stone-wall",3,-8},{"small-electric-pole",3,-5},{"iron-chest",3,0},{"iron-chest",3,3}, + {"small-electric-pole",3,8},{"stone-wall",3,11},{"stone-wall",4,-8},{"small-lamp",4,-1},{"iron-chest",4,0},{"iron-chest",4,3},{"small-lamp",4,4},{"stone-wall",4,11},{"stone-wall",5,-8},{"small-lamp",5,-6}, + {"iron-chest",5,0},{"iron-chest",5,3},{"small-lamp",5,9},{"stone-wall",5,11},{"stone-wall",6,-8},{"small-electric-pole",6,-2},{"iron-chest",6,0},{"iron-chest",6,3},{"small-electric-pole",6,5},{"stone-wall",6,11}, + {"stone-wall",7,-8},{"small-lamp",7,-4},{"small-lamp",7,-1},{"iron-chest",7,0},{"iron-chest",7,3},{"small-lamp",7,4},{"small-lamp",7,7},{"stone-wall",7,11},{"stone-wall",9,-6},{"stone-wall",9,-5}, + {"stone-wall",9,-4},{"stone-wall",9,-3},{"stone-wall",9,-2},{"stone-wall",9,-1},{"stone-wall",9,0},{"stone-wall",9,3},{"stone-wall",9,4},{"stone-wall",9,5},{"stone-wall",9,6},{"stone-wall",9,7}, + {"stone-wall",9,8},{"stone-wall",9,9} +} + +local turrets = {{-3,-3},{-3,3},{3,-3},{3,3}} +local turret_ammo = 'uranium-rounds-magazine' + +local global_offset = {x=0,y=-2} +local decon_radius = 20 +local decon_tile = 'concrete' +local partern_radius = 50 +local partern_tile = 'stone-path' + +local function afk_belt(surface,offset) + local belts = {{-0.5,-0.5,2},{0.5,-0.5,4},{-0.5,0.5,0},{0.5,0.5,6}} + for _,pos in pairs(belts) do + local position = {pos[1]+offset[1],pos[2]+offset[2]} + local belt = surface.create_entity{name='transport-belt',position=position,force='neutral',direction=pos[3]} + belt.destructible = false; belt.health = 0; belt.minable = false; belt.rotatable = false + end +end + +local function spawn_turrets() + local surface = game.surfaces[1] + if not game.forces['spawn'] then game.create_force('spawn').set_cease_fire('player',true) end + for _,pos in pairs(turrets) do + local turret = surface.find_entity('gun-turret',pos) + if not turret then + turret = surface.create_entity{name='gun-turret',position=pos,force='spawn'} + turret.destructible = false; turret.health = 0; turret.minable = false; turret.rotatable = false; turret.operable = false; turret.health = 0 + end + if turret.get_inventory(defines.inventory.turret_ammo).can_insert{name=turret_ammo,count=10} then + turret.get_inventory(defines.inventory.turret_ammo).insert{name=turret_ammo,count=10} + end + end +end + +Event.register(defines.events.on_tick,function(event) + if event.tick % 3600 then + spawn_turrets() + end +end) + +Event.register(defines.events.on_player_created, function(event) + if event.player_index == 1 then + local player = Game.get_player(event) + local surface = player.surface + local offset = {x=0,y=0} + local partern_base_tile = surface.get_tile(player.position).name + local base_tiles = {} + local tiles = {} + for x = -partern_radius-5, partern_radius+5 do + for y = -partern_radius-5, partern_radius+5 do + if x^2+y^2 < decon_radius^2 then + table.insert(base_tiles,{name=decon_tile,position={x+offset.x,y+offset.y}}) + local entities = surface.find_entities_filtered{area={{x+offset.x-1,y+offset.y-1},{x+offset.x,y+offset.y}}} + for _,entity in pairs(entities) do if entity.name ~= 'player' then entity.destroy() end end + elseif x^2+y^2 < partern_radius^2 then + table.insert(base_tiles,{name=partern_base_tile,position={x+offset.x,y+offset.y}}) + end + end + end + surface.set_tiles(base_tiles) + for _,position in pairs(tile_positions) do + table.insert(tiles,{name=partern_tile,position={position[1]+offset.x+global_offset.x,position[2]+offset.y+global_offset.y}}) + end + surface.set_tiles(tiles) + for _,entity in pairs(entitys) do + local entity = surface.create_entity{name=entity[1],position={entity[2]+offset.x+global_offset.x,entity[3]+offset.y+global_offset.y},force='neutral'} + entity.destructible = false; entity.health = 0; entity.minable = false; entity.rotatable = false + end + spawn_turrets() + afk_belt(surface,{offset.x-5,offset.y-5}) + afk_belt(surface,{offset.x+5,offset.y-5}) + afk_belt(surface,{offset.x-5,offset.y+5}) + afk_belt(surface,{offset.x+5,offset.y+5}) + player.force.set_spawn_position(offset,surface) + player.teleport(offset,surface) + end +end) \ No newline at end of file diff --git a/StandAlone/starting-items.lua b/StandAlone/starting-items.lua new file mode 100644 index 00000000..12a2e181 --- /dev/null +++ b/StandAlone/starting-items.lua @@ -0,0 +1,31 @@ + +-- made by cooldude - this just allows condidtions on stating items and custom ammounts to be added, ie more iron made means more starting iron + +local items = { + ['iron-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 8 else return (made*10)/math.pow(tick_to_min(game.tick),2) end end, + ['copper-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*8)/math.pow(tick_to_min(game.tick),2) end end, + ['electronic-circuit']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*6)/math.pow(tick_to_min(game.tick),2) end end, + ['iron-gear-wheel']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*6)/math.pow(tick_to_min(game.tick),2) end end, + ['steel-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return(made*4)/math.pow(tick_to_min(game.tick),2) end end, + ['pistol']=function(player,made) if player.force.item_production_statistics.get_input_count('submachine-gun') > 5 then return 0 else return 1 end end, + ['submachine-gun']=function(player,made) if made > 5 then return 1 else return 0 end end, + ['firearm-magazine']=function(player,made) if player.force.item_production_statistics.get_input_count('piercing-rounds-magazine') > 100 then return 0 else return 10 end end, + ['piercing-rounds-magazine']=function(player,made) if made > 100 then return 10 else return 0 end end, + ['light-armor']=function(player,made) if made > 5 and player.force.item_production_statistics.get_input_count('heavy-armor') <= 5 then return 1 else return 0 end end, + ['heavy-armor']=function(player,made) if made > 5 then return 1 else return 0 end end, + ['burner-mining-drill']=function(player,made) if tick_to_min(game.tick) < 5 then return 4 else return 0 end end, + ['stone-furnace']=function(player,made) if tick_to_min(game.tick) < 5 then return 4 else return 0 end end, + ['iron-axe']=function(player,made) if made > 5 and player.force.item_production_statistics.get_input_count('steel-axe') <= 5 then return 1 else return 0 end end, + ['steel-axe']=function(player,made) if made > 5 then return 1 else return 0 end end +} +Event.register(defines.events.on_player_created, function(event) + local player = game.players[event.player_index] + if event.player_index == 1 then + player.force.friendly_fire = false + player.force.chart(player.surface, {{player.position.x - 400, player.position.y - 400}, {player.position.x + 400, player.position.y + 400}}) + end + for item,count in pairs(items) do + if type(count) == 'function' then count = math.floor(count(player,player.force.item_production_statistics.get_input_count(item))) end + if count > 0 then player.insert{name=item, count=count} end + end +end) \ No newline at end of file From bcfefe3ad7d3a620ad7f4e1db196ac411d669f63 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 5 Jan 2018 14:00:58 +0000 Subject: [PATCH 053/392] Added Protected Require --- StandAlone/load.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/StandAlone/load.lua b/StandAlone/load.lua index 2f6fd4a9..707924cf 100644 --- a/StandAlone/load.lua +++ b/StandAlone/load.lua @@ -7,6 +7,12 @@ Any changes that you may make to the code are yours but that does not make the s Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- +local return_err = true +local _require = require +local function require(path) + local success, err = pcall(_require,path) + if not success and return_err then error(err) end +end -- this file will just contain all the diffrent requires require('colours') require('health') From f633d8485c335c04eda502891241fbde3121e8d1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 22:52:11 +0000 Subject: [PATCH 054/392] Added Auto Message --- Addons/Admin/auto-message.lua | 48 +++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + locale/en/auto-message.cfg | 9 +++++++ 3 files changed, 58 insertions(+) create mode 100644 Addons/Admin/auto-message.lua create mode 100644 locale/en/auto-message.cfg diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua new file mode 100644 index 00000000..9e48afe9 --- /dev/null +++ b/Addons/Admin/auto-message.lua @@ -0,0 +1,48 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- +Event.register(-1,function(event) + Server.new_thread{ + name='auto-message', + timeout=3240000, -- 3240000 = 15 minutes + reopen=true, + data={ + high_rank= 'Owner', + low_rank= 'Regular', + low={ + {'auto-message.join-us'}, + {'auto-message.discord'}, + {'auto-message.website'}, + {'auto-message.custom-commands'}, + {'auto-message.read-readme'} + } + } + }:on_event('timeout',function(self) + local data = self.data + if not data.high_rank or not data.low_rank + or not data.low then self.reopen = false return end + local _high = Ranking.get_rank(data.high_rank) + local _low = Ranking.get_rank(data.low_rank) + Ranking.print(_high,{'auto-message.players-online',#game.connected_players},nil,true) + Ranking.print(_high,{'auto-message.map-time',tick_to_display_format(game.tick)},nil,true) + for _,line in pairs(data.low) do + Ranking.print(_low,line,nil,true) + end + self.reopen = true + end):on_event('error',function(self,err) + discord_emit{ + title='Auto Message Error', + color=Color.to_hex(defines.text_color.bg), + description='Auto Message Error - Closed Thread', + Error=err + } + self.reopen = false + self:close() + end):open() +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index f1194a97..282aa3b1 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -20,6 +20,7 @@ end require('Admin/player-info') require('Admin/admin') -- used with Guis/admin-gui, but can work without require('Admin/discord') +require('Admin/auto-message') -- commands dir require('Commands/cheat-mode') diff --git a/locale/en/auto-message.cfg b/locale/en/auto-message.cfg new file mode 100644 index 00000000..15e620a2 --- /dev/null +++ b/locale/en/auto-message.cfg @@ -0,0 +1,9 @@ +[auto-message] +players-online=There are __1__ players online +map-time=This map has been on for __1__ +line-8=Do /help for more info +join-us=Please join us on: +discord=Discord: https://discord.me/explosivegaming +website=Website: explosivegaming.nl +custom-commands=We use custom commands such as /tag and /report +read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file From a052af6d1e8113c6fd45af4f4ebf0bd5063b5994 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 23:24:16 +0000 Subject: [PATCH 055/392] Added Tree Decon --- Addons/Admin/tree-decon.lua | 51 +++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 6 ++++- locale/en/tree-decon.cfg | 3 +++ 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Addons/Admin/tree-decon.lua create mode 100644 locale/en/tree-decon.cfg diff --git a/Addons/Admin/tree-decon.lua b/Addons/Admin/tree-decon.lua new file mode 100644 index 00000000..a4a9cc87 --- /dev/null +++ b/Addons/Admin/tree-decon.lua @@ -0,0 +1,51 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +Event.register(-1,function(event) + Server.new_thread{ + name='tree-decon', + data={trees={},chache={},clear=0} + }:on_event('tick',function(self) + local trees = self.data.trees + if self.data.clear ~= 0 and self.data.clear < game.tick then self.data.chache = {} self.data.clear = 0 end + if #trees == 0 then return end + for i = 0,math.ceil(#trees/10) do + local tree = table.remove(trees,1) + if tree and tree.valid then tree.destroy() end + end + end):on_event(defines.events.on_marked_for_deconstruction,function(self,event) + local chache = self.data.chache[event.player_index] + if not chache then + local player = Game.get_player(event) + local rank = Ranking.get_rank(player) + if rank:allowed('tree-decon') then self.data.chache[event.player_index] = {'tree-decon',false} + elseif not rank:allowed('decon') then self.data.chache[event.player_index] = {'no-decon',false} end + chache = self.data.chache[event.player_index] + end + if not event.entity.last_user then + if chache[1] == 'tree-decon' then + table.insert(self.data.trees,event.entity) + self.data.clear = game.tick + 10 + end + else + if chache[1] == 'no-decon' then + event.entity.cancel_deconstruction('player') + 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) + local rank = Ranking.get_group('Admin').lowest + Ranking.print(rank,{'tree-decon.rank-print',player.name},defines.text_color.info) + self.data.clear = game.tick + 10 + end + end + end + end):open() +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 282aa3b1..d65863d6 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -21,6 +21,7 @@ require('Admin/player-info') require('Admin/admin') -- used with Guis/admin-gui, but can work without require('Admin/discord') require('Admin/auto-message') +require('Admin/tree-decon') -- commands dir require('Commands/cheat-mode') diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 0f9ebeed..255a7f09 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -141,12 +141,16 @@ ranks['Mod']:edit('allow',false,{ ['bring']=true }) +ranks['Donator']:edit('allow',false,{ + ['tree-decon']=true +}) ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, ['repair']=true }) ranks['Regular']:edit('allow',false,{ - ['kill']=true + ['kill']=true, + ['decon']=true }) ranks['Guest']:edit('allow',false,{ ['tag']=true, diff --git a/locale/en/tree-decon.cfg b/locale/en/tree-decon.cfg new file mode 100644 index 00000000..f1bfe299 --- /dev/null +++ b/locale/en/tree-decon.cfg @@ -0,0 +1,3 @@ +[tree-decon] +player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours +rank-print=__1__ tried to deconstruct something. \ No newline at end of file From ca394012d69e6d6342ab5084d7ec927f5c2ea6b6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 5 Jan 2018 23:32:25 +0000 Subject: [PATCH 056/392] Fixed tree Decon --- Addons/Admin/tree-decon.lua | 3 ++- Addons/playerRanks.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/tree-decon.lua b/Addons/Admin/tree-decon.lua index a4a9cc87..50b269b4 100644 --- a/Addons/Admin/tree-decon.lua +++ b/Addons/Admin/tree-decon.lua @@ -26,7 +26,8 @@ Event.register(-1,function(event) local player = Game.get_player(event) local rank = Ranking.get_rank(player) if rank:allowed('tree-decon') then self.data.chache[event.player_index] = {'tree-decon',false} - elseif not rank:allowed('decon') then self.data.chache[event.player_index] = {'no-decon',false} end + elseif not rank:allowed('decon') then self.data.chache[event.player_index] = {'no-decon',false} + else self.data.chache[event.player_index] = {'decon',false} end chache = self.data.chache[event.player_index] end if not event.entity.last_user then diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 255a7f09..098e4f07 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -124,7 +124,7 @@ groups['User']:add_rank{ tag='[Regular]', time=180, colour={r=24,g=172,b=188}, - power=4 + power=3 } local ranks = Ranking._ranks(true) From d96e9ac07589275c7670b0b03a318e985fa2eef8 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 00:14:24 +0000 Subject: [PATCH 057/392] Adding Reports --- Addons/Admin/reports.lua | 86 ++++++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + 2 files changed, 87 insertions(+) create mode 100644 Addons/Admin/reports.lua diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua new file mode 100644 index 00000000..dfdfbd56 --- /dev/null +++ b/Addons/Admin/reports.lua @@ -0,0 +1,86 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local report_to_warnings = 1 +local varified_to_warings = 3 +local reports_needed_for_jail = 10 +local take_action = 5 -- below this number no action is taken, the first admin given warning jumps to this number +local punishments = { + {'nothing'}, + {'nothing'}, + {'nothing'}, + {'nothing'}, + {'nothing'}, + {'message'}, + {'message'}, + {'message-reported'}, + {'message-kick'}, + {'kick'}, + {'message-temp-ban'}, + {'temp-ban'}, + {'message-ban'}, + {'message-last-waring'}, + {'ban'} +} + +local function _reports(reset) + global.addons = not reset and global.addons or {} + global.addons.reports = not reset and global.addons.reports or {warnings={},reports={},varified={},actions={}} + return global.addons.reports +end + +local function get_warnings(player) + local player = Game.get_player(player) + return Admin._reports()[player.name] or 0 +end + +local function report_message(player,by_player,reason) + +end + +local function count_reports(player) + -- counts the value of the reports +end + +local function cheak_reports(player) + -- jails a player if too many reports +end + +local function give_punishment(player) + -- gives a punishment based on the warnings, or nothing +end + +function Admin.give_warning(player,by_player,reason) + -- gives a waring, by_player is nil when done by script +end + +function Admin.report(player,by_player,reason) + -- reports a user and adds to the right area +end + +function Admin.clear_warings(player,by_player) + -- clears all warnings +end + +function Admin.clear_reports(player,by_player) + -- clears any reports +end + +function Admin.clear_player(player,by_player) + -- clears, warnings, reports, jail +end + +function Admin.temp_ban(player,by_player,reason) + -- jails a player and cant be unjailed and custom gui +end + +-- add an on_tick event to slowly remove warnings, faster for higher ranks + +-- add warnings to tree decon, then add warnings file to give warnings for diffrent actions \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index d65863d6..14b0aea4 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -19,6 +19,7 @@ end -- admin dir require('Admin/player-info') require('Admin/admin') -- used with Guis/admin-gui, but can work without +require('Admin/reports') -- this adds onto Admin/admin, adds report command and warnings, and temp ban require('Admin/discord') require('Admin/auto-message') require('Admin/tree-decon') From fe899ef138459b20df1fe84a0d3aa4e2bb695a18 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:17:08 +0000 Subject: [PATCH 058/392] Added Reports --- Addons/Admin/admin.lua | 23 ++-- Addons/Admin/reports.lua | 231 +++++++++++++++++++++++++++++++---- Addons/Admin/tree-decon.lua | 3 +- Addons/Commands/admin.lua | 54 ++++++++ Addons/Guis/admin-gui.lua | 4 +- Addons/Guis/rank-changer.lua | 4 +- Addons/playerRanks.lua | 6 +- locale/en/reports.cfg | 12 ++ 8 files changed, 294 insertions(+), 43 deletions(-) create mode 100644 Addons/Commands/admin.lua create mode 100644 locale/en/reports.cfg diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 2d270034..c26e0d37 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -10,8 +10,7 @@ Discord: https://discord.gg/r6dC2uK Admin = Admin or {} -local function append_name(reason,player) - local name = Game.get_player(player).name +local function append_name(reason,name) local reason = reason or 'No Reason' if not string.find(string.lower(reason),string.lower(name)) then return reason..' - '..name else return reason end @@ -69,14 +68,14 @@ end) function Admin.ban(player,by_player,reason) local player = Game.get_player(player) - local _player = Game.get_player(by_player) - local reason = append_name(reason,_player) + local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' + local reason = append_name(reason,by_player_name) discord_emit{ title='Player Ban', color=Color.to_hex(defines.text_color.crit), description='There was a player banned.', ['Player:']='<>'..player.name, - ['By:']='<>'.._player.name, + ['By:']='<>'..by_player_name, ['Reason:']=reason } game.ban_player(player,reason) @@ -94,14 +93,14 @@ end) function Admin.kick(player,by_player,reason) local player = Game.get_player(player) - local _player = Game.get_player(by_player) - local reason = append_name(reason,_player) + local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' + local reason = append_name(reason,by_player_name) discord_emit{ title='Player Kick', color=Color.to_hex(defines.text_color.high), description='There was a player kicked.', ['Player:']='<>'..player.name, - ['By:']='<>'.._player.name, + ['By:']='<>'..by_player_name, ['Reason:']=reason } game.kick_player(player,reason) @@ -119,18 +118,18 @@ end) function Admin.jail(player,by_player,reason) local player = Game.get_player(player) - local _player = Game.get_player(by_player) - local reason = append_name(reason,_player) + local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' + local reason = append_name(reason,by_player_name) discord_emit{ title='Player Jail', color=Color.to_hex(defines.text_color.med), description='There was a player jailed.', ['Player:']=player.name, - ['By:']='<>'.._player.name, + ['By:']='<>'..by_player_name, ['Reason:']=reason } Ranking._presets().last_jail = player.name - Ranking.give_rank(player,'Jail',_player) + Ranking.give_rank(player,'Jail',by_player_name) end Admin.go_to_btn = Gui.inputs.add{ diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index dfdfbd56..7dcc9943 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -8,28 +8,45 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -local report_to_warnings = 1 -local varified_to_warings = 3 +local report_to_warnings = 1 -- used in count_reports +local varified_to_warings = 3 -- used in count_reports local reports_needed_for_jail = 10 -local take_action = 5 -- below this number no action is taken, the first admin given warning jumps to this number +local min_time_to_remove_warning = 18000 -- this is in ticks +local take_action = 8 -- below this number no action is taken, the first admin given warning jumps to this number local punishments = { {'nothing'}, {'nothing'}, {'nothing'}, {'nothing'}, {'nothing'}, - {'message'}, - {'message'}, - {'message-reported'}, - {'message-kick'}, + {'message',{'reports.message'},defines.text_color.info}, + {'message',{'reports.message'},defines.text_color.info}, + {'report',{'reports.reported'},defines.text_color.med}, + {'message',{'reports.kick-warn'},defines.text_color.med}, {'kick'}, - {'message-temp-ban'}, + {'message',{'reports.temp-warn'},defines.text_color.high}, {'temp-ban'}, - {'message-ban'}, - {'message-last-waring'}, + {'message',{'reports.ban-warn'},defines.text_color.high}, + {'message',{'reports.last-warn'},defines.text_color.crit}, {'ban'} } +local actions = { + none=0, + report=1, + jail=2, + kick=3, + temp=4, + ban=5 +} + +local function valid_players(player,by_player) + local player = Game.get_player(player) + local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' + local rank = Ranking.get_rank(by_player_name) + return player, by_player_name, rank +end + local function _reports(reset) global.addons = not reset and global.addons or {} global.addons.reports = not reset and global.addons.reports or {warnings={},reports={},varified={},actions={}} @@ -38,49 +55,209 @@ end local function get_warnings(player) local player = Game.get_player(player) - return Admin._reports()[player.name] or 0 + return _reports().warnings[player.name] or 0 end local function report_message(player,by_player,reason) - + local low_rank = Ranking.get_group('User').highest + local high_rank = Ranking.get_group('Admin').lowest + local player, by_player_name = valid_players(player,by_player) + if not player then return end + if _reports().actions[player.name] == actions.report then return end + Ranking.print(low_rank,{'reports.low-print',player.name,med},defines.text_color.info,true) + Ranking.print(high_rank,{'reports.high-print',player.name,by_player_name,reason},defines.text_color.med) + discord_emit{ + title='Player Report', + color=Color.to_hex(defines.text_color.med), + description='There was a player reported.', + ['Player:']='<>'..player.name, + ['By:']='<>'..by_player_name, + ['Reason:']=reason + } end local function count_reports(player) - -- counts the value of the reports + local player = Game.get_player(player) + if not player then return 0 end + local _count = 0 + local data = _reports() + if data.reports[player.name] then + for _,report in pairs(data.reports[player.name]) do + _count=_count+report_to_warnings + end + end + if data.varified[player.name] then + for _,report in pairs(data.varified[player.name]) do + _count=_count+varified_to_warings + end + end + return _count end local function cheak_reports(player) - -- jails a player if too many reports + local player = Game.get_player(player) + if not player then return end + local reports = count_reports(player) + if reports >= reports_needed_for_jail and _reports().actions[player.name] ~= 'report-jail' and Ranking.get_rank(player).group.name ~= 'Jail' then + _reports().actions[player.name] = actions.report + Admin.jail(player,'','To many user reports. Contact an Admin to be unjailed.') + discord_emit{ + title='Player Report Jail', + color=Color.to_hex(defines.text_color.med), + description='There was a player reported and jailed.', + ['Player:']=player.name, + } + end end -local function give_punishment(player) - -- gives a punishment based on the warnings, or nothing +local function give_punishment(player,reason) + local warnings = get_warnings(player) + local punishment = punishments[warnings] + local reason = reason or 'No Other Reason' + if punishment[1] == 'nothing' then return + elseif punishment[1] == 'message' then + local message = punishment[2] + local colour = punishment[3] + player_return(message,colour,player) + elseif punishment[1] == 'report' then + local message = punishment[2] + local colour = punishment[3] + player_return(message,colour,player) + report_message(player,'',reason) + elseif punishment[1] == 'kick' then + _reports().actions[player.name] = actions.kick + Admin.kick(player,'','Too Many Warnings: '..warnings..' Also: '..reason) + elseif punishment[1] == 'temp-ban' then + _reports().actions[player.name] = actions.temp + Admin.temp_ban(player,'','Too Many Warnings: '..warnings..' Also: '..reason) + elseif punishment[1] == 'ban' then + _reports().actions[player.name] = actions.ban + Admin.ban(player,'','Too Many Warnings: '..warnings..' Also: '..reason) + end end -function Admin.give_warning(player,by_player,reason) - -- gives a waring, by_player is nil when done by script +function Admin.give_warning(player,by_player,reason,min) + local player, by_player_name = valid_players(player,by_player) + if not player then return end + local min = by_player_name and take_action or min or 0 + local warnings = get_warnings(player) + if warnings < min then warnings = min end + warnings = warnings+1 + _reports().warnings[player.name] = warnings + give_punishment(player,reason) end function Admin.report(player,by_player,reason) - -- reports a user and adds to the right area + local player, by_player_name = valid_players(player,by_player) + if not player or Ranking.get_rank(player):allowed('no-report') then return end + if rank:allowed('varified') then + _reports.varified[player.name] = _reports.varified[player.name] or {} + table.insert(_reports.varified,{by_player_name,reason}) + else + _reports.reports[player.name] = _reports.reports[player.name] or {} + table.insert(_reports.reports,{by_player_name,reason}) + end + cheak_reports(player) end -function Admin.clear_warings(player,by_player) - -- clears all warnings +function Admin.clear_warings(player,by_player,no_emit) + local player, by_player_name = valid_players(player,by_player) + if not player then return end + _reports().warnings[player.name]=0 + if not no_emit then + discord_emit{ + title='Player Clear', + color=Color.to_hex(defines.text_color.low), + description='A player had there warnings cleared.', + ['Player:']='<>'..player.name, + ['By:']='<>'..by_player_name, + } + end end -function Admin.clear_reports(player,by_player) - -- clears any reports +function Admin.clear_reports(player,by_player,no_emit) + local player, by_player_name = valid_players(player,by_player) + if not player then return end + _reports().reports[player.name]={} + _reports().varified[player.name]={} + if not no_emit then + discord_emit{ + title='Player Clear', + color=Color.to_hex(defines.text_color.low), + description='A player had there reports cleared.', + ['Player:']='<>'..player.name, + ['By:']='<>'..by_player_name, + } + end end function Admin.clear_player(player,by_player) - -- clears, warnings, reports, jail + local player, by_player_name = valid_players(player,by_player) + if not player then return end + Admin.clear_warings(player,by_player) + Admin.clear_reports(player,by_player) + _reports().actions[player.name]=actions.none + if rank.group.name == 'Jail' then Ranking.revert(player,by_player) end + discord_emit{ + title='Player Clear', + color=Color.to_hex(defines.text_color.low), + description='A player had there reports and warnings cleared.', + ['Player:']='<>'..player.name, + ['By:']='<>'..by_player_name, + } end function Admin.temp_ban(player,by_player,reason) - -- jails a player and cant be unjailed and custom gui + local function append_name(reason,name) + local reason = reason or 'No Reason' + if not string.find(string.lower(reason),string.lower(name)) then return reason..' - '..name + else return reason end + end + local player, by_player_name = valid_players(player,by_player) + if not player or Admin.is_banned(player) then return end + _reports().actions[player.name] = actions.temp + discord_emit{ + title='Player Temp-Ban', + color=Color.to_hex(defines.text_color.med), + description='There was a player jailed.', + ['Player:']='<>'..player.name, + ['By:']='<>'..by_player_name, + ['Reason:']=append_name(reason,by_player_name) + } + game.print({'reports.temp-ban',player,by_player_name},defines,text_color.info) + Ranking._presets().last_jail = player.name + Ranking.give_rank(player,'Jail',by_player_name) end --- add an on_tick event to slowly remove warnings, faster for higher ranks +function Admin.is_banned(player) + local player=Game.get_player(player) + local action = _reports().actions[player.name] + if action == actions.temp then return 'temp' + elseif action == actions.ban then return true + else return false end +end --- add warnings to tree decon, then add warnings file to give warnings for diffrent actions \ No newline at end of file +Event.register(defines.events.on_tick,function(event) + if not _reports().remove_warnings_time then + _reports().remove_warnings_time = {} + local highest = nil + for power,rank in pairs(Ranking._rank) do + if not highest and not rank:allowed('no-report') then highest = power+1 end + local _power = power; if highest then _power = highest-power end + if rank:allowed('no-report') then _reports().remove_warnings_time[power] = 0 + else _reports().remove_warnings_time[power] = min_time_to_remove_warning*_power end + end + end + if (game.tick % min_time_to_remove_warning) == 0 then + for name,warnings in pairs(_reports().warnings) do + if warnings > 0 then + local rank = Ranking.get_rank(name) + local time_to_remove = _reports().remove_warnings_time[rank.power] + if (game.tick % time_to_remove) == 0 then + _reports().warnings[name]=warnings-1 + player_return({'reports.remove-warn',_reports().warnings[name],tick_to_displayer_format(time_to_remove)},defines,text_color.low,name) + end + end + end + end +end) \ No newline at end of file diff --git a/Addons/Admin/tree-decon.lua b/Addons/Admin/tree-decon.lua index 50b269b4..27ee1ae2 100644 --- a/Addons/Admin/tree-decon.lua +++ b/Addons/Admin/tree-decon.lua @@ -44,8 +44,9 @@ Event.register(-1,function(event) player_return({'tree-decon.player-print'},defines.text_color.crit,player) local rank = Ranking.get_group('Admin').lowest Ranking.print(rank,{'tree-decon.rank-print',player.name},defines.text_color.info) - self.data.clear = game.tick + 10 + Admin.give_warning(player,'','Trying To Decon The Base') end + self.data.clear = game.tick + 10 end end end):open() diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua new file mode 100644 index 00000000..2676f960 --- /dev/null +++ b/Addons/Commands/admin.lua @@ -0,0 +1,54 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +commands.add_command('report', 'Reports a player', {'player','reason',true}, function(event,args) + local player = Game.get_player(args.player) + local reason = args.reason + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + Admin.report(player,event.player_index,reason) +end) + +commands.add_command('give_warnings', 'Gives a player a warnings', {'player','reason',true}, function(event,args) + local player = Game.get_player(args.player) + local reason = args.reason + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + Admin.give_warning(player,event.player_index,reason) +end) + +commands.add_command('temp_ban', 'Temp Ban A Player', {'player','reason',true}, function(event,args) + local player = Game.get_player(args.player) + local reason = args.reason + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + Admin.temp_ban(player,event.player_index,reason) +end) + +commands.add_command('clear_warings', 'Clears the warnings on a player', {'player'}, function(event,args) + local player = Game.get_player(args.player) + local reason = args.reason + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + Admin.clear_warings(player,event.player_index) +end) + +commands.add_command('clear_reports', 'Clears the reports from a player', {'player'}, function(event,args) + local player = Game.get_player(args.player) + local reason = args.reason + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + Admin.clear_reports(player,event.player_index) +end) + +commands.add_command('clear_player', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) + local player = Game.get_player(args.player) + local reason = args.reason + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + Admin.clear_player(player,event.player_index) +end) \ No newline at end of file diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index 034a57a9..525e91ce 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -22,7 +22,9 @@ local function _players(_player,root_frame,state) local _players = state and game.players or game.connected_players for _,player in pairs(_players) do if player.name ~= _player.name then - table.insert(players,player.name) + if Admin.is_banned and Admin.is_banned(player) then else + table.insert(players,player.name) + end end end return players diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua index a8d7d6e1..6340ac1e 100644 --- a/Addons/Guis/rank-changer.lua +++ b/Addons/Guis/rank-changer.lua @@ -20,7 +20,9 @@ local function _players(_player,root_frame,state) local _players = state and game.players or game.connected_players for _,player in pairs(_players) do if player.name ~= _player.name then - table.insert(players,player.name) + if Admin.is_banned and Admin.is_banned(player) then else + table.insert(players,player.name) + end end end return players diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 098e4f07..7ee40d96 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -138,10 +138,14 @@ ranks['Admin']:edit('allow',false,{ }) ranks['Mod']:edit('allow',false,{ ['go-to']=true, - ['bring']=true + ['bring']=true, + ['no-report']=true }) ranks['Donator']:edit('allow',false,{ + +}) +ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true }) ranks['Member']:edit('allow',false,{ diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg new file mode 100644 index 00000000..4c812918 --- /dev/null +++ b/locale/en/reports.cfg @@ -0,0 +1,12 @@ +[reports] +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 cant be reported. +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. \ No newline at end of file From 24d474dbaa30815d6731a80e3038ca76fff27d86 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:19:16 +0000 Subject: [PATCH 059/392] Added Commands To PLayer Ranks --- Addons/playerRanks.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 7ee40d96..a8d92a17 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -45,7 +45,12 @@ groups['Root']:edit('allow',false,{ ['science']=true, ['tasklist']=true, ['rank-changer']=true, - ['admin-commands']=true + ['admin-commands']=true, + ['give_warnings']=true, + ['temp_ban']=true, + ['clear_warings']=true, + ['clear_reports']=true, + ['clear_player']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -54,7 +59,12 @@ groups['Admin']:edit('allow',false,{ ['science']=true, ['tasklist']=true, ['rank-changer']=true, - ['admin-commands']=true + ['admin-commands']=true, + ['give_warnings']=true, + ['temp_ban']=true, + ['clear_warings']=true, + ['clear_reports']=true, + ['clear_player']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, @@ -158,7 +168,8 @@ ranks['Regular']:edit('allow',false,{ }) ranks['Guest']:edit('allow',false,{ ['tag']=true, - ['tag-clear']=true + ['tag-clear']=true, + ['report']=true }) Ranking._base_preset{ From 465c055649731fcce2529ca53483ccc68bcbd300 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:21:00 +0000 Subject: [PATCH 060/392] Fixed Load --- Addons/Commands/admin.lua | 10 +++++----- Addons/load.lua | 1 + Addons/playerRanks.lua | 10 +++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 2676f960..090233c3 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -16,7 +16,7 @@ commands.add_command('report', 'Reports a player', {'player','reason',true}, fun Admin.report(player,event.player_index,reason) end) -commands.add_command('give_warnings', 'Gives a player a warnings', {'player','reason',true}, function(event,args) +commands.add_command('give-warnings', 'Gives a player a warnings', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -24,7 +24,7 @@ commands.add_command('give_warnings', 'Gives a player a warnings', {'player','re Admin.give_warning(player,event.player_index,reason) end) -commands.add_command('temp_ban', 'Temp Ban A Player', {'player','reason',true}, function(event,args) +commands.add_command('temp-ban', 'Temp Ban A Player', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -32,21 +32,21 @@ commands.add_command('temp_ban', 'Temp Ban A Player', {'player','reason',true}, Admin.temp_ban(player,event.player_index,reason) end) -commands.add_command('clear_warings', 'Clears the warnings on a player', {'player'}, function(event,args) +commands.add_command('clear-warings', 'Clears the warnings on a player', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_warings(player,event.player_index) end) -commands.add_command('clear_reports', 'Clears the reports from a player', {'player'}, function(event,args) +commands.add_command('clear-reports', 'Clears the reports from a player', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear_player', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-player', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end diff --git a/Addons/load.lua b/Addons/load.lua index 14b0aea4..e46cb932 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -30,6 +30,7 @@ require('Commands/kill') require('Commands/repair') require('Commands/tags') require('Commands/tp') -- requires Admin/admin +require('Commands/admin') -- requires Admin/reports -- guis dir require('Guis/readme') diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index a8d92a17..8b370e46 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -60,11 +60,11 @@ groups['Admin']:edit('allow',false,{ ['tasklist']=true, ['rank-changer']=true, ['admin-commands']=true, - ['give_warnings']=true, - ['temp_ban']=true, - ['clear_warings']=true, - ['clear_reports']=true, - ['clear_player']=true + ['give-warnings']=true, + ['temp-ban']=true, + ['clear-warings']=true, + ['clear-reports']=true, + ['clear-player']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, From ef2136ca4f41c7065c505d7bc307b9ff7fcf7fc5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:21:49 +0000 Subject: [PATCH 061/392] More Fixes To Player Ranks --- Addons/playerRanks.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 8b370e46..130bfb17 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -46,11 +46,11 @@ groups['Root']:edit('allow',false,{ ['tasklist']=true, ['rank-changer']=true, ['admin-commands']=true, - ['give_warnings']=true, - ['temp_ban']=true, - ['clear_warings']=true, - ['clear_reports']=true, - ['clear_player']=true + ['give-warnings']=true, + ['temp-ban']=true, + ['clear-warings']=true, + ['clear-reports']=true, + ['clear-player']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, From ed306b4006fa15374682c2b124c5bae7daf80a83 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:23:01 +0000 Subject: [PATCH 062/392] Fixed On_tick --- Addons/Admin/reports.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 7dcc9943..fb5bc965 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -241,7 +241,7 @@ Event.register(defines.events.on_tick,function(event) if not _reports().remove_warnings_time then _reports().remove_warnings_time = {} local highest = nil - for power,rank in pairs(Ranking._rank) do + for power,rank in pairs(Ranking._ranks()) do if not highest and not rank:allowed('no-report') then highest = power+1 end local _power = power; if highest then _power = highest-power end if rank:allowed('no-report') then _reports().remove_warnings_time[power] = 0 From 76c02e8f26e889e33645eede4c4f6333d9ebc671 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:43:47 +0000 Subject: [PATCH 063/392] Fixed A Few Bugs --- Addons/Admin/reports.lua | 23 +++++++++++++---------- Addons/Commands/admin.lua | 2 +- Addons/playerRanks.lua | 10 +++++----- locale/en/reports.cfg | 2 ++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index fb5bc965..99e83256 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -64,7 +64,7 @@ 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 _reports().actions[player.name] == actions.report then return end - Ranking.print(low_rank,{'reports.low-print',player.name,med},defines.text_color.info,true) + Ranking.print(low_rank,{'reports.low-print',player.name,reason},defines.text_color.info,true) Ranking.print(high_rank,{'reports.high-print',player.name,by_player_name,reason},defines.text_color.med) discord_emit{ title='Player Report', @@ -110,11 +110,12 @@ local function cheak_reports(player) end end -local function give_punishment(player,reason) +local function give_punishment(player,by_player,reason) + local player, by_player_name = valid_players(player,by_player) local warnings = get_warnings(player) local punishment = punishments[warnings] local reason = reason or 'No Other Reason' - if punishment[1] == 'nothing' then return + if not punishment or punishment[1] == 'nothing' then return elseif punishment[1] == 'message' then local message = punishment[2] local colour = punishment[3] @@ -126,25 +127,27 @@ local function give_punishment(player,reason) report_message(player,'',reason) elseif punishment[1] == 'kick' then _reports().actions[player.name] = actions.kick - Admin.kick(player,'','Too Many Warnings: '..warnings..' Also: '..reason) + Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) elseif punishment[1] == 'temp-ban' then _reports().actions[player.name] = actions.temp - Admin.temp_ban(player,'','Too Many Warnings: '..warnings..' Also: '..reason) + Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) elseif punishment[1] == 'ban' then _reports().actions[player.name] = actions.ban - Admin.ban(player,'','Too Many Warnings: '..warnings..' Also: '..reason) + Admin.ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) end end function Admin.give_warning(player,by_player,reason,min) local player, by_player_name = valid_players(player,by_player) if not player then return end - local min = by_player_name and take_action or min or 0 + local min = Game.get_player(by_player) and take_action or min or 0 local warnings = get_warnings(player) if warnings < min then warnings = min end warnings = warnings+1 _reports().warnings[player.name] = warnings - give_punishment(player,reason) + player_return({'reports.warning-given-by',by_player_name},defines.text_color.info,player) + game.print({'reports.player-warning',player,by_player_name}) + give_punishment(player,by_player,reason) end function Admin.report(player,by_player,reason) @@ -242,8 +245,8 @@ Event.register(defines.events.on_tick,function(event) _reports().remove_warnings_time = {} local highest = nil for power,rank in pairs(Ranking._ranks()) do - if not highest and not rank:allowed('no-report') then highest = power+1 end - local _power = power; if highest then _power = highest-power end + 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 _reports().remove_warnings_time[power] = 0 else _reports().remove_warnings_time[power] = min_time_to_remove_warning*_power end end diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 090233c3..258c6cd1 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -16,7 +16,7 @@ commands.add_command('report', 'Reports a player', {'player','reason',true}, fun Admin.report(player,event.player_index,reason) end) -commands.add_command('give-warnings', 'Gives a player a warnings', {'player','reason',true}, function(event,args) +commands.add_command('give-warning', 'Gives a player a warnings', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 130bfb17..892bbf1a 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -46,7 +46,7 @@ groups['Root']:edit('allow',false,{ ['tasklist']=true, ['rank-changer']=true, ['admin-commands']=true, - ['give-warnings']=true, + ['give-warning']=true, ['temp-ban']=true, ['clear-warings']=true, ['clear-reports']=true, @@ -60,7 +60,7 @@ groups['Admin']:edit('allow',false,{ ['tasklist']=true, ['rank-changer']=true, ['admin-commands']=true, - ['give-warnings']=true, + ['give-warning']=true, ['temp-ban']=true, ['clear-warings']=true, ['clear-reports']=true, @@ -71,7 +71,8 @@ groups['User']:edit('allow',false,{ ['readme']=true, ['rockets']=true, ['science']=true, - ['tasklist']=true + ['tasklist']=true, + ['report']=true }) groups['Jail']:edit('allow',false,{ @@ -168,8 +169,7 @@ ranks['Regular']:edit('allow',false,{ }) ranks['Guest']:edit('allow',false,{ ['tag']=true, - ['tag-clear']=true, - ['report']=true + ['tag-clear']=true }) Ranking._base_preset{ diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg index 4c812918..4792606b 100644 --- a/locale/en/reports.cfg +++ b/locale/en/reports.cfg @@ -2,6 +2,8 @@ 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 cant be reported. +warning-given-by=This Warnings Was Given By: __1__ +player-warning=__1__ was given a warning by __2__ 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 From eb87f0e61caaceaeab0cdf47a95f6f268da377a0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:45:22 +0000 Subject: [PATCH 064/392] Fixed Temp-ban --- Addons/Admin/reports.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 99e83256..9936c329 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -227,7 +227,7 @@ function Admin.temp_ban(player,by_player,reason) ['By:']='<>'..by_player_name, ['Reason:']=append_name(reason,by_player_name) } - game.print({'reports.temp-ban',player,by_player_name},defines,text_color.info) + game.print({'reports.temp-ban',player,by_player_name},defines.text_color.info) Ranking._presets().last_jail = player.name Ranking.give_rank(player,'Jail',by_player_name) end From dff29a66ec024436d617bb06068c86ac5f70c2dc Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:52:46 +0000 Subject: [PATCH 065/392] Fixed A few bugs --- Addons/Admin/reports.lua | 6 +++--- locale/en/reports.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 9936c329..86b100da 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -146,7 +146,7 @@ function Admin.give_warning(player,by_player,reason,min) warnings = warnings+1 _reports().warnings[player.name] = warnings player_return({'reports.warning-given-by',by_player_name},defines.text_color.info,player) - game.print({'reports.player-warning',player,by_player_name}) + game.print({'reports.player-warning',player.name,by_player_name}) give_punishment(player,by_player,reason) end @@ -227,7 +227,7 @@ function Admin.temp_ban(player,by_player,reason) ['By:']='<>'..by_player_name, ['Reason:']=append_name(reason,by_player_name) } - game.print({'reports.temp-ban',player,by_player_name},defines.text_color.info) + game.print({'reports.temp-ban',player.name,by_player_name,reason},defines.text_color.info) Ranking._presets().last_jail = player.name Ranking.give_rank(player,'Jail',by_player_name) end @@ -258,7 +258,7 @@ Event.register(defines.events.on_tick,function(event) local time_to_remove = _reports().remove_warnings_time[rank.power] if (game.tick % time_to_remove) == 0 then _reports().warnings[name]=warnings-1 - player_return({'reports.remove-warn',_reports().warnings[name],tick_to_displayer_format(time_to_remove)},defines,text_color.low,name) + player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines,text_color.low,name) end end end diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg index 4792606b..9cbe2551 100644 --- a/locale/en/reports.cfg +++ b/locale/en/reports.cfg @@ -3,7 +3,7 @@ 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 cant be reported. warning-given-by=This Warnings Was Given By: __1__ -player-warning=__1__ was given a warning by __2__ +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 From 61110e7c1190655f53804ac371f222e56e706d77 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 14:59:49 +0000 Subject: [PATCH 066/392] Added A few Edits --- Addons/Admin/admin.lua | 1 + Addons/Commands/admin.lua | 3 +++ Addons/Guis/admin-gui.lua | 1 + 3 files changed, 5 insertions(+) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index c26e0d37..7d33069e 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -49,6 +49,7 @@ end function Admin.take_action(action,player,by_player,reason) if action == 'Ban' then Admin.ban(player,by_player,reason) + elseif action == 'Temp Ban' and Admin.temp_ban then Admin.temp_ban(player,by_player,reason) elseif action == 'Kick' then Admin.kick(player,by_player,reason) elseif action == 'Jail' then Admin.jail(player,by_player,reason) elseif action == 'Go To' then Admin.go_to(player,by_player) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 258c6cd1..90134d8c 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -9,10 +9,13 @@ Discord: https://discord.gg/r6dC2uK --Please Only Edit Below This Line----------------------------------------------------------- commands.add_command('report', 'Reports a player', {'player','reason',true}, function(event,args) + local _player = Game.get_player(event) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end + for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end Admin.report(player,event.player_index,reason) end) diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index 525e91ce..de61f1d6 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -65,6 +65,7 @@ local function _actions(player) 'Bring', 'Jail', 'Kick', + 'Temp Ban', 'Ban' } end From 67b220ed1e07741aada52844946264840af86759 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 15:03:36 +0000 Subject: [PATCH 067/392] Fixed Un Jail --- Addons/Admin/reports.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 86b100da..7d6cb8a7 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -197,10 +197,10 @@ end function Admin.clear_player(player,by_player) local player, by_player_name = valid_players(player,by_player) if not player then return end - Admin.clear_warings(player,by_player) - Admin.clear_reports(player,by_player) + Admin.clear_warings(player,by_player,true) + Admin.clear_reports(player,by_player,true) _reports().actions[player.name]=actions.none - if rank.group.name == 'Jail' then Ranking.revert(player,by_player) end + if Ranking.get_rank(player).group.name == 'Jail' then Ranking.revert(player,by_player) end discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), From d7280f84d81c96e3da0702ea7386dad2a444260a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 15:19:55 +0000 Subject: [PATCH 068/392] Added report button on player list --- Addons/Guis/player-list.lua | 5 ++++ Addons/Guis/reports.lua | 53 +++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + locale/en/reports.cfg | 1 + 4 files changed, 60 insertions(+) create mode 100644 Addons/Guis/reports.lua diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index bd9b8734..c572a262 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -73,6 +73,11 @@ Gui.left.add{ caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand} }.style.font_color = rank.colour end + if Admin.report_btn then + local btn = Admin.report_btn:draw(flow) + btn.style.height = 20 + btn.style.width = 20 + end end end end, diff --git a/Addons/Guis/reports.lua b/Addons/Guis/reports.lua new file mode 100644 index 00000000..f0e58ee1 --- /dev/null +++ b/Addons/Guis/reports.lua @@ -0,0 +1,53 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local confirm_report = Gui.inputs.add{ + type='button', + name='admin-report-confirm', + caption='utility/spawn_flag' +}:on_event('click',function(event) + local parent = evet.element.parent + local player = Game.get_player(parent.player.caption) + local reason = parent.reason.text + Admin.report(player,event.player_index,reason) +end) + +Admin.report_btn = Gui.inputs.add{ + type='button', + name='admin-report', + caption='utility/spawp_flag' +}:on_event('click',function(event) + local parent = event.element.parent + local player = nil + for name,_ in pairs(parent.children) do + if name ~= 'admin-report' then + player = Game.get_player(name) + break + end + end + if not player then return end + local _player = Game.get_player(event) + Gui.center.clear(_player) + local frame = Gui.center.get_flow(_player).add{ + type='frame', + name='report-gui' + } + frame.caption={'reports.name'} + frame.add{ + type='textfield', + name='reason' + }.style.width = 300 + confirm_report:draw(frame) + frame.add{ + type='label', + name='player', + caption=player.name + }.style.visible = false +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index e46cb932..45af3c1f 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -41,5 +41,6 @@ require('Guis/tasklist') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin require('Guis/game-settings') +require('Guis/reports') -- requires Admin/reports -- other \ No newline at end of file diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg index 9cbe2551..b0152d44 100644 --- a/locale/en/reports.cfg +++ b/locale/en/reports.cfg @@ -1,4 +1,5 @@ [reports] +name=Report Player 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 cant be reported. From 5bb54db9866c0688a61c661f7406ade1791cbf97 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 15:22:03 +0000 Subject: [PATCH 069/392] Added Tooltips to admin buttons --- Addons/Admin/admin.lua | 15 ++++++++++----- locale/en/admin.cfg | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 7d33069e..7e372d73 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -60,7 +60,8 @@ end Admin.ban_btn = Gui.inputs.add{ type='button', name='admin-ban', - caption='utility/danger_icon' + caption='utility/danger_icon', + tooltip={'admin-commands.tooltip-ban'} }:on_event('click',function(event) local parent = event.element.parent pre_select_player = parent.player and parent.player.caption or nil @@ -85,7 +86,8 @@ end Admin.kick_btn = Gui.inputs.add{ type='button', name='admin-kick', - caption='utility/warning_icon' + caption='utility/warning_icon', + tooltip={'admin-commands.tooltip-kick'} }:on_event('click',function(event) local parent = event.element.parent pre_select_player = parent.player and parent.player.caption or nil @@ -110,7 +112,8 @@ end Admin.jail_btn = Gui.inputs.add{ type='button', name='admin-jail', - caption='utility/clock' + caption='utility/clock', + tooltip={'admin-commands.tooltip-jail'} }:on_event('click',function(event) local parent = event.element.parent pre_select_player = parent.player and parent.player.caption or nil @@ -136,7 +139,8 @@ end Admin.go_to_btn = Gui.inputs.add{ type='button', name='admin-go-to', - caption='utility/export_slot' + caption='utility/export_slot', + tooltip={'admin-commands.tooltip-go-to'} }:on_event('click',function(event) local parent = event.element.parent pre_select_player = parent.player and parent.player.caption or nil @@ -152,7 +156,8 @@ end Admin.bring_btn = Gui.inputs.add{ type='button', name='admin-bring', - caption='utility/import_slot' + caption='utility/import_slot', + tooltip={'admin-commands.tooltip-bring'} }:on_event('click',function(event) local parent = event.element.parent pre_select_player = parent.player and parent.player.caption or nil diff --git a/locale/en/admin.cfg b/locale/en/admin.cfg index 025cd2eb..52434a4d 100644 --- a/locale/en/admin.cfg +++ b/locale/en/admin.cfg @@ -8,3 +8,8 @@ short-reason=Warning, this is a short reason please think i it could be made mor rank-high=This player is a higher rank, please use in game command if you are sure about this! 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 \ No newline at end of file From 54663421d65455df9b59eb89df0ab2fd444a948c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 15:23:50 +0000 Subject: [PATCH 070/392] Report Only Shown On Lower Ranks --- Addons/Guis/player-list.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index c572a262..215104cb 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -73,7 +73,7 @@ Gui.left.add{ caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand} }.style.font_color = rank.colour end - if Admin.report_btn then + if Admin.report_btn and not rank:allowed('no-report') and not player.index == frame.player_index then local btn = Admin.report_btn:draw(flow) btn.style.height = 20 btn.style.width = 20 From 4727296ea47f6896ee2be83f461d1e4d192fd2f0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 15:47:03 +0000 Subject: [PATCH 071/392] Fixed Reports --- Addons/Admin/reports.lua | 9 +++++---- Addons/Guis/player-list.lua | 20 +++++++++++--------- Addons/Guis/reports.lua | 22 +++++++++++----------- Addons/load.lua | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 7d6cb8a7..592ab09c 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -154,12 +154,13 @@ function Admin.report(player,by_player,reason) local player, by_player_name = valid_players(player,by_player) if not player or Ranking.get_rank(player):allowed('no-report') then return end if rank:allowed('varified') then - _reports.varified[player.name] = _reports.varified[player.name] or {} - table.insert(_reports.varified,{by_player_name,reason}) + _reports().varified[player.name] = _reports().varified[player.name] or {} + table.insert(_reports().varified,{by_player_name,reason}) else - _reports.reports[player.name] = _reports.reports[player.name] or {} - table.insert(_reports.reports,{by_player_name,reason}) + _reports().reports[player.name] = _reports().reports[player.name] or {} + table.insert(_reports().reports,{by_player_name,reason}) end + report_message(player,by_player,reason) cheak_reports(player) end diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index 215104cb..a41da941 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -49,11 +49,11 @@ Gui.left.add{ draw=function(frame) frame.caption = '' local player_list = frame.add{ - name="scroll", - type = "scroll-pane", - direction = "vertical", - vertical_scroll_policy="always", - horizontal_scroll_policy="never" + name='scroll', + type = 'scroll-pane', + direction = 'vertical', + vertical_scroll_policy='always', + horizontal_scroll_policy='never' } for _,rank in pairs(Ranking._ranks()) do for _,player in pairs(rank:get_players(true)) do @@ -73,10 +73,12 @@ Gui.left.add{ caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand} }.style.font_color = rank.colour end - if Admin.report_btn and not rank:allowed('no-report') and not player.index == frame.player_index then - local btn = Admin.report_btn:draw(flow) - btn.style.height = 20 - btn.style.width = 20 + if Admin.report_btn then + if not rank:allowed('no-report') and player.index ~= frame.player_index then + local btn = Admin.report_btn:draw(flow) + btn.style.height = 20 + btn.style.width = 20 + end end end end diff --git a/Addons/Guis/reports.lua b/Addons/Guis/reports.lua index f0e58ee1..5205775c 100644 --- a/Addons/Guis/reports.lua +++ b/Addons/Guis/reports.lua @@ -11,27 +11,24 @@ Discord: https://discord.gg/r6dC2uK local confirm_report = Gui.inputs.add{ type='button', name='admin-report-confirm', - caption='utility/spawn_flag' + caption='utility/spawn_flag', + tooltip={'reports.name'} }:on_event('click',function(event) - local parent = evet.element.parent + local parent = event.element.parent local player = Game.get_player(parent.player.caption) local reason = parent.reason.text Admin.report(player,event.player_index,reason) + Gui.center.clear(event.player_index) end) Admin.report_btn = Gui.inputs.add{ type='button', name='admin-report', - caption='utility/spawp_flag' + caption='utility/spawn_flag', + tooltip={'reports.name'} }:on_event('click',function(event) local parent = event.element.parent - local player = nil - for name,_ in pairs(parent.children) do - if name ~= 'admin-report' then - player = Game.get_player(name) - break - end - end + local player = Game.get_player(parent.children[1].name) if not player then return end local _player = Game.get_player(event) Gui.center.clear(_player) @@ -39,12 +36,15 @@ Admin.report_btn = Gui.inputs.add{ type='frame', name='report-gui' } + _player.opened=frame frame.caption={'reports.name'} frame.add{ type='textfield', name='reason' }.style.width = 300 - confirm_report:draw(frame) + local btn = confirm_report:draw(frame) + btn.style.height = 30 + btn.style.width = 30 frame.add{ type='label', name='player', diff --git a/Addons/load.lua b/Addons/load.lua index 45af3c1f..ae69689a 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -40,7 +40,7 @@ require('Guis/player-list') require('Guis/tasklist') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin -require('Guis/game-settings') require('Guis/reports') -- requires Admin/reports +require('Guis/game-settings') -- other \ No newline at end of file From 6dc985a6ceb6cd292b2970384c5b924f138c16c5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 15:53:12 +0000 Subject: [PATCH 072/392] Fixed Reports For Last Time Now --- Addons/Admin/reports.lua | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 592ab09c..85d26b51 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -76,7 +76,7 @@ local function report_message(player,by_player,reason) } end -local function count_reports(player) +function count_reports(player) local player = Game.get_player(player) if not player then return 0 end local _count = 0 @@ -101,12 +101,6 @@ local function cheak_reports(player) if reports >= reports_needed_for_jail and _reports().actions[player.name] ~= 'report-jail' and Ranking.get_rank(player).group.name ~= 'Jail' then _reports().actions[player.name] = actions.report Admin.jail(player,'','To many user reports. Contact an Admin to be unjailed.') - discord_emit{ - title='Player Report Jail', - color=Color.to_hex(defines.text_color.med), - description='There was a player reported and jailed.', - ['Player:']=player.name, - } end end @@ -155,10 +149,10 @@ function Admin.report(player,by_player,reason) if not player or Ranking.get_rank(player):allowed('no-report') then return end if rank:allowed('varified') then _reports().varified[player.name] = _reports().varified[player.name] or {} - table.insert(_reports().varified,{by_player_name,reason}) + table.insert(_reports().varified[player.name],{by_player_name,reason}) else _reports().reports[player.name] = _reports().reports[player.name] or {} - table.insert(_reports().reports,{by_player_name,reason}) + table.insert(_reports().reports[player.name],{by_player_name,reason}) end report_message(player,by_player,reason) cheak_reports(player) From 0e83b8cecc76003374acb0b6718716e6672325d8 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 17:38:28 +0000 Subject: [PATCH 073/392] Added Annoncements --- Addons/Guis/announcements.lua | 88 +++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + locale/en/announcements.cfg | 5 ++ 3 files changed, 94 insertions(+) create mode 100644 Addons/Guis/announcements.lua create mode 100644 locale/en/announcements.cfg diff --git a/Addons/Guis/announcements.lua b/Addons/Guis/announcements.lua new file mode 100644 index 00000000..8fd8c9b5 --- /dev/null +++ b/Addons/Guis/announcements.lua @@ -0,0 +1,88 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local function _ranks(player) + local ranks = {'Select Rank'} + local _rank = Ranking.get_rank(player) + for _,rank in pairs(Ranking._ranks()) do + if rank.power >= _rank.power then + table.insert(ranks,rank.name) + end + end + return ranks +end + +local rank_drop_down = Gui.inputs.add_drop_down('rank-drop-down-annoncements',_ranks,1,function(player,selected,items,element) + element.parent.rank.caption = selected + if selected == 'Select Rank' then element.parent['send-annoncement'].style.visible = false + else element.parent['send-annoncement'].style.visible = true end +end) + +local send_popup = Gui.inputs.add{ + type='button', + name='send-annoncement', + caption='utility/export_slot' +}:on_event('click',function(event) + local meta_data = Ranking._presets().meta + local default = Ranking.get_rank(meta_data.default) + local player = Game.get_player(event) + local rank = Ranking.get_rank(player) + local _rank = Ranking.get_rank(event.element.parent.rank.caption) + if not _rank then return end + local sent_by = {'announcements.sent-by',player.name,rank.name} + local rank_name = _rank.name; if rank_name == default.name then rank_name = 'Everyone' end + local sent_to = {'announcements.sent-to',rank_name} + local message = event.element.parent.parent.message.text + for power,__rank in pairs(Ranking._ranks()) do + if power >= _rank.power then + Gui.popup.open('announcements',{sent_by=sent_by,sent_to=sent_to,message=message},__rank:get_players(true)) + end + end +end) + +Gui.popup.add{ + name='announcements', + caption={'announcements.name'}, + draw=function(frame,data) + frame.add{type='label',caption=data.sent_by} + frame.add{type='label',caption=data.sent_to} + local text_box = frame.add{type='text-box'} + text_box.text = data.message + text_box.style.width = 400 + text_box.read_only = true + text_box.word_wrap = true + text_box.selectable = true + end +}:add_left{ + caption='Gui Left w/ Popup', + tooltip='Send a message', + draw=function(frame) + local frame = frame.add{ + type='flow', + directions='vertical' + } + frame.add{ + type='text-box', + name='message' + } + local flow = frame.add{type='flow'} + flow.add{ + type='label', + caption={'announcements.select-rank'} + } + rank_drop_down:draw(flow) + send_popup:draw(flow).style.visible = false + flow.add{ + type='label', + name='rank', + caption='' + }.style.visible = false + end +} \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index ae69689a..6f92c805 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -38,6 +38,7 @@ require('Guis/science') require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') +require('Guis/announcements') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin require('Guis/reports') -- requires Admin/reports diff --git a/locale/en/announcements.cfg b/locale/en/announcements.cfg new file mode 100644 index 00000000..75a71670 --- /dev/null +++ b/locale/en/announcements.cfg @@ -0,0 +1,5 @@ +[anouncements] +name=Announcement +sent-to=This is sent to __1__ +sent-by=This was sent by __1__ of rank __2__ +select-rank=This message will be sent to: \ No newline at end of file From 785c78c95175e69d8efe1f9e476c0babe5b30386 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 17:58:03 +0000 Subject: [PATCH 074/392] Fixed Annoncements --- Addons/Guis/announcements.lua | 30 ++++++++++++++++++++---------- Addons/playerRanks.lua | 6 ++++-- locale/en/announcements.cfg | 3 ++- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/Addons/Guis/announcements.lua b/Addons/Guis/announcements.lua index 8fd8c9b5..894867d0 100644 --- a/Addons/Guis/announcements.lua +++ b/Addons/Guis/announcements.lua @@ -34,14 +34,13 @@ local send_popup = Gui.inputs.add{ local default = Ranking.get_rank(meta_data.default) local player = Game.get_player(event) local rank = Ranking.get_rank(player) - local _rank = Ranking.get_rank(event.element.parent.rank.caption) - if not _rank then return end + local _rank = Ranking.get_rank(event.element.parent.rank.caption); if not _rank then return end local sent_by = {'announcements.sent-by',player.name,rank.name} local rank_name = _rank.name; if rank_name == default.name then rank_name = 'Everyone' end local sent_to = {'announcements.sent-to',rank_name} local message = event.element.parent.parent.message.text for power,__rank in pairs(Ranking._ranks()) do - if power >= _rank.power then + if power <= _rank.power then Gui.popup.open('announcements',{sent_by=sent_by,sent_to=sent_to,message=message},__rank:get_players(true)) end end @@ -51,8 +50,10 @@ Gui.popup.add{ name='announcements', caption={'announcements.name'}, draw=function(frame,data) - frame.add{type='label',caption=data.sent_by} - frame.add{type='label',caption=data.sent_to} + frame.style.right_padding = 5 + frame.style.bottom_padding = 5 + frame.add{type='label',caption=data.sent_by,style='caption_label'} + frame.add{type='label',caption=data.sent_to,style='caption_label'} local text_box = frame.add{type='text-box'} text_box.text = data.message text_box.style.width = 400 @@ -61,24 +62,33 @@ Gui.popup.add{ text_box.selectable = true end }:add_left{ - caption='Gui Left w/ Popup', - tooltip='Send a message', + caption='item/programmable-speaker', + tooltip={'announcements.tooltip'}, draw=function(frame) + frame.caption = {'announcements.name'} local frame = frame.add{ type='flow', - directions='vertical' + direction='vertical' } - frame.add{ + local text_box = frame.add{ type='text-box', name='message' } + text_box.style.width = 400 + text_box.style.minimal_height = 100 + text_box.read_only = false + text_box.word_wrap = true + text_box.selectable = true local flow = frame.add{type='flow'} flow.add{ type='label', caption={'announcements.select-rank'} } rank_drop_down:draw(flow) - send_popup:draw(flow).style.visible = false + local btn = send_popup:draw(flow) + btn.style.visible = false + btn.style.height = 25 + btn.style.width = 25 flow.add{ type='label', name='rank', diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 892bbf1a..cb19f22d 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -50,7 +50,8 @@ groups['Root']:edit('allow',false,{ ['temp-ban']=true, ['clear-warings']=true, ['clear-reports']=true, - ['clear-player']=true + ['clear-player']=true, + ['announcements']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -64,7 +65,8 @@ groups['Admin']:edit('allow',false,{ ['temp-ban']=true, ['clear-warings']=true, ['clear-reports']=true, - ['clear-player']=true + ['clear-player']=true, + ['announcements']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, diff --git a/locale/en/announcements.cfg b/locale/en/announcements.cfg index 75a71670..c4e55a6a 100644 --- a/locale/en/announcements.cfg +++ b/locale/en/announcements.cfg @@ -1,5 +1,6 @@ -[anouncements] +[announcements] name=Announcement +tooltip=Sent an announcement to players sent-to=This is sent to __1__ sent-by=This was sent by __1__ of rank __2__ select-rank=This message will be sent to: \ No newline at end of file From 66751fb85fb0fc8b2640c9a1ab5e2219921072e1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 18:01:21 +0000 Subject: [PATCH 075/392] Added S on the end of the sent_to rank --- Addons/Guis/announcements.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/announcements.lua b/Addons/Guis/announcements.lua index 894867d0..662ade9e 100644 --- a/Addons/Guis/announcements.lua +++ b/Addons/Guis/announcements.lua @@ -36,7 +36,7 @@ local send_popup = Gui.inputs.add{ local rank = Ranking.get_rank(player) local _rank = Ranking.get_rank(event.element.parent.rank.caption); if not _rank then return end local sent_by = {'announcements.sent-by',player.name,rank.name} - local rank_name = _rank.name; if rank_name == default.name then rank_name = 'Everyone' end + local rank_name = _rank.name..'s'; if rank_name == default.name..'s' then rank_name = 'Everyone' end local sent_to = {'announcements.sent-to',rank_name} local message = event.element.parent.parent.message.text for power,__rank in pairs(Ranking._ranks()) do From 1bb46d747b7d13b3c5846b8ece4471a94021b5a7 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 19:28:11 +0000 Subject: [PATCH 076/392] Added Warp System --- Addons/Guis/warp-system.lua | 216 ++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 9 +- 3 files changed, 223 insertions(+), 3 deletions(-) create mode 100644 Addons/Guis/warp-system.lua diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua new file mode 100644 index 00000000..15b2be02 --- /dev/null +++ b/Addons/Guis/warp-system.lua @@ -0,0 +1,216 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local warp_tiles = { + {-3,-2},{-3,-1},{-3,0},{-3,1},{-3,2},{3,-2},{3,-1},{3,0},{3,1},{3,2}, + {-2,-3},{-1,-3},{0,-3},{1,-3},{2,-3},{-2,3},{-1,3},{0,3},{1,3},{2,3} +} + +local warp_entities = { + {"small-lamp",-3,-2},{"small-lamp",-3,2},{"small-lamp",3,-2},{"small-lamp",3,2}, + {"small-lamp",-2,-3},{"small-lamp",2,-3},{"small-lamp",-2,3},{"small-lamp",2,3}, + {"small-electric-pole",-3,-3},{"small-electric-pole",3,3},{"small-electric-pole",-3,3},{"small-electric-pole",3,-3} +} + +local warp_radius = 4 +local spawn_warp_scale = 5 +local warp_tile = 'lab-dark-1' +local warp_partern = 'lab-dark-2' +local warp_limit = 60 +local warp_item = 'discharge-defense-equipment' +local global_offset = {x=0,y=0} + +local function _warps(reset) + global.addons = not reset and global.addons or {} + global.addons.warps = not reset and global.addons.warps or {_n=0,warps={},cooldowns={}} + return global.addons.warps +end + +local function remove_warp_point(name) + local warp = _warps().warps[name] + if not warp then return end + local surface = warp.surface + local offset = warp.position + local tiles = {} + local tiles = {} + for x = -warp_radius-2, warp_radius+2 do + for y = -warp_radius-2, warp_radius+2 do + if x^2+y^2 < (warp_radius+1)^2 then + table.insert(tiles,{name=warp.old_tile,position={x+offset.x,y+offset.y}}) + local entities = surface.find_entities_filtered{area={{x+offset.x-1,y+offset.y-1},{x+offset.x,y+offset.y}}} + for _,entity in pairs(entities) do if entity.name ~= 'player' then entity.destroy() end end + end + end + end + surface.set_tiles(tiles) + if warp.tag.valid then warp.tag.destroy() end + _warps().warps[name] = nil + _warps()._n = _warps()._n-1 + Gui.left.update('warp-list') +end + +local function make_warp_point(position,surface,name) + local warp = _warps().warps[name] + if warp then return end; warp = nil + local offset = {x=math.floor(position.x),y=math.floor(position.y)} + local old_tile = surface.get_tile(offset).name + local base_tiles = {} + local tiles = {} + -- this makes a base plate to make the warp point + for x = -warp_radius-2, warp_radius+2 do + for y = -warp_radius-2, warp_radius+2 do + if x^2+y^2 < warp_radius^2 then + table.insert(base_tiles,{name=warp_tile,position={x+offset.x,y+offset.y}}) + end + end + end + surface.set_tiles(base_tiles) + -- this adds the patern and entities + for _,position in pairs(warp_tiles) do + table.insert(tiles,{name=warp_partern,position={position[1]+offset.x+global_offset.x,position[2]+offset.y+global_offset.y}}) + end + surface.set_tiles(tiles) + for _,entity in pairs(warp_entities) do + local entity = surface.create_entity{name=entity[1],position={entity[2]+offset.x+global_offset.x,entity[3]+offset.y+global_offset.y},force='neutral'} + entity.destructible = false; entity.health = 0; entity.minable = false; entity.rotatable = false + end + local tag = player.force.add_chart_tag(warp.surface,{ + position=warp.position, + text='Warp: '..name, + icon={type='item',name=warp_item} + }) + _warps().warps[name] = {tag=tag,surface=surface,position=tag.position,old_tile=old_tile} + Gui.left.update('warp-list') +end + +commands.add_command('make-warp', 'Make a warp point at your location', {'name',true}, function(event,args) + if not game.player then return end + local position = game.player.position + local name = args.name + if _warps().warps[name] then player_return({'warp-system.name-used'},defines.text_color.med) return commands.error end + make_warp_point(position,game.player.surface,name) +end) + +local remove_warp = Gui.inputs.add{ + type='button', + name='remove-warp-point', + caption='utility/remove', + tooltip={'warp-system.remove-tooltip'} +}:on_event('click',function(event) + local name = event.element.parent.name + remove_warp_point(name) +end) + +local go_to_warp Gui.inputs.add{ + type='button', + name='go-to-warp-point', + caption='utility/export_slot', + tooltip={'warp-system.go-to-tooltip'} +}:on_event('click',function(event) + local player = Game.get_player(event) + local cooldown = _warps().cooldowns[event.player_index] or 0 + local warp = _warps().warps[element.parent.name] + if cooldown > 0 then player_return({'warp-system.cooldown',cooldown},nil,event) end + if player.vehicle then player.vehicle.set_driver() end + if player.vehicle then player.vehicle.set_passenger() end + if player.vehicle then return end + player.teleport(warp.surface.find_non_colliding_position('player',warp.position,32,1),warp.surface) + if not Ranking.get_rank(player):allowed('always-warp') then + event.element.parent.parent.parent.style.visible = false + _warps().cooldown[event.player_index] = warp_limit + end +end) + +Gui.left.add{ + name='warp-list', + caption='item/'..warp_item, + tooltip={'warp-system.tooltip'}, + draw=function(frame) + local player = Game.get_player(frame.player_index) + frame.caption={'warp-system.name'} + local flow = frame.add{ + type='flow', + direction='vertical' + } + flow.style.maximal_height = 200 + for name,warp in pairs(_warps().warp) do + if not warp.tag or not warp.tag.valid then + player.force.add_chart_tag(warp.surface,{ + position=warp.position, + text='Warp: '..name, + icon={type='item',name=warp_item} + }) + end + flow.add{ + type='label', + caption=name, + style='caption_label' + } + local _flow = flow.add{ + type='flow', + name=name + } + local btn = go_to_warp:draw(_flow) + btn.style.height = 20 + btn.style.width = 20 + if Ranking.get_rank(player):allowed('edit-warp-list') then + local btn = remove_warp:draw(_flow) + btn.style.height = 20 + btn.style.width = 20 + end + end + local cooldown = _warps().cooldowns[event.player_index] or 0 + if cooldown > 0 then frame.style.visible = false return end + if _warps()._n == 0 then frame.style.visible = false return end + if Ranking.get_rank(player):allowed('always-warp') then return + elseif player.surface.get_tile(player.position).name == warp_tile + or player.surface.get_tile(player.position).name == warp_partern + and player.surface.name == 'nauvis' + then return + elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return + else frame.style.visible = false end + end, + can_open=function(player) + local cooldown = _warps().cooldowns[event.player_index] or 0 + if cooldown > 0 then return {'warp-system.cooldown',cooldown} end + if _warps()._n == 0 then return {'warp-system.none'} end + if Ranking.get_rank(player):allowed('always-warp') then return true + elseif player.surface.get_tile(player.position).name == warp_tile + or player.surface.get_tile(player.position).name == warp_partern + and player.surface.name == 'nauvis' + then return true + elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return true + else return {'warp-system.not-on-warp'} end + end, + open_on_join=true +} + +Event.register(defines.events.on_tick,function(event) + if not (event.tick % 60 == 0) then return end + for index,time in pairs(_warps().cooldown) do + if time > 0 then + _warps().cooldown[index] = time-1 + if _warps().cooldown[index] == 0 then player_return({'warp-point.cooldown-zero'},defines.text_color.low,index) end + end + end +end) + +Event.register(defines.events.on_player_created, function(event) + if event.player_index == 1 then + local player = Game.get_player(event) + player.force.chart(player.surface, {{player.position.x - 20, player.position.y - 20}, {player.position.x + 20, player.position.y + 20}}) + local tag = player.force.add_chart_tag(player.surface,{ + position={0,0}, + text='Warp: Spawn', + icon={type='item',name=warp_item} + }) + _warps().warps['Spawn'] = {tag=tag,surface=player.surface,position={0,0}} + end +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 6f92c805..9393f237 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -38,6 +38,7 @@ require('Guis/science') require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') +require('Guis/warp-system') require('Guis/announcements') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index cb19f22d..68a731b3 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -74,7 +74,8 @@ groups['User']:edit('allow',false,{ ['rockets']=true, ['science']=true, ['tasklist']=true, - ['report']=true + ['report']=true, + ['warp-list']=true }) groups['Jail']:edit('allow',false,{ @@ -147,7 +148,8 @@ ranks['Developer']:edit('allow',false,{ }) ranks['Admin']:edit('allow',false,{ - ['game-settings']=true + ['game-settings']=true, + ['always-warp']=true }) ranks['Mod']:edit('allow',false,{ ['go-to']=true, @@ -163,7 +165,8 @@ ranks['Veteran']:edit('allow',false,{ }) ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, - ['repair']=true + ['repair']=true, + ['edit-warp-list']=true }) ranks['Regular']:edit('allow',false,{ ['kill']=true, From 32fb9f2ba16e69acb239ed8c6fca1e82a46d964f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 20:09:26 +0000 Subject: [PATCH 077/392] Fixed Bugs In Warp System --- Addons/Guis/warp-system.lua | 84 +++++++++++++++++++++---------------- Addons/playerRanks.lua | 8 ++-- locale/en/warp-system.cfg | 9 ++++ 3 files changed, 63 insertions(+), 38 deletions(-) create mode 100644 locale/en/warp-system.cfg diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index 15b2be02..d7571ceb 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -14,9 +14,9 @@ local warp_tiles = { } local warp_entities = { - {"small-lamp",-3,-2},{"small-lamp",-3,2},{"small-lamp",3,-2},{"small-lamp",3,2}, - {"small-lamp",-2,-3},{"small-lamp",2,-3},{"small-lamp",-2,3},{"small-lamp",2,3}, - {"small-electric-pole",-3,-3},{"small-electric-pole",3,3},{"small-electric-pole",-3,3},{"small-electric-pole",3,-3} + {'small-lamp',-3,-2},{'small-lamp',-3,2},{'small-lamp',3,-2},{'small-lamp',3,2}, + {'small-lamp',-2,-3},{'small-lamp',2,-3},{'small-lamp',-2,3},{'small-lamp',2,3}, + {'small-electric-pole',-3,-3},{'small-electric-pole',3,3},{'small-electric-pole',-3,3},{'small-electric-pole',3,-3} } local warp_radius = 4 @@ -29,7 +29,7 @@ local global_offset = {x=0,y=0} local function _warps(reset) global.addons = not reset and global.addons or {} - global.addons.warps = not reset and global.addons.warps or {_n=0,warps={},cooldowns={}} + global.addons.warps = not reset and global.addons.warps or {warps={},cooldowns={}} return global.addons.warps end @@ -52,11 +52,10 @@ local function remove_warp_point(name) surface.set_tiles(tiles) if warp.tag.valid then warp.tag.destroy() end _warps().warps[name] = nil - _warps()._n = _warps()._n-1 Gui.left.update('warp-list') end -local function make_warp_point(position,surface,name) +local function make_warp_point(position,surface,force,name) local warp = _warps().warps[name] if warp then return end; warp = nil local offset = {x=math.floor(position.x),y=math.floor(position.y)} @@ -81,8 +80,8 @@ local function make_warp_point(position,surface,name) local entity = surface.create_entity{name=entity[1],position={entity[2]+offset.x+global_offset.x,entity[3]+offset.y+global_offset.y},force='neutral'} entity.destructible = false; entity.health = 0; entity.minable = false; entity.rotatable = false end - local tag = player.force.add_chart_tag(warp.surface,{ - position=warp.position, + local tag = force.add_chart_tag(surface,{ + position={offset.x+0.5,offset.y+0.5}, text='Warp: '..name, icon={type='item',name=warp_item} }) @@ -95,7 +94,7 @@ commands.add_command('make-warp', 'Make a warp point at your location', {'name', local position = game.player.position local name = args.name if _warps().warps[name] then player_return({'warp-system.name-used'},defines.text_color.med) return commands.error end - make_warp_point(position,game.player.surface,name) + make_warp_point(position,game.player.surface,game.player.force,name) end) local remove_warp = Gui.inputs.add{ @@ -108,7 +107,7 @@ local remove_warp = Gui.inputs.add{ remove_warp_point(name) end) -local go_to_warp Gui.inputs.add{ +local go_to_warp = Gui.inputs.add{ type='button', name='go-to-warp-point', caption='utility/export_slot', @@ -116,15 +115,15 @@ local go_to_warp Gui.inputs.add{ }:on_event('click',function(event) local player = Game.get_player(event) local cooldown = _warps().cooldowns[event.player_index] or 0 - local warp = _warps().warps[element.parent.name] - if cooldown > 0 then player_return({'warp-system.cooldown',cooldown},nil,event) end + local warp = _warps().warps[event.element.parent.name] + if cooldown > 0 then player_return({'warp-system.cooldown',cooldown},nil,event) return end if player.vehicle then player.vehicle.set_driver() end if player.vehicle then player.vehicle.set_passenger() end if player.vehicle then return end player.teleport(warp.surface.find_non_colliding_position('player',warp.position,32,1),warp.surface) if not Ranking.get_rank(player):allowed('always-warp') then - event.element.parent.parent.parent.style.visible = false - _warps().cooldown[event.player_index] = warp_limit + event.element.parent.parent.parent.parent.style.visible = false + _warps().cooldowns[event.player_index] = warp_limit end end) @@ -135,12 +134,18 @@ Gui.left.add{ draw=function(frame) local player = Game.get_player(frame.player_index) frame.caption={'warp-system.name'} - local flow = frame.add{ - type='flow', - direction='vertical' + local warp_list = frame.add{ + type='scroll-pane', + direction='vertical', + vertical_scroll_policy='always', + horizontal_scroll_policy='never' } - flow.style.maximal_height = 200 - for name,warp in pairs(_warps().warp) do + warp_list.style.maximal_height = 150 + local table = warp_list.add{ + type='table', + column_count=2 + } + for name,warp in pairs(_warps().warps) do if not warp.tag or not warp.tag.valid then player.force.add_chart_tag(warp.surface,{ position=warp.position, @@ -148,28 +153,27 @@ Gui.left.add{ icon={type='item',name=warp_item} }) end - flow.add{ + table.add{ type='label', caption=name, style='caption_label' } - local _flow = flow.add{ + local _flow = table.add{ type='flow', name=name } local btn = go_to_warp:draw(_flow) btn.style.height = 20 btn.style.width = 20 - if Ranking.get_rank(player):allowed('edit-warp-list') then + if Ranking.get_rank(player):allowed('make-warp') and name ~= 'Spawn' then local btn = remove_warp:draw(_flow) btn.style.height = 20 btn.style.width = 20 end end - local cooldown = _warps().cooldowns[event.player_index] or 0 - if cooldown > 0 then frame.style.visible = false return end - if _warps()._n == 0 then frame.style.visible = false return end - if Ranking.get_rank(player):allowed('always-warp') then return + local cooldown = _warps().cooldowns[player.index] or 0 + if cooldown > 0 then frame.style.visible = false return + elseif Ranking.get_rank(player):allowed('always-warp') then return elseif player.surface.get_tile(player.position).name == warp_tile or player.surface.get_tile(player.position).name == warp_partern and player.surface.name == 'nauvis' @@ -178,15 +182,14 @@ Gui.left.add{ else frame.style.visible = false end end, can_open=function(player) - local cooldown = _warps().cooldowns[event.player_index] or 0 - if cooldown > 0 then return {'warp-system.cooldown',cooldown} end - if _warps()._n == 0 then return {'warp-system.none'} end + local cooldown = _warps().cooldowns[player.index] or 0 if Ranking.get_rank(player):allowed('always-warp') then return true elseif player.surface.get_tile(player.position).name == warp_tile - or player.surface.get_tile(player.position).name == warp_partern - and player.surface.name == 'nauvis' - then return true + or player.surface.get_tile(player.position).name == warp_partern + and player.surface.name == 'nauvis' + then return true elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return true + elseif cooldown > 0 then return {'warp-system.cooldown',cooldown} else return {'warp-system.not-on-warp'} end end, open_on_join=true @@ -194,10 +197,21 @@ Gui.left.add{ Event.register(defines.events.on_tick,function(event) if not (event.tick % 60 == 0) then return end - for index,time in pairs(_warps().cooldown) do + for index,time in pairs(_warps().cooldowns) do if time > 0 then - _warps().cooldown[index] = time-1 - if _warps().cooldown[index] == 0 then player_return({'warp-point.cooldown-zero'},defines.text_color.low,index) end + _warps().cooldowns[index] = time-1 + if _warps().cooldowns[index] == 0 then player_return({'warp-system.cooldown-zero'},defines.text_color.low,index) end + end + end + for _,player in pairs(game.connected_players) do + local cooldown = _warps().cooldowns[player.index] or 0 + if not Ranking.get_rank(player):allowed('always-warp') and cooldown == 0 then + if player.surface.get_tile(player.position).name == warp_tile + or player.surface.get_tile(player.position).name == warp_partern + and player.surface.name == 'nauvis' + then mod_gui.get_frame_flow(player)['warp-list'].style.visible = true + elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then mod_gui.get_frame_flow(player)['warp-list'].style.visible = true + else mod_gui.get_frame_flow(player)['warp-list'].style.visible = false end end end end) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 68a731b3..67f07c46 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -51,7 +51,8 @@ groups['Root']:edit('allow',false,{ ['clear-warings']=true, ['clear-reports']=true, ['clear-player']=true, - ['announcements']=true + ['announcements']=true, + ['warp-list']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -66,7 +67,8 @@ groups['Admin']:edit('allow',false,{ ['clear-warings']=true, ['clear-reports']=true, ['clear-player']=true, - ['announcements']=true + ['announcements']=true, + ['warp-list']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, @@ -166,7 +168,7 @@ ranks['Veteran']:edit('allow',false,{ ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, ['repair']=true, - ['edit-warp-list']=true + ['make-warp']=true }) ranks['Regular']:edit('allow',false,{ ['kill']=true, diff --git a/locale/en/warp-system.cfg b/locale/en/warp-system.cfg new file mode 100644 index 00000000..203519fe --- /dev/null +++ b/locale/en/warp-system.cfg @@ -0,0 +1,9 @@ +[warp-system] +name=Warp List +tooltip=A list of warp points. +remove-tooltip=Remove Warp Point +go-to-tooltip=Go To +cooldown=You Must Wait For The Cooldown, Time Left: __1__ +cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. +name-used=That Name Is Already Taken +not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file From 2151ad7fa5582b0355526708b74d0a76dac9a298 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 21:24:36 +0000 Subject: [PATCH 078/392] Added move Inventory --- Addons/Admin/admin.lua | 42 ++++++++++++++++++++++++++++++++++++++++ Addons/Admin/reports.lua | 1 + 2 files changed, 43 insertions(+) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 7e372d73..d6a59be5 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -57,6 +57,45 @@ function Admin.take_action(action,player,by_player,reason) end end +local inventorys = { + defines.inventory.player_main, + defines.inventory.player_quickbar, + defines.inventory.player_trash, + defines.inventory.player_guns, + defines.inventory.player_ammo, + defines.inventory.player_armor, + defines.inventory.player_armor +} + +local function put_item_in_chests(chests,item,surface) + local chests = chests + local chest = nil + while not chest or not chest.get_inventory(defines.inventory.chest).can_insert(item) do + chest = table.remove(chests,1) + if not chest then chest = surface.create_entity{ + name='iron-chest', + position=surface.find_non_colliding_position('iron-chest',{0,0},32,1) + } end + end + chest.get_inventory(defines.inventory.chest).insert(item) + table.insert(chests,chest) + return chests +end + +function Admin.move_inventory(player) + local player = Game.get_player(player) + if not player then return end + local chests = player.surface.find_entities_filtered{area={{-10,-10},{10,10}},name='iron-chest'} or {} + for _,_inventory in pairs(inventorys) do + local inventory = player.get_inventory(_inventory) + for item,count in pairs(inventory.get_contents()) do + local item = {name=item,count=count} + chests = put_item_in_chests(chests,item,player.surface) + end + inventory.clear() + end +end + Admin.ban_btn = Gui.inputs.add{ type='button', name='admin-ban', @@ -80,6 +119,7 @@ function Admin.ban(player,by_player,reason) ['By:']='<>'..by_player_name, ['Reason:']=reason } + Admin.move_inventory(player) game.ban_player(player,reason) end @@ -106,6 +146,7 @@ function Admin.kick(player,by_player,reason) ['By:']='<>'..by_player_name, ['Reason:']=reason } + Admin.move_inventory(player) game.kick_player(player,reason) end @@ -132,6 +173,7 @@ function Admin.jail(player,by_player,reason) ['By:']='<>'..by_player_name, ['Reason:']=reason } + Admin.move_inventory(player) Ranking._presets().last_jail = player.name Ranking.give_rank(player,'Jail',by_player_name) end diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 85d26b51..3133aea5 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -223,6 +223,7 @@ function Admin.temp_ban(player,by_player,reason) ['Reason:']=append_name(reason,by_player_name) } game.print({'reports.temp-ban',player.name,by_player_name,reason},defines.text_color.info) + Admin.move_inventory(player) Ranking._presets().last_jail = player.name Ranking.give_rank(player,'Jail',by_player_name) end From 62d79c4104f5e58f703372bd50122be01568077c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 21:29:10 +0000 Subject: [PATCH 079/392] Added Inventory Searching --- Addons/Admin/inventory-search.lua | 65 +++++++++++++++++++++++++++++++ Addons/load.lua | 1 + locale/en/inventory-search.cfg | 4 ++ 3 files changed, 70 insertions(+) create mode 100644 Addons/Admin/inventory-search.lua create mode 100644 locale/en/inventory-search.cfg diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua new file mode 100644 index 00000000..768e2bfa --- /dev/null +++ b/Addons/Admin/inventory-search.lua @@ -0,0 +1,65 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +-- removed from none admin ranks, no further action +local low_items = { + 'loader', + 'fast-loader', + 'express-loader', + 'small-plane', + 'player-port', + 'coin' +} + +-- removed for admin and non-admin ranks, gives warnings to non-admins +local med_items = { + 'railgun', + 'railgun-dart' +} + +-- temp-ban for any rank, this is a very hard enforcement, admin ranks lose rank +local high_items = { + 'electric-energy-interface', + 'infinity-chest' +} + +local inventorys = { + defines.inventory.player_main, + defines.inventory.player_quickbar, + defines.inventory.player_trash +} + +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}) + elseif category == 'med_items' then player_return({'inventory-search.med',item_name}) Admin.give_warning(player,'','Found A Banned Item',5) + elseif category == 'high_items' then player_return({'inventory-search.high',item_name}) Admin.temp_ban(player,'','Found A Banned Item') + else return end +end + +local function search_player(player) + for category,items in pairs(_root_tree) do + for _,_inventory in pairs(inventorys) do + local inventory = player.get_inventory(_inventory) + for _,item in pairs(items) do + local found = inventory.remove(item) + if found > 0 then take_action(player,item,category) end + end + end + end +end + +Event.register(defines.events.on_tick,function(event) + if not (game.tick%3600) then return end + local players = game.connected_players + local player = players[math.random(#players)] + search_player(player) +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 9393f237..3d5770d7 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -23,6 +23,7 @@ require('Admin/reports') -- this adds onto Admin/admin, adds report command and require('Admin/discord') require('Admin/auto-message') require('Admin/tree-decon') +require('Admin/inventory-search') -- commands dir require('Commands/cheat-mode') diff --git a/locale/en/inventory-search.cfg b/locale/en/inventory-search.cfg new file mode 100644 index 00000000..20db013b --- /dev/null +++ b/locale/en/inventory-search.cfg @@ -0,0 +1,4 @@ +[inventory-search] +low=Your Inventory Was Search And __1__ was removed. +med=Your Inventory Was Search And __1__ was removed, you have been given a warning. +high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file From 3d894cced4848c8df1c7441be0d78c980b9c2a20 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 21:34:58 +0000 Subject: [PATCH 080/392] Fixed Two Small Problems --- Addons/Admin/inventory-search.lua | 2 +- Addons/Admin/reports.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index 768e2bfa..710318aa 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -58,7 +58,7 @@ local function search_player(player) end Event.register(defines.events.on_tick,function(event) - if not (game.tick%3600) then return end + if not (game.tick%3600)==0 then return end local players = game.connected_players local player = players[math.random(#players)] search_player(player) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 3133aea5..c0d88c75 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -140,7 +140,7 @@ function Admin.give_warning(player,by_player,reason,min) warnings = warnings+1 _reports().warnings[player.name] = warnings player_return({'reports.warning-given-by',by_player_name},defines.text_color.info,player) - game.print({'reports.player-warning',player.name,by_player_name}) + game.print({'reports.player-warning',player.name,by_player_name,reason}) give_punishment(player,by_player,reason) end From 2abd5cc1bbef741588b1c622a85d556067d1f092 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 21:37:33 +0000 Subject: [PATCH 081/392] Fixed PLayer Printing when items found --- Addons/Admin/inventory-search.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index 710318aa..7a1ba9e7 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -39,9 +39,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}) - elseif category == 'med_items' then player_return({'inventory-search.med',item_name}) Admin.give_warning(player,'','Found A Banned Item',5) - elseif category == 'high_items' then player_return({'inventory-search.high',item_name}) Admin.temp_ban(player,'','Found A Banned Item') + 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,'','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,'','Found A Banned Item') else return end end From cb85ebfd2b38d77ca5462482656619978206f625 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 6 Jan 2018 21:46:05 +0000 Subject: [PATCH 082/392] Fixed Time On Inventory Search --- Addons/Admin/inventory-search.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index 7a1ba9e7..db304e3c 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -58,8 +58,9 @@ local function search_player(player) end Event.register(defines.events.on_tick,function(event) - if not (game.tick%3600)==0 then return end - local players = game.connected_players - local player = players[math.random(#players)] - search_player(player) + if (game.tick%3600) == 0 then + local players = game.connected_players + local player = players[math.random(#players)] + search_player(player) + end end) \ No newline at end of file From 0ab553efbf9720e12ed7387cf78a1e5e53bb82fa Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 13:56:13 +0000 Subject: [PATCH 083/392] Added Capsul Events --- Addons/Admin/admin.lua | 6 ++--- Addons/Admin/capsules.lua | 53 +++++++++++++++++++++++++++++++++++++ Addons/Admin/tree-decon.lua | 2 +- Addons/load.lua | 1 + locale/en/capsules.cfg | 3 +++ 5 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 Addons/Admin/capsules.lua create mode 100644 locale/en/capsules.cfg diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index d6a59be5..5bea0a1d 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -67,8 +67,8 @@ local inventorys = { defines.inventory.player_armor } -local function put_item_in_chests(chests,item,surface) - local chests = chests +function Admin.move_item_to_spawn(item,surface,chests) + local chests = chests or surface.find_entities_filtered{area={{-10,-10},{10,10}},name='iron-chest'} or {} local chest = nil while not chest or not chest.get_inventory(defines.inventory.chest).can_insert(item) do chest = table.remove(chests,1) @@ -90,7 +90,7 @@ function Admin.move_inventory(player) local inventory = player.get_inventory(_inventory) for item,count in pairs(inventory.get_contents()) do local item = {name=item,count=count} - chests = put_item_in_chests(chests,item,player.surface) + chests = Admin.move_item_to_spawn(item,player.surface,chests) end inventory.clear() end diff --git a/Addons/Admin/capsules.lua b/Addons/Admin/capsules.lua new file mode 100644 index 00000000..d5631f3a --- /dev/null +++ b/Addons/Admin/capsules.lua @@ -0,0 +1,53 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +-- alot of this is copied from redmew - but it has been reworked to use the ExpCore +-- https://github.com/Valansch/RedMew/blob/develop/nuke_control.lua + +local const = 8 -- this is how many entites must be found in order to give a warning +-- false means that it cant be used +local capsules = { + ['artillery-targeting-remote']=false, + ['cliff-explosives']=true, + ['cluster-grenade']=false, + ['defender-capsule']=true, + ['destroyer-capsule']=true, + ['discharge-defense-remote']=true, + ['distractor-capsule']=true, + ['grenade']=false, + ['poison-capsule']=false, + ['raw-fish']=true, + ['slowdown-capsule']=true, +} + +Event.register(defines.events.on_player_used_capsule,function(event) + local player = Game.get_player(event) + local item = event.item + if capsules[item.name] or Ranking.get_rank(player):allowed('capsules') then return end + local x,y = event.position.x, event.position.y + local player_entities = player.surface.count_entities_filtered{ + force=player.force, + area={{x-5,y-5},{x+5,y+5}} + } + if player_entities < const then return end + player_return({'capsules.used',item.name},defines.text_color.med,player) + Admin.give_warning(player,'','Using '..item.name..' inside the base.',4) +end) + +Event.register(defines.events.on_player_ammo_inventory_changed,function(event) + local player = Game.get_player(event) + if Ranking.get_rank(player):allowed('nuke') then return end + local found = player.remove_item({name='atomic-bomb',count=1000}) + Admin.move_item_to_spawn({name='atomic-bomb',count=found},player.surface) + if found > 0 then + player_return({'capsules.nuke'},defines.text_color.med,player) + Admin.give_warning(player,'','Nukes are not allowed for your rank.',4) + end +end) \ No newline at end of file diff --git a/Addons/Admin/tree-decon.lua b/Addons/Admin/tree-decon.lua index 27ee1ae2..5b39f256 100644 --- a/Addons/Admin/tree-decon.lua +++ b/Addons/Admin/tree-decon.lua @@ -30,7 +30,7 @@ Event.register(-1,function(event) else self.data.chache[event.player_index] = {'decon',false} end chache = self.data.chache[event.player_index] end - if not event.entity.last_user then + if not event.entity.last_user or event.entity.name == 'entity-ghost' then if chache[1] == 'tree-decon' then table.insert(self.data.trees,event.entity) self.data.clear = game.tick + 10 diff --git a/Addons/load.lua b/Addons/load.lua index 3d5770d7..505931ba 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -24,6 +24,7 @@ require('Admin/discord') require('Admin/auto-message') require('Admin/tree-decon') require('Admin/inventory-search') +require('Admin/capsules') -- commands dir require('Commands/cheat-mode') diff --git a/locale/en/capsules.cfg b/locale/en/capsules.cfg new file mode 100644 index 00000000..37913f83 --- /dev/null +++ b/locale/en/capsules.cfg @@ -0,0 +1,3 @@ +[capsules] +used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. +nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file From 23bcad0ab6840560c13a4e3d89c2047e31f2d79d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 13:59:30 +0000 Subject: [PATCH 084/392] Added Allows --- Addons/playerRanks.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 67f07c46..51761b2d 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -168,11 +168,13 @@ ranks['Veteran']:edit('allow',false,{ ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, ['repair']=true, - ['make-warp']=true + ['make-warp']=true, + ['nuke']=true }) ranks['Regular']:edit('allow',false,{ ['kill']=true, - ['decon']=true + ['decon']=true, + ['capsules']=true }) ranks['Guest']:edit('allow',false,{ ['tag']=true, From b5d8c8d0c4256a101ed21a9dc3bfcfa17c7737b0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 7 Jan 2018 14:25:59 +0000 Subject: [PATCH 085/392] Added New Locale files --- locale/de/admin.cfg | 15 ++++++++ locale/de/announcements.cfg | 6 +++ locale/de/auto-message.cfg | 9 +++++ locale/de/capsules.cfg | 3 ++ locale/de/exp-core.cfg | 22 +++++++++++ locale/de/game-settings.cfg | 31 ++++++++++++++++ locale/de/inventory-search.cfg | 4 ++ locale/de/player-list.cfg | 5 +++ locale/de/player_info.cfg | 8 ++++ locale/de/rank-changer.cfg | 9 +++++ locale/de/readme.cfg | 68 ++++++++++++++++++++++++++++++++++ locale/de/reports.cfg | 15 ++++++++ locale/de/rockets.cfg | 12 ++++++ locale/de/science.cfg | 14 +++++++ locale/de/tasklist.cfg | 4 ++ locale/de/tree-decon.cfg | 3 ++ locale/de/warp-system.cfg | 9 +++++ locale/fr/admin.cfg | 15 ++++++++ locale/fr/announcements.cfg | 6 +++ locale/fr/auto-message.cfg | 9 +++++ locale/fr/capsules.cfg | 3 ++ locale/fr/exp-core.cfg | 22 +++++++++++ locale/fr/game-settings.cfg | 31 ++++++++++++++++ locale/fr/inventory-search.cfg | 4 ++ locale/fr/player-list.cfg | 5 +++ locale/fr/player_info.cfg | 8 ++++ locale/fr/rank-changer.cfg | 9 +++++ locale/fr/readme.cfg | 68 ++++++++++++++++++++++++++++++++++ locale/fr/reports.cfg | 15 ++++++++ locale/fr/rockets.cfg | 12 ++++++ locale/fr/science.cfg | 14 +++++++ locale/fr/tasklist.cfg | 4 ++ locale/fr/tree-decon.cfg | 3 ++ locale/fr/warp-system.cfg | 9 +++++ locale/nl/admin.cfg | 15 ++++++++ locale/nl/announcements.cfg | 6 +++ locale/nl/auto-message.cfg | 9 +++++ locale/nl/capsules.cfg | 3 ++ locale/nl/exp-core.cfg | 22 +++++++++++ locale/nl/game-settings.cfg | 31 ++++++++++++++++ locale/nl/inventory-search.cfg | 4 ++ locale/nl/player-list.cfg | 5 +++ locale/nl/player_info.cfg | 8 ++++ locale/nl/rank-changer.cfg | 9 +++++ locale/nl/readme.cfg | 68 ++++++++++++++++++++++++++++++++++ locale/nl/reports.cfg | 15 ++++++++ locale/nl/rockets.cfg | 12 ++++++ locale/nl/science.cfg | 14 +++++++ locale/nl/tasklist.cfg | 4 ++ locale/nl/tree-decon.cfg | 3 ++ locale/nl/warp-system.cfg | 9 +++++ 51 files changed, 711 insertions(+) create mode 100644 locale/de/admin.cfg create mode 100644 locale/de/announcements.cfg create mode 100644 locale/de/auto-message.cfg create mode 100644 locale/de/capsules.cfg create mode 100644 locale/de/exp-core.cfg create mode 100644 locale/de/game-settings.cfg create mode 100644 locale/de/inventory-search.cfg create mode 100644 locale/de/player-list.cfg create mode 100644 locale/de/player_info.cfg create mode 100644 locale/de/rank-changer.cfg create mode 100644 locale/de/readme.cfg create mode 100644 locale/de/reports.cfg create mode 100644 locale/de/rockets.cfg create mode 100644 locale/de/science.cfg create mode 100644 locale/de/tasklist.cfg create mode 100644 locale/de/tree-decon.cfg create mode 100644 locale/de/warp-system.cfg create mode 100644 locale/fr/admin.cfg create mode 100644 locale/fr/announcements.cfg create mode 100644 locale/fr/auto-message.cfg create mode 100644 locale/fr/capsules.cfg create mode 100644 locale/fr/exp-core.cfg create mode 100644 locale/fr/game-settings.cfg create mode 100644 locale/fr/inventory-search.cfg create mode 100644 locale/fr/player-list.cfg create mode 100644 locale/fr/player_info.cfg create mode 100644 locale/fr/rank-changer.cfg create mode 100644 locale/fr/readme.cfg create mode 100644 locale/fr/reports.cfg create mode 100644 locale/fr/rockets.cfg create mode 100644 locale/fr/science.cfg create mode 100644 locale/fr/tasklist.cfg create mode 100644 locale/fr/tree-decon.cfg create mode 100644 locale/fr/warp-system.cfg create mode 100644 locale/nl/admin.cfg create mode 100644 locale/nl/announcements.cfg create mode 100644 locale/nl/auto-message.cfg create mode 100644 locale/nl/capsules.cfg create mode 100644 locale/nl/exp-core.cfg create mode 100644 locale/nl/game-settings.cfg create mode 100644 locale/nl/inventory-search.cfg create mode 100644 locale/nl/player-list.cfg create mode 100644 locale/nl/player_info.cfg create mode 100644 locale/nl/rank-changer.cfg create mode 100644 locale/nl/readme.cfg create mode 100644 locale/nl/reports.cfg create mode 100644 locale/nl/rockets.cfg create mode 100644 locale/nl/science.cfg create mode 100644 locale/nl/tasklist.cfg create mode 100644 locale/nl/tree-decon.cfg create mode 100644 locale/nl/warp-system.cfg diff --git a/locale/de/admin.cfg b/locale/de/admin.cfg new file mode 100644 index 00000000..52434a4d --- /dev/null +++ b/locale/de/admin.cfg @@ -0,0 +1,15 @@ +[admin-commands] +name=Admin Commands +tooltip=Very powerful 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 chose the correct one! +warning=Warning, this player is a higher rank so you cant change their rank. +short-reason=Warning, this is a short reason please think i it could be made more clear. +rank-high=This player is a higher rank, please use in game command if you are sure about this! +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 \ No newline at end of file diff --git a/locale/de/announcements.cfg b/locale/de/announcements.cfg new file mode 100644 index 00000000..c4e55a6a --- /dev/null +++ b/locale/de/announcements.cfg @@ -0,0 +1,6 @@ +[announcements] +name=Announcement +tooltip=Sent an announcement to players +sent-to=This is sent to __1__ +sent-by=This was sent by __1__ of rank __2__ +select-rank=This message will be sent to: \ No newline at end of file diff --git a/locale/de/auto-message.cfg b/locale/de/auto-message.cfg new file mode 100644 index 00000000..15e620a2 --- /dev/null +++ b/locale/de/auto-message.cfg @@ -0,0 +1,9 @@ +[auto-message] +players-online=There are __1__ players online +map-time=This map has been on for __1__ +line-8=Do /help for more info +join-us=Please join us on: +discord=Discord: https://discord.me/explosivegaming +website=Website: explosivegaming.nl +custom-commands=We use custom commands such as /tag and /report +read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file diff --git a/locale/de/capsules.cfg b/locale/de/capsules.cfg new file mode 100644 index 00000000..37913f83 --- /dev/null +++ b/locale/de/capsules.cfg @@ -0,0 +1,3 @@ +[capsules] +used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. +nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file diff --git a/locale/de/exp-core.cfg b/locale/de/exp-core.cfg new file mode 100644 index 00000000..731d758e --- /dev/null +++ b/locale/de/exp-core.cfg @@ -0,0 +1,22 @@ +[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 + +[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 + +[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 \ No newline at end of file diff --git a/locale/de/game-settings.cfg b/locale/de/game-settings.cfg new file mode 100644 index 00000000..cfbcc6e9 --- /dev/null +++ b/locale/de/game-settings.cfg @@ -0,0 +1,31 @@ +[game-settings] +name=Game Settings +tooltip=Allows for editing of the game settings, please use resposibliy. +basic-name=Basic Settings +basic-tooltip=These settings are safe to change with no large effects. +basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. +advanced-name=Advanced Settings +advanced-tooltip=These settings should be left alone unless you know what you are doing. +advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. +personal-name=Personal Settings +personal-tooltip=These will only effect you, if you are spoted you are on your own. +personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. +sure=Are You Sure! +effect-mining-speed=Mining Speed +effect-craft-speed=Crafting Speed +effect-running-speed=Running Speed +effect-build-distance=Build Distance +effect-reach-distance=Reach Distance +effect-bot-speed=Bot Speed +effect-lab-speed=Lab Speed +effect-stack-bonus=Stack Bonus +effect-quickbar-count=Quickbar Count +effect-inventory-size=Inventory Size +effect-mining-prod=Mining Productivity +effect-game-speed=Game Speed +effect-save=Save Game +effect-reload-effects=Reload Effects +effect-reload-map=Reload Minimap +effect-kill-biters=Kill Biters +effect-crc=Force CRC Check +effect-reset-force=Reset Force \ No newline at end of file diff --git a/locale/de/inventory-search.cfg b/locale/de/inventory-search.cfg new file mode 100644 index 00000000..20db013b --- /dev/null +++ b/locale/de/inventory-search.cfg @@ -0,0 +1,4 @@ +[inventory-search] +low=Your Inventory Was Search And __1__ was removed. +med=Your Inventory Was Search And __1__ was removed, you have been given a warning. +high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file diff --git a/locale/de/player-list.cfg b/locale/de/player-list.cfg new file mode 100644 index 00000000..9adacd4d --- /dev/null +++ b/locale/de/player-list.cfg @@ -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 \ No newline at end of file diff --git a/locale/de/player_info.cfg b/locale/de/player_info.cfg new file mode 100644 index 00000000..834ebb19 --- /dev/null +++ b/locale/de/player_info.cfg @@ -0,0 +1,8 @@ +[player-info] +yes=Yes +no=No +name=[__1__] __2__ +online=Is Online: __1__ (__2__) +admin=Has Admin: __1__ +group=In User Group: __1__ +rank=Has Rank: __1__ \ No newline at end of file diff --git a/locale/de/rank-changer.cfg b/locale/de/rank-changer.cfg new file mode 100644 index 00000000..bbc7a51b --- /dev/null +++ b/locale/de/rank-changer.cfg @@ -0,0 +1,9 @@ +[rank-changer] +name=Rank Changer +tooltip=Change the rank of a player below you. +no-info-file=No info file was found +message=Please select a player and a rank, you can you give ranks to people below you. +warning=Warning, this player is a higher rank so you cant change their rank. +rank-high=This player is a higher rank, rank change failed! +invalid=The player or the rank is invalid please try again! +set-rank=Set Player Rank diff --git a/locale/de/readme.cfg b/locale/de/readme.cfg new file mode 100644 index 00000000..f2ada42e --- /dev/null +++ b/locale/de/readme.cfg @@ -0,0 +1,68 @@ +[readme] +tooltip=Open the readme gui that opens when you first join. +guildlines-name=Guild Lines +guildlines-tooltip=These are the guildlines you should follow +guildlines-line1=Welcome to the Explosive Gaming Community! +guildlines-line2= +guildlines-line3=Here are some guidelines to keep this Server fun for everyone: +guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. +guildlines-line5=- Be polite and use common sense. +guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. +guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. +guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line9= +guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! +chat-name=How To Chat +chat-tooltip=How to chat in factorio with default key config +chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. +commands-name=Commands +commands-tooltip=These are the commands you can use +commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown +commands-col1=Command Name +commands-col2=Command Help +links-name=Links +links-tooltip=Helpful links for ways to get in touch +links-cap1=Discord voice and chat server: +links-cap2=Our website: +links-cap3=Steam: +links-cap4=Patreon: +servers-name=Servers +servers-tooltip=Info on our other servers +servers-singleline=Welcome to the Explosive Gaming Community! +servers-format=S__1__: __2__ +servers-cap1=Public +servers-des1=A place for all players, this map reset every 24h. +servers-cap2=Standard +servers-des2=Before you play make sure you understand the game, reset every 48h. +servers-cap3=Pro +servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. +servers-cap4=Modded +servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. +servers-cap5=Events +servers-des5=Sometimes we hold events, may require a password, join discord for more info. +servers-cap6=Donator +servers-des6=For those people who have two much money and give us some. Anything goes per request. +rules-name=All Rules +rules-tooltip=A full list of rules for the server +rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. +rules-format=__1__) __2__ +rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. +rules-rule2=Any bugs or exploits found should be reported. (no creative items) +rules-rule3=Do not disrespect any player in the server. +rules-rule4=Do not take every item frmo a belt or via logics request, share resources. +rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. +rules-rule6=Do not laydown or remove concrete or stone with bots without permission. +rules-rule7=Do not use active provider chests without permission. +rules-rule8=Do not use speakers on global or with alearts without permission. +rules-rule9=Do not remove/move major parts of the factory without permission. +rules-rule10=Do not walk in player random direction for no reason(to save map size). +rules-rule11=Do not remove stuff just because you dont like it, tell people first. +rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. +rules-rule13=Do not make train roundabouts. Or any loops of any kind. +rules-rule14=When using trains use the same size that others have used. +rules-rule15=Trains are Left Hand Drive (LHD) only. +rules-rule16=Do not complain about lag, low fps and low ups or other things like that. +rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. +rules-rule18=Do not advertise other servers unless you are a trusted server owner. +rules-rule19=Report any one who breaks the rules. +rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file diff --git a/locale/de/reports.cfg b/locale/de/reports.cfg new file mode 100644 index 00000000..b0152d44 --- /dev/null +++ b/locale/de/reports.cfg @@ -0,0 +1,15 @@ +[reports] +name=Report Player +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 cant be reported. +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. \ No newline at end of file diff --git a/locale/de/rockets.cfg b/locale/de/rockets.cfg new file mode 100644 index 00000000..be434056 --- /dev/null +++ b/locale/de/rockets.cfg @@ -0,0 +1,12 @@ +[rockets] +name=Rocket Info +tooltip=List of details about the rockets sent. +none=No rockets have been sent yet. +nan=NaN +sent=Rockets Sent: __1__ +first=First Lanuched At: __1__ +last=Last Launch Took: __1__ +time=Average Launch Time: __1__ +fastest=Fastest Launch: __1__ +milestones=Milestones: +format=__1__: __2__ \ No newline at end of file diff --git a/locale/de/science.cfg b/locale/de/science.cfg new file mode 100644 index 00000000..f42dbc94 --- /dev/null +++ b/locale/de/science.cfg @@ -0,0 +1,14 @@ +[science] +name=Science Info +tooltip=List of details about science packs. +total=Packs Made: +time=Packs Per Minute: +format=__1__: __2__ +science-pack-1=Red +science-pack-2=Green +science-pack-3=Blue +military-science-pack=Military +production-science-pack=Production +high-tech-science-pack=High Tech +space-science-pack=Space +none=No science packs have been made yet. \ No newline at end of file diff --git a/locale/de/tasklist.cfg b/locale/de/tasklist.cfg new file mode 100644 index 00000000..1e2baa06 --- /dev/null +++ b/locale/de/tasklist.cfg @@ -0,0 +1,4 @@ +[tasklist] +name=Task List +tooltip=What jobs need to be done round the factory. +none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file diff --git a/locale/de/tree-decon.cfg b/locale/de/tree-decon.cfg new file mode 100644 index 00000000..f1bfe299 --- /dev/null +++ b/locale/de/tree-decon.cfg @@ -0,0 +1,3 @@ +[tree-decon] +player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours +rank-print=__1__ tried to deconstruct something. \ No newline at end of file diff --git a/locale/de/warp-system.cfg b/locale/de/warp-system.cfg new file mode 100644 index 00000000..203519fe --- /dev/null +++ b/locale/de/warp-system.cfg @@ -0,0 +1,9 @@ +[warp-system] +name=Warp List +tooltip=A list of warp points. +remove-tooltip=Remove Warp Point +go-to-tooltip=Go To +cooldown=You Must Wait For The Cooldown, Time Left: __1__ +cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. +name-used=That Name Is Already Taken +not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/locale/fr/admin.cfg b/locale/fr/admin.cfg new file mode 100644 index 00000000..52434a4d --- /dev/null +++ b/locale/fr/admin.cfg @@ -0,0 +1,15 @@ +[admin-commands] +name=Admin Commands +tooltip=Very powerful 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 chose the correct one! +warning=Warning, this player is a higher rank so you cant change their rank. +short-reason=Warning, this is a short reason please think i it could be made more clear. +rank-high=This player is a higher rank, please use in game command if you are sure about this! +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 \ No newline at end of file diff --git a/locale/fr/announcements.cfg b/locale/fr/announcements.cfg new file mode 100644 index 00000000..c4e55a6a --- /dev/null +++ b/locale/fr/announcements.cfg @@ -0,0 +1,6 @@ +[announcements] +name=Announcement +tooltip=Sent an announcement to players +sent-to=This is sent to __1__ +sent-by=This was sent by __1__ of rank __2__ +select-rank=This message will be sent to: \ No newline at end of file diff --git a/locale/fr/auto-message.cfg b/locale/fr/auto-message.cfg new file mode 100644 index 00000000..15e620a2 --- /dev/null +++ b/locale/fr/auto-message.cfg @@ -0,0 +1,9 @@ +[auto-message] +players-online=There are __1__ players online +map-time=This map has been on for __1__ +line-8=Do /help for more info +join-us=Please join us on: +discord=Discord: https://discord.me/explosivegaming +website=Website: explosivegaming.nl +custom-commands=We use custom commands such as /tag and /report +read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file diff --git a/locale/fr/capsules.cfg b/locale/fr/capsules.cfg new file mode 100644 index 00000000..37913f83 --- /dev/null +++ b/locale/fr/capsules.cfg @@ -0,0 +1,3 @@ +[capsules] +used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. +nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file diff --git a/locale/fr/exp-core.cfg b/locale/fr/exp-core.cfg new file mode 100644 index 00000000..731d758e --- /dev/null +++ b/locale/fr/exp-core.cfg @@ -0,0 +1,22 @@ +[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 + +[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 + +[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 \ No newline at end of file diff --git a/locale/fr/game-settings.cfg b/locale/fr/game-settings.cfg new file mode 100644 index 00000000..cfbcc6e9 --- /dev/null +++ b/locale/fr/game-settings.cfg @@ -0,0 +1,31 @@ +[game-settings] +name=Game Settings +tooltip=Allows for editing of the game settings, please use resposibliy. +basic-name=Basic Settings +basic-tooltip=These settings are safe to change with no large effects. +basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. +advanced-name=Advanced Settings +advanced-tooltip=These settings should be left alone unless you know what you are doing. +advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. +personal-name=Personal Settings +personal-tooltip=These will only effect you, if you are spoted you are on your own. +personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. +sure=Are You Sure! +effect-mining-speed=Mining Speed +effect-craft-speed=Crafting Speed +effect-running-speed=Running Speed +effect-build-distance=Build Distance +effect-reach-distance=Reach Distance +effect-bot-speed=Bot Speed +effect-lab-speed=Lab Speed +effect-stack-bonus=Stack Bonus +effect-quickbar-count=Quickbar Count +effect-inventory-size=Inventory Size +effect-mining-prod=Mining Productivity +effect-game-speed=Game Speed +effect-save=Save Game +effect-reload-effects=Reload Effects +effect-reload-map=Reload Minimap +effect-kill-biters=Kill Biters +effect-crc=Force CRC Check +effect-reset-force=Reset Force \ No newline at end of file diff --git a/locale/fr/inventory-search.cfg b/locale/fr/inventory-search.cfg new file mode 100644 index 00000000..20db013b --- /dev/null +++ b/locale/fr/inventory-search.cfg @@ -0,0 +1,4 @@ +[inventory-search] +low=Your Inventory Was Search And __1__ was removed. +med=Your Inventory Was Search And __1__ was removed, you have been given a warning. +high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file diff --git a/locale/fr/player-list.cfg b/locale/fr/player-list.cfg new file mode 100644 index 00000000..9adacd4d --- /dev/null +++ b/locale/fr/player-list.cfg @@ -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 \ No newline at end of file diff --git a/locale/fr/player_info.cfg b/locale/fr/player_info.cfg new file mode 100644 index 00000000..834ebb19 --- /dev/null +++ b/locale/fr/player_info.cfg @@ -0,0 +1,8 @@ +[player-info] +yes=Yes +no=No +name=[__1__] __2__ +online=Is Online: __1__ (__2__) +admin=Has Admin: __1__ +group=In User Group: __1__ +rank=Has Rank: __1__ \ No newline at end of file diff --git a/locale/fr/rank-changer.cfg b/locale/fr/rank-changer.cfg new file mode 100644 index 00000000..bbc7a51b --- /dev/null +++ b/locale/fr/rank-changer.cfg @@ -0,0 +1,9 @@ +[rank-changer] +name=Rank Changer +tooltip=Change the rank of a player below you. +no-info-file=No info file was found +message=Please select a player and a rank, you can you give ranks to people below you. +warning=Warning, this player is a higher rank so you cant change their rank. +rank-high=This player is a higher rank, rank change failed! +invalid=The player or the rank is invalid please try again! +set-rank=Set Player Rank diff --git a/locale/fr/readme.cfg b/locale/fr/readme.cfg new file mode 100644 index 00000000..f2ada42e --- /dev/null +++ b/locale/fr/readme.cfg @@ -0,0 +1,68 @@ +[readme] +tooltip=Open the readme gui that opens when you first join. +guildlines-name=Guild Lines +guildlines-tooltip=These are the guildlines you should follow +guildlines-line1=Welcome to the Explosive Gaming Community! +guildlines-line2= +guildlines-line3=Here are some guidelines to keep this Server fun for everyone: +guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. +guildlines-line5=- Be polite and use common sense. +guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. +guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. +guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line9= +guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! +chat-name=How To Chat +chat-tooltip=How to chat in factorio with default key config +chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. +commands-name=Commands +commands-tooltip=These are the commands you can use +commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown +commands-col1=Command Name +commands-col2=Command Help +links-name=Links +links-tooltip=Helpful links for ways to get in touch +links-cap1=Discord voice and chat server: +links-cap2=Our website: +links-cap3=Steam: +links-cap4=Patreon: +servers-name=Servers +servers-tooltip=Info on our other servers +servers-singleline=Welcome to the Explosive Gaming Community! +servers-format=S__1__: __2__ +servers-cap1=Public +servers-des1=A place for all players, this map reset every 24h. +servers-cap2=Standard +servers-des2=Before you play make sure you understand the game, reset every 48h. +servers-cap3=Pro +servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. +servers-cap4=Modded +servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. +servers-cap5=Events +servers-des5=Sometimes we hold events, may require a password, join discord for more info. +servers-cap6=Donator +servers-des6=For those people who have two much money and give us some. Anything goes per request. +rules-name=All Rules +rules-tooltip=A full list of rules for the server +rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. +rules-format=__1__) __2__ +rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. +rules-rule2=Any bugs or exploits found should be reported. (no creative items) +rules-rule3=Do not disrespect any player in the server. +rules-rule4=Do not take every item frmo a belt or via logics request, share resources. +rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. +rules-rule6=Do not laydown or remove concrete or stone with bots without permission. +rules-rule7=Do not use active provider chests without permission. +rules-rule8=Do not use speakers on global or with alearts without permission. +rules-rule9=Do not remove/move major parts of the factory without permission. +rules-rule10=Do not walk in player random direction for no reason(to save map size). +rules-rule11=Do not remove stuff just because you dont like it, tell people first. +rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. +rules-rule13=Do not make train roundabouts. Or any loops of any kind. +rules-rule14=When using trains use the same size that others have used. +rules-rule15=Trains are Left Hand Drive (LHD) only. +rules-rule16=Do not complain about lag, low fps and low ups or other things like that. +rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. +rules-rule18=Do not advertise other servers unless you are a trusted server owner. +rules-rule19=Report any one who breaks the rules. +rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file diff --git a/locale/fr/reports.cfg b/locale/fr/reports.cfg new file mode 100644 index 00000000..b0152d44 --- /dev/null +++ b/locale/fr/reports.cfg @@ -0,0 +1,15 @@ +[reports] +name=Report Player +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 cant be reported. +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. \ No newline at end of file diff --git a/locale/fr/rockets.cfg b/locale/fr/rockets.cfg new file mode 100644 index 00000000..be434056 --- /dev/null +++ b/locale/fr/rockets.cfg @@ -0,0 +1,12 @@ +[rockets] +name=Rocket Info +tooltip=List of details about the rockets sent. +none=No rockets have been sent yet. +nan=NaN +sent=Rockets Sent: __1__ +first=First Lanuched At: __1__ +last=Last Launch Took: __1__ +time=Average Launch Time: __1__ +fastest=Fastest Launch: __1__ +milestones=Milestones: +format=__1__: __2__ \ No newline at end of file diff --git a/locale/fr/science.cfg b/locale/fr/science.cfg new file mode 100644 index 00000000..f42dbc94 --- /dev/null +++ b/locale/fr/science.cfg @@ -0,0 +1,14 @@ +[science] +name=Science Info +tooltip=List of details about science packs. +total=Packs Made: +time=Packs Per Minute: +format=__1__: __2__ +science-pack-1=Red +science-pack-2=Green +science-pack-3=Blue +military-science-pack=Military +production-science-pack=Production +high-tech-science-pack=High Tech +space-science-pack=Space +none=No science packs have been made yet. \ No newline at end of file diff --git a/locale/fr/tasklist.cfg b/locale/fr/tasklist.cfg new file mode 100644 index 00000000..1e2baa06 --- /dev/null +++ b/locale/fr/tasklist.cfg @@ -0,0 +1,4 @@ +[tasklist] +name=Task List +tooltip=What jobs need to be done round the factory. +none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file diff --git a/locale/fr/tree-decon.cfg b/locale/fr/tree-decon.cfg new file mode 100644 index 00000000..f1bfe299 --- /dev/null +++ b/locale/fr/tree-decon.cfg @@ -0,0 +1,3 @@ +[tree-decon] +player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours +rank-print=__1__ tried to deconstruct something. \ No newline at end of file diff --git a/locale/fr/warp-system.cfg b/locale/fr/warp-system.cfg new file mode 100644 index 00000000..203519fe --- /dev/null +++ b/locale/fr/warp-system.cfg @@ -0,0 +1,9 @@ +[warp-system] +name=Warp List +tooltip=A list of warp points. +remove-tooltip=Remove Warp Point +go-to-tooltip=Go To +cooldown=You Must Wait For The Cooldown, Time Left: __1__ +cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. +name-used=That Name Is Already Taken +not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/locale/nl/admin.cfg b/locale/nl/admin.cfg new file mode 100644 index 00000000..52434a4d --- /dev/null +++ b/locale/nl/admin.cfg @@ -0,0 +1,15 @@ +[admin-commands] +name=Admin Commands +tooltip=Very powerful 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 chose the correct one! +warning=Warning, this player is a higher rank so you cant change their rank. +short-reason=Warning, this is a short reason please think i it could be made more clear. +rank-high=This player is a higher rank, please use in game command if you are sure about this! +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 \ No newline at end of file diff --git a/locale/nl/announcements.cfg b/locale/nl/announcements.cfg new file mode 100644 index 00000000..c4e55a6a --- /dev/null +++ b/locale/nl/announcements.cfg @@ -0,0 +1,6 @@ +[announcements] +name=Announcement +tooltip=Sent an announcement to players +sent-to=This is sent to __1__ +sent-by=This was sent by __1__ of rank __2__ +select-rank=This message will be sent to: \ No newline at end of file diff --git a/locale/nl/auto-message.cfg b/locale/nl/auto-message.cfg new file mode 100644 index 00000000..15e620a2 --- /dev/null +++ b/locale/nl/auto-message.cfg @@ -0,0 +1,9 @@ +[auto-message] +players-online=There are __1__ players online +map-time=This map has been on for __1__ +line-8=Do /help for more info +join-us=Please join us on: +discord=Discord: https://discord.me/explosivegaming +website=Website: explosivegaming.nl +custom-commands=We use custom commands such as /tag and /report +read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file diff --git a/locale/nl/capsules.cfg b/locale/nl/capsules.cfg new file mode 100644 index 00000000..37913f83 --- /dev/null +++ b/locale/nl/capsules.cfg @@ -0,0 +1,3 @@ +[capsules] +used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. +nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file diff --git a/locale/nl/exp-core.cfg b/locale/nl/exp-core.cfg new file mode 100644 index 00000000..731d758e --- /dev/null +++ b/locale/nl/exp-core.cfg @@ -0,0 +1,22 @@ +[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 + +[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 + +[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 \ No newline at end of file diff --git a/locale/nl/game-settings.cfg b/locale/nl/game-settings.cfg new file mode 100644 index 00000000..cfbcc6e9 --- /dev/null +++ b/locale/nl/game-settings.cfg @@ -0,0 +1,31 @@ +[game-settings] +name=Game Settings +tooltip=Allows for editing of the game settings, please use resposibliy. +basic-name=Basic Settings +basic-tooltip=These settings are safe to change with no large effects. +basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. +advanced-name=Advanced Settings +advanced-tooltip=These settings should be left alone unless you know what you are doing. +advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. +personal-name=Personal Settings +personal-tooltip=These will only effect you, if you are spoted you are on your own. +personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. +sure=Are You Sure! +effect-mining-speed=Mining Speed +effect-craft-speed=Crafting Speed +effect-running-speed=Running Speed +effect-build-distance=Build Distance +effect-reach-distance=Reach Distance +effect-bot-speed=Bot Speed +effect-lab-speed=Lab Speed +effect-stack-bonus=Stack Bonus +effect-quickbar-count=Quickbar Count +effect-inventory-size=Inventory Size +effect-mining-prod=Mining Productivity +effect-game-speed=Game Speed +effect-save=Save Game +effect-reload-effects=Reload Effects +effect-reload-map=Reload Minimap +effect-kill-biters=Kill Biters +effect-crc=Force CRC Check +effect-reset-force=Reset Force \ No newline at end of file diff --git a/locale/nl/inventory-search.cfg b/locale/nl/inventory-search.cfg new file mode 100644 index 00000000..20db013b --- /dev/null +++ b/locale/nl/inventory-search.cfg @@ -0,0 +1,4 @@ +[inventory-search] +low=Your Inventory Was Search And __1__ was removed. +med=Your Inventory Was Search And __1__ was removed, you have been given a warning. +high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file diff --git a/locale/nl/player-list.cfg b/locale/nl/player-list.cfg new file mode 100644 index 00000000..9adacd4d --- /dev/null +++ b/locale/nl/player-list.cfg @@ -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 \ No newline at end of file diff --git a/locale/nl/player_info.cfg b/locale/nl/player_info.cfg new file mode 100644 index 00000000..834ebb19 --- /dev/null +++ b/locale/nl/player_info.cfg @@ -0,0 +1,8 @@ +[player-info] +yes=Yes +no=No +name=[__1__] __2__ +online=Is Online: __1__ (__2__) +admin=Has Admin: __1__ +group=In User Group: __1__ +rank=Has Rank: __1__ \ No newline at end of file diff --git a/locale/nl/rank-changer.cfg b/locale/nl/rank-changer.cfg new file mode 100644 index 00000000..bbc7a51b --- /dev/null +++ b/locale/nl/rank-changer.cfg @@ -0,0 +1,9 @@ +[rank-changer] +name=Rank Changer +tooltip=Change the rank of a player below you. +no-info-file=No info file was found +message=Please select a player and a rank, you can you give ranks to people below you. +warning=Warning, this player is a higher rank so you cant change their rank. +rank-high=This player is a higher rank, rank change failed! +invalid=The player or the rank is invalid please try again! +set-rank=Set Player Rank diff --git a/locale/nl/readme.cfg b/locale/nl/readme.cfg new file mode 100644 index 00000000..f2ada42e --- /dev/null +++ b/locale/nl/readme.cfg @@ -0,0 +1,68 @@ +[readme] +tooltip=Open the readme gui that opens when you first join. +guildlines-name=Guild Lines +guildlines-tooltip=These are the guildlines you should follow +guildlines-line1=Welcome to the Explosive Gaming Community! +guildlines-line2= +guildlines-line3=Here are some guidelines to keep this Server fun for everyone: +guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. +guildlines-line5=- Be polite and use common sense. +guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. +guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. +guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line9= +guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! +chat-name=How To Chat +chat-tooltip=How to chat in factorio with default key config +chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. +commands-name=Commands +commands-tooltip=These are the commands you can use +commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown +commands-col1=Command Name +commands-col2=Command Help +links-name=Links +links-tooltip=Helpful links for ways to get in touch +links-cap1=Discord voice and chat server: +links-cap2=Our website: +links-cap3=Steam: +links-cap4=Patreon: +servers-name=Servers +servers-tooltip=Info on our other servers +servers-singleline=Welcome to the Explosive Gaming Community! +servers-format=S__1__: __2__ +servers-cap1=Public +servers-des1=A place for all players, this map reset every 24h. +servers-cap2=Standard +servers-des2=Before you play make sure you understand the game, reset every 48h. +servers-cap3=Pro +servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. +servers-cap4=Modded +servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. +servers-cap5=Events +servers-des5=Sometimes we hold events, may require a password, join discord for more info. +servers-cap6=Donator +servers-des6=For those people who have two much money and give us some. Anything goes per request. +rules-name=All Rules +rules-tooltip=A full list of rules for the server +rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. +rules-format=__1__) __2__ +rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. +rules-rule2=Any bugs or exploits found should be reported. (no creative items) +rules-rule3=Do not disrespect any player in the server. +rules-rule4=Do not take every item frmo a belt or via logics request, share resources. +rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. +rules-rule6=Do not laydown or remove concrete or stone with bots without permission. +rules-rule7=Do not use active provider chests without permission. +rules-rule8=Do not use speakers on global or with alearts without permission. +rules-rule9=Do not remove/move major parts of the factory without permission. +rules-rule10=Do not walk in player random direction for no reason(to save map size). +rules-rule11=Do not remove stuff just because you dont like it, tell people first. +rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. +rules-rule13=Do not make train roundabouts. Or any loops of any kind. +rules-rule14=When using trains use the same size that others have used. +rules-rule15=Trains are Left Hand Drive (LHD) only. +rules-rule16=Do not complain about lag, low fps and low ups or other things like that. +rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. +rules-rule18=Do not advertise other servers unless you are a trusted server owner. +rules-rule19=Report any one who breaks the rules. +rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file diff --git a/locale/nl/reports.cfg b/locale/nl/reports.cfg new file mode 100644 index 00000000..b0152d44 --- /dev/null +++ b/locale/nl/reports.cfg @@ -0,0 +1,15 @@ +[reports] +name=Report Player +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 cant be reported. +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. \ No newline at end of file diff --git a/locale/nl/rockets.cfg b/locale/nl/rockets.cfg new file mode 100644 index 00000000..be434056 --- /dev/null +++ b/locale/nl/rockets.cfg @@ -0,0 +1,12 @@ +[rockets] +name=Rocket Info +tooltip=List of details about the rockets sent. +none=No rockets have been sent yet. +nan=NaN +sent=Rockets Sent: __1__ +first=First Lanuched At: __1__ +last=Last Launch Took: __1__ +time=Average Launch Time: __1__ +fastest=Fastest Launch: __1__ +milestones=Milestones: +format=__1__: __2__ \ No newline at end of file diff --git a/locale/nl/science.cfg b/locale/nl/science.cfg new file mode 100644 index 00000000..f42dbc94 --- /dev/null +++ b/locale/nl/science.cfg @@ -0,0 +1,14 @@ +[science] +name=Science Info +tooltip=List of details about science packs. +total=Packs Made: +time=Packs Per Minute: +format=__1__: __2__ +science-pack-1=Red +science-pack-2=Green +science-pack-3=Blue +military-science-pack=Military +production-science-pack=Production +high-tech-science-pack=High Tech +space-science-pack=Space +none=No science packs have been made yet. \ No newline at end of file diff --git a/locale/nl/tasklist.cfg b/locale/nl/tasklist.cfg new file mode 100644 index 00000000..1e2baa06 --- /dev/null +++ b/locale/nl/tasklist.cfg @@ -0,0 +1,4 @@ +[tasklist] +name=Task List +tooltip=What jobs need to be done round the factory. +none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file diff --git a/locale/nl/tree-decon.cfg b/locale/nl/tree-decon.cfg new file mode 100644 index 00000000..f1bfe299 --- /dev/null +++ b/locale/nl/tree-decon.cfg @@ -0,0 +1,3 @@ +[tree-decon] +player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours +rank-print=__1__ tried to deconstruct something. \ No newline at end of file diff --git a/locale/nl/warp-system.cfg b/locale/nl/warp-system.cfg new file mode 100644 index 00000000..203519fe --- /dev/null +++ b/locale/nl/warp-system.cfg @@ -0,0 +1,9 @@ +[warp-system] +name=Warp List +tooltip=A list of warp points. +remove-tooltip=Remove Warp Point +go-to-tooltip=Go To +cooldown=You Must Wait For The Cooldown, Time Left: __1__ +cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. +name-used=That Name Is Already Taken +not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file From eb15e7ef4b4dba54ca1434090a1dcc91b7e544c6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 14:54:03 +0000 Subject: [PATCH 086/392] Edit to readme.md --- README.md | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 504a9638..5182aeb5 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,31 @@ #### Using The Core Files 1. Copy the core folder and the StdLib File -2. Require StdLib event.lua before the core file-header -3. Use require to run the file-header inside the core file -4. Make any changes to the rank table you wish to use -5. Add you own code to the stand alone folder using the function defined in core +2. Copy the control.lua and edit the load.lua in each file +3. The require order is imporant in the control.lua +4. Use playerRanks.lua to edit the rank system +5. Add your own files to the addons folder and require them in the load.lua #### Using The Addons 1. Copy the addons folder 2. Remove any you do not wish to have -3. Remove the require inside the addons file-header +3. Remove the require inside the addons load.lua #### Making Your Own Addons -* Make sure to require it after the core files -* Add and return the credits vaible with your info inside -* Make sure the core is upto date with out latest version -* It is recomened that your do not edit the core file -* The core files use comments to help explain the many functions +* You must have the core files and StdLib +* The load.lua is the only file outside your own you need to edit +* Keep the core files upto data with the core branch +* Try not to edit StdLib or the core files +* There is many comments inside the core files to descripe how to use them. + +#### Stand Alone File +* This file ocntains a few scripts from else where which dont require any lib +* StdLib and ExpLib are the only exceptions as these are very basic functions +* Any files added to this folder must be given proper sourses +* Each file must be self contained with no _G varibles + +#### Forks and Pull Requests +* We are happy for people to make pull requets if you wish to help make our server better +* You can add a comment at the start of the file to mark any changes you make, for the credit +* Your server is a comunity server, it is all about the people and feedback is good +* Dont make small changes to the core files, please only big meaniful changes +* Dont be afraid to make a pull request as if it fixes something then its a good change From 63f068253fdf625973ce634e42424ef40682fdbd Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 14:58:50 +0000 Subject: [PATCH 087/392] Fixed Error in capsules --- Addons/Admin/capsules.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/capsules.lua b/Addons/Admin/capsules.lua index d5631f3a..242494d7 100644 --- a/Addons/Admin/capsules.lua +++ b/Addons/Admin/capsules.lua @@ -45,8 +45,8 @@ Event.register(defines.events.on_player_ammo_inventory_changed,function(event) local player = Game.get_player(event) if Ranking.get_rank(player):allowed('nuke') then return end local found = player.remove_item({name='atomic-bomb',count=1000}) - Admin.move_item_to_spawn({name='atomic-bomb',count=found},player.surface) if found > 0 then + Admin.move_item_to_spawn({name='atomic-bomb',count=found},player.surface) player_return({'capsules.nuke'},defines.text_color.med,player) Admin.give_warning(player,'','Nukes are not allowed for your rank.',4) end From 680db3adfa6b0a8cc9ac2d8695eaf702d8b0513c Mon Sep 17 00:00:00 2001 From: arty714 Date: Sun, 7 Jan 2018 17:50:26 +0100 Subject: [PATCH 088/392] Update admin.cfg French translation --- locale/fr/admin.cfg | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/fr/admin.cfg b/locale/fr/admin.cfg index 52434a4d..36f6e7a3 100644 --- a/locale/fr/admin.cfg +++ b/locale/fr/admin.cfg @@ -1,15 +1,15 @@ [admin-commands] -name=Admin Commands -tooltip=Very powerful 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 chose the correct one! -warning=Warning, this player is a higher rank so you cant change their rank. -short-reason=Warning, this is a short reason please think i it could be made more clear. -rank-high=This player is a higher rank, please use in game command if you are sure about this! -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 \ No newline at end of file +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. +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=Amerner le Joueur à soi From c5d401cf4d44fc3f9e4011e5a993fbee7e60330d Mon Sep 17 00:00:00 2001 From: arty714 Date: Sun, 7 Jan 2018 17:52:21 +0100 Subject: [PATCH 089/392] French translation --- locale/fr/admin.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr/admin.cfg b/locale/fr/admin.cfg index 36f6e7a3..d2edcb74 100644 --- a/locale/fr/admin.cfg +++ b/locale/fr/admin.cfg @@ -12,4 +12,4 @@ 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=Amerner le Joueur à soi +tooltip-bring=Amener le Joueur à soi From 9390614d8fbc1aed6f48837f4b998e58183a8650 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 7 Jan 2018 17:09:16 +0000 Subject: [PATCH 090/392] Added Max height on player list --- Addons/Guis/player-list.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index a41da941..a09e83d0 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -55,6 +55,7 @@ Gui.left.add{ vertical_scroll_policy='always', horizontal_scroll_policy='never' } + player_list.style.maximal_height=200 for _,rank in pairs(Ranking._ranks()) do for _,player in pairs(rank:get_players(true)) do local flow = player_list.add{type='flow'} From b2363848ec46c3ccf8447ec009b73fdd00134bff Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 17:49:34 +0000 Subject: [PATCH 091/392] Fixed Auto message timeout --- Addons/Admin/auto-message.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua index 9e48afe9..553dc0e4 100644 --- a/Addons/Admin/auto-message.lua +++ b/Addons/Admin/auto-message.lua @@ -10,7 +10,7 @@ Discord: https://discord.gg/r6dC2uK Event.register(-1,function(event) Server.new_thread{ name='auto-message', - timeout=3240000, -- 3240000 = 15 minutes + timeout=54000, -- 3240000 = 15 hours dont make the mistake i did, 54000 is 15 minutes reopen=true, data={ high_rank= 'Owner', From d4f791b5ffadecaaef1b6a4715a2d320ca6abebf Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 18:04:06 +0000 Subject: [PATCH 092/392] Fixed Two Bugs --- Addons/Admin/inventory-search.lua | 1 + Addons/Admin/reports.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index db304e3c..e817187e 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -60,6 +60,7 @@ end Event.register(defines.events.on_tick,function(event) if (game.tick%3600) == 0 then local players = game.connected_players + if #players == 0 then return end local player = players[math.random(#players)] search_player(player) end diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index c0d88c75..516bc509 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -254,7 +254,7 @@ Event.register(defines.events.on_tick,function(event) local time_to_remove = _reports().remove_warnings_time[rank.power] if (game.tick % time_to_remove) == 0 then _reports().warnings[name]=warnings-1 - player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines,text_color.low,name) + player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines.text_color.low,name) end end end From e8f789d53c510e0ed7902a68e245d697f16ab148 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 21:44:21 +0000 Subject: [PATCH 093/392] Fixed Reason on kick --- Addons/Admin/discord.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/discord.lua b/Addons/Admin/discord.lua index 815e3a0d..e02ee49c 100644 --- a/Addons/Admin/discord.lua +++ b/Addons/Admin/discord.lua @@ -40,7 +40,7 @@ Event.register(defines.events.on_console_command,function(event) data.username = args[1] if not Game.get_player(data.username) then return end if string.sub(command,-1) == 'e' then data.command = command..'d' else data.command = command..'ed' end - data.reason = data.reason and not data.reason == '' or 'No Reason Required' + data.reason = data.reason and data.reason ~= '' and data.reason or 'No Reason Required' discord_emit{ title='Player '..data.title, color=data.colour, From 1f18eb549bd34e25671ce8514f7ebe4d385162e3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 21:58:51 +0000 Subject: [PATCH 094/392] Fixed the spam during decon --- Addons/Admin/reports.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 516bc509..868efba2 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -139,8 +139,10 @@ function Admin.give_warning(player,by_player,reason,min) if warnings < min then warnings = min end warnings = warnings+1 _reports().warnings[player.name] = warnings - player_return({'reports.warning-given-by',by_player_name},defines.text_color.info,player) - game.print({'reports.player-warning',player.name,by_player_name,reason}) + if warnings > take_action then + player_return({'reports.warning-given-by',by_player_name},defines.text_color.info,player) + game.print({'reports.player-warning',player.name,by_player_name,reason}) + end give_punishment(player,by_player,reason) end From a5d72f91d340a637b20401b699379cb1064cf551 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 7 Jan 2018 22:03:48 +0000 Subject: [PATCH 095/392] Allowed Report --- Addons/playerRanks.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 51761b2d..144909b2 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -178,7 +178,8 @@ ranks['Regular']:edit('allow',false,{ }) ranks['Guest']:edit('allow',false,{ ['tag']=true, - ['tag-clear']=true + ['tag-clear']=true, + ['report']=true }) Ranking._base_preset{ From 25781e5293374eb216668069afb0353c19adba44 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 8 Jan 2018 21:56:25 +0000 Subject: [PATCH 096/392] Fixed Tree Decon --- Addons/Admin/tree-decon.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Admin/tree-decon.lua b/Addons/Admin/tree-decon.lua index 5b39f256..78aa7bc1 100644 --- a/Addons/Admin/tree-decon.lua +++ b/Addons/Admin/tree-decon.lua @@ -24,6 +24,7 @@ Event.register(-1,function(event) local chache = self.data.chache[event.player_index] if not chache then local player = Game.get_player(event) + if not player then return end local rank = Ranking.get_rank(player) if rank:allowed('tree-decon') then self.data.chache[event.player_index] = {'tree-decon',false} elseif not rank:allowed('decon') then self.data.chache[event.player_index] = {'no-decon',false} From 03bef54222735951fc0f6522903a59ec765271c6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 9 Jan 2018 17:02:57 +0000 Subject: [PATCH 097/392] DE locale partly done - samy115 --- locale/de/admin.cfg | 28 ++++----- locale/de/announcements.cfg | 10 ++-- locale/de/auto-message.cfg | 12 ++-- locale/de/capsules.cfg | 4 +- locale/de/exp-core.cfg | 32 +++++----- locale/de/game-settings.cfg | 60 +++++++++---------- locale/de/inventory-search.cfg | 6 +- locale/de/player-info.cfg | 8 +++ locale/de/player-list.cfg | 4 +- locale/de/rank-changer.cfg | 16 ++--- .../player_info.cfg => en/player-info.cfg} | 0 .../player_info.cfg => fr/player-info.cfg} | 0 .../player_info.cfg => nl/player-info.cfg} | 0 locale/nl/player_info.cfg | 8 --- 14 files changed, 94 insertions(+), 94 deletions(-) create mode 100644 locale/de/player-info.cfg rename locale/{de/player_info.cfg => en/player-info.cfg} (100%) rename locale/{en/player_info.cfg => fr/player-info.cfg} (100%) rename locale/{fr/player_info.cfg => nl/player-info.cfg} (100%) delete mode 100644 locale/nl/player_info.cfg diff --git a/locale/de/admin.cfg b/locale/de/admin.cfg index 52434a4d..41bd1eae 100644 --- a/locale/de/admin.cfg +++ b/locale/de/admin.cfg @@ -1,15 +1,15 @@ [admin-commands] -name=Admin Commands -tooltip=Very powerful 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 chose the correct one! -warning=Warning, this player is a higher rank so you cant change their rank. -short-reason=Warning, this is a short reason please think i it could be made more clear. -rank-high=This player is a higher rank, please use in game command if you are sure about this! -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 \ No newline at end of file +name=Admin Befehle +tooltip=Sehr mächtige Befehle sind hier geschrieben +no-info-file=Kein Informations Ordner wurde gefunden +message=Bitte wähle einen Spieler und eine Aktion zum ausführen, stell sicher dass es der richtige ist! +warning=Achtung, Dieser Spieler hat einen höheren Rang als du selbst, weswegen du seinen Rang nicht ändern kannst. +short-reason=Achtung, Dies ist ein sehr kurzer Grund. Bitte Versuch mehr Informationen zu geben. +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 Action war ungültig. Bitte versuch es noch einmal! +take-action= Ergreife Maßnahme +tooltip-ban=Banne Spieler +tooltip-kick=Kicke Spieler +tooltip-jail= Versiegele Spieler im Gefängnis +tooltip-go-to=Geh zu Spieler +tooltip-bring=Bringe den Spieler \ No newline at end of file diff --git a/locale/de/announcements.cfg b/locale/de/announcements.cfg index c4e55a6a..4612e8ff 100644 --- a/locale/de/announcements.cfg +++ b/locale/de/announcements.cfg @@ -1,6 +1,6 @@ [announcements] -name=Announcement -tooltip=Sent an announcement to players -sent-to=This is sent to __1__ -sent-by=This was sent by __1__ of rank __2__ -select-rank=This message will be sent to: \ No newline at end of file +name=Ankündigung +tooltip=Sende eine Ankündigung zu Spielern +sent-to=Dies wurde zu __1__ gesendet +sent-by=Dies wurde von __1__ vom Rang __2__ gesendet +select-rank=Diese Nachricht wird gesendet zu: \ No newline at end of file diff --git a/locale/de/auto-message.cfg b/locale/de/auto-message.cfg index 15e620a2..6b4a39fb 100644 --- a/locale/de/auto-message.cfg +++ b/locale/de/auto-message.cfg @@ -1,9 +1,9 @@ [auto-message] -players-online=There are __1__ players online -map-time=This map has been on for __1__ -line-8=Do /help for more info -join-us=Please join us on: +players-online=Es sind __1__ Spieler online. +map-time=Dieses Spiel is seit __1__ am laufen. +line-8=Schreibe /help für mehr Informationen +join-us=Bitte folge uns auf: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands such as /tag and /report -read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file +custom-commands=Wir benutzen selbstgemachte Befehle wie /tag und /report +read-readme=Stelle sicher dass du das Liesmich gelesen hast (oben linkes FrageZeichen) \ No newline at end of file diff --git a/locale/de/capsules.cfg b/locale/de/capsules.cfg index 37913f83..abb0eeed 100644 --- a/locale/de/capsules.cfg +++ b/locale/de/capsules.cfg @@ -1,3 +1,3 @@ [capsules] -used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. -nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file +used=Du benutztest __1__ und hast einige deiner eigenen oder anderer Spielern dessen Gebäude damit getroffen, Bitte sei aufmerksamer, zum Glück ist kein Schaden dabei entstanden. +nuke=Atombomben sind nicht erlaubt für deinen Rang. Tut uns leid aber so beugen wir Griefer vor. \ No newline at end of file diff --git a/locale/de/exp-core.cfg b/locale/de/exp-core.cfg index 731d758e..e2c91e27 100644 --- a/locale/de/exp-core.cfg +++ b/locale/de/exp-core.cfg @@ -1,22 +1,22 @@ [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 +unauthorized=401 - Unbefugt:Zugang verweigert weil sie keinen Zugriff auf diese Befehle haben +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__ ,Versuch "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 [ranking] -all-rank-print=[Everyone]: __1__ +all-rank-print=[Alle]: __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 +rank-up=__1__ wurde befördert zu __2__ von __3__ +rank-down=__1__ wurde degradiert zu __2__ von __3__ +rank-given=Dier wurde der __1__ Rang zugeteilt! +tag-reset=Deine Spitzname wurde aufgrund eine Rang wechsels zurückgesetzt [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 \ No newline at end of file +unauthorized=401 - Unbefugt: Zugang verweigert weil sie keinen Zugriff auf diese Befehle haben +cant-open=Du kannst diese Klappbox nicht öfnen aufgrund von, Grund: __1__ +cant-open-no-reason=Du kannst diese Klappbox gerade nicht öffnen \ No newline at end of file diff --git a/locale/de/game-settings.cfg b/locale/de/game-settings.cfg index cfbcc6e9..c2fbe7ff 100644 --- a/locale/de/game-settings.cfg +++ b/locale/de/game-settings.cfg @@ -1,31 +1,31 @@ [game-settings] -name=Game Settings -tooltip=Allows for editing of the game settings, please use resposibliy. -basic-name=Basic Settings -basic-tooltip=These settings are safe to change with no large effects. -basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. -personal-name=Personal Settings -personal-tooltip=These will only effect you, if you are spoted you are on your own. -personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. -sure=Are You Sure! -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force \ No newline at end of file +name=Spiel Einstellungen +tooltip=Erlaubt das modifizieren von Spiel Einstellungen. Bitte mit bedacht benutzen. +basic-name=Einfache Einstellungen +basic-tooltip=Diese Einstellungen sind ohne Probleme veränderbar, sie verursachen keine großen Probleme im Nach hinein. +basic-message=Diese Einstellungen sind Fraktionsweite Einstellungen, welche genutzt werden können um das Spiel zu vereinfachen und es angenehmer für jedermann zu machen. +advanced-name=Erweiterte Einstellungen +advanced-tooltip=Diese Einstellungen sollten nicht von Leuten benutzt werden die nicht wissen was sie tun. +advanced-message=Bitte ändere keine dieser Einstellungen ausser du bist dir 100% sicher was sie tun,lass game.speed allein, da es einen viel größeren Effekt hat als du denkst. +personal-name=Persöhnliche Einstellungen +personal-tooltip=Diese Einstellungen betreffen nur deinen Spieler, wenn man dich beim cheaten erwischt bist du auf dich allein gestellt. +personal-message=Diese Einstellungen betreffen nur deinen eigenen Spieler, übertreib es nicht ansonsten geht die Gefahr aus dass dich normale Spieler (gierige Kleinkinder) dabei erwischen (und rumheulen). +sure=Bist du dir Sicher?! +effect-mining-speed=Abbau geschwindigkeit +effect-craft-speed=Herstell Geschwindigkeit +effect-running-speed=Lauf Geschwindigkeit +effect-build-distance=Bau Distanz +effect-reach-distance=Arm Reichweite +effect-bot-speed=Roboter Geschwindigkeit +effect-lab-speed=Labor Geschwindigkeit +effect-stack-bonus=Stapel Bonuss +effect-quickbar-count=Hotbar Anzahl +effect-inventory-size=Inventar Größe +effect-mining-prod=Abbau produktivität +effect-game-speed=Spiel Geschwindigkeit +effect-save=Speichere Spiel +effect-reload-effects=Effekte neu laden +effect-reload-map=Minimap neu laden +effect-kill-biters=Töte alle Beisser +effect-crc=Forciere CRC check +effect-reset-force=Fraktion zurücksetzen \ No newline at end of file diff --git a/locale/de/inventory-search.cfg b/locale/de/inventory-search.cfg index 20db013b..62508cbb 100644 --- a/locale/de/inventory-search.cfg +++ b/locale/de/inventory-search.cfg @@ -1,4 +1,4 @@ [inventory-search] -low=Your Inventory Was Search And __1__ was removed. -med=Your Inventory Was Search And __1__ was removed, you have been given a warning. -high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file +low=Dein Inventar wurde durchsucht und __1__ wurde entfernt. +med=Dein Inventar wurde durchsucht und __1__ wurde entfernt, Dier wird hiermit eine warnung erteilt bitte versuche es nicht erneut. +high=Dein inventar wurde durchsucht und __1__ wurde gefunden, dies ist auf GAR KEINEN Fall erlaubt, Dein Inventar wurde zum Spawn transferiert. \ No newline at end of file diff --git a/locale/de/player-info.cfg b/locale/de/player-info.cfg new file mode 100644 index 00000000..57e13ea2 --- /dev/null +++ b/locale/de/player-info.cfg @@ -0,0 +1,8 @@ +[player-info] +yes=Ja +no=Nein +name=[__1__] __2__ +online=Ist online: __1__ (__2__) +admin=Hat Admin Rang: __1__ +group=In Benutzer Gruppe: __1__ +rank=Hat Rang: __1__ \ No newline at end of file diff --git a/locale/de/player-list.cfg b/locale/de/player-list.cfg index 9adacd4d..ef000508 100644 --- a/locale/de/player-list.cfg +++ b/locale/de/player-list.cfg @@ -1,5 +1,5 @@ [player-list] -tooltip=Toogle player list, right click player for info +tooltip=verkleinere die Spieler Liste, Rechts-klicke einen Spieler für Informationen über ihn. format-nil=__1__ - __2__ format=__1__ - __2__ - __3__ -no-info-file=No info file was found \ No newline at end of file +no-info-file=Keine Informationen wurden gefunden \ No newline at end of file diff --git a/locale/de/rank-changer.cfg b/locale/de/rank-changer.cfg index bbc7a51b..04fde067 100644 --- a/locale/de/rank-changer.cfg +++ b/locale/de/rank-changer.cfg @@ -1,9 +1,9 @@ [rank-changer] -name=Rank Changer -tooltip=Change the rank of a player below you. -no-info-file=No info file was found -message=Please select a player and a rank, you can you give ranks to people below you. -warning=Warning, this player is a higher rank so you cant change their rank. -rank-high=This player is a higher rank, rank change failed! -invalid=The player or the rank is invalid please try again! -set-rank=Set Player Rank +name=Rang wechsler +tooltip=Wechsle den Rang eines niedriger geranktem Spielers. +no-info-file=Keine Informationen wurden gefunden +message=Bitte wähle einen Spieler und einen Rang, Du kannst nur Spielern mit niedrigerem Rang einen neuen Rang geben. +warning=Achtung, Dieser Spieler hat einen höheren Rang als du also kannst du seinen Rang nicht ändern. +rank-high=Dieser Spieler hat einen höheren Rang als du, Rang wechsel fehlgeschlagen! +invalid=Der Spieler oder der Rang ist ungültig, bitte versuche es erneut! +set-rank=Setzte Spieler Rang \ No newline at end of file diff --git a/locale/de/player_info.cfg b/locale/en/player-info.cfg similarity index 100% rename from locale/de/player_info.cfg rename to locale/en/player-info.cfg diff --git a/locale/en/player_info.cfg b/locale/fr/player-info.cfg similarity index 100% rename from locale/en/player_info.cfg rename to locale/fr/player-info.cfg diff --git a/locale/fr/player_info.cfg b/locale/nl/player-info.cfg similarity index 100% rename from locale/fr/player_info.cfg rename to locale/nl/player-info.cfg diff --git a/locale/nl/player_info.cfg b/locale/nl/player_info.cfg deleted file mode 100644 index 834ebb19..00000000 --- a/locale/nl/player_info.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[player-info] -yes=Yes -no=No -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -rank=Has Rank: __1__ \ No newline at end of file From 88fc2da1c0ec712123f259661441085cf06866ac Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 9 Jan 2018 19:05:57 +0000 Subject: [PATCH 098/392] fixed error in player_list --- Addons/Guis/player-list.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index a09e83d0..ecefa08d 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -105,7 +105,7 @@ Event.register(defines.events.on_gui_click,function(event) local flow = player_list.add{type='flow',direction='vertical'} back_btn:draw(flow) get_player_info(event.element.name,flow,true) - if event.player_index == Game.get_player(event.element.name).index then return end + if Game.get_player(event.element.name) and event.player_index == Game.get_player(event.element.name).index then return end if Admin and Admin.allowed(event.player_index) then Admin.btn_flow(flow).caption = event.element.name end end) From 01317f3fe0ed604b9410dd79d557eeb0beb67401 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 12 Jan 2018 19:15:34 +0000 Subject: [PATCH 099/392] Adding Poll System --- Addons/Guis/polls.lua | 218 +++++++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 3 +- 3 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 Addons/Guis/polls.lua diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua new file mode 100644 index 00000000..7c8f6c24 --- /dev/null +++ b/Addons/Guis/polls.lua @@ -0,0 +1,218 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local poll_time_out = 90 -- this is in seconds + +local function _polls(reset) + global.addons = not reset and global.addons or {} + global.addons.polls = not reset and global.addons.polls or {active={},old={}} + return global.addons.polls +end + +local function _poll_end(uuid) + local poll = _polls().active[poll.uuid] + if not poll then return end + for index,answer in pairs(poll.answers) do + local _result = #poll.votes[index] or 0 + poll.votes[index] = _result + end + local uuid = poll.uuid + poll.uuid = nil + poll.answers = nil + poll.voted = nil + table.insert(_polls().old,poll) + _polls().active[uuid] = nil +end + +local function _poll_data(question,answers) + local poll = { + uuid=Server.new_uuid(), + question=question, + answers=answers or {'None'}, + votes={}, + voted={} + } + Server.new_thread{ + data={poll_uuid=poll.uuid}, + timeout=poll_time_out*60 + }:on_event('timeout',function(self) + local uuid = self.data.poll_uuid + _poll_end(uuid) + end) + _polls().active[poll.uuid]=poll + return poll.uuid +end + +local function _opptions(player,root_frame) + local opptions = {'Please Select An Opption'} + local uuid = root_frame.name + local poll = _polls().active[uuid] + if not poll then return {'Invalid Poll'} end + for _,answer in pairs(poll.answers) do + table.insert(opptions,answer) + end + return opptions +end + +local opption_drop_down = Gui.inputs.add_drop_down('opption-drop-down-polls',_opptions,1,function(player,selected,items,element) + local uuid = element.parent.name + local poll = _polls().active[uuid] + if not poll then return end + if poll.voted[player.index] and poll.voted[player.index] > 1 then + local old_vote = poll.voted[player.index] + poll.votes[old_vote] = poll.votes[old_vote]-1 + end + if element.selected_index > 1 then + poll.votes[element.selected_index-1] = poll.votes[element.selected_index-1] + 1 + end + poll.voted[player.index]=element.selected_index + element.parent.answer.caption = 'Your Answer: '..selected +end) + +local prev = Gui.inputs.add{ + type='button', + name='prev-poll', + caption='utility/hint_arrow_right' +}:on_event('click',function(event) + local parent = event.element.parent + local index = parent.parent.current_index.caption + local _index = tonumber(index)-1 + if _index < 1 then _index = #_polls().old end + parent.parent.current_index.caption = _index + draw_poll(parent.parent.poll_area) +end) + +local next = Gui.inputs.add{ + type='button', + name='next-poll', + caption='utility/hint_arrow_left' +}:on_event('click',function(event) + local parent = event.element.parent + local index = parent.parent.current_index.caption + local _index = tonumber(index)+1 + if _index > #_polls().old then _index = 1 end + parent.parent.current_index.caption = _index + draw_poll(parent.parent.poll_area) +end) + +-- this function from redmew, would take too much to make a better one +local function poll_assembler(frame) + frame.clear() + local frame_table = frame.add { type = 'table', name = 'table_poll_assembler', column_count = 2 } + frame_table.add { type = 'label', caption = 'Question:' } + frame_table.add { type = 'textfield', name = 'textfield_question', text = '' } + frame_table.add { type = 'label', caption = 'Answer #1:' } + frame_table.add { type = 'textfield', name = 'textfield_answer_1', text = '' } + frame_table.add { type = 'label', caption = 'Answer #2:' } + frame_table.add { type = 'textfield', name = 'textfield_answer_2', text = '' } + frame_table.add { type = 'label', caption = 'Answer #3:' } + frame_table.add { type = 'textfield', name = 'textfield_answer_3', text = '' } + frame_table.add { type = 'label', caption = '' } +end + +local create_poll = Gui.inputs.add{ + type='button', + name='create-poll', + caption='utility/add' +}:on_event('click',function(event) + local parent = event.element.parent + if event.element.caption == 'utility/enter' then + local inputs = parent.pool_area.table_poll_assembler + local uuid = _poll_data(inputs.textfield_question,{ + inputs.textfield_answer_1, + inputs.textfield_answer_2, + inputs.textfield_answer_3 + }) + Gui.popup.open('polls',{uuid=uuid}) + else + event.element.caption = 'utility/enter' + poll_assembler(parent.parent.poll_area) + end +end) + +local function draw_poll(frame) + frame.clear() + local index = frame.parent.current_index.caption + local poll = _polls().old[index] + if not poll then + frame.add{ + type='label', + caption={'polls.no-poll'} + } + return + end + frame.add{ + type='label', + caption='Question: '..poll.question + } + for answer,votes in pairs(poll.answers) do + frame.add{ + type='label', + caption=answer..') '..votes + } + end +end + +Gui.popup.add{ + name='polls', + caption={'polls.name'}, + draw=function(frame,data) + frame.style.right_padding = 5 + frame.style.bottom_padding = 5 + local uuid = data.uuid + local poll = _polls().active[uuid] + if not poll then return end + local flow = frame.add{ + type='flow', + name=uuid, + direction='vertical' + } + flow.add{type='label',caption='Question: '..poll.question} + flow.add{type='label',name='answer',caption='Your Answer: None'} + opption_drop_down:draw(flow) + flow.add{type='lable',caption={'polls.auto-update'}}.style.font_size = 8 + end +}:add_left{ + caption='utility/item_editor_icon', + tooltip={'polls.tooltip'}, + draw=function(frame) + frame.add{ + type='lable', + name='current_index', + cpation=1 + }.style.visible = false + local title = frame.add{ + type='flow', + name='title' + } + local btn = prev:draw(title) + btn.style.width = 30 + btn.style.height = 30 + title.add{ + type='label', + caption='Viewing Poll: 1', + style='caption_label' + } + local btn = next:draw(title) + btn.style.width = 30 + btn.style.height = 30 + if Ranking.get_rank(frame.player_index):allowed('create-poll') then + local btn = create_poll:draw(title) + btn.style.width = 30 + btn.style.height = 30 + end + local flow = frame.add{ + type='flow', + name='poll_area', + direction='vertical' + } + draw_poll(flow) + end +} \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 505931ba..dbad5133 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -41,6 +41,7 @@ require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') require('Guis/warp-system') +require('Guis/polls') require('Guis/announcements') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 144909b2..8dd00710 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -163,7 +163,8 @@ ranks['Donator']:edit('allow',false,{ }) ranks['Veteran']:edit('allow',false,{ - ['tree-decon']=true + ['tree-decon']=true, + ['create-poll']=true }) ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, From bd846f73e1c8b7a14da05a93f5232e8fad4f4f4f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 12 Jan 2018 20:14:49 +0000 Subject: [PATCH 100/392] Working Poll System --- Addons/Guis/announcements.lua | 1 + Addons/Guis/polls.lua | 117 +++++++++++++++++++--------------- Addons/playerRanks.lua | 9 ++- locale/en/polls.cfg | 7 ++ 4 files changed, 81 insertions(+), 53 deletions(-) create mode 100644 locale/en/polls.cfg diff --git a/Addons/Guis/announcements.lua b/Addons/Guis/announcements.lua index 662ade9e..9de20b06 100644 --- a/Addons/Guis/announcements.lua +++ b/Addons/Guis/announcements.lua @@ -42,6 +42,7 @@ local send_popup = Gui.inputs.add{ for power,__rank in pairs(Ranking._ranks()) do if power <= _rank.power then Gui.popup.open('announcements',{sent_by=sent_by,sent_to=sent_to,message=message},__rank:get_players(true)) + event.element.parent.parent.message.text = '' end end end) diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index 7c8f6c24..f7174089 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -17,18 +17,24 @@ local function _polls(reset) end local function _poll_end(uuid) - local poll = _polls().active[poll.uuid] + local poll = _polls().active[uuid] if not poll then return end + local highest = {nil,-1} + local _votes = {} for index,answer in pairs(poll.answers) do - local _result = #poll.votes[index] or 0 - poll.votes[index] = _result + local _result = poll.votes[index] or 0 + if _result > highest[2] then highest = {answer,_result} end + _votes[answer] = _result end local uuid = poll.uuid poll.uuid = nil + poll.votes = _votes poll.answers = nil 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) end local function _poll_data(question,answers) @@ -45,11 +51,34 @@ local function _poll_data(question,answers) }:on_event('timeout',function(self) local uuid = self.data.poll_uuid _poll_end(uuid) - end) + end):open() _polls().active[poll.uuid]=poll return poll.uuid end +local function draw_poll(frame) + frame.clear() + local index = tonumber(frame.parent.current_index.caption) + local poll = _polls().old[index] + if not poll then + frame.add{ + type='label', + caption={'polls.no-poll'} + } + return + end + frame.add{ + type='label', + caption='Question: '..poll.question + } + for answer,votes in pairs(poll.votes) do + frame.add{ + type='label', + caption=answer..') '..votes + } + end +end + local function _opptions(player,root_frame) local opptions = {'Please Select An Opption'} local uuid = root_frame.name @@ -67,10 +96,10 @@ local opption_drop_down = Gui.inputs.add_drop_down('opption-drop-down-polls',_op if not poll then return end if poll.voted[player.index] and poll.voted[player.index] > 1 then local old_vote = poll.voted[player.index] - poll.votes[old_vote] = poll.votes[old_vote]-1 + poll.votes[old_vote-1] = poll.votes[old_vote-1] and poll.votes[old_vote-1]-1 or 0 end if element.selected_index > 1 then - poll.votes[element.selected_index-1] = poll.votes[element.selected_index-1] + 1 + poll.votes[element.selected_index-1] = poll.votes[element.selected_index-1] and poll.votes[element.selected_index-1]+1 or 1 end poll.voted[player.index]=element.selected_index element.parent.answer.caption = 'Your Answer: '..selected @@ -79,26 +108,28 @@ end) local prev = Gui.inputs.add{ type='button', name='prev-poll', - caption='utility/hint_arrow_right' + caption='utility/hint_arrow_left' }:on_event('click',function(event) local parent = event.element.parent local index = parent.parent.current_index.caption local _index = tonumber(index)-1 if _index < 1 then _index = #_polls().old end parent.parent.current_index.caption = _index + parent.parent.title.title.caption = 'Viewing Poll: '.._index draw_poll(parent.parent.poll_area) end) local next = Gui.inputs.add{ type='button', name='next-poll', - caption='utility/hint_arrow_left' + caption='utility/hint_arrow_right' }:on_event('click',function(event) local parent = event.element.parent local index = parent.parent.current_index.caption local _index = tonumber(index)+1 if _index > #_polls().old then _index = 1 end parent.parent.current_index.caption = _index + parent.parent.title.title.caption = 'Viewing Poll: '.._index draw_poll(parent.parent.poll_area) end) @@ -108,11 +139,11 @@ local function poll_assembler(frame) local frame_table = frame.add { type = 'table', name = 'table_poll_assembler', column_count = 2 } frame_table.add { type = 'label', caption = 'Question:' } frame_table.add { type = 'textfield', name = 'textfield_question', text = '' } - frame_table.add { type = 'label', caption = 'Answer #1:' } + frame_table.add { type = 'label', caption = 'Option #1:' } frame_table.add { type = 'textfield', name = 'textfield_answer_1', text = '' } - frame_table.add { type = 'label', caption = 'Answer #2:' } + frame_table.add { type = 'label', caption = 'Option #2:' } frame_table.add { type = 'textfield', name = 'textfield_answer_2', text = '' } - frame_table.add { type = 'label', caption = 'Answer #3:' } + frame_table.add { type = 'label', caption = 'Option #3:' } frame_table.add { type = 'textfield', name = 'textfield_answer_3', text = '' } frame_table.add { type = 'label', caption = '' } end @@ -123,43 +154,27 @@ local create_poll = Gui.inputs.add{ caption='utility/add' }:on_event('click',function(event) local parent = event.element.parent - if event.element.caption == 'utility/enter' then - local inputs = parent.pool_area.table_poll_assembler - local uuid = _poll_data(inputs.textfield_question,{ - inputs.textfield_answer_1, - inputs.textfield_answer_2, - inputs.textfield_answer_3 + if event.element.sprite == 'utility/enter' then + local inputs = parent.parent.poll_area.table_poll_assembler + if not inputs then + event.element.sprite = 'utility/add' + draw_poll(parent.parent.poll_area) + return + end + local uuid = _poll_data(inputs.textfield_question.text,{ + inputs.textfield_answer_1.text, + inputs.textfield_answer_2.text, + inputs.textfield_answer_3.text }) Gui.popup.open('polls',{uuid=uuid}) + event.element.sprite = 'utility/add' + draw_poll(parent.parent.poll_area) else - event.element.caption = 'utility/enter' + event.element.sprite = 'utility/enter' poll_assembler(parent.parent.poll_area) end end) -local function draw_poll(frame) - frame.clear() - local index = frame.parent.current_index.caption - local poll = _polls().old[index] - if not poll then - frame.add{ - type='label', - caption={'polls.no-poll'} - } - return - end - frame.add{ - type='label', - caption='Question: '..poll.question - } - for answer,votes in pairs(poll.answers) do - frame.add{ - type='label', - caption=answer..') '..votes - } - end -end - Gui.popup.add{ name='polls', caption={'polls.name'}, @@ -177,36 +192,38 @@ Gui.popup.add{ flow.add{type='label',caption='Question: '..poll.question} flow.add{type='label',name='answer',caption='Your Answer: None'} opption_drop_down:draw(flow) - flow.add{type='lable',caption={'polls.auto-update'}}.style.font_size = 8 + flow.add{type='label',caption={'polls.time-left',poll_time_out}} end }:add_left{ caption='utility/item_editor_icon', tooltip={'polls.tooltip'}, draw=function(frame) + frame.caption={'polls.name'} frame.add{ - type='lable', + type='label', name='current_index', - cpation=1 + caption=1 }.style.visible = false local title = frame.add{ type='flow', name='title' } local btn = prev:draw(title) - btn.style.width = 30 - btn.style.height = 30 + btn.style.width = 20 + btn.style.height = 20 title.add{ type='label', + name='title', caption='Viewing Poll: 1', style='caption_label' } local btn = next:draw(title) - btn.style.width = 30 - btn.style.height = 30 + btn.style.width = 20 + btn.style.height = 20 if Ranking.get_rank(frame.player_index):allowed('create-poll') then local btn = create_poll:draw(title) - btn.style.width = 30 - btn.style.height = 30 + btn.style.width = 20 + btn.style.height = 20 end local flow = frame.add{ type='flow', diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 8dd00710..6047faf0 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -52,7 +52,8 @@ groups['Root']:edit('allow',false,{ ['clear-reports']=true, ['clear-player']=true, ['announcements']=true, - ['warp-list']=true + ['warp-list']=true, + ['polls']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -68,7 +69,8 @@ groups['Admin']:edit('allow',false,{ ['clear-reports']=true, ['clear-player']=true, ['announcements']=true, - ['warp-list']=true + ['warp-list']=true, + ['polls']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, @@ -77,7 +79,8 @@ groups['User']:edit('allow',false,{ ['science']=true, ['tasklist']=true, ['report']=true, - ['warp-list']=true + ['warp-list']=true, + ['polls']=true }) groups['Jail']:edit('allow',false,{ diff --git a/locale/en/polls.cfg b/locale/en/polls.cfg new file mode 100644 index 00000000..14c5c6d8 --- /dev/null +++ b/locale/en/polls.cfg @@ -0,0 +1,7 @@ +[polls] +name=Polls +tooltip=View Old Polls +no-poll=No Old Polls +end=Poll Just Ended: __1__ +winner=__1__ had the most votes. +time-left=You will have __1__s to pick. \ No newline at end of file From 9c503b672d4d0925ffe245395f7000af324f73c5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 12 Jan 2018 20:15:20 +0000 Subject: [PATCH 101/392] Added Locals --- locale/de/polls.cfg | 7 +++++++ locale/fr/polls.cfg | 7 +++++++ locale/nl/polls.cfg | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 locale/de/polls.cfg create mode 100644 locale/fr/polls.cfg create mode 100644 locale/nl/polls.cfg diff --git a/locale/de/polls.cfg b/locale/de/polls.cfg new file mode 100644 index 00000000..14c5c6d8 --- /dev/null +++ b/locale/de/polls.cfg @@ -0,0 +1,7 @@ +[polls] +name=Polls +tooltip=View Old Polls +no-poll=No Old Polls +end=Poll Just Ended: __1__ +winner=__1__ had the most votes. +time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/locale/fr/polls.cfg b/locale/fr/polls.cfg new file mode 100644 index 00000000..14c5c6d8 --- /dev/null +++ b/locale/fr/polls.cfg @@ -0,0 +1,7 @@ +[polls] +name=Polls +tooltip=View Old Polls +no-poll=No Old Polls +end=Poll Just Ended: __1__ +winner=__1__ had the most votes. +time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/locale/nl/polls.cfg b/locale/nl/polls.cfg new file mode 100644 index 00000000..14c5c6d8 --- /dev/null +++ b/locale/nl/polls.cfg @@ -0,0 +1,7 @@ +[polls] +name=Polls +tooltip=View Old Polls +no-poll=No Old Polls +end=Poll Just Ended: __1__ +winner=__1__ had the most votes. +time-left=You will have __1__s to pick. \ No newline at end of file From 525a18458c3d2844cbb28e0c1fc062ef452843d1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 12 Jan 2018 20:18:04 +0000 Subject: [PATCH 102/392] Moved Label For Time To Chose --- Addons/Guis/polls.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index f7174089..fde4b336 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -189,10 +189,10 @@ Gui.popup.add{ name=uuid, direction='vertical' } + flow.add{type='label',caption={'polls.time-left',poll_time_out}} flow.add{type='label',caption='Question: '..poll.question} flow.add{type='label',name='answer',caption='Your Answer: None'} opption_drop_down:draw(flow) - flow.add{type='label',caption={'polls.time-left',poll_time_out}} end }:add_left{ caption='utility/item_editor_icon', From 059cc9a21250b95e0e728657891c66f8c382c7a9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 13 Jan 2018 13:52:06 +0000 Subject: [PATCH 103/392] Added a can_open function --- Addons/Guis/polls.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index fde4b336..2d2dcf86 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -231,5 +231,10 @@ Gui.popup.add{ direction='vertical' } draw_poll(flow) + end, + can_open=function(player) + if #_polls().old > 0 then return true + elseif Ranking.get_rank(player):allowed('create-poll') then return true + else return {'polls.no-poll'} end end } \ No newline at end of file From 6a6abb80d85b9b0cf25d3934da3103a9b5e43e85 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 13 Jan 2018 17:20:11 +0000 Subject: [PATCH 104/392] Player Search Every 15 seconds now and no longer local --- Addons/Admin/inventory-search.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index e817187e..ccdc1d0c 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -45,7 +45,7 @@ local function take_action(player,item_name,category) else return end end -local function search_player(player) +function search_player(player) for category,items in pairs(_root_tree) do for _,_inventory in pairs(inventorys) do local inventory = player.get_inventory(_inventory) @@ -58,7 +58,7 @@ local function search_player(player) end Event.register(defines.events.on_tick,function(event) - if (game.tick%3600) == 0 then + if (game.tick%1800) == 0 then local players = game.connected_players if #players == 0 then return end local player = players[math.random(#players)] From bc0746ee9d6b466b1bf56284972b8556d5f19d35 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 13 Jan 2018 18:18:39 +0000 Subject: [PATCH 105/392] fixed artly attacking spawn --- StandAlone/spawn.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/spawn.lua b/StandAlone/spawn.lua index df4bdd29..e4d0c646 100644 --- a/StandAlone/spawn.lua +++ b/StandAlone/spawn.lua @@ -154,7 +154,7 @@ end local function spawn_turrets() local surface = game.surfaces[1] - if not game.forces['spawn'] then game.create_force('spawn').set_cease_fire('player',true) end + if not game.forces['spawn'] then game.create_force('spawn').set_cease_fire('player',true) game.forces['player'].set_cease_fire('spawn',true) end for _,pos in pairs(turrets) do local turret = surface.find_entity('gun-turret',pos) if not turret then From 62950fb847e7d2491c9d40fa95c5cf27ed83963c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 15 Jan 2018 17:28:21 +0000 Subject: [PATCH 106/392] Fixed Warp System Kicking From Car --- Addons/Guis/warp-system.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index d7571ceb..a803536d 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -117,8 +117,8 @@ local go_to_warp = Gui.inputs.add{ local cooldown = _warps().cooldowns[event.player_index] or 0 local warp = _warps().warps[event.element.parent.name] if cooldown > 0 then player_return({'warp-system.cooldown',cooldown},nil,event) return end - if player.vehicle then player.vehicle.set_driver() end - if player.vehicle then player.vehicle.set_passenger() end + if player.vehicle then player.vehicle.set_driver(nil) end + if player.vehicle then player.vehicle.set_passenger(nil) end if player.vehicle then return end player.teleport(warp.surface.find_non_colliding_position('player',warp.position,32,1),warp.surface) if not Ranking.get_rank(player):allowed('always-warp') then From 98bf1bb3c18e575753be33e4bba0f275d7b3bde4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 23 Jan 2018 18:39:53 +0000 Subject: [PATCH 107/392] A few edits to warning system --- Addons/Admin/discord.lua | 3 ++- Addons/Admin/reports.lua | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Addons/Admin/discord.lua b/Addons/Admin/discord.lua index e02ee49c..87652f70 100644 --- a/Addons/Admin/discord.lua +++ b/Addons/Admin/discord.lua @@ -15,6 +15,7 @@ Event.register(defines.events.on_console_command,function(event) local data = {} data.title = string.gsub(command,'^%l',string.upper) data.by = event.player_index and game.players[event.player_index].name or '' + if data.by == '' then return end if command == 'config' or command == 'banlist' then discord_emit{ title='Edit To '..data.title, @@ -28,7 +29,7 @@ Event.register(defines.events.on_console_command,function(event) data.colour = Color.to_hex(defines.text_color.crit) data.reason = table.concat(args,' ',2) elseif command == 'kick' then - data.colour = Color.to_hex(defines.text_color.med) + data.colour = Color.to_hex(defines.text_color.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) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 868efba2..a842b5e0 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -121,13 +121,13 @@ local function give_punishment(player,by_player,reason) report_message(player,'',reason) elseif punishment[1] == 'kick' then _reports().actions[player.name] = actions.kick - Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) + Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) elseif punishment[1] == 'temp-ban' then _reports().actions[player.name] = actions.temp - Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) + Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) elseif punishment[1] == 'ban' then _reports().actions[player.name] = actions.ban - Admin.ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) + Admin.ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) end end @@ -256,7 +256,9 @@ Event.register(defines.events.on_tick,function(event) local time_to_remove = _reports().remove_warnings_time[rank.power] if (game.tick % time_to_remove) == 0 then _reports().warnings[name]=warnings-1 - player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines.text_color.low,name) + if _reports().warnings[name] > 5 then + player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines.text_color.low,name) + end end end end From f4dd04073f84afc28905236bb970610e88af43a0 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Thu, 25 Jan 2018 14:36:05 +0100 Subject: [PATCH 108/392] CHANGE, reset schedule Changed S1-S3 reset schedule to staggered 72H This may need to be looked at. --- locale/en/readme.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index f2ada42e..3f47cfe8 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -28,14 +28,14 @@ links-cap3=Steam: links-cap4=Patreon: servers-name=Servers servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! +servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. servers-format=S__1__: __2__ servers-cap1=Public -servers-des1=A place for all players, this map reset every 24h. -servers-cap2=Standard -servers-des2=Before you play make sure you understand the game, reset every 48h. -servers-cap3=Pro -servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. +servers-des1=A place for all players, this map reset every 72H At 16:00 UTC. +servers-cap2=Public +servers-des2=A place for all players, this map reset every 72H At 16:00 UTC. +servers-cap3=Public +servers-des3=A place for all players, this map reset every 72H At 16:00 UTC. servers-cap4=Modded servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. servers-cap5=Events @@ -65,4 +65,4 @@ rules-rule16=Do not complain about lag, low fps and low ups or other things like rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. rules-rule18=Do not advertise other servers unless you are a trusted server owner. rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file +rules-rule20=Use common sense and what an admin says goes. From da0836b6d7ebdd89d478dc377be83c2182b7707f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 28 Jan 2018 00:05:18 +0000 Subject: [PATCH 109/392] Fixed A Few Bugs --- Addons/Admin/admin.lua | 1 + Addons/Admin/inventory-search.lua | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 5bea0a1d..d6d446b4 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -209,5 +209,6 @@ end) function Admin.bring(player,by_player) local player = Game.get_player(player) local _player = Game.get_player(by_player) + if not player or not _player then return end player.teleport(_player.surface.find_non_colliding_position('player',_player.position,32,1),_player.surface) end \ No newline at end of file diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index ccdc1d0c..db16b272 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -49,16 +49,18 @@ function search_player(player) for category,items in pairs(_root_tree) do for _,_inventory in pairs(inventorys) do local inventory = player.get_inventory(_inventory) - for _,item in pairs(items) do - local found = inventory.remove(item) - if found > 0 then take_action(player,item,category) end + if inventory then + for _,item in pairs(items) do + local found = inventory.remove(item) + if found > 0 then take_action(player,item,category) end + end end end end end Event.register(defines.events.on_tick,function(event) - if (game.tick%1800) == 0 then + if (game.tick%900) == 0 then local players = game.connected_players if #players == 0 then return end local player = players[math.random(#players)] From 3f7c39888cadc74139ce6025768e21613a37b38f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 28 Jan 2018 20:31:34 +0000 Subject: [PATCH 110/392] Fixed Colour Of Temp Ban Embeded --- Addons/Admin/reports.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index a842b5e0..3ac64e85 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -69,7 +69,7 @@ local function report_message(player,by_player,reason) discord_emit{ title='Player Report', color=Color.to_hex(defines.text_color.med), - description='There was a player reported.', + description='A player was reported.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, ['Reason:']=reason @@ -218,8 +218,8 @@ function Admin.temp_ban(player,by_player,reason) _reports().actions[player.name] = actions.temp discord_emit{ title='Player Temp-Ban', - color=Color.to_hex(defines.text_color.med), - description='There was a player jailed.', + color=Color.to_hex(defines.text_color.high), + description='A player was jailed.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, ['Reason:']=append_name(reason,by_player_name) From e80735daa1f9879dfcaa52d3b643612b7a4ae669 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 29 Jan 2018 17:49:08 +0000 Subject: [PATCH 111/392] Fixed Jail And Things For Mods --- Addons/Admin/admin.lua | 6 +++--- Addons/Admin/reports.lua | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index d6d446b4..45debdf0 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -120,7 +120,7 @@ function Admin.ban(player,by_player,reason) ['Reason:']=reason } Admin.move_inventory(player) - game.ban_player(player,reason) + Server.interface(game.ban_player,true,player,reason) end Admin.kick_btn = Gui.inputs.add{ @@ -147,7 +147,7 @@ function Admin.kick(player,by_player,reason) ['Reason:']=reason } Admin.move_inventory(player) - game.kick_player(player,reason) + Server.interface(game.kick_player,true,player,reason) end Admin.jail_btn = Gui.inputs.add{ @@ -175,7 +175,7 @@ function Admin.jail(player,by_player,reason) } Admin.move_inventory(player) Ranking._presets().last_jail = player.name - Ranking.give_rank(player,'Jail',by_player_name) + Server.interface(Ranking.give_rank,true,player,'Jail',by_player_name) end Admin.go_to_btn = Gui.inputs.add{ diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 3ac64e85..ec382659 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -197,7 +197,7 @@ function Admin.clear_player(player,by_player) Admin.clear_warings(player,by_player,true) Admin.clear_reports(player,by_player,true) _reports().actions[player.name]=actions.none - if Ranking.get_rank(player).group.name == 'Jail' then Ranking.revert(player,by_player) end + if Ranking.get_rank(player).group.name == 'Jail' then Server.interface(Ranking.revert,true,player,by_player) end discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), @@ -227,7 +227,7 @@ function Admin.temp_ban(player,by_player,reason) game.print({'reports.temp-ban',player.name,by_player_name,reason},defines.text_color.info) Admin.move_inventory(player) Ranking._presets().last_jail = player.name - Ranking.give_rank(player,'Jail',by_player_name) + Server.interface(Ranking.give_rank,true,player,'Jail',by_player_name) end function Admin.is_banned(player) From 4ac76f47d97ffce2af5a37ba6f5fac43b1853d5d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 10 Feb 2018 16:46:31 +0000 Subject: [PATCH 112/392] Fixed Scrolls? --- Addons/Guis/player-list.lua | 3 ++- Addons/Guis/warp-system.lua | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index ecefa08d..5610d740 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -52,9 +52,10 @@ Gui.left.add{ name='scroll', type = 'scroll-pane', direction = 'vertical', - vertical_scroll_policy='always', + vertical_scroll_policy='auto', horizontal_scroll_policy='never' } + player_list.vertical_scroll_policy = 'auto' player_list.style.maximal_height=200 for _,rank in pairs(Ranking._ranks()) do for _,player in pairs(rank:get_players(true)) do diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index a803536d..606369f5 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -137,9 +137,10 @@ Gui.left.add{ local warp_list = frame.add{ type='scroll-pane', direction='vertical', - vertical_scroll_policy='always', + vertical_scroll_policy='auto', horizontal_scroll_policy='never' } + warp_list.vertical_scroll_policy = 'auto' warp_list.style.maximal_height = 150 local table = warp_list.add{ type='table', From 31a4dda7fb8f464a8cb9d9e11ea3a57c8d957e50 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 11 Feb 2018 23:00:08 +0000 Subject: [PATCH 113/392] Mods No Longer Admin --- Addons/playerRanks.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 6047faf0..d27b529b 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -118,8 +118,7 @@ groups['Admin']:add_rank{ colour={r=0,g=170,b=0}, disallow={ 'server_command' - }, - is_admin = true + } } groups['User']:add_rank{ From 8f38962c7b4c70392cb8f318f8411ed123760387 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 11 Feb 2018 23:05:10 +0000 Subject: [PATCH 114/392] Fixed Admin Allowed --- Addons/Admin/admin.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 45debdf0..c1d81514 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -22,7 +22,8 @@ end function Admin.allowed(player) local player = Game.get_player(player) - return player.admin + local lowest_admin_power = Ranking.get_group('Admin').lowest.power + return lowest_admin_power <= Ranking.get_rank(player).power end function Admin.btn_flow(frame,buttons) From 67fae5629b81ee43aa1cf8791e9cfbf3ab3cba30 Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 13:43:07 +0100 Subject: [PATCH 115/392] Update admin.cfg --- locale/nl/admin.cfg | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/locale/nl/admin.cfg b/locale/nl/admin.cfg index 52434a4d..102335d2 100644 --- a/locale/nl/admin.cfg +++ b/locale/nl/admin.cfg @@ -1,15 +1,15 @@ [admin-commands] name=Admin Commands -tooltip=Very powerful 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 chose the correct one! -warning=Warning, this player is a higher rank so you cant change their rank. -short-reason=Warning, this is a short reason please think i it could be made more clear. -rank-high=This player is a higher rank, please use in game command if you are sure about this! -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 \ No newline at end of file +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. +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 From b8a760d0175ee124c4216c81bd13abfaf8447619 Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 13:45:51 +0100 Subject: [PATCH 116/392] Update announcements.cfg --- locale/nl/announcements.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/nl/announcements.cfg b/locale/nl/announcements.cfg index c4e55a6a..b755dd4e 100644 --- a/locale/nl/announcements.cfg +++ b/locale/nl/announcements.cfg @@ -1,6 +1,6 @@ [announcements] -name=Announcement -tooltip=Sent an announcement to players -sent-to=This is sent to __1__ -sent-by=This was sent by __1__ of rank __2__ -select-rank=This message will be sent to: \ No newline at end of file +name=Mededelingen +tooltip=Verstuurt een mededeling naar iedereen +sent-to=Deze mededeling is gestuurd naar __1__ +sent-by=Deze mededeling is gestuurd door __1__ ( __2__ ) +select-rank=Deze mededeling wordt gestuurd naar: From 351101cd36213125ea78c175f19305c64a79721b Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 13:49:56 +0100 Subject: [PATCH 117/392] Update auto-message.cfg --- locale/nl/auto-message.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/nl/auto-message.cfg b/locale/nl/auto-message.cfg index 15e620a2..28bece1a 100644 --- a/locale/nl/auto-message.cfg +++ b/locale/nl/auto-message.cfg @@ -1,9 +1,9 @@ [auto-message] -players-online=There are __1__ players online -map-time=This map has been on for __1__ -line-8=Do /help for more info -join-us=Please join us on: +players-online=Er zijn __1__ speler(s) online +map-time=Deze map is actief voor __1__ +line-8=Typ /help (command) voor meer informatie +join-us=Sluit je aan op onze Discord: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands such as /tag and /report -read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file +custom-commands=Wij gebruiken custom commands zoals /tag en /report +read-readme=Zorg er voor dat je de readme hebt gelezen (te vinden in de vraagteken linksboven) From f27b27b57e7d49fabd5f9f44a67454b3a8c3ebe9 Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 13:52:09 +0100 Subject: [PATCH 118/392] Update capsules.cfg --- locale/nl/capsules.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/nl/capsules.cfg b/locale/nl/capsules.cfg index 37913f83..613c91bf 100644 --- a/locale/nl/capsules.cfg +++ b/locale/nl/capsules.cfg @@ -1,3 +1,3 @@ [capsules] -used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. -nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file +used=Je hebt __1__ gebruikt, deze heeft jouw gebouw(en) geraakt. Wees volgende keer wat meer voorzichtig. +nuke=Nukes zijn niet toegestaan op jouw rank. Dit is een preventief middel tegen griefing. From cb210ead3b96c4693a8e9d1c8486b2b3a52d4f4c Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 13:55:49 +0100 Subject: [PATCH 119/392] Update exp-core.cfg --- locale/nl/exp-core.cfg | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/locale/nl/exp-core.cfg b/locale/nl/exp-core.cfg index 731d758e..c3400159 100644 --- a/locale/nl/exp-core.cfg +++ b/locale/nl/exp-core.cfg @@ -1,22 +1,22 @@ [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 +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. [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 +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. [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 \ No newline at end of file +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. From 1d6fabe7bcb02e67c5b40b8c665c5e0629340997 Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 14:07:53 +0100 Subject: [PATCH 120/392] Update game-settings.cfg --- locale/nl/game-settings.cfg | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/locale/nl/game-settings.cfg b/locale/nl/game-settings.cfg index cfbcc6e9..91e50cab 100644 --- a/locale/nl/game-settings.cfg +++ b/locale/nl/game-settings.cfg @@ -1,31 +1,31 @@ [game-settings] -name=Game Settings -tooltip=Allows for editing of the game settings, please use resposibliy. -basic-name=Basic Settings -basic-tooltip=These settings are safe to change with no large effects. -basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. -personal-name=Personal Settings -personal-tooltip=These will only effect you, if you are spoted you are on your own. -personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. -sure=Are You Sure! -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed +name=Game instellingen +tooltip=Maakt het mogelijk om gameinstellingen te wijzigen. Gebruik het verantwoord! +basic-name=Basis instellingen +basic-tooltip=Deze instellingen kunnen veilig worden gewijzigd. +basic-message=Deze instellingen kunnen worden gebruikt om het spelervaring voor de spelers te verbeteren. +advanced-name=Geavanceerde instellingen +advanced-tooltip=Het is ten zeerste aangeraden om niet aan deze instellingen te zitten, tenzij je weet wat je doet. +advanced-message=Waarschuwing: Niet aan deze instellingen zitten tenzij je honderd procent zeker weet wat je aan het doen bent. Het wijzigen van deze instellingen kunnen een groter effect hebben dan je denkt. +personal-name=Persoonlijke instellingen +personal-tooltip=Deze instellingen hebben alleen effect op jouw speler. +personal-message=Deze instellingen hebben alleen effect op jouw speler: gebruik het verantwoord, aangezien het overmatig gebruik van deze instellingen niet zijn toegestaan. +sure=Weet je het zeker? +effect-mining-speed=Mining Snelheid +effect-craft-speed=Crafting Snelheid +effect-running-speed=Ren Snelheid +effect-build-distance=Bouwafstand +effect-reach-distance=Bereik +effect-bot-speed=Bot Snelheid +effect-lab-speed=Lab Snelheid effect-stack-bonus=Stack Bonus effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force \ No newline at end of file +effect-inventory-size=Inventory grootte +effect-mining-prod=Mining Productiviteit +effect-game-speed=Gamesnelheid +effect-save=Opslaan +effect-reload-effects=Effecten herladen +effect-reload-map=Minimap herladen +effect-kill-biters=Biters vermoorden +effect-crc=Forceer CRC check +effect-reset-force=Forceren resetten From 410db832c2551c3d5f2081b3314d098932df0f73 Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 14:10:16 +0100 Subject: [PATCH 121/392] Update inventory-search.cfg --- locale/nl/inventory-search.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/nl/inventory-search.cfg b/locale/nl/inventory-search.cfg index 20db013b..aa687f4c 100644 --- a/locale/nl/inventory-search.cfg +++ b/locale/nl/inventory-search.cfg @@ -1,4 +1,4 @@ [inventory-search] -low=Your Inventory Was Search And __1__ was removed. -med=Your Inventory Was Search And __1__ was removed, you have been given a warning. -high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file +low=Je inventaris is doorzocht en __1__ is verwijderd. +med=Je inventaris is doorzocht en __1__ is verwijderd, je bent gewaarschuwd. +high=Je inventaris is doorzocht en __1__ is gevonden, dit is ten strengste verboden! Je inventaris is verwijderd. From c39269ef8a4a833e05016428302a998d0de9614c Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 14:20:40 +0100 Subject: [PATCH 122/392] Update player-info.cfg --- locale/nl/player-info.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/nl/player-info.cfg b/locale/nl/player-info.cfg index 834ebb19..d937eef2 100644 --- a/locale/nl/player-info.cfg +++ b/locale/nl/player-info.cfg @@ -1,8 +1,8 @@ [player-info] -yes=Yes -no=No +yes=Ja +no=Nee name=[__1__] __2__ online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -rank=Has Rank: __1__ \ No newline at end of file +admin=Heeft Admin: __1__ +group=In Groep: __1__ +rank=Heeft Rank: __1__ From b52a879a4a00d8a57a37cadcf17f5274ad09e852 Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 14:21:38 +0100 Subject: [PATCH 123/392] Update player-list.cfg --- locale/nl/player-list.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/nl/player-list.cfg b/locale/nl/player-list.cfg index 9adacd4d..4ba8d8b6 100644 --- a/locale/nl/player-list.cfg +++ b/locale/nl/player-list.cfg @@ -1,5 +1,5 @@ [player-list] -tooltip=Toogle player list, right click player for info +tooltip=Toggle speler lijst. Rechtermuisklik op een speler voor meer info format-nil=__1__ - __2__ format=__1__ - __2__ - __3__ -no-info-file=No info file was found \ No newline at end of file +no-info-file=Geen infobestand gevonden. From 945cf4243396d2c57e82e9b44cd3cf4d0780b99b Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 14:22:44 +0100 Subject: [PATCH 124/392] Update polls.cfg --- locale/nl/polls.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/nl/polls.cfg b/locale/nl/polls.cfg index 14c5c6d8..5f410073 100644 --- a/locale/nl/polls.cfg +++ b/locale/nl/polls.cfg @@ -1,7 +1,7 @@ [polls] name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file +tooltip=Laat oude polls zien +no-poll=Geen oude polls +end=Poll is zojuist beëindigd: __1__ +winner=__1__ had de meeste stemmen. +time-left=Je hebt __1__s om te kiezen. From cb8d0f5f56198b6a0674e27fe55909c5c5d85d8a Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 14:25:52 +0100 Subject: [PATCH 125/392] Update rank-changer.cfg --- locale/nl/rank-changer.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/nl/rank-changer.cfg b/locale/nl/rank-changer.cfg index bbc7a51b..8e2e1383 100644 --- a/locale/nl/rank-changer.cfg +++ b/locale/nl/rank-changer.cfg @@ -1,9 +1,9 @@ [rank-changer] -name=Rank Changer -tooltip=Change the rank of a player below you. -no-info-file=No info file was found -message=Please select a player and a rank, you can you give ranks to people below you. -warning=Warning, this player is a higher rank so you cant change their rank. -rank-high=This player is a higher rank, rank change failed! -invalid=The player or the rank is invalid please try again! -set-rank=Set Player Rank +name=Rank wijziger +tooltip=Wijzig de ranken van spelers onder jouw rank. +no-info-file=Geen infobestand gevonden. +message=Selecteer een speler en een rank om deze te wijzigen. +warning=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft. +rank-high=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft. +invalid=Fout: De speler kan niet gevonden worden en/of de actie is onjuist. Probeer opnieuw! +set-rank=Wijzig rank From f2ae6661c093b553df2f5bf34ac02377bf987c06 Mon Sep 17 00:00:00 2001 From: Caner Date: Mon, 12 Feb 2018 14:49:06 +0100 Subject: [PATCH 126/392] Update readme.cfg --- locale/nl/readme.cfg | 110 +++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/locale/nl/readme.cfg b/locale/nl/readme.cfg index f2ada42e..99f8672f 100644 --- a/locale/nl/readme.cfg +++ b/locale/nl/readme.cfg @@ -1,68 +1,68 @@ [readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow -guildlines-line1=Welcome to the Explosive Gaming Community! +tooltip=Open de ReadMe wanneer je voor het eerst speelt. +guildlines-name=Richtlijnen +guildlines-tooltip=Dit zijn de richtlijnen die je moet volgen. +guildlines-line1=Welkom op de ExplosiveGaming community! guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line3=Hier zijn een aantal richtlijnen die ieder speler moet volgen. +guildlines-line4=- Hacken / cheaten en bugs misbruiken is niet toegestaan. +guildlines-line5=- Wees aardig en gebruik je gezonde verstand. +guildlines-line6=- Spammen (in de zin van chat, kisten en beton) is niet toegestaan. +guildlines-line7=- Geen spullen verwijderen zonder toestemming van andere spelers. +guildlines-line8=- Treinen (LHD - Left Hand Drive) niet loopen of gebruiken voor lange afstanden. guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. +guildlines-line10=Als je vragen hebt over deze regels of over de server in algemeen, aarzel dan niet om contact op te nemen met onze staff. +chat-name=Chatten +chat-tooltip=Chatten in Factorio met standaard instellingen +chat-singleline=Chatten kan moeilijk zijn voor nieuwe spelers omdat de chatmechanisme in Factorio anders is dan andere spellen. Het is simpel: druk op de "GRAVE/TILDE" knop (locatie is onder de ESC knop). Als je deze knop wilt aanpassen, ga naar de Controls tab in Opties. De knop die je moet aanpassen is "Toggle LUA Console" commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -commands-col1=Command Name -commands-col2=Command Help +commands-tooltip=Dit zijn de commands die je kunt gebruiken. +commands-singleline=Er zijn veel verschillende custom commands die je kunt gebruiken. Let er wel op dat basis commands hier niet zichtbaar zijn. +commands-col1=Commando naam +commands-col2=Commando hulp links-name=Links -links-tooltip=Helpful links for ways to get in touch -links-cap1=Discord voice and chat server: -links-cap2=Our website: +links-tooltip=Nuttige links om in contact te komen met de community +links-cap1=Discord server: +links-cap2=Onze website: links-cap3=Steam: links-cap4=Patreon: servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! +servers-tooltip=Info over onze andere servers +servers-singleline=Welkom op de ExplosiveGaming community! S1 tot en met S3 heeft geplande resets. servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map reset every 24h. -servers-cap2=Standard -servers-des2=Before you play make sure you understand the game, reset every 48h. -servers-cap3=Pro -servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. +servers-cap1=Openbaar +servers-des1=Server voor alle spelers, deze map reset elke 72 uur om 16:00 UTC. +servers-cap2=Openbaar +servers-des2=A place for all players, deze map reset elke 72 uur om 16:00 UTC. +servers-cap3=Openbaar +servers-des3=A place for all players, deze map reset elke 72 uur om 16:00 UTC. servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. +servers-des4=Een modded server voor alle spelers. Links zijn te vinden in de Discord server. servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. +servers-des5=Server voor events. Links en wachtwoorden zijn te vinden in de Discord server. servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. +servers-des6=Voor de spelers die ons financieel ondersteunen. +rules-name=Alle regels +rules-tooltip=Een lijst met regels die van toepassing zijn op alle ExplosiveGaming servers. +rules-singleline=Dit is een lijst met alle regels. De richtlijnen behandelt de meeste punten, maar de volledige lijst is ook van toepassing. rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file +rules-rule1=Hacken / cheaten en bugs misbruiken is niet toegestaan. +rules-rule2=Bugs of fouten horen gerapporteerd te worden aan de staff. +rules-rule3=Respecteer iedereen in de server. +rules-rule4=Pak niet alles uit een belt of via logistiekaanvragen: deel je middelen. +rules-rule5=Spammen (in de zin van chat, kisten en beton) is niet toegestaan. +rules-rule6=Bouw geen beton of steen met bots zonder toestemming. +rules-rule7=Gebruik geen actieve providerkist zonder toestemming. +rules-rule8=Gebruik geen speakers (globaal of met alerts) zonder toestemming. +rules-rule9=Verwijder geen grote delen van het fabriek zonder toestemming. +rules-rule10=Loop niet in willekeurige plekken zonder een reden (bespaart mapgrootte en server resources) +rules-rule11=Geen spullen verwijderen zonder toestemming van andere spelers. +rules-rule12=Draai de belts niet, deactiveer belts niet met draden en laat de productie niet stoppen. +rules-rule13=Maak geen treinrotondes of lussen. +rules-rule14=Gebruik de zelfde grootte treinen als andere spelers. +rules-rule15=Treinen zijn alleen LHD (Left Hand Drive) +rules-rule16=Klaag niet over de lag, lage FPS of lage UPS. +rules-rule17=Vraag niet om ranks: ranks zijn synchroon met onze Discord server. +rules-rule18=Maak geen reclame voor andere servers, tenzij je daarvoor bevoegd bent. +rules-rule19=Rapporteer spelers die de regels breken. +rules-rule20=Gebruik gezond verstand. From cc113f61cbf13215a053ec4afd11c4a20a455447 Mon Sep 17 00:00:00 2001 From: Caner <13422466+CanerAkar@users.noreply.github.com> Date: Mon, 12 Feb 2018 15:13:34 +0100 Subject: [PATCH 127/392] Update reports.cfg --- locale/nl/reports.cfg | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/nl/reports.cfg b/locale/nl/reports.cfg index b0152d44..4ff8f232 100644 --- a/locale/nl/reports.cfg +++ b/locale/nl/reports.cfg @@ -1,15 +1,15 @@ [reports] -name=Report Player -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 cant be reported. -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. \ No newline at end of file +name=Rapporteer speler +low-print=__1__ is gerapporteerd door een speler met de reden: __2__ +high-print=__1__ is gerapporteerd door __2__ met de reden: __3__ +cant-report=Deze speler kan niet gerapporteerd worden. +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. From 0ca7b37dabadafd3afa21da49a92cfdf96fbcf9d Mon Sep 17 00:00:00 2001 From: Caner <13422466+CanerAkar@users.noreply.github.com> Date: Mon, 12 Feb 2018 15:15:26 +0100 Subject: [PATCH 128/392] Update rockets.cfg --- locale/nl/rockets.cfg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/locale/nl/rockets.cfg b/locale/nl/rockets.cfg index be434056..b0c00b88 100644 --- a/locale/nl/rockets.cfg +++ b/locale/nl/rockets.cfg @@ -1,12 +1,12 @@ [rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. -nan=NaN -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: -format=__1__: __2__ \ No newline at end of file +name=Raket Info +tooltip=Lijst met details over de verstuurde raketten. +none=Er zijn nog geen raketten verstuurd. +nan=Niet beschikbaar +sent=Raketten verstuurd: __1__ +first=Eerste raket gelanceerd op: __1__ +last=Meest recente lancering: __1__ +time=Gemiddelde lanceertijd: __1__ +fastest=Snelste lancering: __1__ +milestones=Mijlpalen: +format=__1__: __2__ From 96675190642aa1cb44a657c476d8f0caa3fd4508 Mon Sep 17 00:00:00 2001 From: Caner <13422466+CanerAkar@users.noreply.github.com> Date: Mon, 12 Feb 2018 15:17:17 +0100 Subject: [PATCH 129/392] Update science.cfg --- locale/nl/science.cfg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/locale/nl/science.cfg b/locale/nl/science.cfg index f42dbc94..34e8acd2 100644 --- a/locale/nl/science.cfg +++ b/locale/nl/science.cfg @@ -1,14 +1,14 @@ [science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: +name=Wetenschap info +tooltip=Lijst met details over de wetenschaps pakketten. +total=Pakketten gemaakt: +time=Pakketten per minuut: format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production +science-pack-1=Rood +science-pack-2=Groen +science-pack-3=Blauw +military-science-pack=Militair +production-science-pack=Productie high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file +space-science-pack=Ruimte +none=Er zijn nog geen wetenschaps pakketten gemaakt. From 3472b7f620e470994ca3acb7fa7f999feb64bd45 Mon Sep 17 00:00:00 2001 From: Caner <13422466+CanerAkar@users.noreply.github.com> Date: Mon, 12 Feb 2018 15:18:17 +0100 Subject: [PATCH 130/392] Update tasklist.cfg --- locale/nl/tasklist.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/nl/tasklist.cfg b/locale/nl/tasklist.cfg index 1e2baa06..3838ce22 100644 --- a/locale/nl/tasklist.cfg +++ b/locale/nl/tasklist.cfg @@ -1,4 +1,4 @@ [tasklist] -name=Task List -tooltip=What jobs need to be done round the factory. -none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file +name=Taaklijst +tooltip=Wat voor werk er rondom de fabriek gedaan moet worden +none=Er zijn momenteel geen taken. Vraag een Member om taken toe te voegen. From 50c40227384cddc491928cd5e0f842cf80012bf8 Mon Sep 17 00:00:00 2001 From: Caner <13422466+CanerAkar@users.noreply.github.com> Date: Mon, 12 Feb 2018 15:19:25 +0100 Subject: [PATCH 131/392] Update tree-decon.cfg --- locale/nl/tree-decon.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/nl/tree-decon.cfg b/locale/nl/tree-decon.cfg index f1bfe299..98c12096 100644 --- a/locale/nl/tree-decon.cfg +++ b/locale/nl/tree-decon.cfg @@ -1,3 +1,3 @@ [tree-decon] -player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours -rank-print=__1__ tried to deconstruct something. \ No newline at end of file +player-print=Je moet minstens 3 uur gespeeld hebben om dit uit te voeren. +rank-print=__1__ heeft geprobeerd iets te deconstrueren. From ddb4b83bb535c51ff624b9659790b3f4f2c574ea Mon Sep 17 00:00:00 2001 From: Caner <13422466+CanerAkar@users.noreply.github.com> Date: Mon, 12 Feb 2018 15:20:59 +0100 Subject: [PATCH 132/392] Update warp-system.cfg --- locale/nl/warp-system.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/nl/warp-system.cfg b/locale/nl/warp-system.cfg index 203519fe..a616fe6d 100644 --- a/locale/nl/warp-system.cfg +++ b/locale/nl/warp-system.cfg @@ -1,9 +1,9 @@ [warp-system] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file +name=Warp lijst +tooltip=Een lijst met warps +remove-tooltip=Verwijder warp +go-to-tooltip=Ga naar +cooldown=Je moet wachten op de cooldown. Tijd over: __1__ +cooldown-zero=Je cooldown is verlopen. Je kunt weer warpen. +name-used=Deze naam is al ingenomen. +not-on-warp=Je bent niet op een warp point. Ga naar een warp point om dit te kunnen doen. From 94b2bf695665787552af4f62ce1bc7206fc2e9f5 Mon Sep 17 00:00:00 2001 From: MarwinPhilips Date: Mon, 12 Feb 2018 21:31:06 +0100 Subject: [PATCH 133/392] Rework of the German translation --- locale/de/admin.cfg | 22 +++++++++--------- locale/de/announcements.cfg | 6 ++--- locale/de/auto-message.cfg | 10 ++++---- locale/de/capsules.cfg | 4 ++-- locale/de/exp-core.cfg | 20 ++++++++-------- locale/de/game-settings.cfg | 42 +++++++++++++++++----------------- locale/de/inventory-search.cfg | 4 ++-- locale/de/player-list.cfg | 4 ++-- locale/de/polls.cfg | 12 +++++----- locale/de/rank-changer.cfg | 14 ++++++------ locale/de/readme.cfg | 14 ++++++------ locale/de/rockets.cfg | 18 +++++++-------- locale/de/science.cfg | 24 +++++++++---------- locale/de/tasklist.cfg | 6 ++--- locale/de/tree-decon.cfg | 4 ++-- locale/de/warp-system.cfg | 14 ++++++------ 16 files changed, 109 insertions(+), 109 deletions(-) diff --git a/locale/de/admin.cfg b/locale/de/admin.cfg index 41bd1eae..4665a297 100644 --- a/locale/de/admin.cfg +++ b/locale/de/admin.cfg @@ -1,15 +1,15 @@ [admin-commands] -name=Admin Befehle -tooltip=Sehr mächtige Befehle sind hier geschrieben -no-info-file=Kein Informations Ordner wurde gefunden -message=Bitte wähle einen Spieler und eine Aktion zum ausführen, stell sicher dass es der richtige ist! -warning=Achtung, Dieser Spieler hat einen höheren Rang als du selbst, weswegen du seinen Rang nicht ändern kannst. -short-reason=Achtung, Dies ist ein sehr kurzer Grund. Bitte Versuch mehr Informationen zu geben. -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 Action war ungültig. Bitte versuch es noch einmal! +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. +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= Versiegele Spieler im Gefängnis -tooltip-go-to=Geh zu Spieler -tooltip-bring=Bringe den Spieler \ No newline at end of file +tooltip-jail=Sperre Spieler ins Gefängnis +tooltip-go-to=Gehe zum Spieler +tooltip-bring=Bringe den Spieler zu dir \ No newline at end of file diff --git a/locale/de/announcements.cfg b/locale/de/announcements.cfg index 4612e8ff..37821915 100644 --- a/locale/de/announcements.cfg +++ b/locale/de/announcements.cfg @@ -1,6 +1,6 @@ [announcements] name=Ankündigung -tooltip=Sende eine Ankündigung zu Spielern +tooltip=Eine Ankündigung an Spieler senden sent-to=Dies wurde zu __1__ gesendet -sent-by=Dies wurde von __1__ vom Rang __2__ gesendet -select-rank=Diese Nachricht wird gesendet zu: \ No newline at end of file +sent-by=Dies wurde von __1__ mit Rang __2__ gesendet +select-rank=Diese Nachricht wird gesendet an: \ No newline at end of file diff --git a/locale/de/auto-message.cfg b/locale/de/auto-message.cfg index 6b4a39fb..270ad0f2 100644 --- a/locale/de/auto-message.cfg +++ b/locale/de/auto-message.cfg @@ -1,9 +1,9 @@ [auto-message] players-online=Es sind __1__ Spieler online. map-time=Dieses Spiel is seit __1__ am laufen. -line-8=Schreibe /help für mehr Informationen -join-us=Bitte folge uns auf: +line-8=Schreibe /help für mehr Informationen. +join-us=Folge uns auf: discord=Discord: https://discord.me/explosivegaming -website=Website: explosivegaming.nl -custom-commands=Wir benutzen selbstgemachte Befehle wie /tag und /report -read-readme=Stelle sicher dass du das Liesmich gelesen hast (oben linkes FrageZeichen) \ No newline at end of file +website=Webseite: explosivegaming.nl +custom-commands=Wir benutzen eigene Befehle wie /tag und /report +read-readme=Stelle sicher, dass du das Liesmich gelesen hast (Fragezeichen oben Links) \ No newline at end of file diff --git a/locale/de/capsules.cfg b/locale/de/capsules.cfg index abb0eeed..d758a4d5 100644 --- a/locale/de/capsules.cfg +++ b/locale/de/capsules.cfg @@ -1,3 +1,3 @@ [capsules] -used=Du benutztest __1__ und hast einige deiner eigenen oder anderer Spielern dessen Gebäude damit getroffen, Bitte sei aufmerksamer, zum Glück ist kein Schaden dabei entstanden. -nuke=Atombomben sind nicht erlaubt für deinen Rang. Tut uns leid aber so beugen wir Griefer vor. \ No newline at end of file +used=Du hast __1__ benutzt und damit Gebäude von eigenen oder anderen Spielern getroffen. Bitte sei aufmerksamer! Zum Glück ist kein Schaden dabei entstanden. +nuke=Atombomben sind nicht erlaubt für deinen Rang. Tut uns Leid, aber so beugen wir Griefer vor. \ No newline at end of file diff --git a/locale/de/exp-core.cfg b/locale/de/exp-core.cfg index e2c91e27..8867c3f0 100644 --- a/locale/de/exp-core.cfg +++ b/locale/de/exp-core.cfg @@ -1,22 +1,22 @@ [commands] -unauthorized=401 - Unbefugt:Zugang verweigert weil sie keinen Zugriff auf diese Befehle haben +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__ ,Versuch "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 +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. [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=Dier wurde der __1__ Rang zugeteilt! -tag-reset=Deine Spitzname wurde aufgrund eine Rang wechsels zurückgesetzt +rank-given=Dir wurde der Rang __1__ zugeteilt! +tag-reset=Dein Spitzname wurde aufgrund eines Rangwechsels zurückgesetzt. [gui] -unauthorized=401 - Unbefugt: Zugang verweigert weil sie keinen Zugriff auf diese Befehle haben -cant-open=Du kannst diese Klappbox nicht öfnen aufgrund von, Grund: __1__ -cant-open-no-reason=Du kannst diese Klappbox gerade nicht öffnen \ No newline at end of file +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. \ No newline at end of file diff --git a/locale/de/game-settings.cfg b/locale/de/game-settings.cfg index c2fbe7ff..c1f2c311 100644 --- a/locale/de/game-settings.cfg +++ b/locale/de/game-settings.cfg @@ -1,29 +1,29 @@ [game-settings] -name=Spiel Einstellungen -tooltip=Erlaubt das modifizieren von Spiel Einstellungen. Bitte mit bedacht benutzen. +name=Spieleinstellungen +tooltip=Erlaubt das Modifizieren von Spieleinstellungen. Bitte mit Bedacht benutzen. basic-name=Einfache Einstellungen -basic-tooltip=Diese Einstellungen sind ohne Probleme veränderbar, sie verursachen keine großen Probleme im Nach hinein. -basic-message=Diese Einstellungen sind Fraktionsweite Einstellungen, welche genutzt werden können um das Spiel zu vereinfachen und es angenehmer für jedermann zu machen. +basic-tooltip=Diese Einstellungen sind ohne Probleme veränderbar, sie verursachen keine großen Probleme im nachhinein. +basic-message=Dies sind fraktionsweite Einstellungen, welche genutzt werden können um das Spiel zu vereinfachen und es für Alle angenehmer zu machen. advanced-name=Erweiterte Einstellungen -advanced-tooltip=Diese Einstellungen sollten nicht von Leuten benutzt werden die nicht wissen was sie tun. +advanced-tooltip=Diese Einstellungen sollten nicht von Leuten benutzt werden, die nicht wissen was sie tun. advanced-message=Bitte ändere keine dieser Einstellungen ausser du bist dir 100% sicher was sie tun,lass game.speed allein, da es einen viel größeren Effekt hat als du denkst. -personal-name=Persöhnliche Einstellungen -personal-tooltip=Diese Einstellungen betreffen nur deinen Spieler, wenn man dich beim cheaten erwischt bist du auf dich allein gestellt. -personal-message=Diese Einstellungen betreffen nur deinen eigenen Spieler, übertreib es nicht ansonsten geht die Gefahr aus dass dich normale Spieler (gierige Kleinkinder) dabei erwischen (und rumheulen). +personal-name=Persönliche Einstellungen +personal-tooltip=Diese Einstellungen betreffen nur deinen Spieler. Wenn man dich beim cheaten erwischt bist du auf dich allein gestellt. +personal-message=Diese Einstellungen betreffen nur deinen Spieler, übertreib es nicht ansonsten besteht die Gefahr, dass dich normale Spieler (gierige Kleinkinder) dabei erwischen (und rumheulen). sure=Bist du dir Sicher?! -effect-mining-speed=Abbau geschwindigkeit -effect-craft-speed=Herstell Geschwindigkeit -effect-running-speed=Lauf Geschwindigkeit -effect-build-distance=Bau Distanz -effect-reach-distance=Arm Reichweite -effect-bot-speed=Roboter Geschwindigkeit -effect-lab-speed=Labor Geschwindigkeit -effect-stack-bonus=Stapel Bonuss -effect-quickbar-count=Hotbar Anzahl -effect-inventory-size=Inventar Größe -effect-mining-prod=Abbau produktivität -effect-game-speed=Spiel Geschwindigkeit -effect-save=Speichere Spiel +effect-mining-speed=Abbaugeschwindigkeit +effect-craft-speed=Herstellgeschwindigkeit +effect-running-speed=Laufgeschwindigkeit +effect-build-distance=Baudistanz +effect-reach-distance=Armreichweite +effect-bot-speed=Robotergeschwindigkeit +effect-lab-speed=Laborgeschwindigkeit +effect-stack-bonus=Stapelnonuss +effect-quickbar-count=Anzahl Schnellleistenelemente +effect-inventory-size=Inventargröße +effect-mining-prod=Abbauproduktivität +effect-game-speed=Spielgeschwindigkeit +effect-save=Spiel speichern effect-reload-effects=Effekte neu laden effect-reload-map=Minimap neu laden effect-kill-biters=Töte alle Beisser diff --git a/locale/de/inventory-search.cfg b/locale/de/inventory-search.cfg index 62508cbb..f554f813 100644 --- a/locale/de/inventory-search.cfg +++ b/locale/de/inventory-search.cfg @@ -1,4 +1,4 @@ [inventory-search] low=Dein Inventar wurde durchsucht und __1__ wurde entfernt. -med=Dein Inventar wurde durchsucht und __1__ wurde entfernt, Dier wird hiermit eine warnung erteilt bitte versuche es nicht erneut. -high=Dein inventar wurde durchsucht und __1__ wurde gefunden, dies ist auf GAR KEINEN Fall erlaubt, Dein Inventar wurde zum Spawn transferiert. \ No newline at end of file +med=Dein Inventar wurde durchsucht und __1__ wurde entfernt. Dir wird hiermit eine Warnung erteilt! Versuche es nicht erneut! +high=Dein inventar wurde durchsucht und __1__ wurde gefunden, dies ist auf GAR KEINEN Fall erlaubt, dein Inventar wurde zum Spawnpunkt transferiert. \ No newline at end of file diff --git a/locale/de/player-list.cfg b/locale/de/player-list.cfg index ef000508..7caaf627 100644 --- a/locale/de/player-list.cfg +++ b/locale/de/player-list.cfg @@ -1,5 +1,5 @@ [player-list] -tooltip=verkleinere die Spieler Liste, Rechts-klicke einen Spieler für Informationen über ihn. +tooltip=Verkleinere die Spielerliste. Rechtsklicke einen Spieler für Informationen über ihn. format-nil=__1__ - __2__ format=__1__ - __2__ - __3__ -no-info-file=Keine Informationen wurden gefunden \ No newline at end of file +no-info-file=Es wurden keine Informationen gefunden. \ No newline at end of file diff --git a/locale/de/polls.cfg b/locale/de/polls.cfg index 14c5c6d8..22f49c42 100644 --- a/locale/de/polls.cfg +++ b/locale/de/polls.cfg @@ -1,7 +1,7 @@ [polls] -name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file +name=Umfragen +tooltip=Alte Umfragen ansehen +no-poll=Keine alten Umfragen +end=Die Umfrage hat gerade geendet: __1__ +winner=__1__ hatte die meisten Stimmen. +time-left=Du hast noch __1__s um deine Wahl zu erfassen. \ No newline at end of file diff --git a/locale/de/rank-changer.cfg b/locale/de/rank-changer.cfg index 04fde067..3f41a602 100644 --- a/locale/de/rank-changer.cfg +++ b/locale/de/rank-changer.cfg @@ -1,9 +1,9 @@ [rank-changer] -name=Rang wechsler -tooltip=Wechsle den Rang eines niedriger geranktem Spielers. -no-info-file=Keine Informationen wurden gefunden -message=Bitte wähle einen Spieler und einen Rang, Du kannst nur Spielern mit niedrigerem Rang einen neuen Rang geben. -warning=Achtung, Dieser Spieler hat einen höheren Rang als du also kannst du seinen Rang nicht ändern. -rank-high=Dieser Spieler hat einen höheren Rang als du, Rang wechsel fehlgeschlagen! +name=Rangwechsel +tooltip=Setze den Rang eines niedriger gerankten Spielers. +no-info-file=Es wurde keine Informationsdatei gefunden. +message=Bitte wähle einen Spieler und einen Rang. Du kannst nur Spielern mit niedrigerem Rang einen anderen Rang geben. +warning=Achtung, dieser Spieler hat einen höheren Rang als du. Du kannst seinen Rang nicht ändern. +rank-high=Dieser Spieler hat einen höheren Rang als du, Rangwechsel fehlgeschlagen! invalid=Der Spieler oder der Rang ist ungültig, bitte versuche es erneut! -set-rank=Setzte Spieler Rang \ No newline at end of file +set-rank=Setze Spielerrang \ No newline at end of file diff --git a/locale/de/readme.cfg b/locale/de/readme.cfg index f2ada42e..3f47cfe8 100644 --- a/locale/de/readme.cfg +++ b/locale/de/readme.cfg @@ -28,14 +28,14 @@ links-cap3=Steam: links-cap4=Patreon: servers-name=Servers servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! +servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. servers-format=S__1__: __2__ servers-cap1=Public -servers-des1=A place for all players, this map reset every 24h. -servers-cap2=Standard -servers-des2=Before you play make sure you understand the game, reset every 48h. -servers-cap3=Pro -servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. +servers-des1=A place for all players, this map reset every 72H At 16:00 UTC. +servers-cap2=Public +servers-des2=A place for all players, this map reset every 72H At 16:00 UTC. +servers-cap3=Public +servers-des3=A place for all players, this map reset every 72H At 16:00 UTC. servers-cap4=Modded servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. servers-cap5=Events @@ -65,4 +65,4 @@ rules-rule16=Do not complain about lag, low fps and low ups or other things like rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. rules-rule18=Do not advertise other servers unless you are a trusted server owner. rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file +rules-rule20=Use common sense and what an admin says goes. diff --git a/locale/de/rockets.cfg b/locale/de/rockets.cfg index be434056..93a664e8 100644 --- a/locale/de/rockets.cfg +++ b/locale/de/rockets.cfg @@ -1,12 +1,12 @@ [rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. +name=Raketeninfo +tooltip=Detailliste über gestartete Raketen. +none=Es wurden noch keine Rakten gestartet. nan=NaN -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: +sent=Gestartete Raketen: __1__ +first=Erster Start: __1__ +last=Dauer bis zum letzten Start: __1__ +time=Durchschnittliche Starzeit: __1__ +fastest=Schnellster Start: __1__ +milestones=Meilensteine: format=__1__: __2__ \ No newline at end of file diff --git a/locale/de/science.cfg b/locale/de/science.cfg index f42dbc94..e532d761 100644 --- a/locale/de/science.cfg +++ b/locale/de/science.cfg @@ -1,14 +1,14 @@ [science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: +name=Wissenschaftsinfo +tooltip=Detailliste über Wissenschaftspakete +total=Gemachte Pakete: +time=Pakete pro Minute: format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production -high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file +science-pack-1=Rot +science-pack-2=Grün +science-pack-3=Blau +military-science-pack=Militär +production-science-pack=Produktion +high-tech-science-pack=Hochtechnologie +space-science-pack=Weltraum +none=Es wurden noch keine Wissenschaftspakete gemacht. \ No newline at end of file diff --git a/locale/de/tasklist.cfg b/locale/de/tasklist.cfg index 1e2baa06..bb567f83 100644 --- a/locale/de/tasklist.cfg +++ b/locale/de/tasklist.cfg @@ -1,4 +1,4 @@ [tasklist] -name=Task List -tooltip=What jobs need to be done round the factory. -none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file +name=Taskliste +tooltip=Welche Aufgaben müssen rund um die Fabrik erledigt werden? +none=Es sind aktuell keine Tasks erfasst, frage einen Member um einen hinzuzufügen. \ No newline at end of file diff --git a/locale/de/tree-decon.cfg b/locale/de/tree-decon.cfg index f1bfe299..42c2d06f 100644 --- a/locale/de/tree-decon.cfg +++ b/locale/de/tree-decon.cfg @@ -1,3 +1,3 @@ [tree-decon] -player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours -rank-print=__1__ tried to deconstruct something. \ No newline at end of file +player-print=Du darfst dies noch nicht entfernen. Du benötigst dazu den Rang Regular, den du nach 3 Stunden auf dem Server automatisch erhältst. +rank-print=__1__ versuchte etwas zu entfernen. \ No newline at end of file diff --git a/locale/de/warp-system.cfg b/locale/de/warp-system.cfg index 203519fe..590ce5d2 100644 --- a/locale/de/warp-system.cfg +++ b/locale/de/warp-system.cfg @@ -1,9 +1,9 @@ [warp-system] name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file +tooltip=Die Liste mit den Warp-Punkten +remove-tooltip=Entferne Warp-Punkt +go-to-tooltip=Gehe zu Warp-Punkt +cooldown=Warte, bis der Cooldown abgelaufen ist. Verbleibende Zeit: __1__ +cooldown-zero=Dein Cooldown ist abgelaufen, du kannst jetzt wieder Warp-Punkte verwenden. +name-used=Dieser Name ist schon vergeben. +not-on-warp=Du bist nicht auf einem Warp-Punkt. Gehe auf einen Warp-Punkt, um zu einem anderen zu springen. \ No newline at end of file From 4aeef3f46523952efa5fd330139d1594b978af6e Mon Sep 17 00:00:00 2001 From: badgamernl Date: Tue, 13 Feb 2018 09:23:59 +0100 Subject: [PATCH 134/392] Revert "Update warp-system.cfg" --- locale/nl/warp-system.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/nl/warp-system.cfg b/locale/nl/warp-system.cfg index a616fe6d..203519fe 100644 --- a/locale/nl/warp-system.cfg +++ b/locale/nl/warp-system.cfg @@ -1,9 +1,9 @@ [warp-system] -name=Warp lijst -tooltip=Een lijst met warps -remove-tooltip=Verwijder warp -go-to-tooltip=Ga naar -cooldown=Je moet wachten op de cooldown. Tijd over: __1__ -cooldown-zero=Je cooldown is verlopen. Je kunt weer warpen. -name-used=Deze naam is al ingenomen. -not-on-warp=Je bent niet op een warp point. Ga naar een warp point om dit te kunnen doen. +name=Warp List +tooltip=A list of warp points. +remove-tooltip=Remove Warp Point +go-to-tooltip=Go To +cooldown=You Must Wait For The Cooldown, Time Left: __1__ +cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. +name-used=That Name Is Already Taken +not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file From 2114cb86b10c07116777e81345749777247c4ab3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 13 Feb 2018 21:33:49 +0000 Subject: [PATCH 135/392] Fixed Direction Of Sign --- Addons/Admin/admin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index c1d81514..34e9bfbb 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -23,7 +23,7 @@ end function Admin.allowed(player) local player = Game.get_player(player) local lowest_admin_power = Ranking.get_group('Admin').lowest.power - return lowest_admin_power <= Ranking.get_rank(player).power + return lowest_admin_power >= Ranking.get_rank(player).power end function Admin.btn_flow(frame,buttons) From 5c2de2996b332794961e143282ffd1f31002d69f Mon Sep 17 00:00:00 2001 From: badgamernl Date: Wed, 14 Feb 2018 17:38:13 +0100 Subject: [PATCH 136/392] Caner is the best! Fixed en locale files edited by caner --- locale/en/admin.cfg | 10 ++--- locale/en/announcements.cfg | 10 ++--- locale/en/auto-message.cfg | 6 +-- locale/en/capsules.cfg | 4 +- locale/en/game-settings.cfg | 14 +++---- locale/en/inventory-search.cfg | 6 +-- locale/en/player-list.cfg | 2 +- locale/en/rank-changer.cfg | 10 ++--- locale/en/readme.cfg | 74 +++++++++++++++++----------------- locale/en/reports.cfg | 22 +++++----- locale/en/rockets.cfg | 2 +- locale/en/tasklist.cfg | 4 +- locale/en/tree-decon.cfg | 2 +- locale/en/warp-system.cfg | 10 ++--- 14 files changed, 88 insertions(+), 88 deletions(-) diff --git a/locale/en/admin.cfg b/locale/en/admin.cfg index 52434a4d..2674778c 100644 --- a/locale/en/admin.cfg +++ b/locale/en/admin.cfg @@ -1,12 +1,12 @@ [admin-commands] name=Admin Commands -tooltip=Very powerful commands make their home here +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 chose the correct one! -warning=Warning, this player is a higher rank so you cant change their rank. -short-reason=Warning, this is a short reason please think i it could be made more clear. -rank-high=This player is a higher rank, please use in game command if you are sure about this! -invalid=The player or the action is invalid please try again! +warning=Warning: This player outranks you. Therefore, you cannot edit their rank. +short-reason=Warning: This player outranks you. +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 diff --git a/locale/en/announcements.cfg b/locale/en/announcements.cfg index c4e55a6a..78639e4d 100644 --- a/locale/en/announcements.cfg +++ b/locale/en/announcements.cfg @@ -1,6 +1,6 @@ [announcements] -name=Announcement -tooltip=Sent an announcement to players -sent-to=This is sent to __1__ -sent-by=This was sent by __1__ of rank __2__ -select-rank=This message will be sent to: \ No newline at end of file +name=Announcements +tooltip=Sends an announcement to all players +sent-to=This announcement is sent to __1__ +sent-by=This announcement was sent by __1__ ( __2__ ) +select-rank=This announcement will be sent to: \ No newline at end of file diff --git a/locale/en/auto-message.cfg b/locale/en/auto-message.cfg index 15e620a2..0691259f 100644 --- a/locale/en/auto-message.cfg +++ b/locale/en/auto-message.cfg @@ -1,9 +1,9 @@ [auto-message] players-online=There are __1__ players online map-time=This map has been on for __1__ -line-8=Do /help for more info +line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands such as /tag and /report -read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file +custom-commands=We use custom commands, such as /tag and /report +read-readme=Make sure you have read the ReadMe (can be found through the question mark on the top left) \ No newline at end of file diff --git a/locale/en/capsules.cfg b/locale/en/capsules.cfg index 37913f83..6e094790 100644 --- a/locale/en/capsules.cfg +++ b/locale/en/capsules.cfg @@ -1,3 +1,3 @@ [capsules] -used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. -nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file +used=You used __1__ and it hit some of your own buildings. Please be careful next time! +nukes=Nukes are not allowed in your rank. This is a preventive measure against grievers. \ No newline at end of file diff --git a/locale/en/game-settings.cfg b/locale/en/game-settings.cfg index cfbcc6e9..84827647 100644 --- a/locale/en/game-settings.cfg +++ b/locale/en/game-settings.cfg @@ -1,16 +1,16 @@ [game-settings] name=Game Settings -tooltip=Allows for editing of the game settings, please use resposibliy. +tooltip=Edits Game Settings. Please use responsibly. basic-name=Basic Settings -basic-tooltip=These settings are safe to change with no large effects. -basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. +basic-tooltip=These settings are safe to edit and have no big impact. +basic-message=Basic Settings can be used to improve game play for players. advanced-name=Advanced Settings advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. +advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realize. personal-name=Personal Settings -personal-tooltip=These will only effect you, if you are spoted you are on your own. -personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. -sure=Are You Sure! +personal-tooltip=Personal Settings only affects you. +personal-message=Personal Settings only affects your character. If you are spotted as a result of these settings, you are on your own! +sure=Are you sure? effect-mining-speed=Mining Speed effect-craft-speed=Crafting Speed effect-running-speed=Running Speed diff --git a/locale/en/inventory-search.cfg b/locale/en/inventory-search.cfg index 20db013b..e0d592cb 100644 --- a/locale/en/inventory-search.cfg +++ b/locale/en/inventory-search.cfg @@ -1,4 +1,4 @@ [inventory-search] -low=Your Inventory Was Search And __1__ was removed. -med=Your Inventory Was Search And __1__ was removed, you have been given a warning. -high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file +low=Your inventory was searched and __1__ was removed. +med=Your inventory was searched and __1__ was removed, you have been given a warning as a result. +high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been given a warning as a result. \ No newline at end of file diff --git a/locale/en/player-list.cfg b/locale/en/player-list.cfg index 9adacd4d..a385d119 100644 --- a/locale/en/player-list.cfg +++ b/locale/en/player-list.cfg @@ -1,5 +1,5 @@ [player-list] -tooltip=Toogle player list, right click player for info +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 \ No newline at end of file diff --git a/locale/en/rank-changer.cfg b/locale/en/rank-changer.cfg index bbc7a51b..c610e612 100644 --- a/locale/en/rank-changer.cfg +++ b/locale/en/rank-changer.cfg @@ -2,8 +2,8 @@ name=Rank Changer tooltip=Change the rank of a player below you. no-info-file=No info file was found -message=Please select a player and a rank, you can you give ranks to people below you. -warning=Warning, this player is a higher rank so you cant change their rank. -rank-high=This player is a higher rank, rank change failed! -invalid=The player or the rank is invalid please try again! -set-rank=Set Player Rank +message=Select a player and the desired rank. You can only give ranks to people that are below yours. +warning=Warning: This player outranks you. Therefore, you cannot edit their rank. +rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank. +invalid=The player or the rank is invalid. Please try again! +set-rank=Set Player Rank \ No newline at end of file diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index 3f47cfe8..c07b1b75 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -1,27 +1,27 @@ [readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow +tooltip=Open the ReadMe if this is your first time joining. +guildlines-name=Guidelines +guildlines-tooltip=These are the guidelines everyone should follow guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: +guildlines-line2=Here are some guidelines that everyone is obligated to follow. +guildlines-line3=No rights can be derived from these guidelines as the full list of rules is valid / operative. guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. +guildlines-line7=- Do not remove stuff without asking your fellow players. +guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). Train loops and long-distance use is forbidden. guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! +guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun! chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. +chat-tooltip=How to chat in Factorio with default key config +chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options. The key you need to change is “Toggle LUA console” commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown +commands-tooltip=Commands that you can use in ExplosiveGaming +commands-singleline=Custom commands that you can use. Base commands are not shown here. commands-col1=Command Name commands-col2=Command Help links-name=Links -links-tooltip=Helpful links for ways to get in touch +links-tooltip=Helpful links for ways to get in touch with us links-cap1=Discord voice and chat server: links-cap2=Our website: links-cap3=Steam: @@ -31,38 +31,38 @@ servers-tooltip=Info on our other servers servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. servers-format=S__1__: __2__ servers-cap1=Public -servers-des1=A place for all players, this map reset every 72H At 16:00 UTC. +servers-des1=A place for all players, this map resets every 72H At 16:00 UTC. servers-cap2=Public -servers-des2=A place for all players, this map reset every 72H At 16:00 UTC. +servers-des2=A place for all players, this map resets every 72H At 16:00 UTC. servers-cap3=Public -servers-des3=A place for all players, this map reset every 72H At 16:00 UTC. +servers-des3=A place for all players, this map resets every 72H At 16:00 UTC. servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. +servers-des4=A Modded server for all players. Link on Discord for members. servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. +servers-des5=Server for events (everyone can join) - May require a password. Join Discord for more info servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. +servers-des6=For players who support us financially. Changes can be made per request. +rules-name=Rules +rules-tooltip=The full list of ExplosiveGaming rules. +rules-singleline=Although the guidelines cover most of our rules, the full list always have more priority and override any guideline. It is advised to be familiar with all rules to prevent warnings or bans. rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) +rules-rule1=Hacking / cheating / abusing bugs will not be tolerated. +rules-rule2=Any bugs or exploits found should be reported to our team members. (excluding creative items) rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. +rules-rule4=Taking all items from a belt or logistics request is forbidden: sharing resources is mandatory. +rules-rule5=Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. +rules-rule6=Do not lay down/remove concrete or stone with bots without permission. rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. +rules-rule8=Do not use speakers on global or with alerts without permission. rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. +rules-rule10=Do not walk in random directions for no reason (to save map size and server resources). +rules-rule11=Do not remove stuff without asking your fellow players. +rules-rule12=Do not rotate belts, deactivate belts with wires, or cause production to stop. rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. +rules-rule14=When using trains, use the same size other players have used. rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. +rules-rule16=Do not complain about lag, low fps and low ups etc. +rules-rule17=Do not ask for ranks. Our ranks are synchronized with Discord, make sure to join us there. rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. +rules-rule19=Report players who break the rules. +rules-rule20=Use common sense and what an Admin says goes. diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg index b0152d44..2f400fdd 100644 --- a/locale/en/reports.cfg +++ b/locale/en/reports.cfg @@ -2,14 +2,14 @@ name=Report Player 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 cant be reported. -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. \ No newline at end of file +cant-report=This player can not be reported. +warning-given-by=This warning was given by: __1__ +player-warning=__1__ was given a warning by __2__ for: __3__ +temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset +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. \ No newline at end of file diff --git a/locale/en/rockets.cfg b/locale/en/rockets.cfg index be434056..0c227069 100644 --- a/locale/en/rockets.cfg +++ b/locale/en/rockets.cfg @@ -2,7 +2,7 @@ name=Rocket Info tooltip=List of details about the rockets sent. none=No rockets have been sent yet. -nan=NaN +nan=Not available sent=Rockets Sent: __1__ first=First Lanuched At: __1__ last=Last Launch Took: __1__ diff --git a/locale/en/tasklist.cfg b/locale/en/tasklist.cfg index 1e2baa06..24fafeb9 100644 --- a/locale/en/tasklist.cfg +++ b/locale/en/tasklist.cfg @@ -1,4 +1,4 @@ [tasklist] name=Task List -tooltip=What jobs need to be done round the factory. -none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file +tooltip=Jobs that needs to be completed all around the factory. +none=There are currently no tasks. Ask a Member in-game or through Discord to add tasks. \ No newline at end of file diff --git a/locale/en/tree-decon.cfg b/locale/en/tree-decon.cfg index f1bfe299..8a80a238 100644 --- a/locale/en/tree-decon.cfg +++ b/locale/en/tree-decon.cfg @@ -1,3 +1,3 @@ [tree-decon] -player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours +player-print=You do not have permission to do this right now. You require the Regular rank which can be obtained through 3 hours of in-game playtime on Explosive Gaming. rank-print=__1__ tried to deconstruct something. \ No newline at end of file diff --git a/locale/en/warp-system.cfg b/locale/en/warp-system.cfg index 203519fe..20e2f769 100644 --- a/locale/en/warp-system.cfg +++ b/locale/en/warp-system.cfg @@ -1,9 +1,9 @@ [warp-system] name=Warp List tooltip=A list of warp points. -remove-tooltip=Remove Warp Point +remove-tooltip=Remove Warp point go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file +cooldown=You must wait for the cooldown. Time left: __1__ +cooldown-zero=Your cooldown has expired, You can use warp points again. +name-used=That name is already taken. +not-on-warp=You are not on a warp point right now, you must be on a warp point to go to one. \ No newline at end of file From 8d156876c240a7abee66ebe07993c43aa5be98ef Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 15 Feb 2018 14:42:23 +0000 Subject: [PATCH 137/392] Mods are admin again --- Addons/playerRanks.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index d27b529b..6047faf0 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -118,7 +118,8 @@ groups['Admin']:add_rank{ colour={r=0,g=170,b=0}, disallow={ 'server_command' - } + }, + is_admin = true } groups['User']:add_rank{ From 357b96225c5ad2dacf215604635e8566f4e91fc2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 18 Feb 2018 21:34:16 +0000 Subject: [PATCH 138/392] Fixed Report System --- Addons/Admin/reports.lua | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index ec382659..a366d1e4 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -149,12 +149,21 @@ end function Admin.report(player,by_player,reason) local player, by_player_name = valid_players(player,by_player) if not player or Ranking.get_rank(player):allowed('no-report') then return end + if Admin.is_banned(by_player) or Ranking.get_group(by_player).name == 'Jail' then return end if rank:allowed('varified') then _reports().varified[player.name] = _reports().varified[player.name] or {} - table.insert(_reports().varified[player.name],{by_player_name,reason}) + local reports = _reports().varified[player.name] + for _,value in pairs(reports) do + if value[1] == by_player_name then return end + end + table.insert(reports,{by_player_name,reason}) else - _reports().reports[player.name] = _reports().reports[player.name] or {} - table.insert(_reports().reports[player.name],{by_player_name,reason}) + _reports().reports[player.name] = _reports().reports[player.name] or {} + local reports = _reports().reports[player.name] + for _,value in pairs(reports) do + if value[1] == by_player_name then return end + end + table.insert(reports,{by_player_name,reason}) end report_message(player,by_player,reason) cheak_reports(player) @@ -232,6 +241,7 @@ end function Admin.is_banned(player) local player=Game.get_player(player) + if not player then return false end local action = _reports().actions[player.name] if action == actions.temp then return 'temp' elseif action == actions.ban then return true From d45e5a1abc6cddde13aa488bda5ca7f00bdf9685 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 19 Feb 2018 21:46:02 +0000 Subject: [PATCH 139/392] A Few Edits To Player Search And Added Eddy To Admin --- Addons/Admin/inventory-search.lua | 11 +++++++++-- Addons/playerRanks.lua | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index db16b272..6011b7bb 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -15,13 +15,15 @@ local low_items = { 'express-loader', 'small-plane', 'player-port', - 'coin' + 'coin', + 'programmable-speaker' } -- removed for admin and non-admin ranks, gives warnings to non-admins local med_items = { 'railgun', - 'railgun-dart' + 'railgun-dart', + 'belt-immunity-equipment' } -- temp-ban for any rank, this is a very hard enforcement, admin ranks lose rank @@ -59,6 +61,11 @@ function search_player(player) end end +Event.register({defines.events.on_player_main_inventory_changed,defines.events.on_player_quickbar_inventory_changed},function(event) + local player = Game.get_player(event) + if player and player.name == 'freek18' then search_player(player) end +end) + Event.register(defines.events.on_tick,function(event) if (game.tick%900) == 0 then local players = game.connected_players diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 6047faf0..cca0c8a2 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -190,5 +190,6 @@ Ranking._base_preset{ ['badgamernl']='Owner', ['arty714']='Community Manager', ['cooldude2606']='Developer', - ['mark9064']='Admin' + ['mark9064']='Admin', + ['propangaseddy']='Admin' } \ No newline at end of file From 17d60d1c03989c54538491cdeab8021d01163308 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Sun, 25 Feb 2018 21:21:53 +0100 Subject: [PATCH 140/392] fixing member repair --- Addons/playerRanks.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index cca0c8a2..33ce9502 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -171,7 +171,6 @@ ranks['Veteran']:edit('allow',false,{ }) ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, - ['repair']=true, ['make-warp']=true, ['nuke']=true }) @@ -192,4 +191,4 @@ Ranking._base_preset{ ['cooldude2606']='Developer', ['mark9064']='Admin', ['propangaseddy']='Admin' -} \ No newline at end of file +} From 65b29d46e002ebde0153e5f91a2deca99fcc35cc Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 6 Mar 2018 18:36:10 +0000 Subject: [PATCH 141/392] Fixed Nuke And Base Damage --- Addons/Admin/base-damage.lua | 47 ++++++++++++++++++++++++++++++++ Addons/Admin/capsules.lua | 53 ------------------------------------ Addons/load.lua | 2 +- locale/en/capsules.cfg | 4 +-- 4 files changed, 50 insertions(+), 56 deletions(-) create mode 100644 Addons/Admin/base-damage.lua delete mode 100644 Addons/Admin/capsules.lua diff --git a/Addons/Admin/base-damage.lua b/Addons/Admin/base-damage.lua new file mode 100644 index 00000000..7954705d --- /dev/null +++ b/Addons/Admin/base-damage.lua @@ -0,0 +1,47 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +-- alot of this is copied from redmew - but it has been reworked to use the ExpCore +-- https://github.com/Valansch/RedMew/blob/develop/nuke_control.lua + +local function _damage(reset) + global.addons = not reset and global.addons or {} + global.addons.damage = not reset and global.addons.damage or {} + return global.addons.damage +end + +Event.register(defines.events.on_entity_damaged,function(event) + if event.force == nil or event.force ~= event.entity.force then return end + if event.cause == nil or event.cause.name ~= 'player' then return end + local player = Game.get_player(event.cause.player) + if Ranking.get_rank(player):allowed('base-damage') then return end + if not _damage()[player.index] then _damage()[player.index] = {0,0} end + _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) + Admin.give_warning(player,'','Damaged something inside the base. Total Delt: '.._damage()[player.index][1],4) + end +end) + +Event.register(defines.events.on_player_ammo_inventory_changed,function(event) + local player = Game.get_player(event) + if Ranking.get_rank(player):allowed('nuke') then return end + local found = player.remove_item({name='atomic-bomb',count=1000}) + 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) + if _damage()[player.index][2] < event.tick-300 then + _damage()[player.index][2] = event.tick + Admin.give_warning(player,'','Nukes are not allowed for your rank.',4) + end + end +end) \ No newline at end of file diff --git a/Addons/Admin/capsules.lua b/Addons/Admin/capsules.lua deleted file mode 100644 index 242494d7..00000000 --- a/Addons/Admin/capsules.lua +++ /dev/null @@ -1,53 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - --- alot of this is copied from redmew - but it has been reworked to use the ExpCore --- https://github.com/Valansch/RedMew/blob/develop/nuke_control.lua - -local const = 8 -- this is how many entites must be found in order to give a warning --- false means that it cant be used -local capsules = { - ['artillery-targeting-remote']=false, - ['cliff-explosives']=true, - ['cluster-grenade']=false, - ['defender-capsule']=true, - ['destroyer-capsule']=true, - ['discharge-defense-remote']=true, - ['distractor-capsule']=true, - ['grenade']=false, - ['poison-capsule']=false, - ['raw-fish']=true, - ['slowdown-capsule']=true, -} - -Event.register(defines.events.on_player_used_capsule,function(event) - local player = Game.get_player(event) - local item = event.item - if capsules[item.name] or Ranking.get_rank(player):allowed('capsules') then return end - local x,y = event.position.x, event.position.y - local player_entities = player.surface.count_entities_filtered{ - force=player.force, - area={{x-5,y-5},{x+5,y+5}} - } - if player_entities < const then return end - player_return({'capsules.used',item.name},defines.text_color.med,player) - Admin.give_warning(player,'','Using '..item.name..' inside the base.',4) -end) - -Event.register(defines.events.on_player_ammo_inventory_changed,function(event) - local player = Game.get_player(event) - if Ranking.get_rank(player):allowed('nuke') then return end - local found = player.remove_item({name='atomic-bomb',count=1000}) - if found > 0 then - Admin.move_item_to_spawn({name='atomic-bomb',count=found},player.surface) - player_return({'capsules.nuke'},defines.text_color.med,player) - Admin.give_warning(player,'','Nukes are not allowed for your rank.',4) - end -end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index dbad5133..31a5b49a 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -24,7 +24,7 @@ require('Admin/discord') require('Admin/auto-message') require('Admin/tree-decon') require('Admin/inventory-search') -require('Admin/capsules') +require('Admin/base-damage') -- commands dir require('Commands/cheat-mode') diff --git a/locale/en/capsules.cfg b/locale/en/capsules.cfg index 6e094790..1cb4d0f8 100644 --- a/locale/en/capsules.cfg +++ b/locale/en/capsules.cfg @@ -1,3 +1,3 @@ -[capsules] -used=You used __1__ and it hit some of your own buildings. Please be careful next time! +[base-damage] +used=You hit some of your own buildings. Please be careful next time! nukes=Nukes are not allowed in your rank. This is a preventive measure against grievers. \ No newline at end of file From 128d75163538148978b2e88649ea57b539b2670a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 6 Mar 2018 18:38:10 +0000 Subject: [PATCH 142/392] Edit To Locale Files Needs Updating --- locale/de/{capsules.cfg => base-damage.cfg} | 2 +- locale/en/{capsules.cfg => base-damage.cfg} | 0 locale/fr/{capsules.cfg => base-damage.cfg} | 2 +- locale/nl/{capsules.cfg => base-damage.cfg} | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename locale/de/{capsules.cfg => base-damage.cfg} (82%) rename locale/en/{capsules.cfg => base-damage.cfg} (100%) rename locale/fr/{capsules.cfg => base-damage.cfg} (71%) rename locale/nl/{capsules.cfg => base-damage.cfg} (73%) diff --git a/locale/de/capsules.cfg b/locale/de/base-damage.cfg similarity index 82% rename from locale/de/capsules.cfg rename to locale/de/base-damage.cfg index d758a4d5..1133598a 100644 --- a/locale/de/capsules.cfg +++ b/locale/de/base-damage.cfg @@ -1,3 +1,3 @@ [capsules] -used=Du hast __1__ benutzt und damit Gebäude von eigenen oder anderen Spielern getroffen. Bitte sei aufmerksamer! Zum Glück ist kein Schaden dabei entstanden. +used=Du hast __1__ benutzt und damit Gebäude von eigenen oder anderen Spielern getroffen. Bitte sei aufmerksamer! Zum Glück ist kein Schaden dabei entstanden. nuke=Atombomben sind nicht erlaubt für deinen Rang. Tut uns Leid, aber so beugen wir Griefer vor. \ No newline at end of file diff --git a/locale/en/capsules.cfg b/locale/en/base-damage.cfg similarity index 100% rename from locale/en/capsules.cfg rename to locale/en/base-damage.cfg diff --git a/locale/fr/capsules.cfg b/locale/fr/base-damage.cfg similarity index 71% rename from locale/fr/capsules.cfg rename to locale/fr/base-damage.cfg index 37913f83..e695107e 100644 --- a/locale/fr/capsules.cfg +++ b/locale/fr/base-damage.cfg @@ -1,3 +1,3 @@ [capsules] -used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. +used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file diff --git a/locale/nl/capsules.cfg b/locale/nl/base-damage.cfg similarity index 73% rename from locale/nl/capsules.cfg rename to locale/nl/base-damage.cfg index 613c91bf..c5a3202e 100644 --- a/locale/nl/capsules.cfg +++ b/locale/nl/base-damage.cfg @@ -1,3 +1,3 @@ [capsules] -used=Je hebt __1__ gebruikt, deze heeft jouw gebouw(en) geraakt. Wees volgende keer wat meer voorzichtig. +used=Je hebt __1__ gebruikt, deze heeft jouw gebouw(en) geraakt. Wees volgende keer wat meer voorzichtig. nuke=Nukes zijn niet toegestaan op jouw rank. Dit is een preventief middel tegen griefing. From 8dee2510fafce9e981dab45d22a669be91937829 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 6 Mar 2018 18:43:54 +0000 Subject: [PATCH 143/392] Less Lag On health Popup --- StandAlone/health.lua | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/StandAlone/health.lua b/StandAlone/health.lua index 3ce961db..fbba642a 100644 --- a/StandAlone/health.lua +++ b/StandAlone/health.lua @@ -3,28 +3,27 @@ -- https://mods.factorio.com/mods/chocolateTthunder/Show_Health -- edits include: tick limit to avoid lag, only shows health when it is lost - -Event.register(defines.events.on_tick, function(event) - if not (event.tick % 15 == 0) then return end - for _,player in pairs(game.connected_players) do - if player.character then - if player.character.health == nil then return end - local index = player.index - local health = math.ceil(player.character.health) - if global.player_health == nil then global.player_health = {} end - if global.player_health[index] == nil then global.player_health[index] = health end - if global.player_health[index] ~= health then - if health < global.player_health[index] then - if health > 200 then - player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=(health), position= {player.position.x, player.position.y-2}} - elseif health > 100 then - player.surface.create_entity{name="flying-text", color={r = 1, g = 1, b = 0}, text=(health), position= {player.position.x, player.position.y-2}} - else - player.surface.create_entity{name="flying-text", color={b = 0.1, r= 1, g = 0, a = 0.8}, text=(health), position= {player.position.x, player.position.y-2}} - end +Event.register(defines.events.on_entity_damaged, function(event) + if event.entity.name ~= 'player' then return end + local player = Game.get_player(event.entity.player) + if player.character then + if player.character.health == nil then return end + local index = player.index + local health = math.ceil(player.character.health) + if global.player_health == nil then global.player_health = {} end + if global.player_health[index] == nil then global.player_health[index] = health end + if global.player_health[index] ~= health then + if health < global.player_health[index] then + local text = health..' (-'..event.final_damage_amount..')' + if health > 200 then + player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}} + elseif health > 100 then + player.surface.create_entity{name="flying-text", color={r = 1, g = 1, b = 0}, text=text, position= {player.position.x, player.position.y-2}} + else + player.surface.create_entity{name="flying-text", color={b = 0.1, r= 1, g = 0, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}} end - global.player_health[index] = health end - end - end + global.player_health[index] = health + end + end end) \ No newline at end of file From 2c6d52357d41dbbde63a5734d5e632de1cbbafee Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 7 Mar 2018 20:02:11 +0000 Subject: [PATCH 144/392] Fixed Player Inventory Search --- Addons/Admin/inventory-search.lua | 15 +++++++++------ Addons/playerRanks.lua | 7 +++++-- StandAlone/health.lua | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index 6011b7bb..4472204f 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -49,12 +49,14 @@ end function search_player(player) for category,items in pairs(_root_tree) do - for _,_inventory in pairs(inventorys) do - local inventory = player.get_inventory(_inventory) - if inventory then - for _,item in pairs(items) do - local found = inventory.remove(item) - if found > 0 then take_action(player,item,category) end + if category ~= 'low_items' or not Ranking.get_rank(player).allowed('admin-items') then + for _,_inventory in pairs(inventorys) do + local inventory = player.get_inventory(_inventory) + if inventory then + for _,item in pairs(items) do + local found = inventory.remove(item) + if found > 0 then take_action(player,item,category) end + end end end end @@ -71,6 +73,7 @@ Event.register(defines.events.on_tick,function(event) local players = game.connected_players if #players == 0 then return end local player = players[math.random(#players)] + if Ranking.get_rank(player).allowed('all-items') then return end search_player(player) end end) \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 33ce9502..b58e3b38 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -53,7 +53,9 @@ groups['Root']:edit('allow',false,{ ['clear-player']=true, ['announcements']=true, ['warp-list']=true, - ['polls']=true + ['polls']=true, + ['admin-items']=true, + ['all-items']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -154,7 +156,8 @@ ranks['Developer']:edit('allow',false,{ ranks['Admin']:edit('allow',false,{ ['game-settings']=true, - ['always-warp']=true + ['always-warp']=true, + ['admin-items']=true }) ranks['Mod']:edit('allow',false,{ ['go-to']=true, diff --git a/StandAlone/health.lua b/StandAlone/health.lua index fbba642a..d753c72b 100644 --- a/StandAlone/health.lua +++ b/StandAlone/health.lua @@ -14,7 +14,7 @@ Event.register(defines.events.on_entity_damaged, function(event) if global.player_health[index] == nil then global.player_health[index] = health end if global.player_health[index] ~= health then if health < global.player_health[index] then - local text = health..' (-'..event.final_damage_amount..')' + local text = health..' (-'..math.floor(event.final_damage_amount)..')' if health > 200 then player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}} elseif health > 100 then From fd6fa78a6fd7b34409693ed07b8adb660aa95112 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 7 Mar 2018 20:03:56 +0000 Subject: [PATCH 145/392] Fixed /repair --- Addons/playerRanks.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index b58e3b38..bedbb90f 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -55,7 +55,8 @@ groups['Root']:edit('allow',false,{ ['warp-list']=true, ['polls']=true, ['admin-items']=true, - ['all-items']=true + ['all-items']=true, + ['repair']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -170,7 +171,8 @@ ranks['Donator']:edit('allow',false,{ }) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, - ['create-poll']=true + ['create-poll']=true, + ['repair']=true }) ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, From 98109218f9d7766a685121bc171d51b359bd49c5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 8 Mar 2018 16:43:26 +0000 Subject: [PATCH 146/392] Fixed Inventory Search Syntax --- Addons/Admin/inventory-search.lua | 2 +- Addons/playerRanks.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index 4472204f..0d907ace 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -73,7 +73,7 @@ Event.register(defines.events.on_tick,function(event) local players = game.connected_players if #players == 0 then return end local player = players[math.random(#players)] - if Ranking.get_rank(player).allowed('all-items') then return end + if Ranking.get_rank(player):allowed('all-items') then return end search_player(player) end end) \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index bedbb90f..523a2ee4 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -177,7 +177,8 @@ ranks['Veteran']:edit('allow',false,{ ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, ['make-warp']=true, - ['nuke']=true + ['nuke']=true, + ['base-damage']=true }) ranks['Regular']:edit('allow',false,{ ['kill']=true, From 8a95810b852b3ca83361ac4a3258ae4241150bc5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 8 Mar 2018 16:53:31 +0000 Subject: [PATCH 147/392] Fixed Syntax Again - Forgot One --- Addons/Admin/inventory-search.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua index 0d907ace..0ce81b4f 100644 --- a/Addons/Admin/inventory-search.lua +++ b/Addons/Admin/inventory-search.lua @@ -49,7 +49,7 @@ end function search_player(player) for category,items in pairs(_root_tree) do - if category ~= 'low_items' or not Ranking.get_rank(player).allowed('admin-items') then + if category ~= 'low_items' or not Ranking.get_rank(player):allowed('admin-items') then for _,_inventory in pairs(inventorys) do local inventory = player.get_inventory(_inventory) if inventory then From 749ce6618239f313018db1d2bfa03a61a830ea92 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 9 Mar 2018 22:55:37 +0000 Subject: [PATCH 148/392] Added Paths --- StandAlone/load.lua | 3 +- StandAlone/paths.lua | 84 ++++++++++++++++++++++++++++++++++++++++++++ StandAlone/spawn.lua | 1 + 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 StandAlone/paths.lua diff --git a/StandAlone/load.lua b/StandAlone/load.lua index 707924cf..d38e3864 100644 --- a/StandAlone/load.lua +++ b/StandAlone/load.lua @@ -17,4 +17,5 @@ end require('colours') require('health') require('spawn') -require('starting-items') \ No newline at end of file +require('starting-items') +require('paths') \ No newline at end of file diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua new file mode 100644 index 00000000..c3e1254b --- /dev/null +++ b/StandAlone/paths.lua @@ -0,0 +1,84 @@ +-- made by cooldude +-- idea from Mylon - Dirt Path + +local paths = { + -- ['tile name'] = {health,convert to} + -- health is in hundrads of steps + ['refined-concrete']={60,'concrete'}, + ['refined-hazard-concrete-right']={60,'hazard-concrete-right'}, + ['refined-hazard-concrete-left']={60,'hazard-concrete-left'}, + ['concrete']={40,'stone-path'}, + ['hazard-concrete-right']={40,'stone-path'}, + ['hazard-concrete-left']={40,'stone-path'}, + ['stone-path']={20,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player + ['sand-1']={5,'sand-2'}, + ['sand-2']={10,'sand-3'}, + ['sand-3']={5,'red-desert-3'}, + ['red-desert-3']={5,'red-desert-2'}, + ['red-desert-2']={10,'dirt-1'}, + ['grass-2']={5,'grass-1'}, + ['grass-1']={5,'grass-3'}, + ['grass-3']={10,'red-desert-0'}, + ['red-desert-0']={5,'red-desert-1'}, + ['red-desert-1']={10,'dirt-1'}, + ['dirt-1']={5,'dirt-2'}, + ['dirt-2']={5,'dirt-3'}, + ['dirt-3']={10,'dirt-4'}, + ['dirt-4']={5,'dirt-5'}, + ['dirt-5']={5,'dirt-6'}, + ['dirt-6']={1000,'dirt-6'}, + ['grass-4']={10,'dirt-4'} +} +for tile,value in pairs(paths) do + --value[1]=value[1]*100 +end + +local function global_key(surface,pos) + local key = 'S'..surface.name..'X'..math.floor(pos.x)..'Y'..math.floor(pos.y) + if not global.paths then global.paths = {} end + if not global.paths[key] then + local tile = surface.get_tile(pos).name + global.paths[key] = {tile,paths[tile][1]} + end + return global.paths[key] +end + +local function down_grade(surface,pos) + local tile = surface.get_tile(pos).name + local new_tile = paths[tile][2] + if new_tile == 'world-gen' then new_tile = global_key(surface,pos)[1] or 'grass-1' end + surface.set_tiles{{name=new_tile,position=pos}} + global_key(surface,pos)[2]=paths[new_tile][1] +end + +Event.register(defines.events.on_player_built_tile, function(event) + local surface = game.surfaces[event.surface_index] + local old_tiles = event.tiles + for _,old_tile in pairs(old_tiles) do + if old_tile.old_tile.name ~= 'refined-concrete' and old_tile.old_tile.name ~= 'refined-hazard-concrete-right' + and old_tile.old_tile.name ~= 'refined-hazard-concrete-left' and old_tile.old_tile.name ~= 'concrete' + and old_tile.old_tile.name ~= 'hazard-concrete-right' and old_tile.old_tile.name ~= 'hazard-concrete-left' + and old_tile.old_tile.name ~= 'stone-path' and old_tile.old_tile.name ~= 'water' and old_tile.old_tile.name ~= 'deep-water' then + global_key(surface,old_tile.position)[1]=old_tile.old_tile.name + end + global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] + end +end) + +Event.register(defines.events.on_player_mined_tile, function(event) + local surface = game.surfaces[event.surface_index] + local old_tiles = event.tiles + for _,old_tile in pairs(old_tiles) do + global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] + end +end) + +Event.register(defines.events.on_player_changed_position, function(event) + local player = Game.get_player(event) + local surface = player.surface + local pos = player.position + global_key(surface,pos)[2] = global_key(surface,pos)[2]-1 + if global_key(surface,pos)[2] <= 0 then + down_grade(surface,pos) + end +end) \ No newline at end of file diff --git a/StandAlone/spawn.lua b/StandAlone/spawn.lua index e4d0c646..49ff3e09 100644 --- a/StandAlone/spawn.lua +++ b/StandAlone/spawn.lua @@ -179,6 +179,7 @@ Event.register(defines.events.on_player_created, function(event) local surface = player.surface local offset = {x=0,y=0} local partern_base_tile = surface.get_tile(player.position).name + if partern_base_tile == 'deepwater' or partern_base_tile == 'water' then partern_base_tile = 'grass-1' end local base_tiles = {} local tiles = {} for x = -partern_radius-5, partern_radius+5 do From b29b440708a93152df66e6d86e61235aa47b48cf Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 9 Mar 2018 22:57:04 +0000 Subject: [PATCH 149/392] Added Correct Values For Paths --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index c3e1254b..0004a971 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -30,7 +30,7 @@ local paths = { ['grass-4']={10,'dirt-4'} } for tile,value in pairs(paths) do - --value[1]=value[1]*100 + value[1]=value[1]*100 end local function global_key(surface,pos) From e566ab4dcd30b2f91d66a30a7c7ea8e890c6b91b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 10 Mar 2018 16:11:54 +0000 Subject: [PATCH 150/392] Fixed Path With Lab Tiles --- StandAlone/paths.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 0004a971..ea21920e 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -38,6 +38,7 @@ local function global_key(surface,pos) if not global.paths then global.paths = {} end if not global.paths[key] then local tile = surface.get_tile(pos).name + if not paths[tile] then return end global.paths[key] = {tile,paths[tile][1]} end return global.paths[key] @@ -45,6 +46,7 @@ end local function down_grade(surface,pos) local tile = surface.get_tile(pos).name + if not paths[tile] then return end local new_tile = paths[tile][2] if new_tile == 'world-gen' then new_tile = global_key(surface,pos)[1] or 'grass-1' end surface.set_tiles{{name=new_tile,position=pos}} From a346d6bb6fb0dbba784819392674b4939dbfa820 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 10 Mar 2018 16:26:37 +0000 Subject: [PATCH 151/392] Fixed Error Again --- StandAlone/paths.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index ea21920e..e6fdc039 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -38,7 +38,6 @@ local function global_key(surface,pos) if not global.paths then global.paths = {} end if not global.paths[key] then local tile = surface.get_tile(pos).name - if not paths[tile] then return end global.paths[key] = {tile,paths[tile][1]} end return global.paths[key] @@ -46,7 +45,6 @@ end local function down_grade(surface,pos) local tile = surface.get_tile(pos).name - if not paths[tile] then return end local new_tile = paths[tile][2] if new_tile == 'world-gen' then new_tile = global_key(surface,pos)[1] or 'grass-1' end surface.set_tiles{{name=new_tile,position=pos}} @@ -57,6 +55,7 @@ Event.register(defines.events.on_player_built_tile, function(event) local surface = game.surfaces[event.surface_index] local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do + if not paths[old_tile.old_tile.name] or not paths[surface.get_tile(old_tile.position).name] then return end if old_tile.old_tile.name ~= 'refined-concrete' and old_tile.old_tile.name ~= 'refined-hazard-concrete-right' and old_tile.old_tile.name ~= 'refined-hazard-concrete-left' and old_tile.old_tile.name ~= 'concrete' and old_tile.old_tile.name ~= 'hazard-concrete-right' and old_tile.old_tile.name ~= 'hazard-concrete-left' @@ -71,6 +70,7 @@ Event.register(defines.events.on_player_mined_tile, function(event) local surface = game.surfaces[event.surface_index] local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do + if not paths[old_tile.old_tile.name] or not paths[surface.get_tile(old_tile.position).name] then return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] end end) @@ -79,6 +79,7 @@ Event.register(defines.events.on_player_changed_position, function(event) local player = Game.get_player(event) local surface = player.surface local pos = player.position + if not paths[surface.get_tile(pos).name] then return end global_key(surface,pos)[2] = global_key(surface,pos)[2]-1 if global_key(surface,pos)[2] <= 0 then down_grade(surface,pos) From 6d58612633e26aed3a7dd3a6a1288026b5230538 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Sat, 10 Mar 2018 20:55:35 +0100 Subject: [PATCH 152/392] removed guild line: long-distance use if forbidden --- locale/en/readme.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index c07b1b75..ca647e60 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -9,7 +9,7 @@ guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. guildlines-line5=- Be polite and use common sense. guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. guildlines-line7=- Do not remove stuff without asking your fellow players. -guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). Train loops and long-distance use is forbidden. +guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). Train loops. guildlines-line9= guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun! chat-name=How To Chat From d7113c49319c25134ee25b99ec12fbdd851cfd08 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Sat, 10 Mar 2018 20:57:53 +0100 Subject: [PATCH 153/392] removed guild line: long-distance use if forbidden forgot nl version --- locale/nl/readme.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/nl/readme.cfg b/locale/nl/readme.cfg index 99f8672f..143d506c 100644 --- a/locale/nl/readme.cfg +++ b/locale/nl/readme.cfg @@ -9,7 +9,7 @@ guildlines-line4=- Hacken / cheaten en bugs misbruiken is niet toegestaan. guildlines-line5=- Wees aardig en gebruik je gezonde verstand. guildlines-line6=- Spammen (in de zin van chat, kisten en beton) is niet toegestaan. guildlines-line7=- Geen spullen verwijderen zonder toestemming van andere spelers. -guildlines-line8=- Treinen (LHD - Left Hand Drive) niet loopen of gebruiken voor lange afstanden. +guildlines-line8=- Treinen (LHD - Left Hand Drive) geen loops. guildlines-line9= guildlines-line10=Als je vragen hebt over deze regels of over de server in algemeen, aarzel dan niet om contact op te nemen met onze staff. chat-name=Chatten From a9e392b9cf4416c3633062e2c5653f0ba3d35786 Mon Sep 17 00:00:00 2001 From: mark9064 <30447455+mark9064@users.noreply.github.com> Date: Sat, 10 Mar 2018 20:05:20 +0000 Subject: [PATCH 154/392] Update README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fb7c287f..091217f0 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,7 @@ * Each file must be self contained with no _G varibles #### Forks and Pull Requests -* We are happy for people to make pull requets if you wish to help make our server better -* You can add a comment at the start of the file to mark any changes you make, for the credit -* Your server is a comunity server, it is all about the people and feedback is good -* Dont make small changes to the core files, please only big meaniful changes -* Dont be afraid to make a pull request as if it fixes something then its a good change +* We are happy for people to make pull requests if you wish to help make our server better +* You can add comments at the start of files to mark any changes you make, so you are credited +* Don't make small changes to the core files, please only big meaningful changes +* Don't be afraid to make a pull request as if it fixes something then it's a good change From e0c9b32411025c502b73ce8153f6e3237fb0f51a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 10 Mar 2018 22:30:34 +0000 Subject: [PATCH 155/392] Fixed Paths Huge Size --- StandAlone/paths.lua | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index e6fdc039..1a18a7e6 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,6 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path +local clean_time = 18000 -- time in ticks local paths = { -- ['tile name'] = {health,convert to} -- health is in hundrads of steps @@ -26,7 +27,6 @@ local paths = { ['dirt-3']={10,'dirt-4'}, ['dirt-4']={5,'dirt-5'}, ['dirt-5']={5,'dirt-6'}, - ['dirt-6']={1000,'dirt-6'}, ['grass-4']={10,'dirt-4'} } for tile,value in pairs(paths) do @@ -43,19 +43,33 @@ local function global_key(surface,pos) return global.paths[key] end +local function remove_key(surface,pos) + local key = 'S'..surface.name..'X'..math.floor(pos.x)..'Y'..math.floor(pos.y) + if not global.paths then global.paths = {} end + global.paths[key] = nil +end + +local function clean_global() + if not global.paths then return end + for key,tile in pairs(global.paths) do + if tile[3] < game.tick-clean_time then global.paths[key] = nil end + end +end + local function down_grade(surface,pos) local tile = surface.get_tile(pos).name local new_tile = paths[tile][2] if new_tile == 'world-gen' then new_tile = global_key(surface,pos)[1] or 'grass-1' end surface.set_tiles{{name=new_tile,position=pos}} global_key(surface,pos)[2]=paths[new_tile][1] + if not paths[new_tile] then remove_key(surface,pos) return end end Event.register(defines.events.on_player_built_tile, function(event) local surface = game.surfaces[event.surface_index] local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do - if not paths[old_tile.old_tile.name] or not paths[surface.get_tile(old_tile.position).name] then return end + if not paths[old_tile.old_tile.name] or not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end if old_tile.old_tile.name ~= 'refined-concrete' and old_tile.old_tile.name ~= 'refined-hazard-concrete-right' and old_tile.old_tile.name ~= 'refined-hazard-concrete-left' and old_tile.old_tile.name ~= 'concrete' and old_tile.old_tile.name ~= 'hazard-concrete-right' and old_tile.old_tile.name ~= 'hazard-concrete-left' @@ -64,24 +78,33 @@ Event.register(defines.events.on_player_built_tile, function(event) end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] end + global_key(surface,pos)[3] = event.tick end) Event.register(defines.events.on_player_mined_tile, function(event) local surface = game.surfaces[event.surface_index] local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do - if not paths[old_tile.old_tile.name] or not paths[surface.get_tile(old_tile.position).name] then return end + if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] end + global_key(surface,pos)[3] = event.tick end) Event.register(defines.events.on_player_changed_position, function(event) local player = Game.get_player(event) local surface = player.surface local pos = player.position - if not paths[surface.get_tile(pos).name] then return end + if not paths[surface.get_tile(pos).name] then remove_key(surface,pos) return end global_key(surface,pos)[2] = global_key(surface,pos)[2]-1 if global_key(surface,pos)[2] <= 0 then down_grade(surface,pos) end + global_key(surface,pos)[3] = event.tick +end) + +Event.register(defines.events.on_tick, function(event) + if (game.tick%clean_time) == 0 then + clean_global() + end end) \ No newline at end of file From 2a06f40ec5c14f1a5432ab666a504eaf7122ddc4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 10 Mar 2018 22:35:00 +0000 Subject: [PATCH 156/392] Improved Warp System --- Addons/Guis/warp-system.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index 606369f5..0ecc565f 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -204,16 +204,18 @@ Event.register(defines.events.on_tick,function(event) if _warps().cooldowns[index] == 0 then player_return({'warp-system.cooldown-zero'},defines.text_color.low,index) end end end - for _,player in pairs(game.connected_players) do - local cooldown = _warps().cooldowns[player.index] or 0 - if not Ranking.get_rank(player):allowed('always-warp') and cooldown == 0 then - if player.surface.get_tile(player.position).name == warp_tile - or player.surface.get_tile(player.position).name == warp_partern - and player.surface.name == 'nauvis' - then mod_gui.get_frame_flow(player)['warp-list'].style.visible = true - elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then mod_gui.get_frame_flow(player)['warp-list'].style.visible = true - else mod_gui.get_frame_flow(player)['warp-list'].style.visible = false end - end +end) + +Event.register(defines.events.on_player_changed_position, function(event) + local player = Game.get_player(event) + local cooldown = _warps().cooldowns[player.index] or 0 + local tile = player.surface.get_tile(player.position).name + if not Ranking.get_rank(player):allowed('always-warp') and cooldown == 0 then + if tile == warp_tile or tile == warp_partern and player.surface.name == 'nauvis' then + mod_gui.get_frame_flow(player)['warp-list'].style.visible = true + elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then + mod_gui.get_frame_flow(player)['warp-list'].style.visible = true + else mod_gui.get_frame_flow(player)['warp-list'].style.visible = false end end end) From 132bf9fde23b745c3db29454efd93b5e79a6f1f4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 10 Mar 2018 22:44:37 +0000 Subject: [PATCH 157/392] Fixed Again --- StandAlone/paths.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 1a18a7e6..2aed43a9 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -69,16 +69,16 @@ Event.register(defines.events.on_player_built_tile, function(event) local surface = game.surfaces[event.surface_index] local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do - if not paths[old_tile.old_tile.name] or not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end if old_tile.old_tile.name ~= 'refined-concrete' and old_tile.old_tile.name ~= 'refined-hazard-concrete-right' and old_tile.old_tile.name ~= 'refined-hazard-concrete-left' and old_tile.old_tile.name ~= 'concrete' and old_tile.old_tile.name ~= 'hazard-concrete-right' and old_tile.old_tile.name ~= 'hazard-concrete-left' and old_tile.old_tile.name ~= 'stone-path' and old_tile.old_tile.name ~= 'water' and old_tile.old_tile.name ~= 'deep-water' then global_key(surface,old_tile.position)[1]=old_tile.old_tile.name end + if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] + global_key(surface,old_tile.pos)[3] = event.tick end - global_key(surface,pos)[3] = event.tick end) Event.register(defines.events.on_player_mined_tile, function(event) From 79b2b66fbbaff4a86f0d9ddcf4843fe4d45305c1 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Sun, 11 Mar 2018 01:23:10 +0100 Subject: [PATCH 158/392] Warp tile change to tutorial-grid changed warp tile to turorial-grid and cleaned up as much as easily possible --- Addons/Guis/warp-system.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index 0ecc565f..12934a22 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -21,8 +21,7 @@ local warp_entities = { local warp_radius = 4 local spawn_warp_scale = 5 -local warp_tile = 'lab-dark-1' -local warp_partern = 'lab-dark-2' +local warp_tile = 'tutorial-grid' local warp_limit = 60 local warp_item = 'discharge-defense-equipment' local global_offset = {x=0,y=0} @@ -73,7 +72,7 @@ local function make_warp_point(position,surface,force,name) surface.set_tiles(base_tiles) -- this adds the patern and entities for _,position in pairs(warp_tiles) do - table.insert(tiles,{name=warp_partern,position={position[1]+offset.x+global_offset.x,position[2]+offset.y+global_offset.y}}) + table.insert(tiles,{name=warp_tile,position={position[1]+offset.x+global_offset.x,position[2]+offset.y+global_offset.y}}) end surface.set_tiles(tiles) for _,entity in pairs(warp_entities) do @@ -175,8 +174,7 @@ Gui.left.add{ local cooldown = _warps().cooldowns[player.index] or 0 if cooldown > 0 then frame.style.visible = false return elseif Ranking.get_rank(player):allowed('always-warp') then return - elseif player.surface.get_tile(player.position).name == warp_tile - or player.surface.get_tile(player.position).name == warp_partern + elseif player.surface.get_tile(player.position).name == warp_tile and player.surface.name == 'nauvis' then return elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return @@ -185,8 +183,7 @@ Gui.left.add{ can_open=function(player) local cooldown = _warps().cooldowns[player.index] or 0 if Ranking.get_rank(player):allowed('always-warp') then return true - elseif player.surface.get_tile(player.position).name == warp_tile - or player.surface.get_tile(player.position).name == warp_partern + elseif player.surface.get_tile(player.position).name == warp_tile and player.surface.name == 'nauvis' then return true elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return true @@ -211,7 +208,7 @@ Event.register(defines.events.on_player_changed_position, function(event) local cooldown = _warps().cooldowns[player.index] or 0 local tile = player.surface.get_tile(player.position).name if not Ranking.get_rank(player):allowed('always-warp') and cooldown == 0 then - if tile == warp_tile or tile == warp_partern and player.surface.name == 'nauvis' then + if tile == warp_tile and player.surface.name == 'nauvis' then mod_gui.get_frame_flow(player)['warp-list'].style.visible = true elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then mod_gui.get_frame_flow(player)['warp-list'].style.visible = true From 112f263f5a90370a014320397b328c714ee5e1ed Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 11 Mar 2018 20:57:20 +0000 Subject: [PATCH 159/392] Fixed Pos Bug --- StandAlone/paths.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 2aed43a9..c61f8950 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -77,7 +77,7 @@ Event.register(defines.events.on_player_built_tile, function(event) end if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] - global_key(surface,old_tile.pos)[3] = event.tick + global_key(surface,old_tile.position)[3] = event.tick end end) @@ -88,7 +88,7 @@ Event.register(defines.events.on_player_mined_tile, function(event) if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] end - global_key(surface,pos)[3] = event.tick + global_key(surface,old_tile.position)[3] = event.tick end) Event.register(defines.events.on_player_changed_position, function(event) From aeaa10eb3ec4e401337aaf096baaf81d0aa936b5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 12 Mar 2018 22:43:57 +0000 Subject: [PATCH 160/392] Fixed Line 55 In Paths --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index c61f8950..7c93f867 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -50,7 +50,7 @@ local function remove_key(surface,pos) end local function clean_global() - if not global.paths then return end + if not global.paths or not game then return end for key,tile in pairs(global.paths) do if tile[3] < game.tick-clean_time then global.paths[key] = nil end end From c13964c1d278c5176f9279790bd3a88f4e0a8fad Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 12 Mar 2018 22:45:48 +0000 Subject: [PATCH 161/392] Fixed Again --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 7c93f867..b508ff72 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -52,7 +52,7 @@ end local function clean_global() if not global.paths or not game then return end for key,tile in pairs(global.paths) do - if tile[3] < game.tick-clean_time then global.paths[key] = nil end + if tile[3] and tile[3] < game.tick-clean_time then global.paths[key] = nil end end end From 6dff59dcf3de17e3a00e7a6b3e42e96a52ef4dd8 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 12 Mar 2018 22:52:38 +0000 Subject: [PATCH 162/392] Stoped Black From Being A Colour --- StandAlone/colours.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index a1649a82..56ad916e 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -11,11 +11,14 @@ local default_colours = { Event.register(defines.events.on_player_created, function(event) local player = game.players[event.player_index] - local colours = table.keys(defines.color) - player.color = defines.color[colours[math.random(#colours)]] - if default_colours[player.name] then - local c = default_colours[player.name] - player.color = Color.from_rgb(c.r,c.g,c.b) + local colours = table.keys(defines.color) + player.color = defines.color.black + while player.color == defines.colors.black do + player.color = defines.color[colours[math.random(#colours)]] + if default_colours[player.name] then + local c = default_colours[player.name] + player.color = Color.from_rgb(c.r,c.g,c.b) + end end player.chat_color = player.color end) From a5c3b5ba7dc81b7994fa601c2bd56e5c92cb9951 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 12 Mar 2018 23:12:37 +0000 Subject: [PATCH 163/392] Fixed The 'S' In Colours --- StandAlone/colours.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index 56ad916e..2c740ff7 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -13,7 +13,7 @@ Event.register(defines.events.on_player_created, function(event) local player = game.players[event.player_index] local colours = table.keys(defines.color) player.color = defines.color.black - while player.color == defines.colors.black do + while player.color == defines.color.black do player.color = defines.color[colours[math.random(#colours)]] if default_colours[player.name] then local c = default_colours[player.name] From eb73a2e0928184b5820d99ac111d24f38bc3f80f Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:36:30 -0500 Subject: [PATCH 164/392] Update admin.lua --- Addons/Commands/admin.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 90134d8c..637d425f 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -19,7 +19,7 @@ commands.add_command('report', 'Reports a player', {'player','reason',true}, fun Admin.report(player,event.player_index,reason) end) -commands.add_command('give-warning', 'Gives a player a warnings', {'player','reason',true}, function(event,args) +commands.add_command('give-warning', 'Gives a player a warning', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -27,7 +27,7 @@ commands.add_command('give-warning', 'Gives a player a warnings', {'player','rea Admin.give_warning(player,event.player_index,reason) end) -commands.add_command('temp-ban', 'Temp Ban A Player', {'player','reason',true}, function(event,args) +commands.add_command('temp-ban', 'Temp ban a player', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -42,16 +42,16 @@ commands.add_command('clear-warings', 'Clears the warnings on a player', {'playe Admin.clear_warings(player,event.player_index) end) -commands.add_command('clear-reports', 'Clears the reports from a player', {'player'}, function(event,args) +commands.add_command('clear-reports', 'Clears the reports on a player', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-player', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-player', 'Clears reports and warnings and removes temp-ban', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_player(player,event.player_index) -end) \ No newline at end of file +end) From 0635ca75919bbb237515c8c2f3200fbd03da470c Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:37:28 -0500 Subject: [PATCH 165/392] Update admin.lua --- Addons/Commands/admin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 637d425f..993cc6a9 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -49,7 +49,7 @@ commands.add_command('clear-reports', 'Clears the reports on a player', {'player Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-player', 'Clears reports and warnings and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-player', 'Clears reports and warnings, and removes temp-ban', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end From deeec002418eb20736ca6cface164c5069a9176b Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:37:56 -0500 Subject: [PATCH 166/392] Update kill.lua --- Addons/Commands/kill.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/kill.lua b/Addons/Commands/kill.lua index 6d68f03b..08b190a3 100644 --- a/Addons/Commands/kill.lua +++ b/Addons/Commands/kill.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('kill', 'Kills a player, must be either yourself (/kill self) or a person of a lower rank.', {'player'}, function(event,args) +commands.add_command('kill', 'Kills a player. Must be either yourself (/kill self) or a person of a lower rank.', {'player'}, function(event,args) local _player = Game.get_player(event) local player = Game.get_player(args.player) if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -18,4 +18,4 @@ commands.add_command('kill', 'Kills a player, must be either yourself (/kill sel if player.connected then else player_return({'commands.offline-player'}) return commands.error end if player.character then player.character.die() else player_return({'commands.dead-player'}) return commands.error end else player_return({'commands.unauthorized'}) return commands.error end -end) \ No newline at end of file +end) From af6c28da604a41d1077fedb2929fba9802d5743f Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:39:03 -0500 Subject: [PATCH 167/392] Update tags.lua --- Addons/Commands/tags.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua index 6f4d3297..ee210800 100644 --- a/Addons/Commands/tags.lua +++ b/Addons/Commands/tags.lua @@ -11,14 +11,14 @@ Discord: https://discord.gg/r6dC2uK local const = 20 -- this is the max lenth of a tag -commands.add_command('tag', 'Give yourself a custom tag, use /tag-clear self, to remove tag.', {'tag',true}, function(event,args) +commands.add_command('tag', 'Give yourself a custom tag. Use /tag-clear self to remove tag.', {'tag',true}, function(event,args) local player = Game.get_player(event) local rank = Ranking.get_rank(player) if string.len(args.tag) > const then player_return({'commands.invalid-length',const}) return commands.error end player.tag = rank.tag..' - '..args.tag end) -commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self)', {'player'}, function(event,args) +commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self).', {'player'}, function(event,args) local _player = Game.get_player(event) local _rank = Ranking.get_rank(_player) local player = Game.get_player(args.player) @@ -27,4 +27,4 @@ commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/ta if args.player == 'self' or _player.name == player.name then _player.tag = _rank.tag elseif _rank.power < rank.power then player.tag = rank.tag else player_return({'commands.unauthorized'}) return commands.error end -end) \ No newline at end of file +end) From 2ac3c6bdc9bd8ddbee8d3e0e3e71619fb6e03fb3 Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:40:19 -0500 Subject: [PATCH 168/392] Update repair.lua --- Addons/Commands/repair.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index 961f59a5..1670110d 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -11,7 +11,7 @@ Discord: https://discord.gg/r6dC2uK local const = 100 -- given const = 100: admin+ has unlimited, admin has 100, mod has 50, member has 20 -commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area', {'range'}, function(event,args) +commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area.', {'range'}, function(event,args) local range = tonumber(args.range) local player = Game.get_player(event) local rank = Ranking.get_rank(player) @@ -27,4 +27,4 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an end end end -end) \ No newline at end of file +end) From a58a5e47dbda2af4ebf951909492210cd53355ac Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:41:06 -0500 Subject: [PATCH 169/392] Update admin.lua --- Addons/Commands/admin.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 993cc6a9..d2fd7dca 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('report', 'Reports a player', {'player','reason',true}, function(event,args) +commands.add_command('report', 'Reports a player.', {'player','reason',true}, function(event,args) local _player = Game.get_player(event) local player = Game.get_player(args.player) local reason = args.reason @@ -19,7 +19,7 @@ commands.add_command('report', 'Reports a player', {'player','reason',true}, fun Admin.report(player,event.player_index,reason) end) -commands.add_command('give-warning', 'Gives a player a warning', {'player','reason',true}, function(event,args) +commands.add_command('give-warning', 'Gives a player a warning.', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -27,7 +27,7 @@ commands.add_command('give-warning', 'Gives a player a warning', {'player','reas Admin.give_warning(player,event.player_index,reason) end) -commands.add_command('temp-ban', 'Temp ban a player', {'player','reason',true}, function(event,args) +commands.add_command('temp-ban', 'Temporarily ban a player.', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -35,21 +35,21 @@ commands.add_command('temp-ban', 'Temp ban a player', {'player','reason',true}, Admin.temp_ban(player,event.player_index,reason) end) -commands.add_command('clear-warings', 'Clears the warnings on a player', {'player'}, function(event,args) +commands.add_command('clear-warings', 'Clears the warnings on a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_warings(player,event.player_index) end) -commands.add_command('clear-reports', 'Clears the reports on a player', {'player'}, function(event,args) +commands.add_command('clear-reports', 'Clears the reports on a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-player', 'Clears reports and warnings, and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-player', 'Clears reports and warnings, and removes temp-ban.', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end From 72ec302a6fbd73f736dadcc7b7c66e0326a7a7ad Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:41:19 -0500 Subject: [PATCH 170/392] Update cheat-mode.lua --- Addons/Commands/cheat-mode.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/cheat-mode.lua b/Addons/Commands/cheat-mode.lua index a53ac99d..693255ab 100644 --- a/Addons/Commands/cheat-mode.lua +++ b/Addons/Commands/cheat-mode.lua @@ -8,8 +8,8 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('cheat-mode', 'Toggles cheat mode for a player', {'player'}, function(event,args) +commands.add_command('cheat-mode', 'Toggles cheat mode for a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if player.cheat_mode == true then player.cheat_mode = false else player.cheat_mode = true end -end) \ No newline at end of file +end) From 951c68707979bdddb8a0b7ca894bd9732f27ec0b Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:41:39 -0500 Subject: [PATCH 171/392] Update tp.lua --- Addons/Commands/tp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/tp.lua b/Addons/Commands/tp.lua index fdd4a74b..94be1a33 100644 --- a/Addons/Commands/tp.lua +++ b/Addons/Commands/tp.lua @@ -8,14 +8,14 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('go-to', 'Go to a player\'s location', {'player'}, function(event,args) +commands.add_command('go-to', 'Go to a player\'s location.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.go_to(player,event) end) -commands.add_command('bring', 'Bring a player to your location', {'player'}, function(event,args) +commands.add_command('bring', 'Bring a player to your location.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.bring(player,event) -end) \ No newline at end of file +end) From 48f9dad847f2ef5525ac9f9035503f468e63cbc2 Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:45:55 -0500 Subject: [PATCH 172/392] Update reports.lua --- Addons/Admin/reports.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index a366d1e4..e6420b86 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -100,7 +100,7 @@ local function cheak_reports(player) local reports = count_reports(player) if reports >= reports_needed_for_jail and _reports().actions[player.name] ~= 'report-jail' and Ranking.get_rank(player).group.name ~= 'Jail' then _reports().actions[player.name] = actions.report - Admin.jail(player,'','To many user reports. Contact an Admin to be unjailed.') + Admin.jail(player,'','Too many user reports. Contact an Admin to be unjailed.') end end @@ -177,7 +177,7 @@ function Admin.clear_warings(player,by_player,no_emit) discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), - description='A player had there warnings cleared.', + description='A player had their warnings cleared.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, } @@ -193,7 +193,7 @@ function Admin.clear_reports(player,by_player,no_emit) discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), - description='A player had there reports cleared.', + description='A player had their reports cleared.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, } @@ -210,7 +210,7 @@ function Admin.clear_player(player,by_player) discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), - description='A player had there reports and warnings cleared.', + description='A player had their reports and warnings cleared.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, } @@ -273,4 +273,4 @@ Event.register(defines.events.on_tick,function(event) end end end -end) \ No newline at end of file +end) From 431114fabb2785ca9bf65b40878dcaeee578642c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 13 Mar 2018 16:59:32 +0000 Subject: [PATCH 173/392] Fixed Path Error Again --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index b508ff72..4edaea67 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -87,8 +87,8 @@ Event.register(defines.events.on_player_mined_tile, function(event) for _,old_tile in pairs(old_tiles) do if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] + global_key(surface,old_tile.position)[3] = event.tick end - global_key(surface,old_tile.position)[3] = event.tick end) Event.register(defines.events.on_player_changed_position, function(event) From 02db5e4c87ad99f81a1ceb6995fa9c1f46a4c856 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 17:57:12 +0000 Subject: [PATCH 174/392] Fixed Error In remove_key --- StandAlone/paths.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 4edaea67..0929c976 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -75,7 +75,7 @@ Event.register(defines.events.on_player_built_tile, function(event) and old_tile.old_tile.name ~= 'stone-path' and old_tile.old_tile.name ~= 'water' and old_tile.old_tile.name ~= 'deep-water' then global_key(surface,old_tile.position)[1]=old_tile.old_tile.name end - if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end + if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,old_tile.position) return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] global_key(surface,old_tile.position)[3] = event.tick end @@ -85,7 +85,7 @@ Event.register(defines.events.on_player_mined_tile, function(event) local surface = game.surfaces[event.surface_index] local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do - if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,pos) return end + if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,old_tile.position) return end global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] global_key(surface,old_tile.position)[3] = event.tick end From 6bf16fb69ecca550617c78c9ab7dd316ce358e44 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 19:35:38 +0000 Subject: [PATCH 175/392] Fixed Player Colour --- StandAlone/colours.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index 2c740ff7..3a9f853c 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -13,7 +13,7 @@ Event.register(defines.events.on_player_created, function(event) local player = game.players[event.player_index] local colours = table.keys(defines.color) player.color = defines.color.black - while player.color == defines.color.black do + while player.color.r == defines.color.black.r and player.color.g == defines.color.black.g and player.color.b == defines.color.black.b do player.color = defines.color[colours[math.random(#colours)]] if default_colours[player.name] then local c = default_colours[player.name] From bd3f1ea0d1dabb420306b4a2de2a1b2e127ce0d7 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 15 Mar 2018 17:14:04 +0000 Subject: [PATCH 176/392] Disabled Paths --- StandAlone/load.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/load.lua b/StandAlone/load.lua index d38e3864..6c8b3923 100644 --- a/StandAlone/load.lua +++ b/StandAlone/load.lua @@ -18,4 +18,4 @@ require('colours') require('health') require('spawn') require('starting-items') -require('paths') \ No newline at end of file +--require('paths') -- takes up too much file size \ No newline at end of file From 2d967438cb6f29a80a5c5a570e94f99430afe13d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 15 Mar 2018 18:58:20 +0000 Subject: [PATCH 177/392] Added Body Markers --- StandAlone/body-marker.lua | 25 +++++++++++++++++++++++++ StandAlone/load.lua | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 StandAlone/body-marker.lua diff --git a/StandAlone/body-marker.lua b/StandAlone/body-marker.lua new file mode 100644 index 00000000..3f71db82 --- /dev/null +++ b/StandAlone/body-marker.lua @@ -0,0 +1,25 @@ +-- made by cooldude - this just adds a marker to the map which is removed when the body is removed + +Event.register(defines.events.on_player_died, function(event) + local player = game.players[event.player_index] + local tag = player.force.add_chart_tag(player.surface,{ + position=player.position, + text='Death: '..player.name..' ('..tick_to_display_format(event.tick)..')' + }) + if not global.corpses then global.corpses = {} end + table.insert(global.corpses,tag) +end) + +Event.register(defines.events.on_tick, function(event) + if (game.tick%3600) ~= 0 then return end + if not global.corpses then global.corpses = {} end + for key,tag in pairs(global.corpses) do + if not tag.valid then global.corpses[key] = nil return end + if not tag.target then + local o = tag.position + local entity = tag.surface.find_entities_filtered{area={{o.x-1,o.y-1},{o.x+1,o.y+1}},name='character-corpse'} + if entity[1] then tag.target = entity[1] end + end + if not tag.target or not tag.target.valid then tag.destroy() global.corpses[key] = nil return end + end +end) \ No newline at end of file diff --git a/StandAlone/load.lua b/StandAlone/load.lua index 6c8b3923..12e896b4 100644 --- a/StandAlone/load.lua +++ b/StandAlone/load.lua @@ -18,4 +18,5 @@ require('colours') require('health') require('spawn') require('starting-items') ---require('paths') -- takes up too much file size \ No newline at end of file +--require('paths') -- takes up too much file size +require('body-marker') \ No newline at end of file From 177553d906cdac7986231651ba1a79ac298213db Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 16 Mar 2018 16:02:16 +0000 Subject: [PATCH 178/392] Small Edit To Corpse Marker --- StandAlone/body-marker.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/StandAlone/body-marker.lua b/StandAlone/body-marker.lua index 3f71db82..4700c57f 100644 --- a/StandAlone/body-marker.lua +++ b/StandAlone/body-marker.lua @@ -2,9 +2,13 @@ Event.register(defines.events.on_player_died, function(event) local player = game.players[event.player_index] + local o = player.position + local entity = player.surface.find_entities_filtered{area={{o.x-1,o.y-1},{o.x+1,o.y+1}},name='character-corpse'} + table.insert(entity,nil) local tag = player.force.add_chart_tag(player.surface,{ position=player.position, - text='Death: '..player.name..' ('..tick_to_display_format(event.tick)..')' + text='Death: '..player.name..' ('..tick_to_display_format(event.tick)..')', + target=entity[1] }) if not global.corpses then global.corpses = {} end table.insert(global.corpses,tag) @@ -15,11 +19,6 @@ Event.register(defines.events.on_tick, function(event) if not global.corpses then global.corpses = {} end for key,tag in pairs(global.corpses) do if not tag.valid then global.corpses[key] = nil return end - if not tag.target then - local o = tag.position - local entity = tag.surface.find_entities_filtered{area={{o.x-1,o.y-1},{o.x+1,o.y+1}},name='character-corpse'} - if entity[1] then tag.target = entity[1] end - end if not tag.target or not tag.target.valid then tag.destroy() global.corpses[key] = nil return end end end) \ No newline at end of file From d9878742ec81903bd9918b867093fa15f3e8c690 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 16 Mar 2018 19:26:48 +0000 Subject: [PATCH 179/392] Added Auto Kick --- Addons/Admin/afk-kick.lua | 31 +++++++++++++++++++++++++++++++ Addons/load.lua | 1 + 2 files changed, 32 insertions(+) create mode 100644 Addons/Admin/afk-kick.lua diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua new file mode 100644 index 00000000..dd68e7c9 --- /dev/null +++ b/Addons/Admin/afk-kick.lua @@ -0,0 +1,31 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +Event.register(-1,function(event) + Server.new_thread{ + name='afk-kick', + }:on_event('tick',function(self) + if (game.tick%3600) ~= 0 then return end + for _,player in pairs(game.connected_players) do + local afk = Ranking.get_rank(player).max_afk_time or false + if afk then + if player.afk_time > afk then game.kick_player(player) end + end + end + end):on_event('error',function(self,err) + discord_emit{ + title='Auto Kick Error', + color=Color.to_hex(defines.text_color.bg), + description='Auto Kick Error - Closed Thread', + Error=err + } + self:close() + end):open() +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 31a5b49a..ff9d82b8 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -25,6 +25,7 @@ require('Admin/auto-message') require('Admin/tree-decon') require('Admin/inventory-search') require('Admin/base-damage') +require('Admin/afk-kick') -- commands dir require('Commands/cheat-mode') From 4e2a455731341af6be4fedec59d4f75023e11d87 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 16 Mar 2018 19:32:39 +0000 Subject: [PATCH 180/392] Converted ticks into minutes --- Addons/Admin/afk-kick.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index dd68e7c9..898f309d 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -16,7 +16,7 @@ Event.register(-1,function(event) for _,player in pairs(game.connected_players) do local afk = Ranking.get_rank(player).max_afk_time or false if afk then - if player.afk_time > afk then game.kick_player(player) end + if player.afk_time > afk*3600 then game.kick_player(player) end end end end):on_event('error',function(self,err) From 5224132a75b9ac210783e51ada2a3bd6cc4783de Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 16 Mar 2018 23:27:24 +0000 Subject: [PATCH 181/392] Edit To Locale --- locale/de/admin.cfg | 2 +- locale/en/admin.cfg | 2 +- locale/fr/admin.cfg | 2 +- locale/nl/admin.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/de/admin.cfg b/locale/de/admin.cfg index 4665a297..1d457aab 100644 --- a/locale/de/admin.cfg +++ b/locale/de/admin.cfg @@ -4,7 +4,7 @@ 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. +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 diff --git a/locale/en/admin.cfg b/locale/en/admin.cfg index 2674778c..b25def84 100644 --- a/locale/en/admin.cfg +++ b/locale/en/admin.cfg @@ -4,7 +4,7 @@ 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 chose the correct one! warning=Warning: This player outranks you. Therefore, you cannot edit their rank. -short-reason=Warning: This player outranks you. +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 diff --git a/locale/fr/admin.cfg b/locale/fr/admin.cfg index d2edcb74..1214477e 100644 --- a/locale/fr/admin.cfg +++ b/locale/fr/admin.cfg @@ -4,7 +4,7 @@ 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. +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 diff --git a/locale/nl/admin.cfg b/locale/nl/admin.cfg index 102335d2..822b2916 100644 --- a/locale/nl/admin.cfg +++ b/locale/nl/admin.cfg @@ -4,7 +4,7 @@ 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. +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 From 3f6087a424fdd13d45738f0e8706837f3d75536a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 16 Mar 2018 23:29:30 +0000 Subject: [PATCH 182/392] More Locale Edits --- locale/de/readme.cfg | 2 +- locale/fr/readme.cfg | 2 +- locale/nl/readme.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/de/readme.cfg b/locale/de/readme.cfg index 3f47cfe8..dd5fa6ed 100644 --- a/locale/de/readme.cfg +++ b/locale/de/readme.cfg @@ -9,7 +9,7 @@ guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. guildlines-line5=- Be polite and use common sense. guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) guildlines-line9= guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! chat-name=How To Chat diff --git a/locale/fr/readme.cfg b/locale/fr/readme.cfg index f2ada42e..2d65dc10 100644 --- a/locale/fr/readme.cfg +++ b/locale/fr/readme.cfg @@ -9,7 +9,7 @@ guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. guildlines-line5=- Be polite and use common sense. guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. +guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) guildlines-line9= guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! chat-name=How To Chat diff --git a/locale/nl/readme.cfg b/locale/nl/readme.cfg index 143d506c..afa5172f 100644 --- a/locale/nl/readme.cfg +++ b/locale/nl/readme.cfg @@ -9,7 +9,7 @@ guildlines-line4=- Hacken / cheaten en bugs misbruiken is niet toegestaan. guildlines-line5=- Wees aardig en gebruik je gezonde verstand. guildlines-line6=- Spammen (in de zin van chat, kisten en beton) is niet toegestaan. guildlines-line7=- Geen spullen verwijderen zonder toestemming van andere spelers. -guildlines-line8=- Treinen (LHD - Left Hand Drive) geen loops. +guildlines-line8=- Treinen (LHD - Left Hand Drive) geen loops. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) guildlines-line9= guildlines-line10=Als je vragen hebt over deze regels of over de server in algemeen, aarzel dan niet om contact op te nemen met onze staff. chat-name=Chatten From 86d14c40bff9446b668fc396cdc7b4e5c55581e6 Mon Sep 17 00:00:00 2001 From: Paulo Eduardo Martins Date: Sat, 17 Mar 2018 00:09:50 -0300 Subject: [PATCH 183/392] Spell Checking Readme.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 091217f0..238e2fe0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ #### Using The Core Files 1. Copy the core folder and the StdLib File 2. Copy the control.lua and edit the load.lua in each file -3. The require order is imporant in the control.lua +3. The require order is important in the control.lua 4. Use playerRanks.lua to edit the rank system 5. Add your own files to the addons folder and require them in the load.lua @@ -15,15 +15,15 @@ #### Making Your Own Addons * You must have the core files and StdLib * The load.lua is the only file outside your own you need to edit -* Keep the core files upto data with the core branch +* Keep the core files updated with the core branch * Try not to edit StdLib or the core files -* There is many comments inside the core files to descripe how to use them. +* There is many comments inside the core files to describe how to use them. #### Stand Alone File -* This file ocntains a few scripts from else where which dont require any lib +* This file contains a few scripts from else where which don't require any lib * StdLib and ExpLib are the only exceptions as these are very basic functions -* Any files added to this folder must be given proper sourses -* Each file must be self contained with no _G varibles +* Any files added to this folder must be given proper sources +* Each file must be self contained with no _G variables #### Forks and Pull Requests * We are happy for people to make pull requests if you wish to help make our server better From df06585c26a1796d63ec52ba674b8450b545cbf6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 17 Mar 2018 19:15:54 +0000 Subject: [PATCH 184/392] Added reason to afk kick --- Addons/Admin/afk-kick.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index 898f309d..bb86a4c6 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -16,7 +16,7 @@ Event.register(-1,function(event) for _,player in pairs(game.connected_players) do local afk = Ranking.get_rank(player).max_afk_time or false if afk then - if player.afk_time > afk*3600 then game.kick_player(player) end + if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..afk*3600..' Minutes)') end end end end):on_event('error',function(self,err) From a6360c577aed4f7b674caec56058eda7f2eab597 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 17 Mar 2018 23:02:49 +0000 Subject: [PATCH 185/392] Fixed tostring in Afk Kick --- Addons/Admin/afk-kick.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index bb86a4c6..fdbbb7c4 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -16,7 +16,7 @@ Event.register(-1,function(event) for _,player in pairs(game.connected_players) do local afk = Ranking.get_rank(player).max_afk_time or false if afk then - if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..afk*3600..' Minutes)') end + if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..tostring(afk*3600)..' Minutes)') end end end end):on_event('error',function(self,err) From eee37840d902106b73ca1282e2ca89ebf01e21d9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 19 Mar 2018 20:45:53 +0000 Subject: [PATCH 186/392] Fixed AFK kick message --- Addons/Admin/afk-kick.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index fdbbb7c4..471d4eda 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -16,7 +16,7 @@ Event.register(-1,function(event) for _,player in pairs(game.connected_players) do local afk = Ranking.get_rank(player).max_afk_time or false if afk then - if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..tostring(afk*3600)..' Minutes)') end + if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..afk..' Minutes)') end end end end):on_event('error',function(self,err) From 34ec1dc5fe401ef21b0054896c16a18127e60b21 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Tue, 20 Mar 2018 16:37:08 +0100 Subject: [PATCH 187/392] Fixed AFK kick message it doesnt need to print (max_afk_time*3600) just the time (max_afk_time) --- Addons/Admin/afk-kick.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index fdbbb7c4..82894f60 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -16,7 +16,7 @@ Event.register(-1,function(event) for _,player in pairs(game.connected_players) do local afk = Ranking.get_rank(player).max_afk_time or false if afk then - if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..tostring(afk*3600)..' Minutes)') end + if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..tostring(afk)..' Minutes)') end end end end):on_event('error',function(self,err) @@ -28,4 +28,4 @@ Event.register(-1,function(event) } self:close() end):open() -end) \ No newline at end of file +end) From 604cd14b2a4b7b44e0f1bcf17e3555207df5f55e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 20 Mar 2018 20:41:49 +0000 Subject: [PATCH 188/392] Change to afk system --- Addons/Admin/afk-kick.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index 6a561648..522a9f30 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -8,15 +8,23 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- +function get_afk_time(player) + local rank = Ranking.get_rank(player) + local count = #game.connected_players + local base = rank.base_afk_time or false + if not base then return false end + return (base/5)*count +end + Event.register(-1,function(event) Server.new_thread{ name='afk-kick', }:on_event('tick',function(self) if (game.tick%3600) ~= 0 then return end for _,player in pairs(game.connected_players) do - local afk = Ranking.get_rank(player).max_afk_time or false + local afk = get_afk_time(player) if afk then - if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..afk..' Minutes)') end + if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end end end end):on_event('error',function(self,err) From 0112331add8b386ff842a667b1dafef93a715556 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 22 Mar 2018 21:07:38 +0000 Subject: [PATCH 189/392] Added kick for all if there is less than 3 players --- Addons/Admin/afk-kick.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index 522a9f30..f4f078f3 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -22,7 +22,7 @@ Event.register(-1,function(event) }:on_event('tick',function(self) if (game.tick%3600) ~= 0 then return end for _,player in pairs(game.connected_players) do - local afk = get_afk_time(player) + local afk = #game.connected_players < 3 and 10 or get_afk_time(player) if afk then if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end end From f2217fa17e79aad26c07ce451e129522242e8de0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 23 Mar 2018 16:09:33 +0000 Subject: [PATCH 190/392] Added requirement to give a reason --- Addons/Guis/admin-gui.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index de61f1d6..9aa2c614 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -51,7 +51,7 @@ local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-admin-comman end) local reason_input = Gui.inputs.add_text('reason-input-admin-commands',false,'Enter Reason',function(player,text,element) - if string.len(text) < 20 then + if string.len(text) < 20 or text == 'Enter Reason' then element.parent.warning.caption = {'admin-commands.short-reason'} else element.parent.warning.caption = '' @@ -92,6 +92,7 @@ local take_action = Gui.inputs.add{ local _rank = Ranking.get_rank(_player) if rank.power >= _rank.power then dropdowns.warning.caption = {'admin-commands.rank-high'} return end local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text + if _reason == 'Enter Reason' then return end Admin.take_action(_action,_player,event.player_index,_reason) Gui.center.clear(event) end) From 996a853fa04da73bec683be41a9a608114dcc9b1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 11:55:05 +0100 Subject: [PATCH 191/392] Removed Low Auto Message --- Addons/Admin/auto-message.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua index 553dc0e4..7f6d8baf 100644 --- a/Addons/Admin/auto-message.lua +++ b/Addons/Admin/auto-message.lua @@ -31,9 +31,9 @@ Event.register(-1,function(event) local _low = Ranking.get_rank(data.low_rank) Ranking.print(_high,{'auto-message.players-online',#game.connected_players},nil,true) Ranking.print(_high,{'auto-message.map-time',tick_to_display_format(game.tick)},nil,true) - for _,line in pairs(data.low) do + --[[for _,line in pairs(data.low) do Ranking.print(_low,line,nil,true) - end + end]] self.reopen = true end):on_event('error',function(self,err) discord_emit{ From 5b00b69473686589a82201d6aaffd0409a97e544 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 12:42:51 +0100 Subject: [PATCH 192/392] Added Chat Bot --- Addons/Admin/auto-chat.lua | 63 +++++++++++++++++++ Addons/Admin/auto-message.lua | 29 ++++++--- locale/de/auto-message.cfg | 9 --- .../{en/auto-message.cfg => de/chat-bot.cfg} | 4 +- locale/en/chat-bot.cfg | 16 +++++ locale/fr/auto-message.cfg | 9 --- locale/fr/chat-bot.cfg | 11 ++++ locale/nl/auto-message.cfg | 9 --- locale/nl/chat-bot.cfg | 11 ++++ 9 files changed, 124 insertions(+), 37 deletions(-) create mode 100644 Addons/Admin/auto-chat.lua delete mode 100644 locale/de/auto-message.cfg rename locale/{en/auto-message.cfg => de/chat-bot.cfg} (85%) create mode 100644 locale/en/chat-bot.cfg delete mode 100644 locale/fr/auto-message.cfg create mode 100644 locale/fr/chat-bot.cfg delete mode 100644 locale/nl/auto-message.cfg create mode 100644 locale/nl/chat-bot.cfg diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua new file mode 100644 index 00000000..302a0b08 --- /dev/null +++ b/Addons/Admin/auto-chat.lua @@ -0,0 +1,63 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +-- white spaces removed and made into lower +-- these messages are sent only to the player +local auto_chat = '[Chat Bot]: ' +local messages = { + ['discord']={'chat-bot.discord'}, + ['expgaming']={'chat-bot.website'}, + ['website']={'chat-bot.website'}, + ['command']={'chat-bot.custom-commands'}, + ['commands']={'chat-bot.custom-commands'}, + ['softmod']={'chat-bot.softmod'}, + ['script']={'chat-bot.softmod'}, + ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end +} + +-- white spaces removed and made into lower +-- these are global chat commands that can be used +-- comands start with ! (all messages are also commands) +local command_syntax = '!' +local names = {'Cooldude2606','arty714','badgamernl'} +local commands = { + ['online']=function(player) return {'chat-bot.players-online',#game.connected_players} end, + ['playtime']=function(player) return {'chat-bot.map-time',tick_to_display_format(game.tick)} end, + ['players']=function(player) return {'chat-bot.players',#game.players} end, + ['dev']={'chat-bot.not-real-dev'}, + ['blame']=function(player) local _names = {unpack(names),player.name} local name = _names[math.random(#_names)] return {'chat-bot.blame',name} end, + ['readme']={'chat-bot.read-readme'}, +} + +Event.register(defines.events.on_console_chat,function(event) + local player = Game.get_player(event) + if not player then return end + local player_message = event.message:lower():gsub("%s+", "") + local allowed = Ranking.get_rank(player):allowed('global-chat') + for to_find,message in pairs(messages) do + if player_message:match(command_syntax..to_find) then + if allowed then + if is_type(message,'function') then message=message(player) end + game.print{'chat-bot.message',message} + else player_return({'chat-bot.rank-error'},nil,player) end + elseif player_message:match(to_find) then + if is_type(message,'function') then message=message(player) end + player_return({'chat-bot.message',message},nil,player) + end + end + for to_find,message in pairs(commands) do + if player_message:match(command_syntax..to_find) then + if allowed then + if is_type(message,'function') then message=message(player) end + game.print{'chat-bot.message',message} + else player_return({'chat-bot.rank-error'},nil,player) end + end + end +end) \ No newline at end of file diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua index 7f6d8baf..49f1974f 100644 --- a/Addons/Admin/auto-message.lua +++ b/Addons/Admin/auto-message.lua @@ -16,11 +16,11 @@ Event.register(-1,function(event) high_rank= 'Owner', low_rank= 'Regular', low={ - {'auto-message.join-us'}, - {'auto-message.discord'}, - {'auto-message.website'}, - {'auto-message.custom-commands'}, - {'auto-message.read-readme'} + {'chat-bot.join-us'}, + {'chat-bot.discord'}, + {'chat-bot.website'}, + {'chat-bot.custom-commands'}, + {'chat-bot.read-readme'} } } }:on_event('timeout',function(self) @@ -28,13 +28,24 @@ Event.register(-1,function(event) if not data.high_rank or not data.low_rank or not data.low then self.reopen = false return end local _high = Ranking.get_rank(data.high_rank) - local _low = Ranking.get_rank(data.low_rank) - Ranking.print(_high,{'auto-message.players-online',#game.connected_players},nil,true) - Ranking.print(_high,{'auto-message.map-time',tick_to_display_format(game.tick)},nil,true) - --[[for _,line in pairs(data.low) do + game.print{'chat-bot.message',{'chat-bot.players-online',#game.connected_players}} + game.print{'chat-bot.message',{'chat-bot.map-time',tick_to_display_format(game.tick)}} + --[[local _low = Ranking.get_rank(data.low_rank) + Ranking.print(_high,{'chat-bot.players-online',#game.connected_players},nil,true) + Ranking.print(_high,{'chat-bot.map-time',tick_to_display_format(game.tick)},nil,true) + for _,line in pairs(data.low) do Ranking.print(_low,line,nil,true) end]] self.reopen = true + end):on_event(defines.events.on_player_joined_game,function(self,event) + local player = Game.get_player(event) + if not player then return end + local data = self.data + if not data.high_rank or not data.low_rank + or not data.low then self.reopen = false return end + for _,message in pairs(data.low) do + player_return({'chat-bot.message',message},nil,player) + end end):on_event('error',function(self,err) discord_emit{ title='Auto Message Error', diff --git a/locale/de/auto-message.cfg b/locale/de/auto-message.cfg deleted file mode 100644 index 270ad0f2..00000000 --- a/locale/de/auto-message.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[auto-message] -players-online=Es sind __1__ Spieler online. -map-time=Dieses Spiel is seit __1__ am laufen. -line-8=Schreibe /help für mehr Informationen. -join-us=Folge uns auf: -discord=Discord: https://discord.me/explosivegaming -website=Webseite: explosivegaming.nl -custom-commands=Wir benutzen eigene Befehle wie /tag und /report -read-readme=Stelle sicher, dass du das Liesmich gelesen hast (Fragezeichen oben Links) \ No newline at end of file diff --git a/locale/en/auto-message.cfg b/locale/de/chat-bot.cfg similarity index 85% rename from locale/en/auto-message.cfg rename to locale/de/chat-bot.cfg index 0691259f..b2e664b0 100644 --- a/locale/en/auto-message.cfg +++ b/locale/de/chat-bot.cfg @@ -1,4 +1,6 @@ -[auto-message] +[chat-bot] +name=[Chat Bot] +rank-error=You cant use global chat commands players-online=There are __1__ players online map-time=This map has been on for __1__ line-8=Type /help for more info diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg new file mode 100644 index 00000000..7fb6fc7b --- /dev/null +++ b/locale/en/chat-bot.cfg @@ -0,0 +1,16 @@ +[chat-bot] +message=[Chat Bot]: __1__ +rank-error=You cant use global chat commands +players-online=There are __1__ players online +player=There have been __1__ players on this map +map-time=This map has been on for __1__ +line-8=Type /help for more info +join-us=Please join us on: +discord=Discord: https://discord.me/explosivegaming +website=Website: explosivegaming.nl +custom-commands=We use custom commands, such as /tag and /report, see readme/commands 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 in the top left. +blame=Blame __1__ for what just happend! +afk=Your afk? Look at __1__ they have been afk for: __2__ \ No newline at end of file diff --git a/locale/fr/auto-message.cfg b/locale/fr/auto-message.cfg deleted file mode 100644 index 15e620a2..00000000 --- a/locale/fr/auto-message.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[auto-message] -players-online=There are __1__ players online -map-time=This map has been on for __1__ -line-8=Do /help for more info -join-us=Please join us on: -discord=Discord: https://discord.me/explosivegaming -website=Website: explosivegaming.nl -custom-commands=We use custom commands such as /tag and /report -read-readme=Make sure you have read the readme (top left question mark) \ No newline at end of file diff --git a/locale/fr/chat-bot.cfg b/locale/fr/chat-bot.cfg new file mode 100644 index 00000000..b2e664b0 --- /dev/null +++ b/locale/fr/chat-bot.cfg @@ -0,0 +1,11 @@ +[chat-bot] +name=[Chat Bot] +rank-error=You cant use global chat commands +players-online=There are __1__ players online +map-time=This map has been on for __1__ +line-8=Type /help for more info +join-us=Please join us on: +discord=Discord: https://discord.me/explosivegaming +website=Website: explosivegaming.nl +custom-commands=We use custom commands, such as /tag and /report +read-readme=Make sure you have read the ReadMe (can be found through the question mark on the top left) \ No newline at end of file diff --git a/locale/nl/auto-message.cfg b/locale/nl/auto-message.cfg deleted file mode 100644 index 28bece1a..00000000 --- a/locale/nl/auto-message.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[auto-message] -players-online=Er zijn __1__ speler(s) online -map-time=Deze map is actief voor __1__ -line-8=Typ /help (command) voor meer informatie -join-us=Sluit je aan op onze Discord: -discord=Discord: https://discord.me/explosivegaming -website=Website: explosivegaming.nl -custom-commands=Wij gebruiken custom commands zoals /tag en /report -read-readme=Zorg er voor dat je de readme hebt gelezen (te vinden in de vraagteken linksboven) diff --git a/locale/nl/chat-bot.cfg b/locale/nl/chat-bot.cfg new file mode 100644 index 00000000..b2e664b0 --- /dev/null +++ b/locale/nl/chat-bot.cfg @@ -0,0 +1,11 @@ +[chat-bot] +name=[Chat Bot] +rank-error=You cant use global chat commands +players-online=There are __1__ players online +map-time=This map has been on for __1__ +line-8=Type /help for more info +join-us=Please join us on: +discord=Discord: https://discord.me/explosivegaming +website=Website: explosivegaming.nl +custom-commands=We use custom commands, such as /tag and /report +read-readme=Make sure you have read the ReadMe (can be found through the question mark on the top left) \ No newline at end of file From 69fb9c2fa9f46549d9438e4dbe614eed1f084e66 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 12:43:51 +0100 Subject: [PATCH 193/392] Fixed Local Files --- locale/de/chat-bot.cfg | 11 ++++++++--- locale/fr/chat-bot.cfg | 11 ++++++++--- locale/nl/chat-bot.cfg | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/locale/de/chat-bot.cfg b/locale/de/chat-bot.cfg index b2e664b0..7fb6fc7b 100644 --- a/locale/de/chat-bot.cfg +++ b/locale/de/chat-bot.cfg @@ -1,11 +1,16 @@ [chat-bot] -name=[Chat Bot] +message=[Chat Bot]: __1__ rank-error=You cant use global chat commands players-online=There are __1__ players online +player=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report -read-readme=Make sure you have read the ReadMe (can be found through the question mark on the top left) \ No newline at end of file +custom-commands=We use custom commands, such as /tag and /report, see readme/commands 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 in the top left. +blame=Blame __1__ for what just happend! +afk=Your afk? Look at __1__ they have been afk for: __2__ \ No newline at end of file diff --git a/locale/fr/chat-bot.cfg b/locale/fr/chat-bot.cfg index b2e664b0..7fb6fc7b 100644 --- a/locale/fr/chat-bot.cfg +++ b/locale/fr/chat-bot.cfg @@ -1,11 +1,16 @@ [chat-bot] -name=[Chat Bot] +message=[Chat Bot]: __1__ rank-error=You cant use global chat commands players-online=There are __1__ players online +player=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report -read-readme=Make sure you have read the ReadMe (can be found through the question mark on the top left) \ No newline at end of file +custom-commands=We use custom commands, such as /tag and /report, see readme/commands 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 in the top left. +blame=Blame __1__ for what just happend! +afk=Your afk? Look at __1__ they have been afk for: __2__ \ No newline at end of file diff --git a/locale/nl/chat-bot.cfg b/locale/nl/chat-bot.cfg index b2e664b0..7fb6fc7b 100644 --- a/locale/nl/chat-bot.cfg +++ b/locale/nl/chat-bot.cfg @@ -1,11 +1,16 @@ [chat-bot] -name=[Chat Bot] +message=[Chat Bot]: __1__ rank-error=You cant use global chat commands players-online=There are __1__ players online +player=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report -read-readme=Make sure you have read the ReadMe (can be found through the question mark on the top left) \ No newline at end of file +custom-commands=We use custom commands, such as /tag and /report, see readme/commands 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 in the top left. +blame=Blame __1__ for what just happend! +afk=Your afk? Look at __1__ they have been afk for: __2__ \ No newline at end of file From 18709526670aaca665a3c827cb75c61824f32a45 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 12:45:19 +0100 Subject: [PATCH 194/392] Added Auto Chat to load --- Addons/load.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/load.lua b/Addons/load.lua index ff9d82b8..752c14a1 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -26,6 +26,7 @@ require('Admin/tree-decon') require('Admin/inventory-search') require('Admin/base-damage') require('Admin/afk-kick') +require('Admin/auto-chat') -- commands dir require('Commands/cheat-mode') From c021f983046bd61a9f2b2de89ca08c264641366d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 12:46:30 +0100 Subject: [PATCH 195/392] Fixed Syntax Error --- Addons/Admin/auto-chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 302a0b08..9fee312a 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -19,7 +19,7 @@ local messages = { ['commands']={'chat-bot.custom-commands'}, ['softmod']={'chat-bot.softmod'}, ['script']={'chat-bot.softmod'}, - ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end + ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end } -- white spaces removed and made into lower From 5736402879dae61ba2f0a800756b1c807d7f878f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 12:52:01 +0100 Subject: [PATCH 196/392] Allowed Global COmmands --- Addons/playerRanks.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index ec5d4e5d..dfc0d9a9 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -56,7 +56,8 @@ groups['Root']:edit('allow',false,{ ['polls']=true, ['admin-items']=true, ['all-items']=true, - ['repair']=true + ['repair']=true, + ['global-chat']=true }) groups['Admin']:edit('allow',false,{ ['player-list']=true, @@ -73,7 +74,8 @@ groups['Admin']:edit('allow',false,{ ['clear-player']=true, ['announcements']=true, ['warp-list']=true, - ['polls']=true + ['polls']=true, + ['global-chat']=true }) groups['User']:edit('allow',false,{ ['player-list']=true, @@ -179,7 +181,7 @@ ranks['Mod']:edit('allow',false,{ }) ranks['Donator']:edit('allow',false,{ - + ['global-chat']=true }) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, From 9c310a7b5afc2be1400cead7ae339ef358d7624e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 12:54:39 +0100 Subject: [PATCH 197/392] Fixed !blame --- Addons/Admin/auto-chat.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 9fee312a..4e7568c0 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -26,13 +26,12 @@ local messages = { -- these are global chat commands that can be used -- comands start with ! (all messages are also commands) local command_syntax = '!' -local names = {'Cooldude2606','arty714','badgamernl'} local commands = { ['online']=function(player) return {'chat-bot.players-online',#game.connected_players} end, ['playtime']=function(player) return {'chat-bot.map-time',tick_to_display_format(game.tick)} end, ['players']=function(player) return {'chat-bot.players',#game.players} end, ['dev']={'chat-bot.not-real-dev'}, - ['blame']=function(player) local _names = {unpack(names),player.name} local name = _names[math.random(#_names)] return {'chat-bot.blame',name} end, + ['blame']=function(player) local names = {'Cooldude2606','arty714','badgamernl',player.name} return {'chat-bot.blame',names[math.random(#names)]} end, ['readme']={'chat-bot.read-readme'}, } From a0d0022f065adb54728b54db5fcdc3d0c4eff00b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 13:05:58 +0100 Subject: [PATCH 198/392] Fixed chat-bot.players --- locale/de/chat-bot.cfg | 2 +- locale/en/chat-bot.cfg | 2 +- locale/fr/chat-bot.cfg | 2 +- locale/nl/chat-bot.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/de/chat-bot.cfg b/locale/de/chat-bot.cfg index 7fb6fc7b..65067189 100644 --- a/locale/de/chat-bot.cfg +++ b/locale/de/chat-bot.cfg @@ -2,7 +2,7 @@ message=[Chat Bot]: __1__ rank-error=You cant use global chat commands players-online=There are __1__ players online -player=There have been __1__ players on this map +players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 7fb6fc7b..65067189 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -2,7 +2,7 @@ message=[Chat Bot]: __1__ rank-error=You cant use global chat commands players-online=There are __1__ players online -player=There have been __1__ players on this map +players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: diff --git a/locale/fr/chat-bot.cfg b/locale/fr/chat-bot.cfg index 7fb6fc7b..65067189 100644 --- a/locale/fr/chat-bot.cfg +++ b/locale/fr/chat-bot.cfg @@ -2,7 +2,7 @@ message=[Chat Bot]: __1__ rank-error=You cant use global chat commands players-online=There are __1__ players online -player=There have been __1__ players on this map +players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: diff --git a/locale/nl/chat-bot.cfg b/locale/nl/chat-bot.cfg index 7fb6fc7b..65067189 100644 --- a/locale/nl/chat-bot.cfg +++ b/locale/nl/chat-bot.cfg @@ -2,7 +2,7 @@ message=[Chat Bot]: __1__ rank-error=You cant use global chat commands players-online=There are __1__ players online -player=There have been __1__ players on this map +players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: From 6b64324a34647183f043fb54fd5a4aa85c5ac85f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 13:06:36 +0100 Subject: [PATCH 199/392] removed useless line --- Addons/Admin/auto-chat.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 4e7568c0..753b675c 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -10,7 +10,6 @@ Discord: https://discord.gg/r6dC2uK -- white spaces removed and made into lower -- these messages are sent only to the player -local auto_chat = '[Chat Bot]: ' local messages = { ['discord']={'chat-bot.discord'}, ['expgaming']={'chat-bot.website'}, From 73eb7c63477df5e8eddedecc304ff8f2cc9f84e4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 13:33:51 +0100 Subject: [PATCH 200/392] Added a few more things --- Addons/Admin/auto-chat.lua | 7 ++++++- locale/de/chat-bot.cfg | 10 +++++++--- locale/en/chat-bot.cfg | 10 +++++++--- locale/fr/chat-bot.cfg | 10 +++++++--- locale/nl/chat-bot.cfg | 10 +++++++--- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 753b675c..0cf78b61 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -18,6 +18,8 @@ local messages = { ['commands']={'chat-bot.custom-commands'}, ['softmod']={'chat-bot.softmod'}, ['script']={'chat-bot.softmod'}, + ['link']={'chat-bot.links'}, + ['links']={'chat-bot.links'}, ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end } @@ -32,7 +34,10 @@ local commands = { ['dev']={'chat-bot.not-real-dev'}, ['blame']=function(player) local names = {'Cooldude2606','arty714','badgamernl',player.name} return {'chat-bot.blame',names[math.random(#names)]} end, ['readme']={'chat-bot.read-readme'}, -} + ['magic']={'chat-bot.magic'}, + ['aids']={'chat-bot.aids'}, + ['riot']={'chat-bot.riot'} +} Event.register(defines.events.on_console_chat,function(event) local player = Game.get_player(event) diff --git a/locale/de/chat-bot.cfg b/locale/de/chat-bot.cfg index 65067189..02254c30 100644 --- a/locale/de/chat-bot.cfg +++ b/locale/de/chat-bot.cfg @@ -8,9 +8,13 @@ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see readme/commands for more info. +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 in the top left. +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__ \ No newline at end of file +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) \ No newline at end of file diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 65067189..02254c30 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -8,9 +8,13 @@ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see readme/commands for more info. +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 in the top left. +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__ \ No newline at end of file +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) \ No newline at end of file diff --git a/locale/fr/chat-bot.cfg b/locale/fr/chat-bot.cfg index 65067189..02254c30 100644 --- a/locale/fr/chat-bot.cfg +++ b/locale/fr/chat-bot.cfg @@ -8,9 +8,13 @@ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see readme/commands for more info. +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 in the top left. +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__ \ No newline at end of file +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) \ No newline at end of file diff --git a/locale/nl/chat-bot.cfg b/locale/nl/chat-bot.cfg index 65067189..02254c30 100644 --- a/locale/nl/chat-bot.cfg +++ b/locale/nl/chat-bot.cfg @@ -8,9 +8,13 @@ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.me/explosivegaming website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see readme/commands for more info. +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 in the top left. +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__ \ No newline at end of file +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) \ No newline at end of file From fdd65ec2d634d09fbe507367318450f7bd522b8d Mon Sep 17 00:00:00 2001 From: badgamernl Date: Thu, 29 Mar 2018 20:22:40 +0200 Subject: [PATCH 201/392] guild line fix --- locale/en/readme.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index ca647e60..08b4bcb4 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -9,7 +9,7 @@ guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. guildlines-line5=- Be polite and use common sense. guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. guildlines-line7=- Do not remove stuff without asking your fellow players. -guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). Train loops. +guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). guildlines-line9= guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun! chat-name=How To Chat From 48fedc3e6e4de5461a7b23061ea8d386c0181922 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Thu, 29 Mar 2018 23:10:39 +0200 Subject: [PATCH 202/392] another guidelines update --- locale/en/readme.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index 08b4bcb4..9f6c66ef 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -4,13 +4,13 @@ guildlines-name=Guidelines guildlines-tooltip=These are the guidelines everyone should follow guildlines-line1=Welcome to the Explosive Gaming Community! guildlines-line2=Here are some guidelines that everyone is obligated to follow. -guildlines-line3=No rights can be derived from these guidelines as the full list of rules is valid / operative. +guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. guildlines-line5=- Be polite and use common sense. guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. guildlines-line7=- Do not remove stuff without asking your fellow players. -guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). -guildlines-line9= +guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). No train loops! +guildlines-line9= guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun! chat-name=How To Chat chat-tooltip=How to chat in Factorio with default key config From 6829557e94a5679dd9c97f893d9513caa42fd2f5 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Thu, 29 Mar 2018 23:14:13 +0200 Subject: [PATCH 203/392] inv search lang update --- locale/en/inventory-search.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en/inventory-search.cfg b/locale/en/inventory-search.cfg index e0d592cb..53a5fc89 100644 --- a/locale/en/inventory-search.cfg +++ b/locale/en/inventory-search.cfg @@ -1,4 +1,4 @@ [inventory-search] low=Your inventory was searched and __1__ was removed. med=Your inventory was searched and __1__ was removed, you have been given a warning as a result. -high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been given a warning as a result. \ No newline at end of file +high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been temp banned as a result. From 97fd4202383ccea2b4336efe7d65500208638a34 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 22:15:13 +0100 Subject: [PATCH 204/392] Added Temp Ban To Repaing Banned Items --- Addons/Commands/repair.lua | 15 ++++++++++++++- locale/en/inventory-search.cfg | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index 961f59a5..4668b689 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -8,6 +8,15 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- +-- these items are not repaired, true means it is blocked +local disallow = { + ['loader']=true, + ['fast-loader']=true, + ['express-loader']=true, + ['electric-energy-interface']=true, + ['infinity-chest']=true +} + local const = 100 -- given const = 100: admin+ has unlimited, admin has 100, mod has 50, member has 20 @@ -22,7 +31,11 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an for x = -range-2, range+2 do for y = -range-2, range+2 do if x^2+y^2 < range^2 then - for key, entity in pairs(player.surface.find_entities_filtered({area={{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}},type='entity-ghost'})) do entity.revive() end + for key, entity in pairs(player.surface.find_entities_filtered({area={{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}},type='entity-ghost'})) do + if not disallow[entity.name] then + entity.revive() + else player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) Admin.temp_ban(player,'','Attempt To Repair A Banned Item') entity.destroy() end + end for key, entity in pairs(player.surface.find_entities({{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}})) do if entity.health then entity.health = 10000 end end end end diff --git a/locale/en/inventory-search.cfg b/locale/en/inventory-search.cfg index e0d592cb..e67991b6 100644 --- a/locale/en/inventory-search.cfg +++ b/locale/en/inventory-search.cfg @@ -1,4 +1,4 @@ [inventory-search] low=Your inventory was searched and __1__ was removed. med=Your inventory was searched and __1__ was removed, you have been given a warning as a result. -high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been given a warning as a result. \ No newline at end of file +high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been temp-banned as a result. \ No newline at end of file From 93788e8880480fe88b34bac5c8153e1ca686e749 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 29 Mar 2018 22:35:26 +0100 Subject: [PATCH 205/392] Added loops to chat bot --- Addons/Admin/auto-chat.lua | 4 ++++ locale/en/chat-bot.cfg | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 0cf78b61..e5098b3c 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -20,6 +20,10 @@ local messages = { ['script']={'chat-bot.softmod'}, ['link']={'chat-bot.links'}, ['links']={'chat-bot.links'}, + ['loop']={'chat-bot.loops'}, + ['loops']={'chat-bot.loops'}, + ['roundabout']={'chat-bot.loops'}, + ['roundabouts']={'chat-bot.loops'}, ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end } diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 02254c30..ac074dae 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -17,4 +17,5 @@ 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) \ No newline at end of file +riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) +loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! \ No newline at end of file From ccbde4fcdd754efa56e5bb1b0b1b6e0c7ce1df9c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 30 Mar 2018 12:57:13 +0100 Subject: [PATCH 206/392] Added 'varified' to some ranks --- Addons/playerRanks.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index dfc0d9a9..42de8e86 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -192,7 +192,8 @@ ranks['Member']:edit('allow',false,{ ['edit-tasklist']=true, ['make-warp']=true, ['nuke']=true, - ['base-damage']=true + ['base-damage']=true, + ['varified']=true }) ranks['Regular']:edit('allow',false,{ ['kill']=true, From 622580291b1c34c4bb60f2fa9f40d2f7733d4372 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 30 Mar 2018 23:16:13 +0100 Subject: [PATCH 207/392] Changed number of reports needed to 6 --- Addons/Admin/reports.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index a366d1e4..a8460d9f 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -10,7 +10,7 @@ Discord: https://discord.gg/r6dC2uK local report_to_warnings = 1 -- used in count_reports local varified_to_warings = 3 -- used in count_reports -local reports_needed_for_jail = 10 +local reports_needed_for_jail = 6 local min_time_to_remove_warning = 18000 -- this is in ticks local take_action = 8 -- below this number no action is taken, the first admin given warning jumps to this number local punishments = { From 910e8b48f11889f0a171e734835baf351e87e211 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 1 Apr 2018 13:13:40 +0100 Subject: [PATCH 208/392] Update From New Master Branch --- Addons/Admin/admin.lua | 6 +++--- Addons/Admin/afk-kick.lua | 2 +- Addons/Admin/auto-message.lua | 2 +- Addons/Admin/discord.lua | 4 ++-- Addons/Admin/reports.lua | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 34e9bfbb..e5a05e3c 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -112,7 +112,7 @@ function Admin.ban(player,by_player,reason) local player = Game.get_player(player) local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' local reason = append_name(reason,by_player_name) - discord_emit{ + Sync.emit_embeded{ title='Player Ban', color=Color.to_hex(defines.text_color.crit), description='There was a player banned.', @@ -139,7 +139,7 @@ function Admin.kick(player,by_player,reason) local player = Game.get_player(player) local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' local reason = append_name(reason,by_player_name) - discord_emit{ + Sync.emit_embeded{ title='Player Kick', color=Color.to_hex(defines.text_color.high), description='There was a player kicked.', @@ -166,7 +166,7 @@ function Admin.jail(player,by_player,reason) local player = Game.get_player(player) local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' local reason = append_name(reason,by_player_name) - discord_emit{ + Sync.emit_embeded{ title='Player Jail', color=Color.to_hex(defines.text_color.med), description='There was a player jailed.', diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index f4f078f3..caf72077 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -28,7 +28,7 @@ Event.register(-1,function(event) end end end):on_event('error',function(self,err) - discord_emit{ + Sync.emit_embeded{ title='Auto Kick Error', color=Color.to_hex(defines.text_color.bg), description='Auto Kick Error - Closed Thread', diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua index 49f1974f..1780885e 100644 --- a/Addons/Admin/auto-message.lua +++ b/Addons/Admin/auto-message.lua @@ -47,7 +47,7 @@ Event.register(-1,function(event) player_return({'chat-bot.message',message},nil,player) end end):on_event('error',function(self,err) - discord_emit{ + Sync.emit_embeded{ title='Auto Message Error', color=Color.to_hex(defines.text_color.bg), description='Auto Message Error - Closed Thread', diff --git a/Addons/Admin/discord.lua b/Addons/Admin/discord.lua index 87652f70..9ec03be5 100644 --- a/Addons/Admin/discord.lua +++ b/Addons/Admin/discord.lua @@ -17,7 +17,7 @@ Event.register(defines.events.on_console_command,function(event) data.by = event.player_index and game.players[event.player_index].name or '' if data.by == '' then return end if command == 'config' or command == 'banlist' then - discord_emit{ + Sync.emit_embeded{ title='Edit To '..data.title, color=Color.to_hex(defines.text_color.bg), description='A player edited the '..command..'.', @@ -42,7 +42,7 @@ Event.register(defines.events.on_console_command,function(event) if not Game.get_player(data.username) then return end if string.sub(command,-1) == 'e' then data.command = command..'d' else data.command = command..'ed' end data.reason = data.reason and data.reason ~= '' and data.reason or 'No Reason Required' - discord_emit{ + Sync.emit_embeded{ title='Player '..data.title, color=data.colour, description='There was a player '..data.command..'.', diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index a8460d9f..8f384a1a 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -66,7 +66,7 @@ local function report_message(player,by_player,reason) if _reports().actions[player.name] == actions.report then return end Ranking.print(low_rank,{'reports.low-print',player.name,reason},defines.text_color.info,true) Ranking.print(high_rank,{'reports.high-print',player.name,by_player_name,reason},defines.text_color.med) - discord_emit{ + Sync.emit_embeded{ title='Player Report', color=Color.to_hex(defines.text_color.med), description='A player was reported.', @@ -174,7 +174,7 @@ function Admin.clear_warings(player,by_player,no_emit) if not player then return end _reports().warnings[player.name]=0 if not no_emit then - discord_emit{ + Sync.emit_embeded{ title='Player Clear', color=Color.to_hex(defines.text_color.low), description='A player had there warnings cleared.', @@ -190,7 +190,7 @@ function Admin.clear_reports(player,by_player,no_emit) _reports().reports[player.name]={} _reports().varified[player.name]={} if not no_emit then - discord_emit{ + Sync.emit_embeded{ title='Player Clear', color=Color.to_hex(defines.text_color.low), description='A player had there reports cleared.', @@ -207,7 +207,7 @@ function Admin.clear_player(player,by_player) Admin.clear_reports(player,by_player,true) _reports().actions[player.name]=actions.none if Ranking.get_rank(player).group.name == 'Jail' then Server.interface(Ranking.revert,true,player,by_player) end - discord_emit{ + Sync.emit_embeded{ title='Player Clear', color=Color.to_hex(defines.text_color.low), description='A player had there reports and warnings cleared.', @@ -225,7 +225,7 @@ function Admin.temp_ban(player,by_player,reason) local player, by_player_name = valid_players(player,by_player) if not player or Admin.is_banned(player) then return end _reports().actions[player.name] = actions.temp - discord_emit{ + Sync.emit_embeded{ title='Player Temp-Ban', color=Color.to_hex(defines.text_color.high), description='A player was jailed.', From af1329bf41ab21f58fec515cfcaaea535667a3ae Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 1 Apr 2018 22:08:02 +0100 Subject: [PATCH 209/392] Fixed Admin Gui Temp Ban Not Working --- Addons/Guis/admin-gui.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index 9aa2c614..696a9a5c 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -72,7 +72,7 @@ end local action_drop_down = Gui.inputs.add_drop_down('action-drop-down-rank-change',_actions,1,function(player,selected,items,element) element.parent.parent.action.caption = selected - if selected == 'Jail' or selected == 'Kick' or selected == 'Ban' then + if selected == 'Jail' or selected == 'Kick' or selected == 'Ban' or selected == 'Temp Ban' then element.parent['reason-input-admin-commands'].style.visible = true else element.parent['reason-input-admin-commands'].style.visible = false @@ -92,7 +92,7 @@ local take_action = Gui.inputs.add{ local _rank = Ranking.get_rank(_player) if rank.power >= _rank.power then dropdowns.warning.caption = {'admin-commands.rank-high'} return end local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text - if _reason == 'Enter Reason' then return end + if selected == 'Jail' or selected == 'Kick' or selected == 'Ban' or selected == 'Temp Ban' and _reason == 'Enter Reason' or string.len(_reason) < 20 then return end Admin.take_action(_action,_player,event.player_index,_reason) Gui.center.clear(event) end) From 974c6985dd36ea94403973a585466af173bc3a74 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 4 Apr 2018 16:28:55 +0100 Subject: [PATCH 210/392] No Auto Message For High Ranks --- Addons/Admin/auto-message.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua index 1780885e..f1dc6000 100644 --- a/Addons/Admin/auto-message.lua +++ b/Addons/Admin/auto-message.lua @@ -43,6 +43,7 @@ Event.register(-1,function(event) local data = self.data if not data.high_rank or not data.low_rank or not data.low then self.reopen = false return end + if Ranking.get_rank(player).power <= Ranking.get_rank(data.low_rank).power then return end for _,message in pairs(data.low) do player_return({'chat-bot.message',message},nil,player) end From fe375c41ce259294467e630d28450493f11d27c5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 5 Apr 2018 21:12:54 +0100 Subject: [PATCH 211/392] Added more checks to auto message --- Addons/Admin/auto-message.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua index f1dc6000..5fdaa6e3 100644 --- a/Addons/Admin/auto-message.lua +++ b/Addons/Admin/auto-message.lua @@ -43,7 +43,8 @@ Event.register(-1,function(event) local data = self.data if not data.high_rank or not data.low_rank or not data.low then self.reopen = false return end - if Ranking.get_rank(player).power <= Ranking.get_rank(data.low_rank).power then return end + -- idk but this stoped working for no appent reason so i added more checks for nil values + if Ranking.get_rank(player) and Ranking.get_rank(player).power <= Ranking.get_rank(data.low_rank).power then return end for _,message in pairs(data.low) do player_return({'chat-bot.message',message},nil,player) end From 6eccc9ba0e15c4fd4c8533edfa6b313bf2ae7740 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 7 Apr 2018 17:34:04 +0100 Subject: [PATCH 212/392] Changed some Command Names --- Addons/Commands/admin.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 90134d8c..5be9cba5 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -19,7 +19,7 @@ commands.add_command('report', 'Reports a player', {'player','reason',true}, fun Admin.report(player,event.player_index,reason) end) -commands.add_command('give-warning', 'Gives a player a warnings', {'player','reason',true}, function(event,args) +commands.add_command('warn', 'Gives a player a warnings', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -35,23 +35,26 @@ commands.add_command('temp-ban', 'Temp Ban A Player', {'player','reason',true}, Admin.temp_ban(player,event.player_index,reason) end) +commands.add_command('clear-inv', 'Clears the player\'s invetory', {'player'}, function(event,args) + local player = Game.get_player(args.player) + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + Admin.move_inventory(player) +end) + commands.add_command('clear-warings', 'Clears the warnings on a player', {'player'}, function(event,args) local player = Game.get_player(args.player) - local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_warings(player,event.player_index) end) commands.add_command('clear-reports', 'Clears the reports from a player', {'player'}, function(event,args) local player = Game.get_player(args.player) - local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-player', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-all', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) local player = Game.get_player(args.player) - local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_player(player,event.player_index) end) \ No newline at end of file From b66c823c46f2b7d1d81d050159a63efb85c9ca71 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 8 Apr 2018 16:44:29 +0100 Subject: [PATCH 213/392] Added Button For Guild Lines --- Addons/Guis/readme.lua | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 7f90e744..a58f57fa 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -118,18 +118,6 @@ end):add_tab('rules',{'readme.rules-name'},{'readme.rules-tooltip'},function(fra end end) -Event.register(defines.events.on_player_joined_game,function(event) - local player = Game.get_player(event) - if not player.admin and player.online_time < 60 then - script.raise_event(defines.events.on_gui_click,{ - name=defines.events.on_gui_click, - tick=event.tick, - element=mod_gui.get_button_flow(player).readme, - player_index=player.index, - button=defines.mouse_button_type.left, - alt=false, - control=false, - shift=false - }) - end -end) \ No newline at end of file +Sync.add_to_gui(Gui.inputs.add_button('readme-sync-guildlines','View Guildlines','View the guildlines in the readme',function(player,element) + Gui.center.open_tab(player,'readme','guildlines') +end)) \ No newline at end of file From 1aa2f67ffa813852867d2cadf78054376629a846 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 8 Apr 2018 17:04:08 +0100 Subject: [PATCH 214/392] Added More Buttons To Server Info --- Addons/Guis/readme.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index a58f57fa..acf84f03 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -120,4 +120,12 @@ end) Sync.add_to_gui(Gui.inputs.add_button('readme-sync-guildlines','View Guildlines','View the guildlines in the readme',function(player,element) Gui.center.open_tab(player,'readme','guildlines') +end)) + +Sync.add_to_gui(Gui.inputs.add_button('readme-sync-links','View Other Links','View the links in the readme',function(player,element) + Gui.center.open_tab(player,'readme','links') +end)) + +Sync.add_to_gui(Gui.inputs.add_button('readme-sync-rules','View All Rules','View the all rules in the readme',function(player,element) + Gui.center.open_tab(player,'readme','rules') end)) \ No newline at end of file From 5e5838eb868d1e37e4bafae120a4ebcfaa9ae6fd Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 9 Apr 2018 12:53:12 +0100 Subject: [PATCH 215/392] General Addidions to help fix a known desync --- Addons/Admin/auto-message.lua | 2 +- Addons/Guis/polls.lua | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua index 5fdaa6e3..9e0deb5b 100644 --- a/Addons/Admin/auto-message.lua +++ b/Addons/Admin/auto-message.lua @@ -44,7 +44,7 @@ Event.register(-1,function(event) if not data.high_rank or not data.low_rank or not data.low then self.reopen = false return end -- idk but this stoped working for no appent reason so i added more checks for nil values - if Ranking.get_rank(player) and Ranking.get_rank(player).power <= Ranking.get_rank(data.low_rank).power then return end + if Ranking.get_rank(player).power <= Ranking.get_rank(data.low_rank).power then return end for _,message in pairs(data.low) do player_return({'chat-bot.message',message},nil,player) end diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index 2d2dcf86..a69bf50a 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -16,7 +16,8 @@ local function _polls(reset) return global.addons.polls end -local function _poll_end(uuid) +local function _poll_end(self) + local uuid = self.data.poll_uuid local poll = _polls().active[uuid] if not poll then return end local highest = {nil,-1} @@ -48,10 +49,8 @@ local function _poll_data(question,answers) Server.new_thread{ data={poll_uuid=poll.uuid}, timeout=poll_time_out*60 - }:on_event('timeout',function(self) - local uuid = self.data.poll_uuid - _poll_end(uuid) - end):open() + }:on_event('timeout',_poll_end):open() + -- this time out is knowen to cause desyncs and so i have moved it to a hard coded function _polls().active[poll.uuid]=poll return poll.uuid end From 48a3792ac8d29c37dd61a4a092fe8139a8070f54 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 10 Apr 2018 15:19:42 +0100 Subject: [PATCH 216/392] Added Jail and Unjail --- Addons/Commands/admin.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 5be9cba5..6afe5bec 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -27,6 +27,20 @@ commands.add_command('warn', 'Gives a player a warnings', {'player','reason',tru Admin.give_warning(player,event.player_index,reason) end) +commands.add_command('jail', 'Jails a player', {'player','reason',true}, function(event,args) + local player = Game.get_player(args.player) + local reason = args.reason + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + Admin.jail(player,event.player_index,reason) +end) + +commands.add_command('unjail', 'Returns the players old rank', {'player',true}, function(event,args) + local player = Game.get_player(args.player) + if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + Ranking.revert(player,event.player_index) +end) + commands.add_command('temp-ban', 'Temp Ban A Player', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason From 265717985a22b44929c5b4440aef0619d1c77a35 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 12 Apr 2018 12:14:22 +0100 Subject: [PATCH 217/392] Fixed bug with missing inventory --- Addons/Admin/admin.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index e5a05e3c..80fbb7e2 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -89,11 +89,13 @@ function Admin.move_inventory(player) local chests = player.surface.find_entities_filtered{area={{-10,-10},{10,10}},name='iron-chest'} or {} for _,_inventory in pairs(inventorys) do local inventory = player.get_inventory(_inventory) - for item,count in pairs(inventory.get_contents()) do - local item = {name=item,count=count} - chests = Admin.move_item_to_spawn(item,player.surface,chests) + if inventory then + for item,count in pairs(inventory.get_contents()) do + local item = {name=item,count=count} + chests = Admin.move_item_to_spawn(item,player.surface,chests) + end + inventory.clear() end - inventory.clear() end end From 9a581b50a9ace458fd4c07c568d03b85e239781b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 12 Apr 2018 22:06:43 +0100 Subject: [PATCH 218/392] Fixed Permissions For Commands --- Addons/playerRanks.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 42de8e86..bb333d86 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -67,11 +67,12 @@ groups['Admin']:edit('allow',false,{ ['tasklist']=true, ['rank-changer']=true, ['admin-commands']=true, - ['give-warning']=true, + ['warn']=true, ['temp-ban']=true, ['clear-warings']=true, ['clear-reports']=true, - ['clear-player']=true, + ['clear-all']=true, + ['clear-inv']=true, ['announcements']=true, ['warp-list']=true, ['polls']=true, @@ -181,7 +182,9 @@ ranks['Mod']:edit('allow',false,{ }) ranks['Donator']:edit('allow',false,{ - ['global-chat']=true + ['global-chat']=true, + ['jail']=true, + ['unjail']=true }) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, From ebddec6e97b2498adacf6f8bafd029438103bf59 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 12 Apr 2018 22:32:45 +0100 Subject: [PATCH 219/392] URGENT - SECURITY FLAW - Rank Changer Root Acess Fixed --- Addons/Guis/rank-changer.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua index 6340ac1e..86c72a8b 100644 --- a/Addons/Guis/rank-changer.lua +++ b/Addons/Guis/rank-changer.lua @@ -121,12 +121,12 @@ Gui.center.add{ frame.add{ name='player', type='label', - caption='' + caption='///' }.style.visible = false frame.add{ name='rank', type='label', - caption='' + caption='///' }.style.visible = false end } \ No newline at end of file From 241b0e0e767c6144d55467acfba544f1421f5fab Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 13 Apr 2018 21:34:03 +0100 Subject: [PATCH 220/392] No More White Player Color --- StandAlone/colours.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index 3a9f853c..a353c59c 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -13,7 +13,8 @@ Event.register(defines.events.on_player_created, function(event) local player = game.players[event.player_index] local colours = table.keys(defines.color) player.color = defines.color.black - while player.color.r == defines.color.black.r and player.color.g == defines.color.black.g and player.color.b == defines.color.black.b do + while player.color.r == defines.color.black.r and player.color.g == defines.color.black.g and player.color.b == defines.color.black.b + or player.color.r == defines.color.white.r and player.color.g == defines.color.white.g and player.color.b == defines.color.white.b do player.color = defines.color[colours[math.random(#colours)]] if default_colours[player.name] then local c = default_colours[player.name] From a204194bdb37c5681472846078d0170fb3b2ee17 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 14 Apr 2018 13:08:55 +0100 Subject: [PATCH 221/392] Fixed Temp Ban --- Addons/Admin/reports.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 8f384a1a..8a8c75ad 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -123,7 +123,7 @@ local function give_punishment(player,by_player,reason) _reports().actions[player.name] = actions.kick Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) elseif punishment[1] == 'temp-ban' then - _reports().actions[player.name] = actions.temp + --_reports().actions[player.name] = actions.temp -- see Admin.temp-ban Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) elseif punishment[1] == 'ban' then _reports().actions[player.name] = actions.ban From 6a0164aff520b9eba4d9c76f96eb2b966d8b7849 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:13:19 +0200 Subject: [PATCH 222/392] Add files via upload --- locale/reports.cfg | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 locale/reports.cfg diff --git a/locale/reports.cfg b/locale/reports.cfg new file mode 100644 index 00000000..549701d1 --- /dev/null +++ b/locale/reports.cfg @@ -0,0 +1,13 @@ +name=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. +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. \ No newline at end of file From 76897e7a2be3475ba8c3617be30d99987a5ca9bf Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:21:34 +0200 Subject: [PATCH 223/392] sv From 1858ba7a12bb159a493cd82169165e7f31a8a9e4 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:25:22 +0200 Subject: [PATCH 224/392] Create reports.cvg --- locale/sv/reports.cvg | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 locale/sv/reports.cvg diff --git a/locale/sv/reports.cvg b/locale/sv/reports.cvg new file mode 100644 index 00000000..8c2b85cd --- /dev/null +++ b/locale/sv/reports.cvg @@ -0,0 +1,13 @@ +name=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. +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. From a373d8fd43272b07b9f80c1c058d279bcbdb54a6 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:26:04 +0200 Subject: [PATCH 225/392] Add files via upload --- locale/sv/reports.cfg | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 locale/sv/reports.cfg diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg new file mode 100644 index 00000000..549701d1 --- /dev/null +++ b/locale/sv/reports.cfg @@ -0,0 +1,13 @@ +name=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. +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. \ No newline at end of file From 03e21c618d741183f21b906a25adc03455313580 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:26:31 +0200 Subject: [PATCH 226/392] Delete reports.cvg --- locale/sv/reports.cvg | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 locale/sv/reports.cvg diff --git a/locale/sv/reports.cvg b/locale/sv/reports.cvg deleted file mode 100644 index 8c2b85cd..00000000 --- a/locale/sv/reports.cvg +++ /dev/null @@ -1,13 +0,0 @@ -name=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. -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. From 8fa2648b6c8a4e55ad169ef8becffcbe4b90b84b Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:26:46 +0200 Subject: [PATCH 227/392] Delete reports.cfg --- locale/reports.cfg | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 locale/reports.cfg diff --git a/locale/reports.cfg b/locale/reports.cfg deleted file mode 100644 index 549701d1..00000000 --- a/locale/reports.cfg +++ /dev/null @@ -1,13 +0,0 @@ -name=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. -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. \ No newline at end of file From a7df4dd31bdd97acffeb92f7594887f6376e898a Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:29:07 +0200 Subject: [PATCH 228/392] Delete reports.cfg --- locale/sv/reports.cfg | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 locale/sv/reports.cfg diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg deleted file mode 100644 index 549701d1..00000000 --- a/locale/sv/reports.cfg +++ /dev/null @@ -1,13 +0,0 @@ -name=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. -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. \ No newline at end of file From 08088f794e68feace7fef76e1a063d2f9b449383 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:29:42 +0200 Subject: [PATCH 229/392] Create report.txt --- locale/sv/report.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 locale/sv/report.txt diff --git a/locale/sv/report.txt b/locale/sv/report.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/locale/sv/report.txt @@ -0,0 +1 @@ + From d589816cbfd0cb5d24bd9dbffa302232eb94e68f Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:30:03 +0200 Subject: [PATCH 230/392] Add files via upload --- locale/sv/reports.cfg | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 locale/sv/reports.cfg diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg new file mode 100644 index 00000000..549701d1 --- /dev/null +++ b/locale/sv/reports.cfg @@ -0,0 +1,13 @@ +name=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. +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. \ No newline at end of file From 117577e0d5bcc7e344c7597e03ce5a0101724846 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:30:18 +0200 Subject: [PATCH 231/392] Delete report.txt --- locale/sv/report.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 locale/sv/report.txt diff --git a/locale/sv/report.txt b/locale/sv/report.txt deleted file mode 100644 index 8b137891..00000000 --- a/locale/sv/report.txt +++ /dev/null @@ -1 +0,0 @@ - From 61e0982bd80cea39b2ffacf8c09a99f0e18048ba Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:32:22 +0200 Subject: [PATCH 232/392] Update reports.cfg --- locale/sv/reports.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg index 549701d1..159d4305 100644 --- a/locale/sv/reports.cfg +++ b/locale/sv/reports.cfg @@ -1,3 +1,4 @@ +[reports] name=Rapportera Spelare low-print=_1_ har blivit rapporterad av _2_ för: _3_ high-print=_1_ har blivit rapporterad av _2_ för: _3_ @@ -10,4 +11,4 @@ reported= Du har blivit rapporterad till administrationen av systemet. Mer påf 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. \ No newline at end of file +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. From 6356c5ffe750512654379e3a9f1157057c9941ac Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:38:12 +0200 Subject: [PATCH 233/392] Update reports.cfg --- locale/sv/reports.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg index 159d4305..8e21e1db 100644 --- a/locale/sv/reports.cfg +++ b/locale/sv/reports.cfg @@ -1,11 +1,11 @@ [reports] name=Rapportera Spelare -low-print=_1_ har blivit rapporterad av _2_ för: _3_ -high-print=_1_ har blivit rapporterad av _2_ för: _3_ +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. -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_ +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 From 318b7d417097211e8b0b40b4f95d3d82b2c3931d Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 16:45:24 +0200 Subject: [PATCH 234/392] Swedish translation (reports) (#30) * Add files via upload * sv * Create reports.cvg * Add files via upload * Delete reports.cvg * Delete reports.cfg * Delete reports.cfg * Create report.txt * Add files via upload * Delete report.txt * Update reports.cfg * Update reports.cfg --- locale/sv/reports.cfg | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 locale/sv/reports.cfg diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg new file mode 100644 index 00000000..8e21e1db --- /dev/null +++ b/locale/sv/reports.cfg @@ -0,0 +1,14 @@ +[reports] +name=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. +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. From c9ed6c62ce5d16ff4b9226833bd20a73632d7ce3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 14 Apr 2018 16:05:09 +0100 Subject: [PATCH 235/392] idk but this 'change' would not go away --- locale/sv/reports.cfg | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg index 8e21e1db..bc9e0c7c 100644 --- a/locale/sv/reports.cfg +++ b/locale/sv/reports.cfg @@ -1,14 +1,14 @@ -[reports] -name=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. -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. +[reports] +name=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. +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. From f348108aadbc46116278c98a6955dbf23044291c Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:17:15 +0200 Subject: [PATCH 236/392] Rename locale/sv/reports.cfg to locale/sv-SE/reports.cfg --- locale/{sv => sv-SE}/reports.cfg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename locale/{sv => sv-SE}/reports.cfg (100%) diff --git a/locale/sv/reports.cfg b/locale/sv-SE/reports.cfg similarity index 100% rename from locale/sv/reports.cfg rename to locale/sv-SE/reports.cfg From af1a25011fdcc5502c37362c116309edfc81aae2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 14 Apr 2018 19:09:54 +0100 Subject: [PATCH 237/392] Added Alpha Sort For Warps --- Addons/Guis/warp-system.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index 12934a22..bf18db23 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -85,6 +85,7 @@ local function make_warp_point(position,surface,force,name) icon={type='item',name=warp_item} }) _warps().warps[name] = {tag=tag,surface=surface,position=tag.position,old_tile=old_tile} + _warps().warps = table.keysort(_warps().warps) Gui.left.update('warp-list') end From d227ad90d61a49c37225efb48390788e366dd08d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 14 Apr 2018 19:31:02 +0100 Subject: [PATCH 238/392] Added Home Commands --- Addons/Commands/home.lua | 37 +++++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 5 ++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 Addons/Commands/home.lua diff --git a/Addons/Commands/home.lua b/Addons/Commands/home.lua new file mode 100644 index 00000000..4ea2d3a7 --- /dev/null +++ b/Addons/Commands/home.lua @@ -0,0 +1,37 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local function homes(reset) + global.addons = not reset and global.addons or {} + global.addons.homes = not reset and global.addons.homes or {} + return global.addons.homes +end + +commands.add_command('set-home', 'Set Your Home Possition', {}, function(event,args) + local player = Game.get_player(event) + if not homes()[player.index] then homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end + homes()[player.index][1] = player.position + player_return('Home set at: ('..math.floor(player.position.x)..','..math.floor(player.position.y)..')') +end) + +commands.add_command('home', 'Goto you home possition', {}, function(event,args) + local player = Game.get_player(event) + if not homes()[player.index] then homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end + homes()[player.index][2] = player.position + player.teleport(player.surface.find_non_colliding_position('player',homes()[player.index][1],32,1),player.surface) +end) + +commands.add_command('return', 'Goto where you were before using /home', {}, function(event,args) + local player = Game.get_player(event) + if not homes()[player.index] then homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end + local _temp = player.position + player.teleport(player.surface.find_non_colliding_position('player',homes()[player.index][2],32,1),player.surface) + homes()[player.index][2] = _temp +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 87dec82c..6ca2e7ea 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -26,6 +26,7 @@ require('Commands/cheat-mode') require('Commands/kill') require('Commands/repair') require('Commands/tags') +require('Commands/home') require('Commands/tp') -- requires Admin/admin require('Commands/admin') -- requires Admin/reports diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index bb333d86..4de2676f 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -184,7 +184,10 @@ ranks['Mod']:edit('allow',false,{ ranks['Donator']:edit('allow',false,{ ['global-chat']=true, ['jail']=true, - ['unjail']=true + ['unjail']=true, + ['set-home']=true, + ['home']=true, + ['return']=true }) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, From bfe4cdbaf1acf2534d32789f41e9d0a4975b3493 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 14 Apr 2018 19:51:41 +0100 Subject: [PATCH 239/392] Added Lenny --- Addons/Admin/auto-chat.lua | 3 ++- locale/en/chat-bot.cfg | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index e5098b3c..92e4ca5e 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -40,7 +40,8 @@ local commands = { ['readme']={'chat-bot.read-readme'}, ['magic']={'chat-bot.magic'}, ['aids']={'chat-bot.aids'}, - ['riot']={'chat-bot.riot'} + ['riot']={'chat-bot.riot'}, + ['lenny']={'chat-bot.lenny'} } Event.register(defines.events.on_console_chat,function(event) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index ac074dae..d90c2687 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -18,4 +18,5 @@ 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) -loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! \ No newline at end of file +loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! +lenny=( ͡° ͜ʖ ͡°) \ No newline at end of file From afa21ac306eec3f5aac770f031c0c60490edb964 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 14 Apr 2018 21:58:12 +0100 Subject: [PATCH 240/392] Fixed Root Group Perrmissions --- Addons/playerRanks.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 4de2676f..244b6a49 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -46,11 +46,12 @@ groups['Root']:edit('allow',false,{ ['tasklist']=true, ['rank-changer']=true, ['admin-commands']=true, - ['give-warning']=true, + ['warn']=true, ['temp-ban']=true, ['clear-warings']=true, ['clear-reports']=true, - ['clear-player']=true, + ['clear-all']=true, + ['clear-inv']=true, ['announcements']=true, ['warp-list']=true, ['polls']=true, From 6dba36754a824d745414b5c2b44cbfdd6642123d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 14 Apr 2018 22:35:49 +0100 Subject: [PATCH 241/392] Change to homes --- Addons/Commands/home.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Addons/Commands/home.lua b/Addons/Commands/home.lua index 4ea2d3a7..3f079d23 100644 --- a/Addons/Commands/home.lua +++ b/Addons/Commands/home.lua @@ -16,22 +16,22 @@ end commands.add_command('set-home', 'Set Your Home Possition', {}, function(event,args) local player = Game.get_player(event) - if not homes()[player.index] then homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - homes()[player.index][1] = player.position + if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end + _homes()[player.index][1] = player.position player_return('Home set at: ('..math.floor(player.position.x)..','..math.floor(player.position.y)..')') end) commands.add_command('home', 'Goto you home possition', {}, function(event,args) local player = Game.get_player(event) - if not homes()[player.index] then homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - homes()[player.index][2] = player.position - player.teleport(player.surface.find_non_colliding_position('player',homes()[player.index][1],32,1),player.surface) + if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end + _homes()[player.index][2] = player.position + player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][1],32,1),player.surface) end) commands.add_command('return', 'Goto where you were before using /home', {}, function(event,args) local player = Game.get_player(event) - if not homes()[player.index] then homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end + if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end local _temp = player.position - player.teleport(player.surface.find_non_colliding_position('player',homes()[player.index][2],32,1),player.surface) - homes()[player.index][2] = _temp + player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][2],32,1),player.surface) + _homes()[player.index][2] = _temp end) \ No newline at end of file From 74199c0ba72d07888693f8bcbd1a9e6005bad4f0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 14 Apr 2018 22:53:15 +0100 Subject: [PATCH 242/392] Added Bonus --- Addons/Commands/bonus.lua | 35 +++++++++++++++++++++++++++++++++++ Addons/load.lua | 1 + Addons/playerRanks.lua | 3 ++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Addons/Commands/bonus.lua diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua new file mode 100644 index 00000000..b2e7a40d --- /dev/null +++ b/Addons/Commands/bonus.lua @@ -0,0 +1,35 @@ +--[[ +Explosive Gaming + +This file can be used with permission but this and the credit below must remain in the file. +Contact a member of management on our discord to seek permission to use our code. +Any changes that you may make to the code are yours but that does not make the script yours. +Discord: https://discord.gg/r6dC2uK +]] +--Please Only Edit Below This Line----------------------------------------------------------- + +local settings = { + {key='character_mining_speed_modifier',scale=3}, + {key='character_crafting_speed_modifier',scale=3}, + {key='character_running_speed_modifier',scale=3}, + {key='character_build_distance_bonus',scale=20}, + {key='character_reach_distance_bonus',scale=20}, + {key='character_inventory_slots_bonus',scale=200} +} + +commands.add_command('bonus', 'Set your player bonus (default is 20, guest has 0)', {'bonus'}, function(event,args) + local player = Game.get_player(event) + local bonus = tonumber(args.bonus) + if not bonus or bonus < 0 or bonus > 50 then player_return{'commands.invalid-range',0,50} return commands.error end + for _,setting in pairs(settings) do player[setting.key] = setting.scale*math.floor(bonus)*0.01 end + player_return('Bonus set to: '..math.floor(bonus)..'%') +end) + +Event.register(defines.events.rank_change,function(event) + local player = Game.get_player(event) + if event.new_rank:allowed('bonus') then + for _,setting in pairs(settings) do player[setting.key] = setting.scale*0.2 end + else + for _,setting in pairs(settings) do player[setting.key] = 0 end + end +end) \ No newline at end of file diff --git a/Addons/load.lua b/Addons/load.lua index 6ca2e7ea..699a1dd1 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -25,6 +25,7 @@ require('Admin/auto-chat') require('Commands/cheat-mode') require('Commands/kill') require('Commands/repair') +require('Commands/bonus') require('Commands/tags') require('Commands/home') require('Commands/tp') -- requires Admin/admin diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 244b6a49..8801a98d 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -188,7 +188,8 @@ ranks['Donator']:edit('allow',false,{ ['unjail']=true, ['set-home']=true, ['home']=true, - ['return']=true + ['return']=true, + ['bonus']=true }) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, From 09499f334b89aad1397b722815bba6e47cc17f62 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 15 Apr 2018 20:01:13 +0100 Subject: [PATCH 243/392] Reapir made cleaner --- Addons/Commands/repair.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index ba29f90d..1c41900d 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -32,9 +32,11 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an for y = -range-2, range+2 do if x^2+y^2 < range^2 then for key, entity in pairs(player.surface.find_entities_filtered({area={{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}},type='entity-ghost'})) do - if not disallow[entity.name] then - entity.revive() - else player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) Admin.temp_ban(player,'','Attempt To Repair A Banned Item') entity.destroy() end + if disallow[entity.name] then + player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) + Admin.temp_ban(player,'','Attempt To Repair A Banned Item') + entity.destroy() + else entity.revive() end end for key, entity in pairs(player.surface.find_entities({{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}})) do if entity.health then entity.health = 10000 end end end From ae06b0b1acd41a6e744445daf921ae8ea2d4a181 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 15 Apr 2018 20:03:02 +0100 Subject: [PATCH 244/392] Forgot to rename function --- Addons/Commands/home.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/home.lua b/Addons/Commands/home.lua index 3f079d23..7647fab4 100644 --- a/Addons/Commands/home.lua +++ b/Addons/Commands/home.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -local function homes(reset) +local function _homes(reset) global.addons = not reset and global.addons or {} global.addons.homes = not reset and global.addons.homes or {} return global.addons.homes From 4c800460a9657f129aa49f4502866931430dd20b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 15 Apr 2018 20:07:49 +0100 Subject: [PATCH 245/392] Fixed the reapir disallow --- Addons/Commands/repair.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index 1c41900d..f862f4ce 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -32,7 +32,7 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an for y = -range-2, range+2 do if x^2+y^2 < range^2 then for key, entity in pairs(player.surface.find_entities_filtered({area={{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}},type='entity-ghost'})) do - if disallow[entity.name] then + if disallow[entity.ghost_prototype.name] then player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) Admin.temp_ban(player,'','Attempt To Repair A Banned Item') entity.destroy() From 7d61a9e5606334d3b73dacbac955a67fd668bdf7 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 15 Apr 2018 22:26:42 +0100 Subject: [PATCH 246/392] Disabled Polls --- Addons/load.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/load.lua b/Addons/load.lua index 699a1dd1..20f935bb 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -38,7 +38,7 @@ require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') require('Guis/warp-system') -require('Guis/polls') +--require('Guis/polls') -- too many desyncs require('Guis/announcements') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin From f6c5b8f25eb0f77f6e8a350efd5e0c50efdf49bc Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 15 Apr 2018 22:36:43 +0100 Subject: [PATCH 247/392] Fixed few _G functions --- Addons/Admin/afk-kick.lua | 2 +- Addons/Admin/reports.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index caf72077..06557f93 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -function get_afk_time(player) +local function get_afk_time(player) local rank = Ranking.get_rank(player) local count = #game.connected_players local base = rank.base_afk_time or false diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 35411f95..fbc7157f 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -76,7 +76,7 @@ local function report_message(player,by_player,reason) } end -function count_reports(player) +local function count_reports(player) local player = Game.get_player(player) if not player then return 0 end local _count = 0 From f49feb1b1b1204cf8f6ea980e889b9a90cfe583a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 16 Apr 2018 18:50:20 +0100 Subject: [PATCH 248/392] maybe help with desync idk --- Addons/Commands/home.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/home.lua b/Addons/Commands/home.lua index 7647fab4..c65df76d 100644 --- a/Addons/Commands/home.lua +++ b/Addons/Commands/home.lua @@ -17,21 +17,21 @@ end commands.add_command('set-home', 'Set Your Home Possition', {}, function(event,args) local player = Game.get_player(event) if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - _homes()[player.index][1] = player.position + _homes()[player.index][1] = {math.floor(player.position.x),math.floor(player.position.y)} player_return('Home set at: ('..math.floor(player.position.x)..','..math.floor(player.position.y)..')') end) commands.add_command('home', 'Goto you home possition', {}, function(event,args) local player = Game.get_player(event) if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - _homes()[player.index][2] = player.position + _homes()[player.index][2] = {math.floor(player.position.x),math.floor(player.position.y)} player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][1],32,1),player.surface) end) commands.add_command('return', 'Goto where you were before using /home', {}, function(event,args) local player = Game.get_player(event) if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - local _temp = player.position + local _temp = {math.floor(player.position.x),math.floor(player.position.y)} player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][2],32,1),player.surface) _homes()[player.index][2] = _temp end) \ No newline at end of file From 77cada080c4cefd509be03c993167ea4027aff99 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Wed, 18 Apr 2018 00:52:26 +0200 Subject: [PATCH 249/392] Create readme.cfg --- locale/sv-SE/readme.cfg | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 locale/sv-SE/readme.cfg diff --git a/locale/sv-SE/readme.cfg b/locale/sv-SE/readme.cfg new file mode 100644 index 00000000..0a731162 --- /dev/null +++ b/locale/sv-SE/readme.cfg @@ -0,0 +1,68 @@ +[readme] +tooltip=Öppna ReadMe om det här är första gången du ansluter dig. +guildlines-name=Riktlinjer +guildlines-tooltip=Det här är riktlinjerna som alla bör följa +guildlines-line1=Välkommen till gemenskapen ExplosiveGaming! +guildlines-line2=Här är riktlinjerna som alla är tvingade att följa. +guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! +guildlines-line4=- Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. +guildlines-line5=- Var artig och använd sunt förnuft. +guildlines-line6=- Spam (genom chat, bottar, obegränsade kistor och betong) är inte tillåtet. +guildlines-line7=- Ta inte bort saker utan att fråga dina medspelare. +guildlines-line8=- Tåg är bara tillåtna med vänstertrafik. Inga tågloopar! +guildlines-line9= +guildlines-line10= Om du har frågor om reglerna, servern eller generelt om Factorio, känn dig fri att fråga dina medspelare eller vårat hjälpsamma team. Ha kul! +chat-name=Hur du chattar +chat-tooltip=Hur du chattar i Factorio med standardinställningar +chat-singleline=Att chatta kan vara svårt för nya spelare efterson det är annurlunda från andra spel. Det är väldigt enkelt, tangenten som du behöver trycka på är "ö".Om du vill byta det, gå in till "kontroller" och ändra tangent för "lua konsol". +commands-name=Kommandon +commands-tooltip=Kommandon som du kan använda i ExplosiveGaming +commands-singleline=Anpassade kommandon som du kan använda. Baskommandon visas inte här. +commands-col1=Kommandonamn +commands-col2=kommandohjälp +links-name=Länkar +links-tooltip=Hjälpfulla länkar som visar vägar att komma i kontakt med oss. +links-cap1=Discord röst- och chatserver: +links-cap2=våran Webbadress : +links-cap3=Steam: +links-cap4=Patreon: +servers-name=Servrar +servers-tooltip=Information om våra servrar +servers-singleline=Välkommen till ExplosiveGamings gemenskap! S1-S3 har förskjutna återställningar (resets). +servers-format=S__1__: __2__ +servers-cap1=Publik +servers-des1=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. +servers-cap2=Publik +servers-des2=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. +servers-cap3=Publik +servers-des3=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. +servers-cap4=Modifierad +servers-des4=A Modifierad server för alla spelare. Länk i Discord för medlemmar. +servers-cap5=Evenemang +servers-des5=Server för evenemang (alla kan ansluta sig) - Kan kräva lösenord. Anslut dig till Discord för mer info. +servers-cap6=Donator +servers-des6=För spelare som stöder oss finansiellt. Ändringar kan göras på begäran. +rules-name=Regler +rules-tooltip=Den fullla listan över ExplosiveGamings regler. +rules-singleline=Även om riktlinjerna täcker de flesta av reglerna, den fulla listan har alltid prioritet och går alltid före en riktlinje. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. +rules-format=__1__) __2__ +rules-rule1=Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. +rules-rule2=Buggar och utnyttjingssätt ska rapporteras till team-medlemmar (exkluderande kreativa saker) +rules-rule3=Var inte respektlös mot någon annan spelare i servern. +rules-rule4=Att ta alla saker från ett bälte eller logistikbegäran är förbjudet: att dela med sig av resurserna är obligatoriskt. +rules-rule5=Spam (genom chat, bottar, obegränsade kistor eller betong) är inte tillåtet. +rules-rule6=Gör inga placeringar/borttagningar av betong eller sten med hjälp av bottar utan tillåtelse. +rules-rule7=Använd inte aktiva tillgångskistor utan tillåtelse. +rules-rule8=Använd inte högtalare globalt eller med varningar utan tillåtelse. +rules-rule9=Ta inte bort eller flytta huvuddelar av fabriken utan tillåtelse. +rules-rule10=Gå inte omkring i slumpvisa riktningar utan anledning (för att spara kartstorlek och serverresurser) +rules-rule11=Ta inte bort saker utan att fråga dina medspelare. +rules-rule12=Rotera inte bälten, deaktivera inte bälten med kabel och orsaka inte produktionsstop. +rules-rule13=Gör inte tågrondeller. Eller någon loop av något slag. +rules-rule14=Vid användning av tåg, använd samma storlek som andra spelare använt sig av. +rules-rule15=Tåg körs endast med vänstertrafik. +rules-rule16=Klaga inte om lag, låg fps, låg ups etc. +rules-rule17=Be inte om högre rang. Våra ranger är synkroniserade med Discord, se till att du ansluter dig till oss där. +rules-rule18=Gör inte reklam för andra servrar om du inte är en betrodd serverägare. +rules-rule19=Rapportera spelare som bryter mot reglerna. +rules-rule20=Använd sunt förnuft och vad en admin säger gäller. From f94039eccc15c06ede13e796f71dfb87fb0047dd Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Wed, 18 Apr 2018 00:58:23 +0200 Subject: [PATCH 250/392] Update readme.cfg --- locale/sv-SE/readme.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/sv-SE/readme.cfg b/locale/sv-SE/readme.cfg index 0a731162..22e411d6 100644 --- a/locale/sv-SE/readme.cfg +++ b/locale/sv-SE/readme.cfg @@ -44,7 +44,7 @@ servers-cap6=Donator servers-des6=För spelare som stöder oss finansiellt. Ändringar kan göras på begäran. rules-name=Regler rules-tooltip=Den fullla listan över ExplosiveGamings regler. -rules-singleline=Även om riktlinjerna täcker de flesta av reglerna, den fulla listan har alltid prioritet och går alltid före en riktlinje. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. +rules-singleline=Även om riktlinjerna täcker de flesta av reglerna, den fulla listan har alltid prioritet och går alltid före riktlinjerna. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. rules-format=__1__) __2__ rules-rule1=Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. rules-rule2=Buggar och utnyttjingssätt ska rapporteras till team-medlemmar (exkluderande kreativa saker) @@ -53,7 +53,7 @@ rules-rule4=Att ta alla saker från ett bälte eller logistikbegäran är förbj rules-rule5=Spam (genom chat, bottar, obegränsade kistor eller betong) är inte tillåtet. rules-rule6=Gör inga placeringar/borttagningar av betong eller sten med hjälp av bottar utan tillåtelse. rules-rule7=Använd inte aktiva tillgångskistor utan tillåtelse. -rules-rule8=Använd inte högtalare globalt eller med varningar utan tillåtelse. +rules-rule8=Använd inte globala högtalare varningar utan tillåtelse. rules-rule9=Ta inte bort eller flytta huvuddelar av fabriken utan tillåtelse. rules-rule10=Gå inte omkring i slumpvisa riktningar utan anledning (för att spara kartstorlek och serverresurser) rules-rule11=Ta inte bort saker utan att fråga dina medspelare. From 1bfbf78ebc62497bc6cd72f8989fe10acee5497a Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Wed, 18 Apr 2018 16:14:49 +0200 Subject: [PATCH 251/392] Delete reports.cfg --- locale/sv/reports.cfg | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 locale/sv/reports.cfg diff --git a/locale/sv/reports.cfg b/locale/sv/reports.cfg deleted file mode 100644 index bc9e0c7c..00000000 --- a/locale/sv/reports.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[reports] -name=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. -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. From e8a6c546328f8398a6bc20d4effcb5b39fe7f340 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 18 Apr 2018 19:11:41 +0100 Subject: [PATCH 252/392] Merge branch 'core' --- locale/sv-SE/reports.cfg | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/locale/sv-SE/reports.cfg b/locale/sv-SE/reports.cfg index 8e21e1db..bc9e0c7c 100644 --- a/locale/sv-SE/reports.cfg +++ b/locale/sv-SE/reports.cfg @@ -1,14 +1,14 @@ -[reports] -name=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. -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. +[reports] +name=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. +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. From 61bdd84c2e0aeb3c54a41b3be67d08c0c1961584 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 18 Apr 2018 19:32:55 +0100 Subject: [PATCH 253/392] Fixed Bonus After Death And Instant Respawn --- Addons/Commands/bonus.lua | 24 ++++++++++++++++++++++++ Addons/playerRanks.lua | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index b2e7a40d..9ebbe5da 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -17,11 +17,18 @@ local settings = { {key='character_inventory_slots_bonus',scale=200} } +local function _bonus(reset) + global.addons = not reset and global.addons or {} + global.addons.homes = not reset and global.addons.bonus or {} + return global.addons.bonus +end + commands.add_command('bonus', 'Set your player bonus (default is 20, guest has 0)', {'bonus'}, function(event,args) local player = Game.get_player(event) local bonus = tonumber(args.bonus) if not bonus or bonus < 0 or bonus > 50 then player_return{'commands.invalid-range',0,50} return commands.error end for _,setting in pairs(settings) do player[setting.key] = setting.scale*math.floor(bonus)*0.01 end + _bonus()[player.index]=bonus player_return('Bonus set to: '..math.floor(bonus)..'%') end) @@ -29,7 +36,24 @@ Event.register(defines.events.rank_change,function(event) local player = Game.get_player(event) if event.new_rank:allowed('bonus') then for _,setting in pairs(settings) do player[setting.key] = setting.scale*0.2 end + _bonus()[player.index]=0.2 else for _,setting in pairs(settings) do player[setting.key] = 0 end + _bonus()[player.index]=nil + end +end) + +Event.register(defines.events.on_player_respawned,fucntion(event) + local player = Game.get_player(event) + local bonus = _bonus()[player.index] + if bonus then + for _,setting in pairs(settings) do player[setting.key] = setting.scale*math.floor(bonus)*0.01 end + end +end) + +Event.register(defines.events.on_player_died,function(event) + local player = Game.get_player(event) + if Ranking.get_rank(player):allowed('bonus-respawn') then + player.ticks_to_respawn = nil end end) \ No newline at end of file diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 8801a98d..9cb19c79 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -189,7 +189,8 @@ ranks['Donator']:edit('allow',false,{ ['set-home']=true, ['home']=true, ['return']=true, - ['bonus']=true + ['bonus']=true, + ['bonus-respawn']=true }) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, From 7e887cb7dca49c5270a145991115ce48eefbadbe Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 18 Apr 2018 19:53:31 +0100 Subject: [PATCH 254/392] Bonus Fixed and Admin Bring Fixed --- Addons/Commands/bonus.lua | 8 ++++---- Addons/Guis/admin-gui.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index 9ebbe5da..2b6b8ec3 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -19,7 +19,7 @@ local settings = { local function _bonus(reset) global.addons = not reset and global.addons or {} - global.addons.homes = not reset and global.addons.bonus or {} + global.addons.bonus = not reset and global.addons.bonus or {} return global.addons.bonus end @@ -36,14 +36,14 @@ Event.register(defines.events.rank_change,function(event) local player = Game.get_player(event) if event.new_rank:allowed('bonus') then for _,setting in pairs(settings) do player[setting.key] = setting.scale*0.2 end - _bonus()[player.index]=0.2 + _bonus()[player.index]=20 else for _,setting in pairs(settings) do player[setting.key] = 0 end _bonus()[player.index]=nil end end) -Event.register(defines.events.on_player_respawned,fucntion(event) +Event.register(defines.events.on_player_respawned,function(event) local player = Game.get_player(event) local bonus = _bonus()[player.index] if bonus then @@ -54,6 +54,6 @@ end) Event.register(defines.events.on_player_died,function(event) local player = Game.get_player(event) if Ranking.get_rank(player):allowed('bonus-respawn') then - player.ticks_to_respawn = nil + player.ticks_to_respawn = 0 end end) \ No newline at end of file diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index 696a9a5c..4c0cbf79 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -92,7 +92,7 @@ local take_action = Gui.inputs.add{ local _rank = Ranking.get_rank(_player) if rank.power >= _rank.power then dropdowns.warning.caption = {'admin-commands.rank-high'} return end local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text - if selected == 'Jail' or selected == 'Kick' or selected == 'Ban' or selected == 'Temp Ban' and _reason == 'Enter Reason' or string.len(_reason) < 20 then return end + if (selected == 'Jail' or selected == 'Kick' or selected == 'Ban' or selected == 'Temp Ban') and (_reason == 'Enter Reason' or string.len(_reason) < 20) then return end Admin.take_action(_action,_player,event.player_index,_reason) Gui.center.clear(event) end) From e36d70f6d467fb17ca5874d509723380984ad6b1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 18 Apr 2018 20:12:15 +0100 Subject: [PATCH 255/392] Fixed Instant Respawn --- Addons/Commands/bonus.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index 2b6b8ec3..ef4376eb 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -51,9 +51,9 @@ Event.register(defines.events.on_player_respawned,function(event) end end) -Event.register(defines.events.on_player_died,function(event) +Event.register(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) if Ranking.get_rank(player):allowed('bonus-respawn') then - player.ticks_to_respawn = 0 + player.ticks_to_respawn = nil end end) \ No newline at end of file From 9e4ef485507c859ff795e18b8f9876313441f3cf Mon Sep 17 00:00:00 2001 From: badgamernl Date: Wed, 18 Apr 2018 23:49:26 +0200 Subject: [PATCH 256/392] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..cc15905a --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + Scenario for Facotorio multiplayer. + Copyright (C) 2018 badgamernl + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + explosivegaming.nl Copyright (C) 2018 badgamernl + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From f2fa5f0287328908f066b9310a30da89c11a7ce0 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Thu, 19 Apr 2018 19:06:42 +0200 Subject: [PATCH 257/392] translations fixed (all files but one I think) (#36) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed --- locale/en/base-damage.cfg | 2 +- locale/sv-SE/admin.cfg | 15 +++++++++++++++ locale/sv-SE/announcements.cfg | 7 +++++++ locale/sv-SE/base-damage.cfg | 3 +++ locale/sv-SE/chat-bot.cfg | 24 ++++++++++++++++++++++++ locale/sv-SE/exp-core.cfg | 22 ++++++++++++++++++++++ locale/sv-SE/game-settings.cfg | 31 +++++++++++++++++++++++++++++++ locale/sv-SE/inventory-search.cfg | 4 ++++ locale/sv-SE/player-info.cfg | 8 ++++++++ locale/sv-SE/player-list.cfg | 5 +++++ locale/sv-SE/polls.cfg | 7 +++++++ locale/sv-SE/rank-changer.cfg | 9 +++++++++ locale/sv-SE/rockets.cfg | 13 +++++++++++++ locale/sv-SE/science.cfg | 15 +++++++++++++++ locale/sv-SE/tasklist.cfg | 4 ++++ locale/sv-SE/tree-decon | 3 +++ locale/sv-SE/warp-system.cfg | 9 +++++++++ 17 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 locale/sv-SE/admin.cfg create mode 100644 locale/sv-SE/announcements.cfg create mode 100644 locale/sv-SE/base-damage.cfg create mode 100644 locale/sv-SE/chat-bot.cfg create mode 100644 locale/sv-SE/exp-core.cfg create mode 100644 locale/sv-SE/game-settings.cfg create mode 100644 locale/sv-SE/inventory-search.cfg create mode 100644 locale/sv-SE/player-info.cfg create mode 100644 locale/sv-SE/player-list.cfg create mode 100644 locale/sv-SE/polls.cfg create mode 100644 locale/sv-SE/rank-changer.cfg create mode 100644 locale/sv-SE/rockets.cfg create mode 100644 locale/sv-SE/science.cfg create mode 100644 locale/sv-SE/tasklist.cfg create mode 100644 locale/sv-SE/tree-decon create mode 100644 locale/sv-SE/warp-system.cfg diff --git a/locale/en/base-damage.cfg b/locale/en/base-damage.cfg index 1cb4d0f8..025dc56f 100644 --- a/locale/en/base-damage.cfg +++ b/locale/en/base-damage.cfg @@ -1,3 +1,3 @@ [base-damage] used=You hit some of your own buildings. Please be careful next time! -nukes=Nukes are not allowed in your rank. This is a preventive measure against grievers. \ No newline at end of file +nukes=Nukes are not allowed in your rank. This is a preventive measure against griefers. diff --git a/locale/sv-SE/admin.cfg b/locale/sv-SE/admin.cfg new file mode 100644 index 00000000..c4432fa8 --- /dev/null +++ b/locale/sv-SE/admin.cfg @@ -0,0 +1,15 @@ +[admin-commands] +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 diff --git a/locale/sv-SE/announcements.cfg b/locale/sv-SE/announcements.cfg new file mode 100644 index 00000000..f3f38a32 --- /dev/null +++ b/locale/sv-SE/announcements.cfg @@ -0,0 +1,7 @@ + +[announcements] +name=Meddelanden +tooltip=Sänder ett meddelande till alla spelare +sent-to=Det här meddelandet är skickat till __1__ +sent-by=Det här meddelandet är skickat av __1__ ( __2__ ) +select-rank=Det här meddelandet kommer att skickas till: diff --git a/locale/sv-SE/base-damage.cfg b/locale/sv-SE/base-damage.cfg new file mode 100644 index 00000000..db96b8a7 --- /dev/null +++ b/locale/sv-SE/base-damage.cfg @@ -0,0 +1,3 @@ +[base-damage] +used=Du träffade några av dina egna byggnader. Var försiktig nästa gång! +nukes=Kärnvapen är inte tillåted för din rang. Det här är en förebyggande åtgärd mot griefers (bråkstakar) diff --git a/locale/sv-SE/chat-bot.cfg b/locale/sv-SE/chat-bot.cfg new file mode 100644 index 00000000..df7e5fe3 --- /dev/null +++ b/locale/sv-SE/chat-bot.cfg @@ -0,0 +1,24 @@ + +[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 för mer information +join-us=Var snäll och förena dig med oss: +discord=Discord: https://discord.me/explosivegaming +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__ De har varit afk för: __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=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! diff --git a/locale/sv-SE/exp-core.cfg b/locale/sv-SE/exp-core.cfg new file mode 100644 index 00000000..7dacce04 --- /dev/null +++ b/locale/sv-SE/exp-core.cfg @@ -0,0 +1,22 @@ +[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=Spellare ä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 + +[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. + +[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 diff --git a/locale/sv-SE/game-settings.cfg b/locale/sv-SE/game-settings.cfg new file mode 100644 index 00000000..f8d8fd3d --- /dev/null +++ b/locale/sv-SE/game-settings.cfg @@ -0,0 +1,31 @@ +[game-settings] +name=Game Settings +tooltip=Edits Game Settings. Please use responsibly. +basic-name=Basic Settings +basic-tooltip=These settings are safe to edit and have no big impact. +basic-message=Basic Settings can be used to improve game play for players. +advanced-name=Advanced Settings +advanced-tooltip=These settings should be left alone unless you know what you are doing. +advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realize. +personal-name=Personal Settings +personal-tooltip=Personal Settings only affects you. +personal-message=Personal Settings only affects your character. If you are spotted as a result of these settings, you are on your own! +sure=Are you sure? +effect-mining-speed=Mining Speed +effect-craft-speed=Crafting Speed +effect-running-speed=Running Speed +effect-build-distance=Build Distance +effect-reach-distance=Reach Distance +effect-bot-speed=Bot Speed +effect-lab-speed=Lab Speed +effect-stack-bonus=Stack Bonus +effect-quickbar-count=Quickbar Count +effect-inventory-size=Inventory Size +effect-mining-prod=Mining Productivity +effect-game-speed=Game Speed +effect-save=Save Game +effect-reload-effects=Reload Effects +effect-reload-map=Reload Minimap +effect-kill-biters=Kill Biters +effect-crc=Force CRC Check +effect-reset-force=Reset Force diff --git a/locale/sv-SE/inventory-search.cfg b/locale/sv-SE/inventory-search.cfg new file mode 100644 index 00000000..3de370f6 --- /dev/null +++ b/locale/sv-SE/inventory-search.cfg @@ -0,0 +1,4 @@ +[inventory-search] +low=Ditt inventarie blev genomsökt och __1__ togs bort. +med=Ditt inventarie blev genomsökt och __1__ togs bort, du har fått en varning på grund av detta. +high=Ditt inventarie blev genomsökt och __1__ togs bort: Det här är inte tillåtet. Som ett resultat av det har du blivit tillfälligt bannlyst. diff --git a/locale/sv-SE/player-info.cfg b/locale/sv-SE/player-info.cfg new file mode 100644 index 00000000..2f5b5e22 --- /dev/null +++ b/locale/sv-SE/player-info.cfg @@ -0,0 +1,8 @@ +[player-info] +yes=Ja +no=Nej +name=[__1__] __2__ +online=Är Online: __1__ (__2__) +admin=Har Admin: __1__ +group=I användargrupp: __1__ +rank=Har rang: __1__ diff --git a/locale/sv-SE/player-list.cfg b/locale/sv-SE/player-list.cfg new file mode 100644 index 00000000..b415bf5d --- /dev/null +++ b/locale/sv-SE/player-list.cfg @@ -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 diff --git a/locale/sv-SE/polls.cfg b/locale/sv-SE/polls.cfg new file mode 100644 index 00000000..39095bbe --- /dev/null +++ b/locale/sv-SE/polls.cfg @@ -0,0 +1,7 @@ +[polls] +name=Undersökningar +tooltip=Se gamla undersökningar +no-poll=Inga gamla undersökningar +end=Röstning slutade nyss: __1__ +winner=__1__ hade flest röster. +time-left=Du kommer att få __1__s att välja. diff --git a/locale/sv-SE/rank-changer.cfg b/locale/sv-SE/rank-changer.cfg new file mode 100644 index 00000000..54a091ae --- /dev/null +++ b/locale/sv-SE/rank-changer.cfg @@ -0,0 +1,9 @@ +[rank-changer] +name=Rangbytare +tooltip=Byt rang för en spelare under dig. +no-info-file=Ingen fil kunde hittas. +message=Välj en spelare och en önskad rang. Du kan bara ge ny rang till personer som har lägre rang än du. +warning=Varning: Den här spelaren har högre rang än du. Därför kan du inte redigera dennes rang. +rank-high=Warning: Varning: Den här spelaren har högre rang än du. Därför kan du inte redigera dennes rang. +invalid=Antingen spelaren eller rangen är ogiltig. Var vänlig försök igen! +set-rank=Sätt spelares rang diff --git a/locale/sv-SE/rockets.cfg b/locale/sv-SE/rockets.cfg new file mode 100644 index 00000000..0f0dbd5a --- /dev/null +++ b/locale/sv-SE/rockets.cfg @@ -0,0 +1,13 @@ + +[rockets] +name=Raketinformation +tooltip=Lista över detaljerna kring skickade raketer. +none=Inga raketer har blivit skickade ännu. +nan=Inte tillgängligt +sent=Skickade raketer: __1__ +first=Första uppskjutningen skedde: __1__ +last=Senaste uppskjutningen tog: __1__ +time=Genomsnittlig uppskjutningstid: __1__ +fastest=Snabbaste uppskjutning: __1__ +milestones=Milstolpar: +format=__1__: __2__ diff --git a/locale/sv-SE/science.cfg b/locale/sv-SE/science.cfg new file mode 100644 index 00000000..0cfdf11e --- /dev/null +++ b/locale/sv-SE/science.cfg @@ -0,0 +1,15 @@ + +[science] +name=Vetenskapsinformation +tooltip=Detaljerad lista över vetenskapspaket. +total=Paket gjorda: +time=Paket per minut: +format=__1__: __2__ +science-pack-1=Röda +science-pack-2=Gröna +science-pack-3=Blåa +military-science-pack=Militära +production-science-pack=Produktion +high-tech-science-pack=Högteknologiska +space-science-pack=Rymd +none=Inga vetenskapspaket har blivit gjorda ännu. diff --git a/locale/sv-SE/tasklist.cfg b/locale/sv-SE/tasklist.cfg new file mode 100644 index 00000000..cb84ae48 --- /dev/null +++ b/locale/sv-SE/tasklist.cfg @@ -0,0 +1,4 @@ +[tasklist] +name=Uppgiftslista +tooltip=Jobb som behövs slutföras överallt i fabriken +none=Det finns för närvarande inga uppgifter. Fråga en medlem i spelet eller via Discord för att lägga till uppgifter. diff --git a/locale/sv-SE/tree-decon b/locale/sv-SE/tree-decon new file mode 100644 index 00000000..5d7e1563 --- /dev/null +++ b/locale/sv-SE/tree-decon @@ -0,0 +1,3 @@ +[tree-decon] +player-print=Du har inte tillåtelse med det här just nu. Du behöver ha rang "Regular" vilket kan uppnås genom 3 timmar inne i spelet (den här kartan) hos Explosive Gaming. +rank-print=__1__ försökte dekonstruera något. diff --git a/locale/sv-SE/warp-system.cfg b/locale/sv-SE/warp-system.cfg new file mode 100644 index 00000000..6c468e82 --- /dev/null +++ b/locale/sv-SE/warp-system.cfg @@ -0,0 +1,9 @@ +[warp-system] +name=Warp-lista +tooltip=En lista över Warp-punkter. +remove-tooltip=Ta bort Warp-punkt +go-to-tooltip=Gå till +cooldown=Du måste vänta på nedräkningen. Tid kvar: __1__ +cooldown-zero=Din nedräkningstimer har gått ut, så nu kan du använda Warp-punkter igen. +name-used=Det namnet är redan taget. +not-on-warp=Du är inte på en Warp-punkt just nu, för att gå till en Warp-punkt måste du befinna dig på en. From d5205efbad3940296df1add89c0095d242e7c904 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 19 Apr 2018 19:49:24 +0100 Subject: [PATCH 258/392] Changed Quick Respawn To 60 Ticks --- Addons/Commands/bonus.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index ef4376eb..5e4e9b80 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -54,6 +54,6 @@ end) Event.register(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) if Ranking.get_rank(player):allowed('bonus-respawn') then - player.ticks_to_respawn = nil + player.ticks_to_respawn = 60 end end) \ No newline at end of file From f0051d2ce983fdb2f0743063554c021836b10365 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 20 Apr 2018 15:28:08 +0100 Subject: [PATCH 259/392] Fixed Bug In Reports.lua --- Addons/Admin/reports.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index fbc7157f..ccea1637 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -150,7 +150,7 @@ function Admin.report(player,by_player,reason) local player, by_player_name = valid_players(player,by_player) if not player or Ranking.get_rank(player):allowed('no-report') then return end if Admin.is_banned(by_player) or Ranking.get_group(by_player).name == 'Jail' then return end - if rank:allowed('varified') then + if Ranking.get_rank(by_player):allowed('varified') then _reports().varified[player.name] = _reports().varified[player.name] or {} local reports = _reports().varified[player.name] for _,value in pairs(reports) do From 07c6ea882fa683a1f1e686882250bf5d40200352 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 20 Apr 2018 20:53:33 +0100 Subject: [PATCH 260/392] Some Changes to maybe Fix Problem With Afk Kick --- Addons/Admin/afk-kick.lua | 4 ++-- Addons/Guis/polls.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index 06557f93..49ef748c 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -local function get_afk_time(player) +function _.get_afk_time(player) local rank = Ranking.get_rank(player) local count = #game.connected_players local base = rank.base_afk_time or false @@ -22,7 +22,7 @@ Event.register(-1,function(event) }:on_event('tick',function(self) if (game.tick%3600) ~= 0 then return end for _,player in pairs(game.connected_players) do - local afk = #game.connected_players < 3 and 10 or get_afk_time(player) + local afk = #game.connected_players < 3 and 10 or _.get_afk_time(player) if afk then if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end end diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index a69bf50a..725b23be 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -16,7 +16,7 @@ local function _polls(reset) return global.addons.polls end -local function _poll_end(self) +function _._poll_end(self) local uuid = self.data.poll_uuid local poll = _polls().active[uuid] if not poll then return end @@ -49,7 +49,7 @@ local function _poll_data(question,answers) Server.new_thread{ data={poll_uuid=poll.uuid}, timeout=poll_time_out*60 - }:on_event('timeout',_poll_end):open() + }:on_event('timeout',_._poll_end):open() -- this time out is knowen to cause desyncs and so i have moved it to a hard coded function _polls().active[poll.uuid]=poll return poll.uuid From 5d442982993097525247e1adf2dc1f960f6f6a4e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Apr 2018 17:05:04 +0100 Subject: [PATCH 261/392] Fixing Afk Kick Bug --- Addons/Admin/afk-kick.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index 49ef748c..fba7601c 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -21,6 +21,7 @@ Event.register(-1,function(event) name='afk-kick', }:on_event('tick',function(self) if (game.tick%3600) ~= 0 then return end + if game.tick < 1 then return end for _,player in pairs(game.connected_players) do local afk = #game.connected_players < 3 and 10 or _.get_afk_time(player) if afk then From b60355cd77f2ec7348837f8fd0a4ac1fa45c9367 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Apr 2018 17:08:25 +0100 Subject: [PATCH 262/392] Trying To Fix Again --- Addons/Admin/afk-kick.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index fba7601c..6e2d260a 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -21,9 +21,8 @@ Event.register(-1,function(event) name='afk-kick', }:on_event('tick',function(self) if (game.tick%3600) ~= 0 then return end - if game.tick < 1 then return end for _,player in pairs(game.connected_players) do - local afk = #game.connected_players < 3 and 10 or _.get_afk_time(player) + local afk = #game.connected_players < 3 and 10 or _G._.get_afk_time(player) if afk then if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end end From 3d77da9de5aecd1b59b496cd5b6b951522ade430 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 22 Apr 2018 19:27:07 +0100 Subject: [PATCH 263/392] Changed One Thing --- Addons/Admin/afk-kick.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua index 6e2d260a..68a66a00 100644 --- a/Addons/Admin/afk-kick.lua +++ b/Addons/Admin/afk-kick.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -function _.get_afk_time(player) +function get_allowed_afk_time(player) local rank = Ranking.get_rank(player) local count = #game.connected_players local base = rank.base_afk_time or false @@ -22,7 +22,7 @@ Event.register(-1,function(event) }:on_event('tick',function(self) if (game.tick%3600) ~= 0 then return end for _,player in pairs(game.connected_players) do - local afk = #game.connected_players < 3 and 10 or _G._.get_afk_time(player) + local afk = #game.connected_players < 3 and 10 or get_allowed_afk_time(player) if afk then if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end end From b2111b6b4cfb178bfb9bfe20483cc3e43727bf9e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 22 Apr 2018 19:27:38 +0100 Subject: [PATCH 264/392] Changed Another Global Thing --- Addons/Guis/polls.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index 725b23be..2b3f9eb4 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -16,7 +16,7 @@ local function _polls(reset) return global.addons.polls end -function _._poll_end(self) +function _poll_end(self) local uuid = self.data.poll_uuid local poll = _polls().active[uuid] if not poll then return end @@ -49,7 +49,7 @@ local function _poll_data(question,answers) Server.new_thread{ data={poll_uuid=poll.uuid}, timeout=poll_time_out*60 - }:on_event('timeout',_._poll_end):open() + }:on_event('timeout',_poll_end):open() -- this time out is knowen to cause desyncs and so i have moved it to a hard coded function _polls().active[poll.uuid]=poll return poll.uuid From e1d5603be757d80f4854afd0c7ccd81cc8ac68b2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 23 Apr 2018 18:06:32 +0100 Subject: [PATCH 265/392] Small Changes To PLayer Info Gui --- Addons/Admin/player-info.lua | 2 +- Addons/Guis/admin-gui.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/player-info.lua b/Addons/Admin/player-info.lua index d9d03245..465a8a21 100644 --- a/Addons/Admin/player-info.lua +++ b/Addons/Admin/player-info.lua @@ -33,7 +33,7 @@ function get_player_info(player,frame,add_cam) frame.add{type='label',caption={'player-info.group',_player.group}} frame.add{type='label',caption={'player-info.rank',_player.rank}} if add_cam then - Gui.cam_link{entity=player.character,frame=frame,width=200,height=75,zoom=0.5,respawn_open=true} + Gui.cam_link{entity=player.character,frame=frame,width=200,height=150,zoom=0.5,respawn_open=true} end end return _player diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index 4c0cbf79..b2404db5 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -133,7 +133,7 @@ Admin.center = Gui.center.add{ type='flow', direction='vertical' } - player_info_flow.style.height = 200 + player_info_flow.style.height = 300 player_info_flow.style.width = 200 local label = dropdowns.add{ type='label', From 2e6a2762e38e020ae393f00f702581ebf2ef1fcd Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Tue, 24 Apr 2018 22:52:56 +0200 Subject: [PATCH 266/392] Just some grammar and spelling fixes (#37) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change --- locale/en/chat-bot.cfg | 2 +- locale/sv-SE/chat-bot.cfg | 6 ++---- locale/sv-SE/exp-core.cfg | 4 ++-- locale/sv-SE/polls.cfg | 2 +- locale/sv-SE/tasklist.cfg | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index d90c2687..fc01b9e7 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -13,7 +13,7 @@ read-readme=Make sure you have read the Readme (can be found through the questio 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__ +afk=Your afk? Look at __1__, that player has 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 ≖ ‿ ≖ diff --git a/locale/sv-SE/chat-bot.cfg b/locale/sv-SE/chat-bot.cfg index df7e5fe3..79c4cfd1 100644 --- a/locale/sv-SE/chat-bot.cfg +++ b/locale/sv-SE/chat-bot.cfg @@ -13,12 +13,10 @@ custom-commands=Vi använder oss av specialiserade kommandon, som till exempel / 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__ De har varit afk för: __2__ +afk=Är du afk (borta från tangentbordet)? Titta på __1__, den spelaren har varit afk för: __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=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! +loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! \ No newline at end of file diff --git a/locale/sv-SE/exp-core.cfg b/locale/sv-SE/exp-core.cfg index 7dacce04..40791114 100644 --- a/locale/sv-SE/exp-core.cfg +++ b/locale/sv-SE/exp-core.cfg @@ -4,7 +4,7 @@ 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=Spellare är offline. Kommando misslyckades med att köras. +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 @@ -19,4 +19,4 @@ tag-reset=Din tag blev återställd på grund av rangförändrning. [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 +cant-open-no-reason=Du kan inte öppna den här panelen just nu \ No newline at end of file diff --git a/locale/sv-SE/polls.cfg b/locale/sv-SE/polls.cfg index 39095bbe..4331b9d7 100644 --- a/locale/sv-SE/polls.cfg +++ b/locale/sv-SE/polls.cfg @@ -4,4 +4,4 @@ tooltip=Se gamla undersökningar no-poll=Inga gamla undersökningar end=Röstning slutade nyss: __1__ winner=__1__ hade flest röster. -time-left=Du kommer att få __1__s att välja. +time-left=Du kommer att få __1__s på dig att välja. \ No newline at end of file diff --git a/locale/sv-SE/tasklist.cfg b/locale/sv-SE/tasklist.cfg index cb84ae48..dcfd6e8c 100644 --- a/locale/sv-SE/tasklist.cfg +++ b/locale/sv-SE/tasklist.cfg @@ -1,4 +1,4 @@ [tasklist] name=Uppgiftslista tooltip=Jobb som behövs slutföras överallt i fabriken -none=Det finns för närvarande inga uppgifter. Fråga en medlem i spelet eller via Discord för att lägga till uppgifter. +none=Det finns för närvarande inga uppgifter. Fråga en medlem i spelet eller via Discord för att lägga till nya uppgifter. \ No newline at end of file From 1f6fcd439e1b4aa7c9c0e371b538a9f24a6fbce3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 26 Apr 2018 16:43:12 +0100 Subject: [PATCH 267/392] Added More To Sync --- Addons/Guis/rockets.lua | 20 +++++++++++++++++++- Addons/Guis/science.lua | 18 +++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index 5ca8fb1f..62fa1074 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -83,4 +83,22 @@ Gui.left.add{ end } -Event.register(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) \ No newline at end of file +Event.register(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) +Sync.add_update('rockets',function() + local _return = {} + local data = _global() + local satellites = game.forces.player.get_item_launched('satellite') + local time = {'rockets.nan'} + if satellites == 1 then time = tick_to_display_format(game.tick) + elseif satellites > 1 then time = tick_to_display_format((game.tick-data.first)/satellites) end + _return.total = satellites + _return.first = Sync.tick_format(data.first) + _return.last = Sync.tick_format(data.last-data._last) + _return.time = Sync.tick_format(time) + _return.fastest = Sync.tick_format(data.fastest) + _return.milestones = {} + for milestone,time in pairs(data.milestones) do + _return.milestones[milestone] = Sync.tick_format(_time) + end + return _return +end) \ No newline at end of file diff --git a/Addons/Guis/science.lua b/Addons/Guis/science.lua index 1bca2004..1cdf7887 100644 --- a/Addons/Guis/science.lua +++ b/Addons/Guis/science.lua @@ -83,4 +83,20 @@ Gui.left.add{ end } -Event.register(defines.events.on_research_finished,function(event) Gui.left.update('science') end) \ No newline at end of file +Event.register(defines.events.on_research_finished,function(event) Gui.left.update('science') end) +Sync.add_update('science',function() + local _return = {} + local _data = _global() + for force_name,data in pairs(_data) do + if force_name ~= '_base' then + _return[force_name] = {totals={},times={}} + for i,name in pairs(science_packs) do + local made = data.made[i] + _return[force_name].totals[name] = made + local _made = string.format('%.2f',(made-data._made[i])/((data.update-data._update)/(3600*game.speed))) + _return[force_name].times[name] = _made + end + end + end + return _return +end) \ No newline at end of file From 035ef4b2e193ded5590149273115b6d1e83a6ed4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 26 Apr 2018 16:49:11 +0100 Subject: [PATCH 268/392] Fixed Rockets in Sync --- Addons/Guis/rockets.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index 62fa1074..10f716d1 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -98,7 +98,7 @@ Sync.add_update('rockets',function() _return.fastest = Sync.tick_format(data.fastest) _return.milestones = {} for milestone,time in pairs(data.milestones) do - _return.milestones[milestone] = Sync.tick_format(_time) + _return.milestones[milestone] = Sync.tick_format(time) end return _return end) \ No newline at end of file From 7d760ceb5720af286366971398cf44a7aec5c376 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 27 Apr 2018 16:52:25 +0100 Subject: [PATCH 269/392] Spawn always at top of warp list --- Addons/Guis/warp-system.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index bf18db23..1b378438 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -85,7 +85,10 @@ local function make_warp_point(position,surface,force,name) icon={type='item',name=warp_item} }) _warps().warps[name] = {tag=tag,surface=surface,position=tag.position,old_tile=old_tile} - _warps().warps = table.keysort(_warps().warps) + local _temp = {Spawn=_warps().warps.Spawn} + _warps().warps.Spawn = nil + for name,data in pairs(table.keysort(_warps().warps)) do _temp[name] = data end + _warps().warps = _temp Gui.left.update('warp-list') end From 12e0f3adc789e1e4c924efb504893ccb51f7cfe4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 27 Apr 2018 17:14:18 +0100 Subject: [PATCH 270/392] Added cant-report-ban to admin commands --- Addons/Commands/admin.lua | 15 +++++++++++---- locale/en/reports.cfg | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 8cbeac66..4635a0fc 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -13,7 +13,8 @@ commands.add_command('report', 'Reports a player.', {'player','reason',true}, fu local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end Admin.report(player,event.player_index,reason) @@ -23,7 +24,8 @@ commands.add_command('warn', 'Gives a player a warnings', {'player','reason',tru local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end Admin.give_warning(player,event.player_index,reason) end) @@ -31,13 +33,15 @@ commands.add_command('jail', 'Jails a player', {'player','reason',true}, functio local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end Admin.jail(player,event.player_index,reason) end) commands.add_command('unjail', 'Returns the players old rank', {'player',true}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end Ranking.revert(player,event.player_index) end) @@ -45,25 +49,28 @@ commands.add_command('temp-ban', 'Temporarily ban a player.', {'player','reason' local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end Admin.temp_ban(player,event.player_index,reason) end) commands.add_command('clear-inv', 'Clears the player\'s invetory', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end Admin.move_inventory(player) end) commands.add_command('clear-warings', 'Clears the warnings on a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end Admin.clear_warings(player,event.player_index) end) commands.add_command('clear-reports', 'Clears the reports on a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end + if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg index 2f400fdd..72678613 100644 --- a/locale/en/reports.cfg +++ b/locale/en/reports.cfg @@ -3,6 +3,7 @@ name=Report Player 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 not be reported. +cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all warning-given-by=This warning was given by: __1__ player-warning=__1__ was given a warning by __2__ for: __3__ temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset From 7d8f367692b951b466fc2487484d94ab11fb1b1c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 2 May 2018 19:36:40 +0100 Subject: [PATCH 271/392] Too Close Warning of /make-warp --- Addons/Guis/warp-system.lua | 2 ++ locale/en/warp-system.cfg | 1 + 2 files changed, 3 insertions(+) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index 1b378438..b05a416f 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -97,6 +97,8 @@ commands.add_command('make-warp', 'Make a warp point at your location', {'name', local position = game.player.position local name = args.name 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 + -- to do add a test for all warps make_warp_point(position,game.player.surface,game.player.force,name) end) diff --git a/locale/en/warp-system.cfg b/locale/en/warp-system.cfg index 20e2f769..b241d7b4 100644 --- a/locale/en/warp-system.cfg +++ b/locale/en/warp-system.cfg @@ -6,4 +6,5 @@ go-to-tooltip=Go To cooldown=You must wait for the cooldown. Time left: __1__ cooldown-zero=Your cooldown has expired, You can use warp points again. name-used=That name is already taken. +too-close=You are too close to an existing warp point to make a new one. not-on-warp=You are not on a warp point right now, you must be on a warp point to go to one. \ No newline at end of file From 60c0166239b019d8f47debaceee84ae14923549b Mon Sep 17 00:00:00 2001 From: badgamernl Date: Fri, 4 May 2018 16:25:05 +0200 Subject: [PATCH 272/392] warings -> warnings --- Addons/Commands/admin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 4635a0fc..0bd05d6e 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -60,7 +60,7 @@ commands.add_command('clear-inv', 'Clears the player\'s invetory', {'player'}, f Admin.move_inventory(player) end) -commands.add_command('clear-warings', 'Clears the warnings on a player.', {'player'}, function(event,args) +commands.add_command('clear-warnings', 'Clears the warnings on a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end From 033d87e4febcf4ab9ae3f0b1fa5720f35427cabb Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Fri, 4 May 2018 10:01:06 -0500 Subject: [PATCH 273/392] Fix typos in descriptions of home commands (#40) --- Addons/Commands/home.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Addons/Commands/home.lua b/Addons/Commands/home.lua index c65df76d..cc08b439 100644 --- a/Addons/Commands/home.lua +++ b/Addons/Commands/home.lua @@ -14,24 +14,24 @@ local function _homes(reset) return global.addons.homes end -commands.add_command('set-home', 'Set Your Home Possition', {}, function(event,args) +commands.add_command('set-home', 'Set your home position', {}, function(event,args) local player = Game.get_player(event) if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end _homes()[player.index][1] = {math.floor(player.position.x),math.floor(player.position.y)} player_return('Home set at: ('..math.floor(player.position.x)..','..math.floor(player.position.y)..')') end) -commands.add_command('home', 'Goto you home possition', {}, function(event,args) +commands.add_command('home', 'Go to you home position', {}, function(event,args) local player = Game.get_player(event) if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end _homes()[player.index][2] = {math.floor(player.position.x),math.floor(player.position.y)} player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][1],32,1),player.surface) end) -commands.add_command('return', 'Goto where you were before using /home', {}, function(event,args) +commands.add_command('return', 'Go to where you were before using /home', {}, function(event,args) local player = Game.get_player(event) if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end local _temp = {math.floor(player.position.x),math.floor(player.position.y)} player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][2],32,1),player.surface) _homes()[player.index][2] = _temp -end) \ No newline at end of file +end) From c4bef6bcb10f0f29849a47d7a1a5e9aed6547df5 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Fri, 4 May 2018 17:03:01 +0200 Subject: [PATCH 274/392] LOOPAR, and some swenglish to swedish (#39) --- locale/sv-SE/chat-bot.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/sv-SE/chat-bot.cfg b/locale/sv-SE/chat-bot.cfg index 79c4cfd1..3d65d9d2 100644 --- a/locale/sv-SE/chat-bot.cfg +++ b/locale/sv-SE/chat-bot.cfg @@ -14,9 +14,9 @@ read-readme=Se till att du har läst "Readme" (Finn den genom att klicka på fr 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 för: __2__ +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=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! \ No newline at end of file +loops=INGA LOOPAR; LOOPAR ÄR DÅLIGT; JUST INGA LOOPAR!!!!!; OM DU GJÖR EN LOOP.... DET KOMMER INTE ATT SLUTA VÄL!!!!!!! From ef224eb3481adcd298d097ad8d9350d19795cd13 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Fri, 4 May 2018 20:58:56 +0200 Subject: [PATCH 275/392] Added Issue templates Bug report and Feature request --- .github/ISSUE_TEMPLATE/Bug_report.md | 28 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/Feature_request.md | 17 ++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/Bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/Feature_request.md diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md new file mode 100644 index 00000000..4f4c5a9d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -0,0 +1,28 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Other information (please complete the following information):** + - OS: [e.g. iOS, Windows, Linux] + - Factorio Version [e.g. 0.16.30] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md new file mode 100644 index 00000000..53842951 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 54507b9fc3bede6ff1e252141da53d441815146d Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Mon, 7 May 2018 18:13:08 +0200 Subject: [PATCH 276/392] estetical language change (#41) "publik" and "offentlig" means the same thing, but I later noticed that factorio uses "offentlig" in their translation. Better to have the same word. "offentlig" is also a slighly more common word. some other small misc grammar changes --- locale/sv-SE/readme.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/sv-SE/readme.cfg b/locale/sv-SE/readme.cfg index 22e411d6..30e6530e 100644 --- a/locale/sv-SE/readme.cfg +++ b/locale/sv-SE/readme.cfg @@ -30,30 +30,30 @@ servers-name=Servrar servers-tooltip=Information om våra servrar servers-singleline=Välkommen till ExplosiveGamings gemenskap! S1-S3 har förskjutna återställningar (resets). servers-format=S__1__: __2__ -servers-cap1=Publik +servers-cap1=Offentlig servers-des1=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. -servers-cap2=Publik +servers-cap2=Offentlig servers-des2=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. -servers-cap3=Publik +servers-cap3=Offentlig servers-des3=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. servers-cap4=Modifierad -servers-des4=A Modifierad server för alla spelare. Länk i Discord för medlemmar. +servers-des4=En modifierad server för alla spelare. Länk i Discord för medlemmar. servers-cap5=Evenemang servers-des5=Server för evenemang (alla kan ansluta sig) - Kan kräva lösenord. Anslut dig till Discord för mer info. servers-cap6=Donator servers-des6=För spelare som stöder oss finansiellt. Ändringar kan göras på begäran. rules-name=Regler rules-tooltip=Den fullla listan över ExplosiveGamings regler. -rules-singleline=Även om riktlinjerna täcker de flesta av reglerna, den fulla listan har alltid prioritet och går alltid före riktlinjerna. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. +rules-singleline=Även om riktlinjerna täcker de flesta av reglerna så har den fulla listan alltid prioritet och går alltid före riktlinjerna. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. rules-format=__1__) __2__ rules-rule1=Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. -rules-rule2=Buggar och utnyttjingssätt ska rapporteras till team-medlemmar (exkluderande kreativa saker) +rules-rule2=Buggar och utnyttjingssätt ska rapporteras till team-medlemmar (exkludera kreativa saker) rules-rule3=Var inte respektlös mot någon annan spelare i servern. rules-rule4=Att ta alla saker från ett bälte eller logistikbegäran är förbjudet: att dela med sig av resurserna är obligatoriskt. rules-rule5=Spam (genom chat, bottar, obegränsade kistor eller betong) är inte tillåtet. rules-rule6=Gör inga placeringar/borttagningar av betong eller sten med hjälp av bottar utan tillåtelse. rules-rule7=Använd inte aktiva tillgångskistor utan tillåtelse. -rules-rule8=Använd inte globala högtalare varningar utan tillåtelse. +rules-rule8=Använd inte globala högtalare eller varningar utan tillåtelse. rules-rule9=Ta inte bort eller flytta huvuddelar av fabriken utan tillåtelse. rules-rule10=Gå inte omkring i slumpvisa riktningar utan anledning (för att spara kartstorlek och serverresurser) rules-rule11=Ta inte bort saker utan att fråga dina medspelare. From 6ac9c11b9b45385d18006aa6b24abbf21553a683 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 8 May 2018 16:48:14 +0100 Subject: [PATCH 277/392] Re-Enabled Paths No Large File This Time --- StandAlone/load.lua | 2 +- StandAlone/paths.lua | 59 ++++++++------------------------------------ 2 files changed, 11 insertions(+), 50 deletions(-) diff --git a/StandAlone/load.lua b/StandAlone/load.lua index 84bcca6b..16841b94 100644 --- a/StandAlone/load.lua +++ b/StandAlone/load.lua @@ -12,5 +12,5 @@ require('colours') require('health') require('spawn') require('starting-items') ---require('paths') -- takes up too much file size +require('paths') require('body-marker') \ No newline at end of file diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 0929c976..bd7ea213 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,7 +1,6 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local clean_time = 18000 -- time in ticks local paths = { -- ['tile name'] = {health,convert to} -- health is in hundrads of steps @@ -30,39 +29,21 @@ local paths = { ['grass-4']={10,'dirt-4'} } for tile,value in pairs(paths) do - value[1]=value[1]*100 + value[1]=1/(value[1]*200) end local function global_key(surface,pos) - local key = 'S'..surface.name..'X'..math.floor(pos.x)..'Y'..math.floor(pos.y) - if not global.paths then global.paths = {} end - if not global.paths[key] then - local tile = surface.get_tile(pos).name - global.paths[key] = {tile,paths[tile][1]} - end - return global.paths[key] -end - -local function remove_key(surface,pos) - local key = 'S'..surface.name..'X'..math.floor(pos.x)..'Y'..math.floor(pos.y) - if not global.paths then global.paths = {} end - global.paths[key] = nil -end - -local function clean_global() - if not global.paths or not game then return end - for key,tile in pairs(global.paths) do - if tile[3] and tile[3] < game.tick-clean_time then global.paths[key] = nil end - end + return 'S'..surface.name..'X'..math.floor(pos.x)..'Y'..math.floor(pos.y) end local function down_grade(surface,pos) local tile = surface.get_tile(pos).name local new_tile = paths[tile][2] - if new_tile == 'world-gen' then new_tile = global_key(surface,pos)[1] or 'grass-1' end + if new_tile == 'world-gen' then + if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable + new_tile = global.paths[global_key(surface,pos)] or 'grass-1' + end surface.set_tiles{{name=new_tile,position=pos}} - global_key(surface,pos)[2]=paths[new_tile][1] - if not paths[new_tile] then remove_key(surface,pos) return end end Event.register(defines.events.on_player_built_tile, function(event) @@ -73,21 +54,9 @@ Event.register(defines.events.on_player_built_tile, function(event) and old_tile.old_tile.name ~= 'refined-hazard-concrete-left' and old_tile.old_tile.name ~= 'concrete' and old_tile.old_tile.name ~= 'hazard-concrete-right' and old_tile.old_tile.name ~= 'hazard-concrete-left' and old_tile.old_tile.name ~= 'stone-path' and old_tile.old_tile.name ~= 'water' and old_tile.old_tile.name ~= 'deep-water' then - global_key(surface,old_tile.position)[1]=old_tile.old_tile.name + if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable + global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name end - if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,old_tile.position) return end - global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] - global_key(surface,old_tile.position)[3] = event.tick - end -end) - -Event.register(defines.events.on_player_mined_tile, function(event) - local surface = game.surfaces[event.surface_index] - local old_tiles = event.tiles - for _,old_tile in pairs(old_tiles) do - if not paths[surface.get_tile(old_tile.position).name] then remove_key(surface,old_tile.position) return end - global_key(surface,old_tile.position)[2]=paths[surface.get_tile(old_tile.position).name][1] - global_key(surface,old_tile.position)[3] = event.tick end end) @@ -95,16 +64,8 @@ Event.register(defines.events.on_player_changed_position, function(event) local player = Game.get_player(event) local surface = player.surface local pos = player.position - if not paths[surface.get_tile(pos).name] then remove_key(surface,pos) return end - global_key(surface,pos)[2] = global_key(surface,pos)[2]-1 - if global_key(surface,pos)[2] <= 0 then + if not paths[surface.get_tile(pos).name] then return end + if math.random() < paths[surface.get_tile(pos).name][1] then down_grade(surface,pos) end - global_key(surface,pos)[3] = event.tick -end) - -Event.register(defines.events.on_tick, function(event) - if (game.tick%clean_time) == 0 then - clean_global() - end end) \ No newline at end of file From 470c699f1ce952a24775ef67620881c80ee551ef Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 8 May 2018 16:50:23 +0100 Subject: [PATCH 278/392] Some Git files that were auto added --- .github/ISSUE_TEMPLATE/Bug_report.md | 56 +++++++++++------------ .github/ISSUE_TEMPLATE/Feature_request.md | 34 +++++++------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index 4f4c5a9d..519efb41 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -1,28 +1,28 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Other information (please complete the following information):** - - OS: [e.g. iOS, Windows, Linux] - - Factorio Version [e.g. 0.16.30] - -**Additional context** -Add any other context about the problem here. +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Other information (please complete the following information):** + - OS: [e.g. iOS, Windows, Linux] + - Factorio Version [e.g. 0.16.30] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md index 53842951..066b2d92 100644 --- a/.github/ISSUE_TEMPLATE/Feature_request.md +++ b/.github/ISSUE_TEMPLATE/Feature_request.md @@ -1,17 +1,17 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From ce743e5d649831cbab5ccce597436748990e7cb3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 8 May 2018 16:50:23 +0100 Subject: [PATCH 279/392] changes will happen more often for paths --- StandAlone/paths.lua | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index bd7ea213..eac4e7b3 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -3,33 +3,33 @@ local paths = { -- ['tile name'] = {health,convert to} - -- health is in hundrads of steps - ['refined-concrete']={60,'concrete'}, - ['refined-hazard-concrete-right']={60,'hazard-concrete-right'}, - ['refined-hazard-concrete-left']={60,'hazard-concrete-left'}, - ['concrete']={40,'stone-path'}, - ['hazard-concrete-right']={40,'stone-path'}, - ['hazard-concrete-left']={40,'stone-path'}, - ['stone-path']={20,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player - ['sand-1']={5,'sand-2'}, - ['sand-2']={10,'sand-3'}, - ['sand-3']={5,'red-desert-3'}, - ['red-desert-3']={5,'red-desert-2'}, - ['red-desert-2']={10,'dirt-1'}, - ['grass-2']={5,'grass-1'}, - ['grass-1']={5,'grass-3'}, - ['grass-3']={10,'red-desert-0'}, - ['red-desert-0']={5,'red-desert-1'}, - ['red-desert-1']={10,'dirt-1'}, - ['dirt-1']={5,'dirt-2'}, - ['dirt-2']={5,'dirt-3'}, - ['dirt-3']={10,'dirt-4'}, - ['dirt-4']={5,'dirt-5'}, - ['dirt-5']={5,'dirt-6'}, - ['grass-4']={10,'dirt-4'} + -- health is the average (aim for 75%) number of steps in hundards before it changes + ['refined-concrete']={40,'concrete'}, + ['refined-hazard-concrete-right']={40,'hazard-concrete-right'}, + ['refined-hazard-concrete-left']={40,'hazard-concrete-left'}, + ['concrete']={30,'stone-path'}, + ['hazard-concrete-right']={30,'stone-path'}, + ['hazard-concrete-left']={30,'stone-path'}, + ['stone-path']={15,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player + ['sand-1']={3,'sand-2'}, + ['sand-2']={8,'sand-3'}, + ['sand-3']={3,'red-desert-3'}, + ['red-desert-3']={3,'red-desert-2'}, + ['red-desert-2']={8,'dirt-1'}, + ['grass-2']={3,'grass-1'}, + ['grass-1']={3,'grass-3'}, + ['grass-3']={8,'red-desert-0'}, + ['red-desert-0']={3,'red-desert-1'}, + ['red-desert-1']={8,'dirt-1'}, + ['dirt-1']={3,'dirt-2'}, + ['dirt-2']={3,'dirt-3'}, + ['dirt-3']={8,'dirt-4'}, + ['dirt-4']={3,'dirt-5'}, + ['dirt-5']={3,'dirt-6'}, + ['grass-4']={8,'dirt-4'} } for tile,value in pairs(paths) do - value[1]=1/(value[1]*200) + value[1]=1/(value[1]*150) end local function global_key(surface,pos) From 0c148bdce3ea8b68e63280d537a94b43e775e59c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 9 May 2018 20:28:26 +0100 Subject: [PATCH 280/392] Readded Polls --- Addons/Guis/polls.lua | 57 +++++++++++++++++++++++++++++-------------- Addons/load.lua | 2 +- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index 2b3f9eb4..290746c4 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -132,19 +132,33 @@ local next = Gui.inputs.add{ draw_poll(parent.parent.poll_area) end) --- this function from redmew, would take too much to make a better one +local poll_question_input = Gui.inputs.add_text('poll-question-input',true,'Question',function(player,text,element) + local options = element.parent.options + if not options.question then options.add{type='label',name='question',caption=''} + else options.question.caption = text end +end) + +local _self_referace_poll_option_input = nil +local poll_option_input = Gui.inputs.add_text('poll-option-input',true,'Enter Option',function(player,text,element) + local options = element.parent.parent.parent.options + if not options[element.parent.name] then options.add{type='label',name=element.parent.name,caption=text} + else options[element.parent.name].caption = text end + if options.last.caption == element.parent.name then + options.last.caption = tonumber(options.last.caption)+1 + _self_referace_poll_option_input:draw(element.parent.parent.add{type='flow',name=options.last.caption}).style.minimal_width = 200 + end +end) +_self_referace_poll_option_input = poll_option_input + local function poll_assembler(frame) - frame.clear() - local frame_table = frame.add { type = 'table', name = 'table_poll_assembler', column_count = 2 } - frame_table.add { type = 'label', caption = 'Question:' } - frame_table.add { type = 'textfield', name = 'textfield_question', text = '' } - frame_table.add { type = 'label', caption = 'Option #1:' } - frame_table.add { type = 'textfield', name = 'textfield_answer_1', text = '' } - frame_table.add { type = 'label', caption = 'Option #2:' } - frame_table.add { type = 'textfield', name = 'textfield_answer_2', text = '' } - frame_table.add { type = 'label', caption = 'Option #3:' } - frame_table.add { type = 'textfield', name = 'textfield_answer_3', text = '' } - frame_table.add { type = 'label', caption = '' } + frame.clear() + local options = frame.add{type='flow',name='options'} + options.style.visible = false + options.add{type='label',name='last',caption='2'} + poll_question_input:draw(frame).style.minimal_width = 200 + local flow = frame.add{type='flow',direction='vertical'} + poll_option_input:draw(flow.add{type='flow',name='1'}).style.minimal_width = 200 + poll_option_input:draw(flow.add{type='flow',name='2'}).style.minimal_width = 200 end local create_poll = Gui.inputs.add{ @@ -154,17 +168,24 @@ local create_poll = Gui.inputs.add{ }:on_event('click',function(event) local parent = event.element.parent if event.element.sprite == 'utility/enter' then - local inputs = parent.parent.poll_area.table_poll_assembler + local inputs = parent.parent.poll_area.options if not inputs then event.element.sprite = 'utility/add' draw_poll(parent.parent.poll_area) return end - local uuid = _poll_data(inputs.textfield_question.text,{ - inputs.textfield_answer_1.text, - inputs.textfield_answer_2.text, - inputs.textfield_answer_3.text - }) + local options = {} + for _,option in pairs(inputs.children) do + if option.name ~= 'question' and option.name ~= 'last' then + if option.caption ~= 'Enter Option' and option.caption ~= '' then table.insert(options,option.caption) end + end + end + if not inputs.question or #options == 0 then + event.element.sprite = 'utility/add' + draw_poll(parent.parent.poll_area) + return + end + local uuid = _poll_data(inputs.question.caption,options) Gui.popup.open('polls',{uuid=uuid}) event.element.sprite = 'utility/add' draw_poll(parent.parent.poll_area) diff --git a/Addons/load.lua b/Addons/load.lua index 20f935bb..206379ba 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -38,7 +38,7 @@ require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') require('Guis/warp-system') ---require('Guis/polls') -- too many desyncs +require('Guis/polls') -- too many desyncs require('Guis/announcements') require('Guis/rank-changer') require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin From ebd9b52dfb12feda2974d00a3155ba7f2fe9190b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 9 May 2018 20:34:56 +0100 Subject: [PATCH 281/392] Added no biter expansion --- StandAlone/starting-items.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/StandAlone/starting-items.lua b/StandAlone/starting-items.lua index 12a2e181..5a3db04f 100644 --- a/StandAlone/starting-items.lua +++ b/StandAlone/starting-items.lua @@ -22,6 +22,7 @@ Event.register(defines.events.on_player_created, function(event) local player = game.players[event.player_index] if event.player_index == 1 then player.force.friendly_fire = false + game.map_settings.enemy_expansion.enabled = false player.force.chart(player.surface, {{player.position.x - 400, player.position.y - 400}, {player.position.x + 400, player.position.y + 400}}) end for item,count in pairs(items) do From 67aaf2cd51e31c0bb95d806baf2eeac32825d93a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 9 May 2018 21:10:39 +0100 Subject: [PATCH 282/392] Added make tea --- Addons/Admin/auto-chat.lua | 7 ++++++- locale/en/chat-bot.cfg | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 92e4ca5e..23da5903 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -41,7 +41,12 @@ local commands = { ['magic']={'chat-bot.magic'}, ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, - ['lenny']={'chat-bot.lenny'} + ['lenny']={'chat-bot.lenny'}, + ['maketea']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.make-tea-2',self.data}} end + end):open() return {'chat-bot.make-tea-1'} end } Event.register(defines.events.on_console_chat,function(event) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index fc01b9e7..8626268c 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -19,4 +19,6 @@ 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=( ͡° ͜ʖ ͡°) \ No newline at end of file +lenny=( ͡° ͜ʖ ͡°) +make-tea-1= ☕ Boiling the water... ☕ +make-tea-2= ☕ __1__ your tea is done! ☕ \ No newline at end of file From 0ba546fa9113cecda96a966192c7ef4db8d3656f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 9 May 2018 22:46:12 +0100 Subject: [PATCH 283/392] Respawn 2 seconds --- Addons/Commands/bonus.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index 5e4e9b80..20f13703 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -54,6 +54,6 @@ end) Event.register(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) if Ranking.get_rank(player):allowed('bonus-respawn') then - player.ticks_to_respawn = 60 + player.ticks_to_respawn = 120 end end) \ No newline at end of file From 327bb66eb8ab5fc808891365960ec1b47032e4e7 Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Wed, 9 May 2018 20:25:14 -0500 Subject: [PATCH 284/392] Fix reviving ghosts placed by players and healing entities of other forces --- Addons/Commands/repair.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index f862f4ce..9d2a1a6a 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -28,18 +28,20 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an local max_range = rank.power-highest_admin_power > 0 and const/(rank.power-highest_admin_power) or nil local center = player and player.position or {x=0,y=0} if not range or max_range and range > max_range then player_return({'commands.invalid-range',0,math.floor(max_range)}) return commands.error end - for x = -range-2, range+2 do - for y = -range-2, range+2 do - if x^2+y^2 < range^2 then - for key, entity in pairs(player.surface.find_entities_filtered({area={{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}},type='entity-ghost'})) do - if disallow[entity.ghost_prototype.name] then - player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) - Admin.temp_ban(player,'','Attempt To Repair A Banned Item') - entity.destroy() - else entity.revive() end - end - for key, entity in pairs(player.surface.find_entities({{x+center.x,y+center.y},{x+center.x+1,y+center.y+1}})) do if entity.health then entity.health = 10000 end end - end + local area = {{center.x-range,center.y-range},{center.x+range,center.y+range}} + local max_health = 2^32 - 1 + local sq_range = range^2 + for key, entity in pairs(player.surface.find_entities_filtered({area=area,type='entity-ghost'})) do + if entity.force == player.force and (entity.position.x-center.x)^2+(entity.position.y-center.y)^2 < sq_range then + if disallow[entity.ghost_prototype.name] then + player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) + Admin.temp_ban(player,'','Attempt To Repair A Banned Item') + entity.destroy() + elseif entity.time_to_live ~= max_health then + entity.revive() end end end + for key, entity in pairs(player.surface.find_entities(area)) do + if entity.force == player.force and (entity.position.x-center.x)^2+(entity.position.y-center.y)^2 < sq_range and entity.health then entity.health = 10000 end + end end) From a577a6088375e4d66335e566683f3a93434c7bd6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 10 May 2018 17:32:35 +0100 Subject: [PATCH 285/392] Change name of max_health to max_time_to_live --- Addons/Commands/repair.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index 9d2a1a6a..654af5f9 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -29,7 +29,7 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an local center = player and player.position or {x=0,y=0} if not range or max_range and range > max_range then player_return({'commands.invalid-range',0,math.floor(max_range)}) return commands.error end local area = {{center.x-range,center.y-range},{center.x+range,center.y+range}} - local max_health = 2^32 - 1 + local max_time_to_live = 2^32 - 1 local sq_range = range^2 for key, entity in pairs(player.surface.find_entities_filtered({area=area,type='entity-ghost'})) do if entity.force == player.force and (entity.position.x-center.x)^2+(entity.position.y-center.y)^2 < sq_range then @@ -37,7 +37,7 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) Admin.temp_ban(player,'','Attempt To Repair A Banned Item') entity.destroy() - elseif entity.time_to_live ~= max_health then + elseif entity.time_to_live ~= max_time_to_live then entity.revive() end end end From 1191de2c86a8770988d61ad821b78a9642c3b9e2 Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Thu, 10 May 2018 12:48:23 -0500 Subject: [PATCH 286/392] Fix body marker not appearing when bonus respawn is applied --- Addons/Commands/bonus.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index 20f13703..dbc650d1 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -55,5 +55,7 @@ Event.register(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) if Ranking.get_rank(player):allowed('bonus-respawn') then player.ticks_to_respawn = 120 + -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death + Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index}) end end) \ No newline at end of file From 987760a776f62c045181495b28afa8f73f0e79ff Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Thu, 10 May 2018 13:20:07 -0500 Subject: [PATCH 287/392] Add cause missing cause property to death event --- Addons/Commands/bonus.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index dbc650d1..bc129d8b 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -56,6 +56,6 @@ Event.register(defines.events.on_pre_player_died,function(event) if Ranking.get_rank(player):allowed('bonus-respawn') then player.ticks_to_respawn = 120 -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death - Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index}) + Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index, cause = event.cause}) end end) \ No newline at end of file From 67c7832207b83f390832f11d0a24a893e11c70d2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 10 May 2018 21:16:33 +0100 Subject: [PATCH 288/392] Better layout of code for Event.dispatch --- Addons/Commands/bonus.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua index bc129d8b..d38af150 100644 --- a/Addons/Commands/bonus.lua +++ b/Addons/Commands/bonus.lua @@ -56,6 +56,11 @@ Event.register(defines.events.on_pre_player_died,function(event) if Ranking.get_rank(player):allowed('bonus-respawn') then player.ticks_to_respawn = 120 -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death - Event.dispatch({name = defines.events.on_player_died, tick = event.tick, player_index = event.player_index, cause = event.cause}) + Event.dispatch{ + name=defines.events.on_player_died, + tick=event.tick, + player_index=event.player_index, + cause = event.cause + } end -end) \ No newline at end of file +end) From ee4175aabcc1cf580ff283b257fe333de197f7fa Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 11 May 2018 16:26:21 +0100 Subject: [PATCH 289/392] Fixed Key Fir base-damage.nuke --- locale/en/base-damage.cfg | 2 +- locale/sv-SE/base-damage.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/en/base-damage.cfg b/locale/en/base-damage.cfg index 025dc56f..a9e54d1d 100644 --- a/locale/en/base-damage.cfg +++ b/locale/en/base-damage.cfg @@ -1,3 +1,3 @@ [base-damage] used=You hit some of your own buildings. Please be careful next time! -nukes=Nukes are not allowed in your rank. This is a preventive measure against griefers. +nuke=Nukes are not allowed in your rank. This is a preventive measure against griefers. diff --git a/locale/sv-SE/base-damage.cfg b/locale/sv-SE/base-damage.cfg index db96b8a7..154e28c3 100644 --- a/locale/sv-SE/base-damage.cfg +++ b/locale/sv-SE/base-damage.cfg @@ -1,3 +1,3 @@ [base-damage] used=Du träffade några av dina egna byggnader. Var försiktig nästa gång! -nukes=Kärnvapen är inte tillåted för din rang. Det här är en förebyggande åtgärd mot griefers (bråkstakar) +nuke=Kärnvapen är inte tillåted för din rang. Det här är en förebyggande åtgärd mot griefers (bråkstakar) From 4e75707eab9adcff43cc9843c2872e9db8f9aa72 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 11 May 2018 16:41:02 +0100 Subject: [PATCH 290/392] Even lower numbers to make change faster --- StandAlone/paths.lua | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index eac4e7b3..42ed3171 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -3,33 +3,33 @@ local paths = { -- ['tile name'] = {health,convert to} - -- health is the average (aim for 75%) number of steps in hundards before it changes - ['refined-concrete']={40,'concrete'}, - ['refined-hazard-concrete-right']={40,'hazard-concrete-right'}, - ['refined-hazard-concrete-left']={40,'hazard-concrete-left'}, - ['concrete']={30,'stone-path'}, - ['hazard-concrete-right']={30,'stone-path'}, - ['hazard-concrete-left']={30,'stone-path'}, - ['stone-path']={15,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player - ['sand-1']={3,'sand-2'}, - ['sand-2']={8,'sand-3'}, - ['sand-3']={3,'red-desert-3'}, - ['red-desert-3']={3,'red-desert-2'}, - ['red-desert-2']={8,'dirt-1'}, - ['grass-2']={3,'grass-1'}, - ['grass-1']={3,'grass-3'}, - ['grass-3']={8,'red-desert-0'}, - ['red-desert-0']={3,'red-desert-1'}, - ['red-desert-1']={8,'dirt-1'}, - ['dirt-1']={3,'dirt-2'}, - ['dirt-2']={3,'dirt-3'}, - ['dirt-3']={8,'dirt-4'}, - ['dirt-4']={3,'dirt-5'}, - ['dirt-5']={3,'dirt-6'}, - ['grass-4']={8,'dirt-4'} + -- health is the average number of steps in hundards before it changes + ['refined-concrete']={30,'concrete'}, + ['refined-hazard-concrete-right']={30,'hazard-concrete-right'}, + ['refined-hazard-concrete-left']={30,'hazard-concrete-left'}, + ['concrete']={25,'stone-path'}, + ['hazard-concrete-right']={25,'stone-path'}, + ['hazard-concrete-left']={25,'stone-path'}, + ['stone-path']={10,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player + ['sand-1']={1,'sand-2'}, + ['sand-2']={5,'sand-3'}, + ['sand-3']={1,'red-desert-3'}, + ['red-desert-3']={1,'red-desert-2'}, + ['red-desert-2']={5,'dirt-1'}, + ['grass-2']={1,'grass-1'}, + ['grass-1']={1,'grass-3'}, + ['grass-3']={5,'red-desert-0'}, + ['red-desert-0']={1,'red-desert-1'}, + ['red-desert-1']={5,'dirt-1'}, + ['dirt-1']={1,'dirt-2'}, + ['dirt-2']={1,'dirt-3'}, + ['dirt-3']={5,'dirt-4'}, + ['dirt-4']={1,'dirt-5'}, + ['dirt-5']={1,'dirt-6'}, + ['grass-4']={5,'dirt-4'} } for tile,value in pairs(paths) do - value[1]=1/(value[1]*150) + value[1]=1/(value[1]*150) -- 150 do make it so about 75% will change by the expected value end local function global_key(surface,pos) From 3cf53fe8c177a246aad2f4b3a59b923e2bbeb048 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 11 May 2018 16:44:19 +0100 Subject: [PATCH 291/392] No Afk paths --- StandAlone/paths.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 42ed3171..63b481ac 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -62,6 +62,7 @@ end) Event.register(defines.events.on_player_changed_position, function(event) local player = Game.get_player(event) + if player.afk_time > 300 then return end local surface = player.surface local pos = player.position if not paths[surface.get_tile(pos).name] then return end From dc30baa5d53a627d98ae6b2c20b48e7c81eb0558 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 13 May 2018 12:12:23 +0100 Subject: [PATCH 292/392] Fixed SyncOn Tasklist when removing tasks --- Addons/Guis/tasklist.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua index 91860415..f4cb2262 100644 --- a/Addons/Guis/tasklist.lua +++ b/Addons/Guis/tasklist.lua @@ -108,6 +108,7 @@ local function _tasks(player) return _global().tasks elseif not data._edit and _edit then data._edit = true + for key,_ in pairs(data._tasks) do if not data._editing[key] then data._editing[key] = false end end return data._tasks elseif _edit then return data._tasks else return _global().tasks From 22a7a6bb4c0ac869b936428c586b52146b372177 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 13 May 2018 12:24:27 +0100 Subject: [PATCH 293/392] Paths adjacency boost --- StandAlone/paths.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 63b481ac..4962a88f 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,6 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path +local adjacency_boost = 1.3 -- makes paths more lickly to be next to each other local paths = { -- ['tile name'] = {health,convert to} -- health is the average number of steps in hundards before it changes @@ -65,8 +66,14 @@ Event.register(defines.events.on_player_changed_position, function(event) if player.afk_time > 300 then return end local surface = player.surface local pos = player.position - if not paths[surface.get_tile(pos).name] then return end - if math.random() < paths[surface.get_tile(pos).name][1] then + local tile_name = surface.get_tile(pos).name + if not paths[tile_name] then return end + local chance = paths[tile_name][1] + for x = -1,1 do for y = -1,1 do + local _pos = {pos.x+x,pos.y+y} + if surface.get_tile(_pos).name == paths[tile_name][2] then chance=chance*adjacency_boost end + end end + if math.random() < chance then down_grade(surface,pos) end end) \ No newline at end of file From 56007bd5267797bf8b427ffdef7b7e3f439a1ed2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 13 May 2018 12:41:14 +0100 Subject: [PATCH 294/392] Fixed adjacency boost --- StandAlone/paths.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 4962a88f..f418aa48 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -2,6 +2,15 @@ -- idea from Mylon - Dirt Path local adjacency_boost = 1.3 -- makes paths more lickly to be next to each other +local placed_paths = { + ['refined-concrete']=true, + ['refined-hazard-concrete-right']=true, + ['refined-hazard-concrete-left']=true, + ['concrete']=true, + ['hazard-concrete-right']=true, + ['hazard-concrete-left']=true, + ['stone-path']=true +} local paths = { -- ['tile name'] = {health,convert to} -- health is the average number of steps in hundards before it changes @@ -51,10 +60,7 @@ Event.register(defines.events.on_player_built_tile, function(event) local surface = game.surfaces[event.surface_index] local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do - if old_tile.old_tile.name ~= 'refined-concrete' and old_tile.old_tile.name ~= 'refined-hazard-concrete-right' - and old_tile.old_tile.name ~= 'refined-hazard-concrete-left' and old_tile.old_tile.name ~= 'concrete' - and old_tile.old_tile.name ~= 'hazard-concrete-right' and old_tile.old_tile.name ~= 'hazard-concrete-left' - and old_tile.old_tile.name ~= 'stone-path' and old_tile.old_tile.name ~= 'water' and old_tile.old_tile.name ~= 'deep-water' then + if placed_paths[old_tile.old_tile.name] or old_tile.old_tile.name == 'water' or old_tile.old_tile.name == 'deep-water' then else if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name end @@ -71,7 +77,7 @@ Event.register(defines.events.on_player_changed_position, function(event) local chance = paths[tile_name][1] for x = -1,1 do for y = -1,1 do local _pos = {pos.x+x,pos.y+y} - if surface.get_tile(_pos).name == paths[tile_name][2] then chance=chance*adjacency_boost end + if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] or surface.get_tile(_pos).name == paths[tile_name][2] then chance=chance*adjacency_boost end end end if math.random() < chance then down_grade(surface,pos) From e711d5d2ca4da826f399758e2c7c18738f04fdbd Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 13 May 2018 12:42:34 +0100 Subject: [PATCH 295/392] Added Comment For Command --- StandAlone/paths.lua | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index f418aa48..42572fe9 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -77,9 +77,24 @@ Event.register(defines.events.on_player_changed_position, function(event) local chance = paths[tile_name][1] for x = -1,1 do for y = -1,1 do local _pos = {pos.x+x,pos.y+y} - if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] or surface.get_tile(_pos).name == paths[tile_name][2] then chance=chance*adjacency_boost end + if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] + or surface.get_tile(_pos).name == paths[tile_name][2] + then chance=chance*adjacency_boost end end end if math.random() < chance then down_grade(surface,pos) end -end) \ No newline at end of file +end) + +--[[ +/interface +local tile_name = tile.name +local chance = paths[tile_name][1] +for x = -1,1 do for y = -1,1 do + local _pos = {position.x+x,position.y+y} + if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] + or surface.get_tile(_pos).name == paths[tile_name][2] + then game.print('boost'..tostring(math.random())) chance=chance*adjacency_boost end end +end +return chance +]] \ No newline at end of file From db3515e122f3b6c57655abc8aa1aa1b670f44966 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Mon, 14 May 2018 20:54:03 +0200 Subject: [PATCH 296/392] my messing around with the chat box (#45) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg --- Addons/Admin/auto-chat.lua | 12 ++++++++++-- locale/en/chat-bot.cfg | 5 ++++- locale/sv-SE/chat-bot.cfg | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 23da5903..99da5bad 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -41,7 +41,15 @@ local commands = { ['magic']={'chat-bot.magic'}, ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, - ['lenny']={'chat-bot.lenny'}, + ['lenny']={'chat-bot.lenny'} + ['orderpizza']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true + }:on_event('timeout',function(self) + if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}} + elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false + end + self.data[2]=sel.data[2] + 1 + end):open() return {'chat-bot.order-pizza-1'} end, ['maketea']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) @@ -73,4 +81,4 @@ Event.register(defines.events.on_console_chat,function(event) else player_return({'chat-bot.rank-error'},nil,player) end end end -end) \ No newline at end of file +end) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 8626268c..0388864c 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -21,4 +21,7 @@ riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹ 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! ☕ \ No newline at end of file +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! 🍕 \ No newline at end of file diff --git a/locale/sv-SE/chat-bot.cfg b/locale/sv-SE/chat-bot.cfg index 3d65d9d2..e35b3b11 100644 --- a/locale/sv-SE/chat-bot.cfg +++ b/locale/sv-SE/chat-bot.cfg @@ -19,4 +19,4 @@ 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!!!!!!! +loops=INGA LOOPAR; LOOPAR ÄR DÅLIGT; JUST INGA LOOPAR!!!!!; OM DU GJÖR EN LOOP.... DET KOMMER INTE ATT SLUTA VÄL!!!!!!! \ No newline at end of file From 5edf3f78709dc5bd83f1c9a4555cacc02caf7475 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 14 May 2018 19:59:47 +0100 Subject: [PATCH 297/392] Missing a comma --- Addons/Admin/auto-chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 99da5bad..ca0c3df4 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -41,7 +41,7 @@ local commands = { ['magic']={'chat-bot.magic'}, ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, - ['lenny']={'chat-bot.lenny'} + ['lenny']={'chat-bot.lenny'}, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) From e2a149a3974d1b232d0d7474913a4036f63faa5b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 14 May 2018 20:00:22 +0100 Subject: [PATCH 298/392] Missing f on self --- Addons/Admin/auto-chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index ca0c3df4..dea51840 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -48,7 +48,7 @@ local commands = { if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}} elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false end - self.data[2]=sel.data[2] + 1 + self.data[2]=self.data[2]+1 end):open() return {'chat-bot.order-pizza-1'} end, ['maketea']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data=player.name From db1625a1dac873a38642814c151d112331c293e6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 14 May 2018 20:22:15 +0100 Subject: [PATCH 299/392] Auto Chat Last Fix --- Addons/Admin/auto-chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index dea51840..b6ec95a6 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -45,7 +45,7 @@ local commands = { ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}} + if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}} elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false end self.data[2]=self.data[2]+1 From 4d2794a72dbda4a6d46feeb5bc6b5558c4e8d94f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 15 May 2018 20:17:49 +0100 Subject: [PATCH 300/392] More Adjacency Boost --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 42572fe9..705c4b87 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,7 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local adjacency_boost = 1.3 -- makes paths more lickly to be next to each other +local adjacency_boost = 1.5 -- makes paths more lickly to be next to each other local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, From f4b9bdc3ebe598553bb00f6dfd1534a8dff1c735 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 15 May 2018 20:21:05 +0100 Subject: [PATCH 301/392] more number edits --- StandAlone/paths.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 705c4b87..85fab2c3 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,7 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local adjacency_boost = 1.5 -- makes paths more lickly to be next to each other +local adjacency_boost = 2.25 -- makes paths more lickly to be next to each other local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, @@ -39,7 +39,7 @@ local paths = { ['grass-4']={5,'dirt-4'} } for tile,value in pairs(paths) do - value[1]=1/(value[1]*150) -- 150 do make it so about 75% will change by the expected value + value[1]=1/(value[1]*175) -- 150 do make it so about 75% will change by the expected value end local function global_key(surface,pos) From 7439787543347273d3e2ba0464094582ae8219ec Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 17 May 2018 17:00:38 +0100 Subject: [PATCH 302/392] Added more rockets to milestone list --- Addons/Guis/rockets.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index 10f716d1..e7995564 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -10,7 +10,7 @@ Discord: https://discord.gg/r6dC2uK local function _global(reset) global.addons = not reset and global.addons or {} - global.addons.rockets = not reset and global.addons.rockets or {update=0,first=0,_last=0,last=0,fastest=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0}} + global.addons.rockets = not reset and global.addons.rockets or {update=0,first=0,_last=0,last=0,fastest=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0,m1000=0,m1500=0,m2000=0}} return global.addons.rockets end Gui.left.add{ From e82a11609cbc3982acc77ddc9638cebac4ce091f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 17 May 2018 21:39:31 +0100 Subject: [PATCH 303/392] Even more Balnace Changes --- StandAlone/paths.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 85fab2c3..eac645bf 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,7 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local adjacency_boost = 2.25 -- makes paths more lickly to be next to each other +local adjacency_boost = 5 -- makes paths more lickly to be next to each other local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, @@ -22,24 +22,24 @@ local paths = { ['hazard-concrete-left']={25,'stone-path'}, ['stone-path']={10,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player ['sand-1']={1,'sand-2'}, - ['sand-2']={5,'sand-3'}, + ['sand-2']={3,'sand-3'}, ['sand-3']={1,'red-desert-3'}, ['red-desert-3']={1,'red-desert-2'}, - ['red-desert-2']={5,'dirt-1'}, + ['red-desert-2']={3,'dirt-1'}, ['grass-2']={1,'grass-1'}, ['grass-1']={1,'grass-3'}, - ['grass-3']={5,'red-desert-0'}, + ['grass-3']={3,'red-desert-0'}, ['red-desert-0']={1,'red-desert-1'}, - ['red-desert-1']={5,'dirt-1'}, + ['red-desert-1']={3,'dirt-1'}, ['dirt-1']={1,'dirt-2'}, ['dirt-2']={1,'dirt-3'}, - ['dirt-3']={5,'dirt-4'}, + ['dirt-3']={3,'dirt-4'}, ['dirt-4']={1,'dirt-5'}, ['dirt-5']={1,'dirt-6'}, - ['grass-4']={5,'dirt-4'} + ['grass-4']={3,'dirt-4'} } for tile,value in pairs(paths) do - value[1]=1/(value[1]*175) -- 150 do make it so about 75% will change by the expected value + value[1]=1/(value[1]*100) end local function global_key(surface,pos) From a99064493abccf5ae220b5716bdf8a34d1dd58be Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 18 May 2018 11:16:10 +0100 Subject: [PATCH 304/392] sv-SE file rename to .cfg --- locale/sv-SE/{tree-decon => tree-decon.cfg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename locale/sv-SE/{tree-decon => tree-decon.cfg} (100%) diff --git a/locale/sv-SE/tree-decon b/locale/sv-SE/tree-decon.cfg similarity index 100% rename from locale/sv-SE/tree-decon rename to locale/sv-SE/tree-decon.cfg From 29d444ac25d3e03f1969d6fcabeac76013a9fea2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 18 May 2018 15:51:04 +0100 Subject: [PATCH 305/392] Change to size of player list --- Addons/Guis/player-list.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua index 5610d740..ff04748f 100644 --- a/Addons/Guis/player-list.lua +++ b/Addons/Guis/player-list.lua @@ -56,7 +56,7 @@ Gui.left.add{ horizontal_scroll_policy='never' } player_list.vertical_scroll_policy = 'auto' - player_list.style.maximal_height=200 + player_list.style.maximal_height=195 for _,rank in pairs(Ranking._ranks()) do for _,player in pairs(rank:get_players(true)) do local flow = player_list.add{type='flow'} From f82e8ce815d6fcd9553208cdae5e41be221a5b85 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 18 May 2018 21:48:24 +0100 Subject: [PATCH 306/392] 5 for adjacency_boost is way to high --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index eac645bf..bf6d02a2 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,7 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local adjacency_boost = 5 -- makes paths more lickly to be next to each other +local adjacency_boost = 3.25 -- makes paths more lickly to be next to each other local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, From 3806c9252aee6ecca5fc5ad42b827873a6e590d5 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Fri, 18 May 2018 22:58:56 +0200 Subject: [PATCH 307/392] Discord invite change Changed discord invite from the `https://discord.me/explosivegaming` => `https://discord.explosivegaming.nl` --- Addons/Guis/readme.lua | 2 +- README.md | 2 +- locale/de/chat-bot.cfg | 2 +- locale/en/chat-bot.cfg | 2 +- locale/fr/chat-bot.cfg | 2 +- locale/nl/chat-bot.cfg | 2 +- locale/sv-SE/chat-bot.cfg | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index acf84f03..0674e3be 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -65,7 +65,7 @@ end):add_tab('commands',{'readme.commands-name'},{'readme.commands-tooltip'},fun end end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(frame) local links={ - 'https://discord.me/explosivegaming', + 'https://discord.explosivegaming.nl', 'https://explosivegaming.nl', 'http://steamcommunity.com/groups/tntexplosivegaming', 'https://www.patreon.com/badgamernl' diff --git a/README.md b/README.md index 238e2fe0..2e5a019e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## ExpGaming Repository [![CodeFactor](https://www.codefactor.io/repository/github/badgamernl/explosivegaming-main/badge)](https://www.codefactor.io/repository/github/badgamernl/explosivegaming-main) [![dev chat](https://discordapp.com/api/guilds/260843215836545025/widget.png?style=shield)](https://discord.me/explosivegaming) +## ExpGaming Repository [![CodeFactor](https://www.codefactor.io/repository/github/badgamernl/explosivegaming-main/badge)](https://www.codefactor.io/repository/github/badgamernl/explosivegaming-main) [![dev chat](https://discordapp.com/api/guilds/260843215836545025/widget.png?style=shield)](https://discord.explosivegaming.nl) #### Using The Core Files 1. Copy the core folder and the StdLib File diff --git a/locale/de/chat-bot.cfg b/locale/de/chat-bot.cfg index 02254c30..e4bbbe31 100644 --- a/locale/de/chat-bot.cfg +++ b/locale/de/chat-bot.cfg @@ -6,7 +6,7 @@ players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: -discord=Discord: https://discord.me/explosivegaming +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) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 0388864c..4cac4845 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -6,7 +6,7 @@ players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: -discord=Discord: https://discord.me/explosivegaming +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) diff --git a/locale/fr/chat-bot.cfg b/locale/fr/chat-bot.cfg index 02254c30..e4bbbe31 100644 --- a/locale/fr/chat-bot.cfg +++ b/locale/fr/chat-bot.cfg @@ -6,7 +6,7 @@ players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: -discord=Discord: https://discord.me/explosivegaming +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) diff --git a/locale/nl/chat-bot.cfg b/locale/nl/chat-bot.cfg index 02254c30..e4bbbe31 100644 --- a/locale/nl/chat-bot.cfg +++ b/locale/nl/chat-bot.cfg @@ -6,7 +6,7 @@ players=There have been __1__ players on this map map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: -discord=Discord: https://discord.me/explosivegaming +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) diff --git a/locale/sv-SE/chat-bot.cfg b/locale/sv-SE/chat-bot.cfg index e35b3b11..e5bded44 100644 --- a/locale/sv-SE/chat-bot.cfg +++ b/locale/sv-SE/chat-bot.cfg @@ -7,7 +7,7 @@ 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 för mer information join-us=Var snäll och förena dig med oss: -discord=Discord: https://discord.me/explosivegaming +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) From c7487839afb38d70943d43fc05a56758e9bf1a1e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 18 May 2018 23:43:16 +0100 Subject: [PATCH 308/392] Added !pass a beer --- Addons/Admin/auto-chat.lua | 7 ++++++- locale/en/chat-bot.cfg | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index b6ec95a6..2c55273b 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -54,7 +54,12 @@ local commands = { timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) if self.data then game.print{'chat-bot.message',{'chat-bot.make-tea-2',self.data}} end - end):open() return {'chat-bot.make-tea-1'} end + end):open() return {'chat-bot.make-tea-1'} end, + ['passabeer']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.get-beer-2',self.data}} end + end):open() return {'chat-bot.get-beer-1'} end } Event.register(defines.events.on_console_chat,function(event) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 0388864c..bf972b13 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -24,4 +24,6 @@ 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! 🍕 \ No newline at end of file +order-pizza-3= 🍕 __1__ your pizza is here! 🍕 +get-beer-1= 🍺 Pouring A Glass 🍺 +get-beer-2= 🍻 Chears Mate 🍻 From 0d52010d45be518b766869f49e1217a51fcfdc67 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 19 May 2018 13:08:18 +0200 Subject: [PATCH 309/392] Pr/1 (#48) * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise --- Addons/Admin/auto-chat.lua | 7 +++++++ locale/en/chat-bot.cfg | 3 +++ 2 files changed, 10 insertions(+) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 2c55273b..9f3b3652 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -42,6 +42,8 @@ local commands = { ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, + -- jokes about food and drink + ['whattoeat']={'chat-bot.food'}, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) @@ -50,6 +52,11 @@ local commands = { end self.data[2]=self.data[2]+1 end):open() return {'chat-bot.order-pizza-1'} end, + ['makecoffee']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end + end):open() return {'chat-bot.make-coffee-1'} end, ['maketea']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 203ca6ea..4e731599 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -25,5 +25,8 @@ 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 🍻 +what-to-eat = Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ From 92025e17c0aaae83deffc25d5cc5893f0023b38b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 19 May 2018 16:18:17 +0100 Subject: [PATCH 310/392] Fixed What to eat error --- locale/en/chat-bot.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 4e731599..9c4f60eb 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -29,4 +29,4 @@ 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 🍻 -what-to-eat = Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ +food=Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ From 1cb0814eb6cabc9c4f46727f69fb043d398aa3cb Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 19 May 2018 16:57:48 +0100 Subject: [PATCH 311/392] Fixed GoTo on admin gui --- Addons/Admin/admin.lua | 2 +- Addons/Guis/admin-gui.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 80fbb7e2..27fc38dd 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -53,7 +53,7 @@ function Admin.take_action(action,player,by_player,reason) elseif action == 'Temp Ban' and Admin.temp_ban then Admin.temp_ban(player,by_player,reason) elseif action == 'Kick' then Admin.kick(player,by_player,reason) elseif action == 'Jail' then Admin.jail(player,by_player,reason) - elseif action == 'Go To' then Admin.go_to(player,by_player) + elseif action == 'GoTo' then Admin.go_to(player,by_player) elseif action == 'Bring' then Admin.bring(player,by_player) end end diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua index b2404db5..3360a321 100644 --- a/Addons/Guis/admin-gui.lua +++ b/Addons/Guis/admin-gui.lua @@ -92,7 +92,7 @@ local take_action = Gui.inputs.add{ local _rank = Ranking.get_rank(_player) if rank.power >= _rank.power then dropdowns.warning.caption = {'admin-commands.rank-high'} return end local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text - if (selected == 'Jail' or selected == 'Kick' or selected == 'Ban' or selected == 'Temp Ban') and (_reason == 'Enter Reason' or string.len(_reason) < 20) then return end + if (_action == 'Jail' or _action == 'Kick' or _action == 'Ban' or _action == 'Temp Ban') and (_reason == 'Enter Reason' or string.len(_reason) < 20) then return end Admin.take_action(_action,_player,event.player_index,_reason) Gui.center.clear(event) end) @@ -133,7 +133,7 @@ Admin.center = Gui.center.add{ type='flow', direction='vertical' } - player_info_flow.style.height = 300 + player_info_flow.style.height = 280 player_info_flow.style.width = 200 local label = dropdowns.add{ type='label', From f47138c49ab5dad6eea00b09f78a9cdca6c46e92 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sat, 19 May 2018 18:00:37 +0200 Subject: [PATCH 312/392] Pr/1 (#49) * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? --- Addons/Admin/auto-chat.lua | 25 +++++++++++++++++++++++-- locale/en/chat-bot.cfg | 10 +++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 9f3b3652..de218655 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -43,7 +43,7 @@ local commands = { ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, -- jokes about food and drink - ['whattoeat']={'chat-bot.food'}, + ['whattoeat']={'chat-bot.food'}, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) @@ -52,7 +52,23 @@ local commands = { end self.data[2]=self.data[2]+1 end):open() return {'chat-bot.order-pizza-1'} end, - ['makecoffee']=function(player) Server.new_thread{ + ['passsomesnaps']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true + }:on_event('timeout',function(self) + if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.get-snaps-2',self.data[1]}} + elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.get-snaps-3',self.data[1]}} self.reopen = false + end + self.data[2]=self.data[2]+1 + end):open() return {'chat-bot.get-snaps-1'} end, + ['makecocktail']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true + }:on_event('timeout',function(self) + if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.get-cocktail-2',self.data[1]}} + elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.get-cocktail-3',self.data[1]}} self.reopen = false + end + self.data[2]=self.data[2]+1 + end):open() return {'chat-bot.get-cocktail-1'} end, + ['makecoffee']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end @@ -62,6 +78,11 @@ local commands = { }:on_event('timeout',function(self) if self.data then game.print{'chat-bot.message',{'chat-bot.make-tea-2',self.data}} end end):open() return {'chat-bot.make-tea-1'} end, + ['meadplease']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.get-mead-2',self.data}} end + end):open() return {'chat-bot.get-mead-1'} end, ['passabeer']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 9c4f60eb..367ca05f 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -29,4 +29,12 @@ 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 🍻 -food=Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ +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=schkå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.🍸 +food=Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ \ No newline at end of file From be8711e1abf29ceee15e97985d14ecf89b7d462f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 20 May 2018 00:06:24 +0100 Subject: [PATCH 313/392] More Changes To Paths --- StandAlone/paths.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index bf6d02a2..ebc0149f 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,7 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local adjacency_boost = 3.25 -- makes paths more lickly to be next to each other +local adjacency_boost = 10 -- makes paths more lickly to be next to each other local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, @@ -14,13 +14,13 @@ local placed_paths = { local paths = { -- ['tile name'] = {health,convert to} -- health is the average number of steps in hundards before it changes - ['refined-concrete']={30,'concrete'}, - ['refined-hazard-concrete-right']={30,'hazard-concrete-right'}, - ['refined-hazard-concrete-left']={30,'hazard-concrete-left'}, - ['concrete']={25,'stone-path'}, - ['hazard-concrete-right']={25,'stone-path'}, - ['hazard-concrete-left']={25,'stone-path'}, - ['stone-path']={10,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player + ['refined-concrete']={40,'concrete'}, + ['refined-hazard-concrete-right']={40,'hazard-concrete-right'}, + ['refined-hazard-concrete-left']={40,'hazard-concrete-left'}, + ['concrete']={30,'stone-path'}, + ['hazard-concrete-right']={30,'stone-path'}, + ['hazard-concrete-left']={30,'stone-path'}, + ['stone-path']={25,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player ['sand-1']={1,'sand-2'}, ['sand-2']={3,'sand-3'}, ['sand-3']={1,'red-desert-3'}, @@ -39,7 +39,7 @@ local paths = { ['grass-4']={3,'dirt-4'} } for tile,value in pairs(paths) do - value[1]=1/(value[1]*100) + value[1]=1/(value[1]*125) end local function global_key(surface,pos) @@ -75,11 +75,12 @@ Event.register(defines.events.on_player_changed_position, function(event) local tile_name = surface.get_tile(pos).name if not paths[tile_name] then return end local chance = paths[tile_name][1] + local count = 1 for x = -1,1 do for y = -1,1 do local _pos = {pos.x+x,pos.y+y} if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] or surface.get_tile(_pos).name == paths[tile_name][2] - then chance=chance*adjacency_boost end + then chance=chance*(adjacency_boost/count) count=count+1 end end end if math.random() < chance then down_grade(surface,pos) @@ -89,12 +90,13 @@ end) --[[ /interface local tile_name = tile.name -local chance = paths[tile_name][1] +local chance = paths[tile_name][1] +local count = 1 for x = -1,1 do for y = -1,1 do local _pos = {position.x+x,position.y+y} if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] or surface.get_tile(_pos).name == paths[tile_name][2] - then game.print('boost'..tostring(math.random())) chance=chance*adjacency_boost end end + then game.print('boost '..tostring(count)) chance=chance=chance*(adjacency_boost/count) count=count+1 end end end return chance ]] \ No newline at end of file From 96b428ed376a2252ed8891bb62d98613223ce5de Mon Sep 17 00:00:00 2001 From: mark9064 <30447455+mark9064@users.noreply.github.com> Date: Sun, 20 May 2018 00:17:11 +0100 Subject: [PATCH 314/392] General English fixes (#52) * Speeling fixes * Speeling/capitalisation * More speeling * Label grammar consistency * Consistency * Phrasing * Consistency * Clarity of const * Consistency * Consistency * Speeling * Apostrophes: check whether they need escaping * Capitalisation (more apostrophes need checking) * Americanisation * Clarity * Contraction * Clarity * Speeling --- Addons/Commands/admin.lua | 16 ++++++++-------- Addons/Commands/cheat-mode.lua | 2 +- Addons/Commands/home.lua | 2 +- Addons/Commands/kill.lua | 2 +- Addons/Commands/repair.lua | 4 ++-- Addons/Commands/tags.lua | 4 ++-- Addons/Commands/tp.lua | 4 ++-- Addons/Guis/polls.lua | 6 +++--- Addons/load.lua | 24 ++++++++++++------------ Addons/playerRanks.lua | 30 +++++++++++++++--------------- control.lua | 28 ++++++++++++++-------------- locale/en/admin.cfg | 4 ++-- locale/en/chat-bot.cfg | 4 ++-- locale/en/exp-core.cfg | 8 ++++---- locale/en/game-settings.cfg | 8 ++++---- locale/en/rank-changer.cfg | 4 ++-- locale/en/reports.cfg | 4 ++-- locale/en/tree-decon.cfg | 4 ++-- 18 files changed, 79 insertions(+), 79 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 0bd05d6e..9c556a74 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('report', 'Reports a player.', {'player','reason',true}, function(event,args) +commands.add_command('report', 'Reports a player', {'player','reason',true}, function(event,args) local _player = Game.get_player(event) local player = Game.get_player(args.player) local reason = args.reason @@ -20,7 +20,7 @@ commands.add_command('report', 'Reports a player.', {'player','reason',true}, fu Admin.report(player,event.player_index,reason) end) -commands.add_command('warn', 'Gives a player a warnings', {'player','reason',true}, function(event,args) +commands.add_command('warn', 'Gives a player a warning', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -38,14 +38,14 @@ commands.add_command('jail', 'Jails a player', {'player','reason',true}, functio Admin.jail(player,event.player_index,reason) end) -commands.add_command('unjail', 'Returns the players old rank', {'player',true}, function(event,args) +commands.add_command('unjail', 'Returns a player\'s old rank', {'player',true}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end Ranking.revert(player,event.player_index) end) -commands.add_command('temp-ban', 'Temporarily ban a player.', {'player','reason',true}, function(event,args) +commands.add_command('temp-ban', 'Temporarily ban a player', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -53,28 +53,28 @@ commands.add_command('temp-ban', 'Temporarily ban a player.', {'player','reason' Admin.temp_ban(player,event.player_index,reason) end) -commands.add_command('clear-inv', 'Clears the player\'s invetory', {'player'}, function(event,args) +commands.add_command('clear-inv', 'Clears a player\'s invetory', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end Admin.move_inventory(player) end) -commands.add_command('clear-warnings', 'Clears the warnings on a player.', {'player'}, function(event,args) +commands.add_command('clear-warnings', 'Clears a player\'s warnings', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end Admin.clear_warings(player,event.player_index) end) -commands.add_command('clear-reports', 'Clears the reports on a player.', {'player'}, function(event,args) +commands.add_command('clear-reports', 'Clears a player\'s reports', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-all', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-all', 'Clears a player of any temp-ban, reports or warnings', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_player(player,event.player_index) diff --git a/Addons/Commands/cheat-mode.lua b/Addons/Commands/cheat-mode.lua index 693255ab..7fc17e17 100644 --- a/Addons/Commands/cheat-mode.lua +++ b/Addons/Commands/cheat-mode.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('cheat-mode', 'Toggles cheat mode for a player.', {'player'}, function(event,args) +commands.add_command('cheat-mode', 'Toggles cheat mode for a player', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if player.cheat_mode == true then player.cheat_mode = false else player.cheat_mode = true end diff --git a/Addons/Commands/home.lua b/Addons/Commands/home.lua index cc08b439..5f7d92d8 100644 --- a/Addons/Commands/home.lua +++ b/Addons/Commands/home.lua @@ -28,7 +28,7 @@ commands.add_command('home', 'Go to you home position', {}, function(event,args) player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][1],32,1),player.surface) end) -commands.add_command('return', 'Go to where you were before using /home', {}, function(event,args) +commands.add_command('return', 'Return to your previous position after using /home', {}, function(event,args) local player = Game.get_player(event) if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end local _temp = {math.floor(player.position.x),math.floor(player.position.y)} diff --git a/Addons/Commands/kill.lua b/Addons/Commands/kill.lua index 08b190a3..a48f9143 100644 --- a/Addons/Commands/kill.lua +++ b/Addons/Commands/kill.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('kill', 'Kills a player. Must be either yourself (/kill self) or a person of a lower rank.', {'player'}, function(event,args) +commands.add_command('kill', 'Kills a player. Must be either yourself (/kill self) or a person of a lower rank', {'player'}, function(event,args) local _player = Game.get_player(event) local player = Game.get_player(args.player) if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index 654af5f9..ed6a534f 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- --- these items are not repaired, true means it is blocked +-- Set an item to true to disallow it from being repaired local disallow = { ['loader']=true, ['fast-loader']=true, @@ -18,7 +18,7 @@ local disallow = { } local const = 100 --- given const = 100: admin+ has unlimited, admin has 100, mod has 50, member has 20 +-- Given const = 100: admin+ has unlimited, admin has const (100), mod has const / 2 (50), member has const / 5 (20) commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area.', {'range'}, function(event,args) local range = tonumber(args.range) diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua index ee210800..2b1defc5 100644 --- a/Addons/Commands/tags.lua +++ b/Addons/Commands/tags.lua @@ -11,14 +11,14 @@ Discord: https://discord.gg/r6dC2uK local const = 20 -- this is the max lenth of a tag -commands.add_command('tag', 'Give yourself a custom tag. Use /tag-clear self to remove tag.', {'tag',true}, function(event,args) +commands.add_command('tag', 'Give yourself a custom tag. Use /tag-clear self to remove tag', {'tag',true}, function(event,args) local player = Game.get_player(event) local rank = Ranking.get_rank(player) if string.len(args.tag) > const then player_return({'commands.invalid-length',const}) return commands.error end player.tag = rank.tag..' - '..args.tag end) -commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self).', {'player'}, function(event,args) +commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self)', {'player'}, function(event,args) local _player = Game.get_player(event) local _rank = Ranking.get_rank(_player) local player = Game.get_player(args.player) diff --git a/Addons/Commands/tp.lua b/Addons/Commands/tp.lua index 94be1a33..79734a7c 100644 --- a/Addons/Commands/tp.lua +++ b/Addons/Commands/tp.lua @@ -8,13 +8,13 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('go-to', 'Go to a player\'s location.', {'player'}, function(event,args) +commands.add_command('go-to', 'Go to a player\'s location', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.go_to(player,event) end) -commands.add_command('bring', 'Bring a player to your location.', {'player'}, function(event,args) +commands.add_command('bring', 'Bring a player to your location', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.bring(player,event) diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua index 290746c4..eb6d5c5c 100644 --- a/Addons/Guis/polls.lua +++ b/Addons/Guis/polls.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -local poll_time_out = 90 -- this is in seconds +local poll_time_out = 90 -- In seconds local function _polls(reset) global.addons = not reset and global.addons or {} @@ -50,7 +50,7 @@ local function _poll_data(question,answers) data={poll_uuid=poll.uuid}, timeout=poll_time_out*60 }:on_event('timeout',_poll_end):open() - -- this time out is knowen to cause desyncs and so i have moved it to a hard coded function + -- This time out is known to cause desyncs and so I have moved it to a hard coded function _polls().active[poll.uuid]=poll return poll.uuid end @@ -257,4 +257,4 @@ Gui.popup.add{ elseif Ranking.get_rank(player):allowed('create-poll') then return true else return {'polls.no-poll'} end end -} \ No newline at end of file +} diff --git a/Addons/load.lua b/Addons/load.lua index 206379ba..2ad583fb 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -7,12 +7,12 @@ Any changes that you may make to the code are yours but that does not make the s Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- --- this file will just contain all the diffrent requires +-- This file just contains all the diffrent requires --- admin dir +-- Admin dir require('Admin/player-info') -require('Admin/admin') -- used with Guis/admin-gui, but can work without -require('Admin/reports') -- this adds onto Admin/admin, adds report command and warnings, and temp ban +require('Admin/admin') -- Used with Guis/admin-gui, but can work without +require('Admin/reports') -- This adds onto Admin/admin, adds report command and warnings, and temp ban require('Admin/discord') require('Admin/auto-message') require('Admin/tree-decon') @@ -21,28 +21,28 @@ require('Admin/base-damage') require('Admin/afk-kick') require('Admin/auto-chat') --- commands dir +-- Commands dir require('Commands/cheat-mode') require('Commands/kill') require('Commands/repair') require('Commands/bonus') require('Commands/tags') require('Commands/home') -require('Commands/tp') -- requires Admin/admin -require('Commands/admin') -- requires Admin/reports +require('Commands/tp') -- Requires Admin/admin +require('Commands/admin') -- Requires Admin/reports --- guis dir +-- GUIs dir require('Guis/readme') require('Guis/science') require('Guis/rockets') require('Guis/player-list') require('Guis/tasklist') require('Guis/warp-system') -require('Guis/polls') -- too many desyncs +require('Guis/polls') -- Too many desyncs require('Guis/announcements') require('Guis/rank-changer') -require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin -require('Guis/reports') -- requires Admin/reports +require('Guis/admin-gui') -- Used with Admin/admin, requires Admin/admin +require('Guis/reports') -- Requires Admin/reports require('Guis/game-settings') --- other \ No newline at end of file +-- other diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 9cb19c79..e4e532b1 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -10,21 +10,21 @@ Discord: https://discord.gg/r6dC2uK --[[ How to use groups: -name the name that you can use to refence it. -disallow if present then all ranks in this group will have this added to their disallow. -allow if present then all ranks in this group will have this added to their allow. -highest is asigned by the script to show the highest rank in this group. -lowest is asigned by the script to show the lowest rank in this group. +name The name that you can use to reference it. +disallow If present then all ranks in this group will have this added to their disallow. +allow If present then all ranks in this group will have this added to their allow. +highest Assigned by the script to show the highest rank in this group. +lowest Assigned by the script to show the lowest rank in this group. How to add ranks: -Name is what will be used in the scripts and is often the best choice for display in text. -short_hand is what can be used when short on space but the rank still need to be displayed. -tag is the tag the player will gain when moved to the rank, it can be nil. -time is used for auto-rank feature where you are moved to the rank after a certain play time in minutes. -colour is the RGB value that can be used to emphasise GUI elements based on rank. -power is asigned by the script based on their index in ranks, you can insert new ranks between current ones. -group is asigned by the script to show the group this rank is in -disallow is a list containing input actions that the user can not perform. -allow is a list of custom commands and effects that that rank can use, all defined in the sctips. +Name What will be used in the scripts and is often the best choice for display in text. +short_hand What can be used when short on space but the rank still need to be displayed. +tag The tag the player will gain when moved to the rank, it can be nil. +time Used for auto-rank feature where you are moved to the rank after a certain play time in minutes. +colour The RGB value that can be used to emphasise GUI elements based on rank. +power Assigned by the script based on their index in ranks, you can insert new ranks between current ones. +group Assigned by the script to show the group this rank is in. +disallow A list containing input actions that the user can not perform. +allow A list of custom commands and effects that that rank can use, all defined in the scripts. For allow, add the allow as the key and the value as true Example: test for 'server-interface' => allow['server-interface'] = true @@ -34,7 +34,7 @@ Example: defines.input_action.drop_item -> 'drop_item' http://lua-api.factorio.com/latest/defines.html#defines.input_action --]] --- see ExpCore/ranks.lua for examples - you add your own and edit pre-made ones here. +-- See ExpCore/ranks.lua for examples - you add your own and edit pre-made ones here. local groups = Ranking._groups(true) diff --git a/control.lua b/control.lua index deee6a0f..7be7606a 100644 --- a/control.lua +++ b/control.lua @@ -8,10 +8,10 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- --- a base for functions to keep things clean +-- A base for functions to keep things clean _G._ = {} --- replaces the base error function +-- Replaces the base error function _error = error error = function(err) if _G.Sync and _G.Sync.emit_embeded and game then @@ -28,8 +28,8 @@ error = function(err) _error(err) end end --- replaces the base require function -require_return_err = false -- set to false when removing files; set to true for debuging +-- Replaces the base require function +require_return_err = false -- Set to false when removing files; set to true for debuging _require = require require = function(path) local _return = {pcall(_require,path)} @@ -38,29 +38,29 @@ require = function(path) end require("mod-gui") --- loads the stdlib and allows Core Game and Event +-- Loads the stdlib and allows Core Game and Event Color, Game, Event = require('/StdLib/load'){'Color','Game','Event'} --- loads the ExpLib, functions are plased into the lua global +-- loads the ExpLib, functions are placed into the lua global local ExpLib = require 'ExpLib' ExpLib._unpack_to_G(ExpLib) ---_G.Sync.emit_embeded = nil -- un-comment this line if you are not using the json.data +--_G.Sync.emit_embeded = nil -- Un-comment this line if you are not using the json.data --- loads the ExpCore files these are need in order to run the other addons +-- Loads the ExpCore files. These are need in order to run the other addons Ranking, Sync, Server, Gui = require('/ExpCore/load'){'Ranking','Sync','Server','Gui'} local success,err = pcall(require,'/ExpCore/GuiParts/test') if success then Gui.test = err end if Gui.popup then Gui.popup._load() end if Sync._load then Sync._load() end --- this loads the ranks that Ranking uses +-- Loads the ranks that Ranking uses require('/ExpCore/ranks') --- this loads any edits that are not need in core pcall as file may not be preset +-- Loads any edits that are not need in core pcall as file may not be present pcall(require,'/Addons/playerRanks') --- this makes sure that all the little details are cleaned up +-- Makes sure that all the little details are cleaned up Ranking._auto_edit_ranks() --- this loads all the addons +-- Loads all the addons local success,err = pcall(require,'Addons/load') if not success then error(err) end --- this loads anything that does not use ExpCore (sourse given in the file) +-- Loads anything that does not use ExpCore (source given in the file) local success,err = pcall(require,'StandAlone/load') -if not success then error(err) end \ No newline at end of file +if not success then error(err) end diff --git a/locale/en/admin.cfg b/locale/en/admin.cfg index b25def84..2eab9cfa 100644 --- a/locale/en/admin.cfg +++ b/locale/en/admin.cfg @@ -2,7 +2,7 @@ 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 chose the correct one! +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. @@ -12,4 +12,4 @@ tooltip-ban=Ban Player tooltip-kick=Kick Player tooltip-jail=Jail Player tooltip-go-to=Go To Player -tooltip-bring=Bring Player \ No newline at end of file +tooltip-bring=Bring Player diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 367ca05f..6721b23d 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -1,6 +1,6 @@ [chat-bot] message=[Chat Bot]: __1__ -rank-error=You cant use global chat commands +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__ @@ -37,4 +37,4 @@ get-snaps-3=schkå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.🍸 -food=Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ \ No newline at end of file +food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ diff --git a/locale/en/exp-core.cfg b/locale/en/exp-core.cfg index 731d758e..c5453d60 100644 --- a/locale/en/exp-core.cfg +++ b/locale/en/exp-core.cfg @@ -4,8 +4,8 @@ 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 +offline-player=Player is offline: Command failed to run +dead-player=Player is dead: Command failed to run command-ran=Command Complete [ranking] @@ -18,5 +18,5 @@ tag-reset=Your Tag was reset due to a Rank change [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 \ No newline at end of file +cant-open=You can't open this panel right now, reason: __1__ +cant-open-no-reason=You can't open this panel right now diff --git a/locale/en/game-settings.cfg b/locale/en/game-settings.cfg index 84827647..c7bbb411 100644 --- a/locale/en/game-settings.cfg +++ b/locale/en/game-settings.cfg @@ -6,10 +6,10 @@ basic-tooltip=These settings are safe to edit and have no big impact. basic-message=Basic Settings can be used to improve game play for players. advanced-name=Advanced Settings advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realize. +advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realise. personal-name=Personal Settings -personal-tooltip=Personal Settings only affects you. -personal-message=Personal Settings only affects your character. If you are spotted as a result of these settings, you are on your own! +personal-tooltip=Personal Settings only affect you. +personal-message=Personal Settings only affect your character. If you are spotted as a result of these settings, you are on your own! sure=Are you sure? effect-mining-speed=Mining Speed effect-craft-speed=Crafting Speed @@ -28,4 +28,4 @@ effect-reload-effects=Reload Effects effect-reload-map=Reload Minimap effect-kill-biters=Kill Biters effect-crc=Force CRC Check -effect-reset-force=Reset Force \ No newline at end of file +effect-reset-force=Reset Force diff --git a/locale/en/rank-changer.cfg b/locale/en/rank-changer.cfg index c610e612..6ea0209f 100644 --- a/locale/en/rank-changer.cfg +++ b/locale/en/rank-changer.cfg @@ -2,8 +2,8 @@ name=Rank Changer tooltip=Change the rank of a player below you. no-info-file=No info file was found -message=Select a player and the desired rank. You can only give ranks to people that are below yours. +message=Select a player and the desired rank. You can only give ranks to people that are below your rank. warning=Warning: This player outranks you. Therefore, you cannot edit their rank. rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank. invalid=The player or the rank is invalid. Please try again! -set-rank=Set Player Rank \ No newline at end of file +set-rank=Set Player Rank diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg index 72678613..8e7423c6 100644 --- a/locale/en/reports.cfg +++ b/locale/en/reports.cfg @@ -2,7 +2,7 @@ name=Report Player 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 not be reported. +cant-report=This player can't be reported. cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all warning-given-by=This warning was given by: __1__ player-warning=__1__ was given a warning by __2__ for: __3__ @@ -13,4 +13,4 @@ reported=You have been reported to the admins by the system. Further action may 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. \ No newline at end of file +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. diff --git a/locale/en/tree-decon.cfg b/locale/en/tree-decon.cfg index 8a80a238..b554b454 100644 --- a/locale/en/tree-decon.cfg +++ b/locale/en/tree-decon.cfg @@ -1,3 +1,3 @@ [tree-decon] -player-print=You do not have permission to do this right now. You require the Regular rank which can be obtained through 3 hours of in-game playtime on Explosive Gaming. -rank-print=__1__ tried to deconstruct something. \ No newline at end of file +player-print=You do not have permission to do this right now. You require the Regular rank which can be obtained through 3 hours of in-game playtime on a server. +rank-print=__1__ tried to deconstruct something. From 3a6f7d7788e0fedf5ace38eb094a1bbd549b1e47 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sun, 20 May 2018 12:11:11 +0200 Subject: [PATCH 315/392] added rhd message that thadius suggested (#53) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg * spelfix * Update auto-chat.lua * added make-cofee * added make cofee * fix because I cant spell apperantly * spell fix because I cant spell apperantly * missing = * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? * rhd (thadius suggestion) * lhd message added * Fixed Comment and indentation --- Addons/Admin/auto-chat.lua | 19 +++++++++++++++++-- locale/en/chat-bot.cfg | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index de218655..8a4a02a5 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -26,7 +26,6 @@ local messages = { ['roundabouts']={'chat-bot.loops'}, ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end } - -- white spaces removed and made into lower -- these are global chat commands that can be used -- comands start with ! (all messages are also commands) @@ -42,7 +41,9 @@ local commands = { ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, - -- jokes about food and drink + --Thadius suggestion + ['rhd']={'chat-bot.lhd'}, + --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true @@ -73,6 +74,20 @@ local commands = { }:on_event('timeout',function(self) if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end end):open() return {'chat-bot.make-coffee-1'} end, + ['makecoffee']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end + end):open() return {'chat-bot.make-coffee-1'} end + }, + ['orderpizza']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true + }:on_event('timeout',function(self) + if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}} + elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false + end + self.data[2]=self.data[2] + 1 + end):open() return {'chat-bot.order-pizza-1'} end, ['maketea']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 6721b23d..aa5e54c0 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -37,4 +37,6 @@ get-snaps-3=schkå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.🍸 -food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ +food=Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ +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/ \ No newline at end of file From 694942d869c21fdcfbd72e07a9ce9ed11fb545dc Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sun, 20 May 2018 15:13:12 +0200 Subject: [PATCH 316/392] Pr/1 (#57) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg * spelfix * Update auto-chat.lua * added make-cofee * added make cofee * fix because I cant spell apperantly * spell fix because I cant spell apperantly * missing = * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? * rhd (thadius suggestion) * lhd message added * Fixed Comment and indentation * rhd changed from shout to messages * I am also a lazy bastard * Update colours.lua * Not needed in commands if present in messages * Fixed missing comma --- Addons/Admin/auto-chat.lua | 5 +++-- StandAlone/colours.lua | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 8a4a02a5..6326b2af 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -22,6 +22,9 @@ local messages = { ['links']={'chat-bot.links'}, ['loop']={'chat-bot.loops'}, ['loops']={'chat-bot.loops'}, + --Thadius suggestion start + ['rhd']={'chat-bot.lhd'}, + --Thadius suggestion end ['roundabout']={'chat-bot.loops'}, ['roundabouts']={'chat-bot.loops'}, ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end @@ -41,8 +44,6 @@ local commands = { ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, - --Thadius suggestion - ['rhd']={'chat-bot.lhd'}, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, ['orderpizza']=function(player) Server.new_thread{ diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index a353c59c..774aaec7 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -6,7 +6,8 @@ local default_colours = { arty714={r=150,g=68,b=161}, Cooldude2606={r=57,g=192,b=207}, mark9064={r=99,g=0,b=255}, - eissturm={r=25,g=25,b=112} + eissturm={r=25,g=25,b=112}, + Sakama={r=20,g=213,b=80} } Event.register(defines.events.on_player_created, function(event) From e2156bf622332a7875ef24295f96c85e8ddb92ed Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 20 May 2018 15:18:48 +0100 Subject: [PATCH 317/392] Added few people to default colours --- StandAlone/colours.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index 774aaec7..a05ddf42 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -7,7 +7,10 @@ local default_colours = { Cooldude2606={r=57,g=192,b=207}, mark9064={r=99,g=0,b=255}, eissturm={r=25,g=25,b=112}, - Sakama={r=20,g=213,b=80} + Sakama={r=20,g=213,b=80}, + freek18={r=50,g=0,b=255}, + aldldl={r=0,g=131,b=255}, + UUBlueFire={r=0,g=204,b=255} } Event.register(defines.events.on_player_created, function(event) From 76e2244497c3c34fac3c66891f879705717ddd99 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 20 May 2018 16:06:25 +0100 Subject: [PATCH 318/392] Added another name to default colours --- StandAlone/colours.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index a05ddf42..48a4712d 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -10,6 +10,7 @@ local default_colours = { Sakama={r=20,g=213,b=80}, freek18={r=50,g=0,b=255}, aldldl={r=0,g=131,b=255}, + NAD4X4={r=135,g=206,b=250}, UUBlueFire={r=0,g=204,b=255} } From 5226c4cf660b9e1e93a03caab20d8efe78c6abbf Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 20 May 2018 17:24:44 +0100 Subject: [PATCH 319/392] Removed Second food key --- locale/en/chat-bot.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index aa5e54c0..9c6598bf 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -37,6 +37,5 @@ get-snaps-3=schkå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.🍸 -food=Dont know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ 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/ \ No newline at end of file From 0a4f5a2ffafa5d43cecf9b74ebfdef7abe2bdc1c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 20 May 2018 17:26:29 +0100 Subject: [PATCH 320/392] Fixed Syntax Error --- Addons/Admin/auto-chat.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 6326b2af..6701944b 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -79,8 +79,7 @@ local commands = { timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end - end):open() return {'chat-bot.make-coffee-1'} end - }, + end):open() return {'chat-bot.make-coffee-1'} end, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) From 53c321be9a64258be12f76605c6c12f8b91257c4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 20 May 2018 18:37:16 +0100 Subject: [PATCH 321/392] Added verbose into addons load --- Addons/load.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Addons/load.lua b/Addons/load.lua index 2ad583fb..f5e4f41d 100644 --- a/Addons/load.lua +++ b/Addons/load.lua @@ -10,6 +10,7 @@ Discord: https://discord.gg/r6dC2uK -- This file just contains all the diffrent requires -- Admin dir +verbose('Begain Admin Loading') require('Admin/player-info') require('Admin/admin') -- Used with Guis/admin-gui, but can work without require('Admin/reports') -- This adds onto Admin/admin, adds report command and warnings, and temp ban @@ -22,6 +23,7 @@ require('Admin/afk-kick') require('Admin/auto-chat') -- Commands dir +verbose('Begain Command Loading') require('Commands/cheat-mode') require('Commands/kill') require('Commands/repair') @@ -32,6 +34,7 @@ require('Commands/tp') -- Requires Admin/admin require('Commands/admin') -- Requires Admin/reports -- GUIs dir +verbose('Begain Gui Loading') require('Guis/readme') require('Guis/science') require('Guis/rockets') @@ -43,6 +46,4 @@ require('Guis/announcements') require('Guis/rank-changer') require('Guis/admin-gui') -- Used with Admin/admin, requires Admin/admin require('Guis/reports') -- Requires Admin/reports -require('Guis/game-settings') - --- other +require('Guis/game-settings') \ No newline at end of file From 6c7fb87d5bac2bf99984310353129136abeb188c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 20 May 2018 22:54:05 +0100 Subject: [PATCH 322/392] Added cydes to colour defaults --- StandAlone/colours.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index 48a4712d..d962a738 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -11,6 +11,7 @@ local default_colours = { freek18={r=50,g=0,b=255}, aldldl={r=0,g=131,b=255}, NAD4X4={r=135,g=206,b=250}, + cydes={r=82,g=249,b=155}, UUBlueFire={r=0,g=204,b=255} } From bae424b03bbc9694bdd75e60c78d48c512293bd8 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 24 May 2018 21:47:24 +0100 Subject: [PATCH 323/392] Fixed /unjail --- Addons/Commands/admin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 9c556a74..775df6d1 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -42,7 +42,7 @@ commands.add_command('unjail', 'Returns a player\'s old rank', {'player',true}, local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end - Ranking.revert(player,event.player_index) + Server.interface(Ranking.revert,true,player,event.player_index) end) commands.add_command('temp-ban', 'Temporarily ban a player', {'player','reason',true}, function(event,args) From 9995cf0b72ced3be624871e9cf762a6c78991f22 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 26 May 2018 11:38:09 +0100 Subject: [PATCH 324/392] Change to paths to help cut errors on lod --- StandAlone/paths.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index ebc0149f..a73439fb 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -69,6 +69,7 @@ end) Event.register(defines.events.on_player_changed_position, function(event) local player = Game.get_player(event) + if player and player.valid and game.tick > 10 then else return end if player.afk_time > 300 then return end local surface = player.surface local pos = player.position From 9041006c5a37af0fa1fb2dc2ba18ce3616ca46b1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 26 May 2018 11:39:57 +0100 Subject: [PATCH 325/392] Fixed /make-warp name --- Addons/Guis/warp-system.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index b05a416f..ec3571ce 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -96,6 +96,7 @@ 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 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 -- to do add a test for all warps From 11f9f098e1f6cef259db868b812ea541a00f598f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 26 May 2018 11:40:43 +0100 Subject: [PATCH 326/392] Fixed Aagain forgot the game.player --- Addons/Guis/warp-system.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index ec3571ce..b6f5c93f 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -96,7 +96,7 @@ 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 player.gui.top[name] then player_return({'warp-system.name-used'},defines.text_color.med) return commands.error end + 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 -- to do add a test for all warps From 729be13efa23f822dd9f2c75d0be6a1efe510791 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 26 May 2018 17:04:11 +0100 Subject: [PATCH 327/392] 2000 rockets is not a high enough goal -_- --- Addons/Guis/rockets.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index e7995564..6ef4ce44 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -10,7 +10,7 @@ Discord: https://discord.gg/r6dC2uK local function _global(reset) global.addons = not reset and global.addons or {} - global.addons.rockets = not reset and global.addons.rockets or {update=0,first=0,_last=0,last=0,fastest=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0,m1000=0,m1500=0,m2000=0}} + global.addons.rockets = not reset and global.addons.rockets or {update=0,first=0,_last=0,last=0,fastest=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0,m1000=0,m2000=0,m5000=0}} return global.addons.rockets end Gui.left.add{ From ffbe97186958f09ff084559826cbdee649109bc9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 27 May 2018 11:09:50 +0100 Subject: [PATCH 328/392] Fixed body markers --- StandAlone/body-marker.lua | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/StandAlone/body-marker.lua b/StandAlone/body-marker.lua index 4700c57f..5ed1b999 100644 --- a/StandAlone/body-marker.lua +++ b/StandAlone/body-marker.lua @@ -2,13 +2,9 @@ Event.register(defines.events.on_player_died, function(event) local player = game.players[event.player_index] - local o = player.position - local entity = player.surface.find_entities_filtered{area={{o.x-1,o.y-1},{o.x+1,o.y+1}},name='character-corpse'} - table.insert(entity,nil) local tag = player.force.add_chart_tag(player.surface,{ position=player.position, - text='Death: '..player.name..' ('..tick_to_display_format(event.tick)..')', - target=entity[1] + text='Death: '..player.name..' ('..tick_to_display_format(event.tick)..')' }) if not global.corpses then global.corpses = {} end table.insert(global.corpses,tag) @@ -19,6 +15,7 @@ Event.register(defines.events.on_tick, function(event) if not global.corpses then global.corpses = {} end for key,tag in pairs(global.corpses) do if not tag.valid then global.corpses[key] = nil return end + if not tag.target then tag.target = tag.surface.find_entity('character-corpse',tag.position) or nil end if not tag.target or not tag.target.valid then tag.destroy() global.corpses[key] = nil return end end end) \ No newline at end of file From 566a0af3fd502a8e5c26b66dd8ba356dbdb824f4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 27 May 2018 23:59:39 +0100 Subject: [PATCH 329/392] Fixed Error with body marker --- StandAlone/body-marker.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/StandAlone/body-marker.lua b/StandAlone/body-marker.lua index 5ed1b999..92ed9666 100644 --- a/StandAlone/body-marker.lua +++ b/StandAlone/body-marker.lua @@ -13,9 +13,16 @@ end) Event.register(defines.events.on_tick, function(event) if (game.tick%3600) ~= 0 then return end if not global.corpses then global.corpses = {} end - for key,tag in pairs(global.corpses) do - if not tag.valid then global.corpses[key] = nil return end - if not tag.target then tag.target = tag.surface.find_entity('character-corpse',tag.position) or nil end - if not tag.target or not tag.target.valid then tag.destroy() global.corpses[key] = nil return end + local key = 1 + while key <= #global.corpses do + local tag = global.corpses[key] + if not tag or not tag.valid then table.remove(global.corpses,key) else + if not tag.target then + local entity = tag.surface.find_entity('character-corpse',tag.position) + if entity then tag.target = entity + else tag.destroy() table.remove(global.corpses,key) key=key-1 end + elseif not tag.target.valid then tag.destroy() table.remove(global.corpses,key) key=key-1 end + end + key=key+1 end end) \ No newline at end of file From dda4951123290245f13568538bdb3d2988970aa3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 28 May 2018 10:39:51 +0100 Subject: [PATCH 330/392] Fixed jail Discord Emit --- Addons/Admin/admin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 27fc38dd..4f21e90f 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -172,7 +172,7 @@ function Admin.jail(player,by_player,reason) title='Player Jail', color=Color.to_hex(defines.text_color.med), description='There was a player jailed.', - ['Player:']=player.name, + ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, ['Reason:']=reason } From 7584cd9a9a31e4e68b26b9da892d79a61d82049a Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Wed, 30 May 2018 01:29:11 +0200 Subject: [PATCH 331/392] added shout, !make popcorn (#62) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg * spelfix * Update auto-chat.lua * added make-cofee * added make cofee * fix because I cant spell apperantly * spell fix because I cant spell apperantly * missing = * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? * rhd (thadius suggestion) * lhd message added * Fixed Comment and indentation * rhd changed from shout to messages * I am also a lazy bastard * Update colours.lua * Not needed in commands if present in messages * Fixed missing comma * !make popcorn need more shouts. Somebody tried this without result so why not. * get-popcorn added * addition --- Addons/Admin/auto-chat.lua | 5 +++++ StandAlone/colours.lua | 1 + locale/en/chat-bot.cfg | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 6701944b..ed121e95 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -46,6 +46,11 @@ local commands = { ['lenny']={'chat-bot.lenny'}, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, + ['makepopcorn']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.get-popcorn-2',self.data}} end + end):open() return {'chat-bot.get-popcorn-1'} end, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index d962a738..2bdb3299 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -8,6 +8,7 @@ local default_colours = { mark9064={r=99,g=0,b=255}, eissturm={r=25,g=25,b=112}, Sakama={r=20,g=213,b=80}, + Sakama={r=20,g=213,b=80}, freek18={r=50,g=0,b=255}, aldldl={r=0,g=131,b=255}, NAD4X4={r=135,g=206,b=250}, diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 9c6598bf..84b1da76 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -38,4 +38,6 @@ 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/ \ No newline at end of file +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. \ No newline at end of file From bea1b8643bcc9a70f18fef000cca35cc831f6491 Mon Sep 17 00:00:00 2001 From: JCA122204 <34488805+JCA122204@users.noreply.github.com> Date: Wed, 30 May 2018 18:37:22 -0400 Subject: [PATCH 332/392] Add !evolution command (#63) * Add !evolution to auto-chat.lua * Add !evolution to chat-bot.cfg * Fixed syntax error and converted to two decimal places --- Addons/Admin/auto-chat.lua | 1 + locale/en/chat-bot.cfg | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index ed121e95..177789c1 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -44,6 +44,7 @@ local commands = { ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, + ['evolution']=function(player) return {'chat_bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, ['makepopcorn']=function(player) Server.new_thread{ diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 84b1da76..634dad23 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -15,6 +15,7 @@ softmod=A softmod is a custom scenario that runs on this server, example is the 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) @@ -40,4 +41,4 @@ 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. \ No newline at end of file +get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold. From 627e7f08ec67115ddd50ef4222e3861942620670 Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Thu, 31 May 2018 20:46:38 +0200 Subject: [PATCH 333/392] Added wiki to readme and chat bot plus a couple of translations (#64) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg * spelfix * Update auto-chat.lua * added make-cofee * added make cofee * fix because I cant spell apperantly * spell fix because I cant spell apperantly * missing = * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? * rhd (thadius suggestion) * lhd message added * Fixed Comment and indentation * rhd changed from shout to messages * I am also a lazy bastard * Update colours.lua * Not needed in commands if present in messages * Fixed missing comma * !make popcorn need more shouts. Somebody tried this without result so why not. * get-popcorn added * addition * looks better this way * -added wiki message to chat bot (only as a global shout !wiki) -added wiki to links in readme -minor language change in one of the jokes and a couple of translations for swedish version --- Addons/Admin/auto-chat.lua | 1 + Addons/Guis/readme.lua | 1 + locale/en/chat-bot.cfg | 3 ++- locale/sv-SE/chat-bot.cfg | 5 ++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 177789c1..92648d6f 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -44,6 +44,7 @@ local commands = { ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, + ['wiki']={'chat-bot.wiki'}, ['evolution']=function(player) return {'chat_bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 0674e3be..e2cac8d7 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -69,6 +69,7 @@ end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(fra 'https://explosivegaming.nl', 'http://steamcommunity.com/groups/tntexplosivegaming', 'https://www.patreon.com/badgamernl' + 'https://wiki.explosivegaming.nl/' } local function format(text_box) text_box.style.minimal_width=400 diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 634dad23..c8767ca7 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -34,7 +34,7 @@ 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=schkål, my friends! +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.🍸 @@ -42,3 +42,4 @@ 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/ \ No newline at end of file diff --git a/locale/sv-SE/chat-bot.cfg b/locale/sv-SE/chat-bot.cfg index e5bded44..68e0663e 100644 --- a/locale/sv-SE/chat-bot.cfg +++ b/locale/sv-SE/chat-bot.cfg @@ -19,4 +19,7 @@ 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!!!!!!! \ No newline at end of file +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/ \ No newline at end of file From 50a5d0baa84573311ac4e9a7ce78e2813c13d77d Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Fri, 1 Jun 2018 21:03:57 +0200 Subject: [PATCH 334/392] typing error fixed (#66) --- Addons/Admin/auto-chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 92648d6f..4cde4162 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -45,7 +45,7 @@ local commands = { ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, ['wiki']={'chat-bot.wiki'}, - ['evolution']=function(player) return {'chat_bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, + ['evolution']=function(player) return {'chat-bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, ['makepopcorn']=function(player) Server.new_thread{ From b9b43504a5b5368966f9513b039e02084a95b42c Mon Sep 17 00:00:00 2001 From: JCA122204 <34488805+JCA122204@users.noreply.github.com> Date: Fri, 1 Jun 2018 15:10:28 -0400 Subject: [PATCH 335/392] Add /tp Command To Co-Exist With /bring And /go-to (#65) * Add !evolution to auto-chat.lua * Add !evolution to chat-bot.cfg * Fixed syntax error and converted to two decimal places * Add the /tp command to co-exist with /bring and /go-to * Add /tp command to co-exist with /bring and /go-to into admin.lua * Fix /tp * Fix admin.lua * Fixed Admin.tp call --- Addons/Admin/admin.lua | 14 +++++++++++++- Addons/Commands/tp.lua | 10 ++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua index 4f21e90f..7523c739 100644 --- a/Addons/Admin/admin.lua +++ b/Addons/Admin/admin.lua @@ -214,4 +214,16 @@ function Admin.bring(player,by_player) local _player = Game.get_player(by_player) if not player or not _player then return end player.teleport(_player.surface.find_non_colliding_position('player',_player.position,32,1),_player.surface) -end \ No newline at end of file +end + +function Admin.tp(from_playaer, to_player) + local _from_player = Game.get_player(from_player) + local _to_player = Game.get_player(to_player) + + if not _from_player or not _to_player then return end + + if Game.players[_from_player].health >= 0 then return end + if Game.players[_to_player].health >= 0 then return end + + _from_player.teleport(_to_player.surface.find_non_colliding_position('player',_to_player.position,32,1),_to_player.surface) +end diff --git a/Addons/Commands/tp.lua b/Addons/Commands/tp.lua index 79734a7c..852f379d 100644 --- a/Addons/Commands/tp.lua +++ b/Addons/Commands/tp.lua @@ -19,3 +19,13 @@ commands.add_command('bring', 'Bring a player to your location', {'player'}, fun if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.bring(player,event) end) + +commands.add_command('tp', 'Teleport a player to another player\'s location', {'from', 'to'}, function(event,args) + local from_player = Game.get_player(args.from) + if not from_player then player_return({'commands.invalid-player',args.from_player}) return commands.error end + + local to_player = Game.get_player(args.to) + if not to_player then player_return({'commands.invalid-player',args.to_player}) return commands.error end + + Admin.tp(from_player, to_player) +end) From 00da61eed65c4e60da9aca3efc4c9c95d994dcf0 Mon Sep 17 00:00:00 2001 From: JCA122204 <34488805+JCA122204@users.noreply.github.com> Date: Sat, 2 Jun 2018 17:16:36 -0400 Subject: [PATCH 336/392] Fix a few possible errors with grammar (#68) * Fix Some Grammar * Update base-damage.cfg * Update chat-bot.cfg --- locale/en/admin.cfg | 2 +- locale/en/base-damage.cfg | 2 +- locale/en/chat-bot.cfg | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/en/admin.cfg b/locale/en/admin.cfg index 2eab9cfa..e02eb650 100644 --- a/locale/en/admin.cfg +++ b/locale/en/admin.cfg @@ -2,7 +2,7 @@ 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! +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. diff --git a/locale/en/base-damage.cfg b/locale/en/base-damage.cfg index a9e54d1d..43f65cdc 100644 --- a/locale/en/base-damage.cfg +++ b/locale/en/base-damage.cfg @@ -1,3 +1,3 @@ [base-damage] used=You hit some of your own buildings. Please be careful next time! -nuke=Nukes are not allowed in your rank. This is a preventive measure against griefers. +nuke=Nukes are not allowed at your rank. This is a preventive measure against griefers. diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index c8767ca7..2eebce90 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -7,9 +7,9 @@ map-time=This map has been on for __1__ line-8=Type /help for more info join-us=Please join us on: discord=Discord: https://discord.explosivegaming.nl -website=Website: 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 (can be found through the question mark on the top left) +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. blame=Blame __1__ for what just happend! @@ -42,4 +42,4 @@ 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/ \ No newline at end of file +wiki=You can get more information about us and the custom scenario from our wiki: https://wiki.explosivegaming.nl/ From 80a607e31768e11c35de7aaaf4d56420af698cec Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 2 Jun 2018 23:37:26 +0100 Subject: [PATCH 337/392] Fixed Sytax error in readme --- Addons/Guis/readme.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index e2cac8d7..5d618cc5 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -68,7 +68,7 @@ end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(fra 'https://discord.explosivegaming.nl', 'https://explosivegaming.nl', 'http://steamcommunity.com/groups/tntexplosivegaming', - 'https://www.patreon.com/badgamernl' + 'https://www.patreon.com/badgamernl', 'https://wiki.explosivegaming.nl/' } local function format(text_box) @@ -77,7 +77,7 @@ end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(fra text_box.word_wrap = true text_box.selectable = true end - for i = 1,4 do + for i,link in pairs(links) do frame.add{ type="label", caption={'readme.links-cap'..tostring(i)}, @@ -85,7 +85,7 @@ end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(fra } format(frame.add{ type='text-box', - text=links[i] + text=link }) end end):add_tab('servers',{'readme.servers-name'},{'readme.servers-tooltip'},function(frame) From f14dc833bb4ce1415d3ec2449fff052d46c7c0fc Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Sun, 3 Jun 2018 01:29:34 +0200 Subject: [PATCH 338/392] wiki added (#70) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg * spelfix * Update auto-chat.lua * added make-cofee * added make cofee * fix because I cant spell apperantly * spell fix because I cant spell apperantly * missing = * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? * rhd (thadius suggestion) * lhd message added * Fixed Comment and indentation * rhd changed from shout to messages * I am also a lazy bastard * Update colours.lua * Not needed in commands if present in messages * Fixed missing comma * !make popcorn need more shouts. Somebody tried this without result so why not. * get-popcorn added * addition * looks better this way * -added wiki message to chat bot (only as a global shout !wiki) -added wiki to links in readme -minor language change in one of the jokes and a couple of translations for swedish version * caps5 (wiki) added * merge error * merge error * merge * merge * colon * colon * asdf --- Addons/Guis/readme.lua | 2 +- locale/en/readme.cfg | 1 + locale/sv-SE/readme.cfg | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua index 5d618cc5..09c2a895 100644 --- a/Addons/Guis/readme.lua +++ b/Addons/Guis/readme.lua @@ -129,4 +129,4 @@ end)) Sync.add_to_gui(Gui.inputs.add_button('readme-sync-rules','View All Rules','View the all rules in the readme',function(player,element) Gui.center.open_tab(player,'readme','rules') -end)) \ No newline at end of file +end)) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index 9f6c66ef..2107ce33 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -26,6 +26,7 @@ links-cap1=Discord voice and chat server: links-cap2=Our website: links-cap3=Steam: links-cap4=Patreon: +links-cap5=Our wiki: servers-name=Servers servers-tooltip=Info on our other servers servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. diff --git a/locale/sv-SE/readme.cfg b/locale/sv-SE/readme.cfg index 30e6530e..fe0d909c 100644 --- a/locale/sv-SE/readme.cfg +++ b/locale/sv-SE/readme.cfg @@ -23,9 +23,10 @@ commands-col2=kommandohjälp links-name=Länkar links-tooltip=Hjälpfulla länkar som visar vägar att komma i kontakt med oss. links-cap1=Discord röst- och chatserver: -links-cap2=våran Webbadress : +links-cap2=Våran Webbadress : links-cap3=Steam: links-cap4=Patreon: +links-cap5=Vår wiki: servers-name=Servrar servers-tooltip=Information om våra servrar servers-singleline=Välkommen till ExplosiveGamings gemenskap! S1-S3 har förskjutna återställningar (resets). From e482dbcd01538bf8dbdf772f8580ca219a00d11e Mon Sep 17 00:00:00 2001 From: flbuddymooreiv Date: Mon, 11 Jun 2018 10:17:07 -0400 Subject: [PATCH 339/392] Fix logic error on table sort function (#72) * Fix logic error on table sort function * Fix injected logic error from previous change * Incorporate Cooldude2606's review comments Added ldoc Removed a couple of redundant boolean checks --- StdLib/table.lua | 52 +++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/StdLib/table.lua b/StdLib/table.lua index 783507b6..4087ef83 100644 --- a/StdLib/table.lua +++ b/StdLib/table.lua @@ -246,6 +246,28 @@ function table.deepcopy(object) return _copy(object) end +--- Default table comparator sort function. +-- @local +-- @param x one comparator operand +-- @param y the other comparator operand +-- @return true if x logically comes before y in a list, false otherwise +local sortfunc = + function(x, y) --sorts tables with mixed index types. + local tx = type(x) + local ty = type(y) + if tx == ty then + if type(x) == 'string' then + return string.lower(x) < string.lower(y) + else + return x < y + end + elseif tx == 'number' then + return true --only x is a number and goes first + else + return false --only y is a number and goes first + end + end + --- Returns a copy of all of the values in the table. -- @tparam table tbl the table to copy the keys from, or an empty table if tbl is nil -- @tparam[opt] boolean sorted whether to sort the keys (slower) or keep the random order from pairs() @@ -267,19 +289,7 @@ function table.values(tbl, sorted, as_string) end end if sorted then - table.sort(valueset, - function(x, y) --sorts tables with mixed index types. - local tx = type(x) == 'number' - local ty = type(y) == 'number' - if tx == ty then - return x < y and true or false --similar type can be compared - elseif tx == true then - return true --only x is a number and goes first - else - return false --only y is a number and goes first - end - end - ) + table.sort(valueset, sortfunc) end return valueset end @@ -305,19 +315,7 @@ function table.keys(tbl, sorted, as_string) end end if sorted then - table.sort(keyset, - function(x, y) --sorts tables with mixed index types. - local tx = type(x) == 'number' - local ty = type(y) == 'number' - if tx == ty then - return x < y and true or false --similar type can be compared - elseif tx == true then - return true --only x is a number and goes first - else - return false --only y is a number and goes first - end - end - ) + table.sort(keyset, sortfunc) end return keyset end @@ -521,4 +519,4 @@ function table.keysort(tbl) local _tbl = {} for _,k in pairs(o) do _tbl[k] = tbl[k] end return _tbl -end \ No newline at end of file +end From 02fdb88be4194f840008610906e0b6e71f062f55 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 12 Jun 2018 16:53:57 +0100 Subject: [PATCH 340/392] Update to radme.cfg files for hour changes --- locale/de/readme.cfg | 6 +++--- locale/en/readme.cfg | 6 +++--- locale/sv-SE/readme.cfg | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/locale/de/readme.cfg b/locale/de/readme.cfg index dd5fa6ed..654ce47e 100644 --- a/locale/de/readme.cfg +++ b/locale/de/readme.cfg @@ -31,11 +31,11 @@ servers-tooltip=Info on our other servers servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. servers-format=S__1__: __2__ servers-cap1=Public -servers-des1=A place for all players, this map reset every 72H At 16:00 UTC. +servers-des1=A place for all players, this map reset every 144H At 16:00 UTC. servers-cap2=Public -servers-des2=A place for all players, this map reset every 72H At 16:00 UTC. +servers-des2=A place for all players, this map reset every 144H At 16:00 UTC. servers-cap3=Public -servers-des3=A place for all players, this map reset every 72H At 16:00 UTC. +servers-des3=A place for all players, this map reset every 144H At 16:00 UTC. servers-cap4=Modded servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. servers-cap5=Events diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index 2107ce33..45d9d809 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -32,11 +32,11 @@ servers-tooltip=Info on our other servers servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. servers-format=S__1__: __2__ servers-cap1=Public -servers-des1=A place for all players, this map resets every 72H At 16:00 UTC. +servers-des1=A place for all players, this map resets every 144H At 16:00 UTC. servers-cap2=Public -servers-des2=A place for all players, this map resets every 72H At 16:00 UTC. +servers-des2=A place for all players, this map resets every 144H At 16:00 UTC. servers-cap3=Public -servers-des3=A place for all players, this map resets every 72H At 16:00 UTC. +servers-des3=A place for all players, this map resets every 144H At 16:00 UTC. servers-cap4=Modded servers-des4=A Modded server for all players. Link on Discord for members. servers-cap5=Events diff --git a/locale/sv-SE/readme.cfg b/locale/sv-SE/readme.cfg index fe0d909c..9107815c 100644 --- a/locale/sv-SE/readme.cfg +++ b/locale/sv-SE/readme.cfg @@ -32,11 +32,11 @@ servers-tooltip=Information om våra servrar servers-singleline=Välkommen till ExplosiveGamings gemenskap! S1-S3 har förskjutna återställningar (resets). servers-format=S__1__: __2__ servers-cap1=Offentlig -servers-des1=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. +servers-des1=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. servers-cap2=Offentlig -servers-des2=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. +servers-des2=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. servers-cap3=Offentlig -servers-des3=En plats för alla spelare, then här kartan återställs varje 72H, 16:00 UTC. +servers-des3=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. servers-cap4=Modifierad servers-des4=En modifierad server för alla spelare. Länk i Discord för medlemmar. servers-cap5=Evenemang From 8a158b4afa4f2ee0cdc405868d642cfa2154228c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 12 Jun 2018 17:00:35 +0100 Subject: [PATCH 341/392] Fixed NL locale file --- locale/nl/readme.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/nl/readme.cfg b/locale/nl/readme.cfg index afa5172f..597051c0 100644 --- a/locale/nl/readme.cfg +++ b/locale/nl/readme.cfg @@ -31,11 +31,11 @@ servers-tooltip=Info over onze andere servers servers-singleline=Welkom op de ExplosiveGaming community! S1 tot en met S3 heeft geplande resets. servers-format=S__1__: __2__ servers-cap1=Openbaar -servers-des1=Server voor alle spelers, deze map reset elke 72 uur om 16:00 UTC. +servers-des1=Server voor alle spelers, deze map reset elke 144 uur om 16:00 UTC. servers-cap2=Openbaar -servers-des2=A place for all players, deze map reset elke 72 uur om 16:00 UTC. +servers-des2=A place for all players, deze map reset elke 144 uur om 16:00 UTC. servers-cap3=Openbaar -servers-des3=A place for all players, deze map reset elke 72 uur om 16:00 UTC. +servers-des3=A place for all players, deze map reset elke 144 uur om 16:00 UTC. servers-cap4=Modded servers-des4=Een modded server voor alle spelers. Links zijn te vinden in de Discord server. servers-cap5=Events From 43edffb74ef90c7b99118f1782280d45f0e1e090 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 12 Jun 2018 21:06:27 +0100 Subject: [PATCH 342/392] removed duplicate of makecoffe --- Addons/Admin/auto-chat.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 4cde4162..2fd5cd8f 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -82,11 +82,6 @@ local commands = { }:on_event('timeout',function(self) if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end end):open() return {'chat-bot.make-coffee-1'} end, - ['makecoffee']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end - end):open() return {'chat-bot.make-coffee-1'} end, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) From 1ceee3b76f4aab29b14bdd0a10e0ee3eca0410f7 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Sun, 24 Jun 2018 22:59:10 +0200 Subject: [PATCH 343/392] fix spawn lag --- Addons/Guis/warp-system.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua index b6f5c93f..ddad3638 100644 --- a/Addons/Guis/warp-system.lua +++ b/Addons/Guis/warp-system.lua @@ -154,7 +154,7 @@ Gui.left.add{ } for name,warp in pairs(_warps().warps) do if not warp.tag or not warp.tag.valid then - player.force.add_chart_tag(warp.surface,{ + warp.tag = player.force.add_chart_tag(warp.surface,{ position=warp.position, text='Warp: '..name, icon={type='item',name=warp_item} @@ -234,4 +234,4 @@ Event.register(defines.events.on_player_created, function(event) }) _warps().warps['Spawn'] = {tag=tag,surface=player.surface,position={0,0}} end -end) \ No newline at end of file +end) From 4ec0408fa9f02f00c49882a5064d2b310a5c8968 Mon Sep 17 00:00:00 2001 From: JCA122204 <34488805+JCA122204@users.noreply.github.com> Date: Wed, 27 Jun 2018 14:36:09 -0400 Subject: [PATCH 344/392] Update sync.lua (#74) --- ExpCore/sync.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index dec82cf8..dd3a1840 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -344,7 +344,7 @@ function Sync._load() end _frame.add{ type='label', - caption='Press Ecs or E to close; this is only visible once!', + caption='Press Esc or E to close; this is only visible once!', style='fake_disabled_label' }.style.font='default-small' end} @@ -356,4 +356,4 @@ Event.register(defines.events.on_player_joined_game,function(event) Gui.center.open(player,'server-info') end) -return Sync \ No newline at end of file +return Sync From f5c71c75d6cae0680b7188896808ee93e8c7f9e6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Jul 2018 16:36:07 +0100 Subject: [PATCH 345/392] Added afk times to sync --- ExpCore/sync.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index dd3a1840..34218828 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -113,14 +113,14 @@ end -- @usage Sync.count_afk() -- @tparam[opt=7200] int time in ticks that a player is called afk -- @treturn int the number of afk players -function Sync.count_afk(time) +function Sync.count_afk_times(time) if not game then return 0 end local time = time or 7200 - local _count = 0 + local rtn = {} for _,player in pairs(game.connected_players) do - if player.afk_time > time then _count=_count+1 end + if player.afk_time > time then rtn[player.name] = player.afk_time end end - return _count + return rtn end --- used to get the number of players in each rank and currently online @@ -175,6 +175,7 @@ function Sync.info(set) server_description='A factorio server for everyone', reset_time='On Demand', time='Day Mth 00 00:00:00 UTC Year', + game_speed=game.speed, time_set=Sync.tick_format(0), last_update=Sync.tick_format(0), time_period=Sync.tick_format(18000), @@ -184,7 +185,7 @@ function Sync.info(set) all=Sync.count_players(), n_all=#game.players, admins_online=Sync.count_admins(), - afk_players=Sync.count_afk(), + afk_players=Sync.count_afk_times(), times=Sync.count_player_times() }, ranks=Sync.count_ranks(), @@ -225,6 +226,7 @@ function Sync.update() info.time_period[2] = tick_to_display_format(info.time_period[1]) info.last_update[1] = game.tick info.last_update[2] = tick_to_display_format(game.tick) + info.game_speed=game.speed, info.players={ online=Sync.count_players(true), n_online=#game.connected_players, From 601df6c6e084f400bcba25edb3d0840e51052c22 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Jul 2018 16:39:24 +0100 Subject: [PATCH 346/392] Forgot tp update function name --- ExpCore/sync.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index 34218828..479d6e7c 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -233,7 +233,7 @@ function Sync.update() all=Sync.count_players(), n_all=#game.players, admins_online=Sync.count_admins(), - afk_players=Sync.count_afk(), + afk_players=Sync.count_afk_times(), times=Sync.count_player_times() } info.ranks = Sync.count_ranks() From a753f70c27789840834f58a9dd83c9e5d73a9401 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Jul 2018 17:06:34 +0100 Subject: [PATCH 347/392] Forgot to maintain tick formating --- ExpCore/sync.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index 479d6e7c..3d1085b2 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -118,7 +118,7 @@ function Sync.count_afk_times(time) local time = time or 7200 local rtn = {} for _,player in pairs(game.connected_players) do - if player.afk_time > time then rtn[player.name] = player.afk_time end + if player.afk_time > time then rtn[player.name] = Sync.tick_format(player.afk_time) end end return rtn end From d3a31e27f8fa439e77bcb21802c730ab3cd24533 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 22 Jul 2018 18:15:59 +0100 Subject: [PATCH 348/392] Fixed Sync Error --- ExpCore/sync.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index 3d1085b2..31df4607 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -226,7 +226,7 @@ function Sync.update() info.time_period[2] = tick_to_display_format(info.time_period[1]) info.last_update[1] = game.tick info.last_update[2] = tick_to_display_format(game.tick) - info.game_speed=game.speed, + info.game_speed=game.speed info.players={ online=Sync.count_players(true), n_online=#game.connected_players, From 55937c343db0429e7228358f7311660fe73f0020 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Jul 2018 16:36:07 +0100 Subject: [PATCH 349/392] Added afk times to sync --- ExpCore/sync.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index dd3a1840..34218828 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -113,14 +113,14 @@ end -- @usage Sync.count_afk() -- @tparam[opt=7200] int time in ticks that a player is called afk -- @treturn int the number of afk players -function Sync.count_afk(time) +function Sync.count_afk_times(time) if not game then return 0 end local time = time or 7200 - local _count = 0 + local rtn = {} for _,player in pairs(game.connected_players) do - if player.afk_time > time then _count=_count+1 end + if player.afk_time > time then rtn[player.name] = player.afk_time end end - return _count + return rtn end --- used to get the number of players in each rank and currently online @@ -175,6 +175,7 @@ function Sync.info(set) server_description='A factorio server for everyone', reset_time='On Demand', time='Day Mth 00 00:00:00 UTC Year', + game_speed=game.speed, time_set=Sync.tick_format(0), last_update=Sync.tick_format(0), time_period=Sync.tick_format(18000), @@ -184,7 +185,7 @@ function Sync.info(set) all=Sync.count_players(), n_all=#game.players, admins_online=Sync.count_admins(), - afk_players=Sync.count_afk(), + afk_players=Sync.count_afk_times(), times=Sync.count_player_times() }, ranks=Sync.count_ranks(), @@ -225,6 +226,7 @@ function Sync.update() info.time_period[2] = tick_to_display_format(info.time_period[1]) info.last_update[1] = game.tick info.last_update[2] = tick_to_display_format(game.tick) + info.game_speed=game.speed, info.players={ online=Sync.count_players(true), n_online=#game.connected_players, From ad746de68c21bad0077a6dcb0ca9bbb662965637 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Jul 2018 16:39:24 +0100 Subject: [PATCH 350/392] Forgot tp update function name --- ExpCore/sync.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index 34218828..479d6e7c 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -233,7 +233,7 @@ function Sync.update() all=Sync.count_players(), n_all=#game.players, admins_online=Sync.count_admins(), - afk_players=Sync.count_afk(), + afk_players=Sync.count_afk_times(), times=Sync.count_player_times() } info.ranks = Sync.count_ranks() From e95c6c039eb09cd13f3780129cd4300cfef02aea Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 21 Jul 2018 17:06:34 +0100 Subject: [PATCH 351/392] Forgot to maintain tick formating --- ExpCore/sync.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index 479d6e7c..3d1085b2 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -118,7 +118,7 @@ function Sync.count_afk_times(time) local time = time or 7200 local rtn = {} for _,player in pairs(game.connected_players) do - if player.afk_time > time then rtn[player.name] = player.afk_time end + if player.afk_time > time then rtn[player.name] = Sync.tick_format(player.afk_time) end end return rtn end From 32ba9f2ddad07b8d9d868eb37bb81f1006ac3b5f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 22 Jul 2018 18:15:59 +0100 Subject: [PATCH 352/392] Fixed Sync Error --- ExpCore/sync.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index 3d1085b2..31df4607 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -226,7 +226,7 @@ function Sync.update() info.time_period[2] = tick_to_display_format(info.time_period[1]) info.last_update[1] = game.tick info.last_update[2] = tick_to_display_format(game.tick) - info.game_speed=game.speed, + info.game_speed=game.speed info.players={ online=Sync.count_players(true), n_online=#game.connected_players, From b0a8f6a51fe56012a442404fea3acdd5394c4fd4 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Wed, 1 Aug 2018 11:19:39 +0200 Subject: [PATCH 353/392] Added feedback to the chatbot --- Addons/Admin/auto-chat.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 2fd5cd8f..e59b45f4 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -44,6 +44,7 @@ local commands = { ['aids']={'chat-bot.aids'}, ['riot']={'chat-bot.riot'}, ['lenny']={'chat-bot.lenny'}, + ['feedback']={'chat-bot.feedback'}, ['wiki']={'chat-bot.wiki'}, ['evolution']=function(player) return {'chat-bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, --Jokes about food and drink From 0609ec33498a812220337d3e96f567599b590546 Mon Sep 17 00:00:00 2001 From: badgamernl Date: Wed, 1 Aug 2018 11:21:27 +0200 Subject: [PATCH 354/392] Added feedback to the chatbot --- locale/en/chat-bot.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 2eebce90..0e81ea5f 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -43,3 +43,4 @@ food=Don't know what to make for dinner? Use a random recipe from the random din 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/ From cedbfab95f7baa45b98c378b5e44838ed217b5df Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 12 Aug 2018 12:49:34 +0100 Subject: [PATCH 355/392] Fixed placed paths chance to removed --- StandAlone/paths.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index a73439fb..ae55ab03 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -1,7 +1,7 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local adjacency_boost = 10 -- makes paths more lickly to be next to each other +local adjacency_boost = 2 -- makes paths more lickly to be next to each other; must be greater than 0 local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, @@ -14,13 +14,13 @@ local placed_paths = { local paths = { -- ['tile name'] = {health,convert to} -- health is the average number of steps in hundards before it changes - ['refined-concrete']={40,'concrete'}, - ['refined-hazard-concrete-right']={40,'hazard-concrete-right'}, - ['refined-hazard-concrete-left']={40,'hazard-concrete-left'}, - ['concrete']={30,'stone-path'}, - ['hazard-concrete-right']={30,'stone-path'}, - ['hazard-concrete-left']={30,'stone-path'}, - ['stone-path']={25,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player + ['refined-concrete']={70,'concrete'}, + ['refined-hazard-concrete-right']={70,'hazard-concrete-right'}, + ['refined-hazard-concrete-left']={70,'hazard-concrete-left'}, + ['concrete']={50,'stone-path'}, + ['hazard-concrete-right']={50,'stone-path'}, + ['hazard-concrete-left']={50,'stone-path'}, + ['stone-path']={40,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player ['sand-1']={1,'sand-2'}, ['sand-2']={3,'sand-3'}, ['sand-3']={1,'red-desert-3'}, @@ -62,7 +62,7 @@ Event.register(defines.events.on_player_built_tile, function(event) for _,old_tile in pairs(old_tiles) do if placed_paths[old_tile.old_tile.name] or old_tile.old_tile.name == 'water' or old_tile.old_tile.name == 'deep-water' then else if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable - global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name + global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name -- not a mistake, this makes it have dimising returns end end end) @@ -79,9 +79,9 @@ Event.register(defines.events.on_player_changed_position, function(event) local count = 1 for x = -1,1 do for y = -1,1 do local _pos = {pos.x+x,pos.y+y} - if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] + if placed_paths[tile_name] and not placed_paths[surface.get_tile(_pos).name] or surface.get_tile(_pos).name == paths[tile_name][2] - then chance=chance*(adjacency_boost/count) count=count+1 end + then chance=chance*((adjacency_boost+8)/count) count=count+1 end end end if math.random() < chance then down_grade(surface,pos) @@ -100,4 +100,4 @@ for x = -1,1 do for y = -1,1 do then game.print('boost '..tostring(count)) chance=chance=chance*(adjacency_boost/count) count=count+1 end end end return chance -]] \ No newline at end of file +]] From 3b55dec9e8e9c2a3a253a82afb49f6013fa3ed79 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 13 Aug 2018 18:19:58 +0100 Subject: [PATCH 356/392] Entities Make Paths --- StandAlone/paths.lua | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index ae55ab03..6f045709 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -2,6 +2,33 @@ -- idea from Mylon - Dirt Path local adjacency_boost = 2 -- makes paths more lickly to be next to each other; must be greater than 0 +local entities = { + ['stone-furnace']=2, + ['steel-furnace']=2, + ['electric-furnace']=3, + ['assembling-machine-1']=3, + ['assembling-machine-2']=3, + ['assembling-machine-3']=3, + ['beacon']=3, + ['centrifuge']=3, + ['chemical-plant']=3, + ['oil-refinery']=7, + ['storage-tank']=3, + ['nuclear-reactor']=5, + ['steam-engine']=4, + ['steam-turbine']=4, + ['boiler']=3, + ['heat-exchanger']=3, + ['stone-wall']=1, + ['gate']=1, + ['gun-turret']=2, + ['laser-turret']=2, + ['radar']=3, + ['lab']=3, + ['big-electric-pole']=2, + ['substation']=2, + ['rocket-silo']=7 +} local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, @@ -88,6 +115,21 @@ Event.register(defines.events.on_player_changed_position, function(event) end end) +Event.register(defines.events.on_built_entity, function(event) + local entity = event.entity + local surface = player.surface + if entities[entity.name] then + local size = entities[entity.name] + for (x in 0,size) do for (y in 0,size) do + local pos = [entity.position.x+x,entity.position.y+y] + local tile = surface.get_tile(pos).name + if math.random() < paths[tile]*size then + down_grade(surface,pos) + end + end end + end +end) + --[[ /interface local tile_name = tile.name From 37eba43f26b9b57cdf09bdec567706a78c464631 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 13 Aug 2018 19:02:53 +0100 Subject: [PATCH 357/392] Paths under entities are more likly --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 6f045709..b6524c11 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -123,7 +123,7 @@ Event.register(defines.events.on_built_entity, function(event) for (x in 0,size) do for (y in 0,size) do local pos = [entity.position.x+x,entity.position.y+y] local tile = surface.get_tile(pos).name - if math.random() < paths[tile]*size then + if math.random() < paths[tile]*size*10 then down_grade(surface,pos) end end end From 606de3233690a523be2f8c4a5cf4b9e9a47853ed Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 8 Sep 2018 16:12:56 +0100 Subject: [PATCH 358/392] Changed Wording On Sync Gui --- ExpCore/sync.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExpCore/sync.lua b/ExpCore/sync.lua index 31df4607..03eb48be 100644 --- a/ExpCore/sync.lua +++ b/ExpCore/sync.lua @@ -288,7 +288,7 @@ Sync.add_to_gui(function(player,frame) return 'You have been assigned the rank \''..Ranking.get_rank(player).name..'\'' end) Sync.add_to_gui(function(player,frame) - return 'This server will reset at: '..Sync.info().reset_time + return 'This server\'s next reset: '..Sync.info().reset_time end) -- if readme is included then see addons/guis/readme.lua for more examples From 1ffef67902fff3ee1bd7b9e470d2a165660e2f6c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 8 Sep 2018 17:09:29 +0100 Subject: [PATCH 359/392] New Ranks --- Addons/playerRanks.lua | 74 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index e4e532b1..ef498db8 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -36,6 +36,17 @@ http://lua-api.factorio.com/latest/defines.html#defines.input_action -- See ExpCore/ranks.lua for examples - you add your own and edit pre-made ones here. +Ranking._group:create{ + name='Donator', + allow={}, + disallow={ + 'set_allow_commands', + 'edit_permission_group', + 'delete_permission_group', + 'add_permission_group' + } +} + local groups = Ranking._groups(true) groups['Root']:edit('allow',false,{ @@ -79,6 +90,20 @@ groups['Admin']:edit('allow',false,{ ['polls']=true, ['global-chat']=true }) +groups['Donator']:edit('allow',false,{ + ['player-list']=true, + ['readme']=true, + ['rockets']=true, + ['science']=true, + ['tasklist']=true, + ['report']=true, + ['warp-list']=true, + ['polls']=true, + ['global-chat']=true, + ['set-home']=true, + ['home']=true, + ['return']=true, +}) groups['User']:edit('allow',false,{ ['player-list']=true, ['readme']=true, @@ -137,22 +162,47 @@ groups['Admin']:add_rank{ base_afk_time=false } -groups['User']:add_rank{ +groups['Donator']:add_rank{ + name='Sponsor', + short_hand='Spon', + tag='[Sponsor]', + colour={r=247,g=246,b=54}, + power=7, + is_spectator=true, + base_afk_time=false +} +groups['Donator']:add_rank{ + name='Subscription', + short_hand='Sub', + tag='[Sub]', + colour={r=238,g=172,b=44}, + is_spectator=true, + base_afk_time=160 +} +groups['Donator']:add_rank{ name='Donator', short_hand='P2W', tag='[P2W]', - colour={r=233,g=63,b=233}, - power=0, + colour={r=230,g=99,b=34}, is_spectator=true, base_afk_time=120 } + +groups['User']:add_rank{ + name='Partner', + short_hand='Part', + tag='[Partner]', + power=0, + colour={r=26,g=118,b=156}, + base_afk_time=120 +} groups['User']:add_rank{ name='Veteran', short_hand='Vet', tag='[Veteran]', time=600, - colour={r=140,g=120,b=200}, power=1, + colour={r=140,g=120,b=200}, base_afk_time=60 } groups['User']:add_rank{ @@ -182,16 +232,22 @@ ranks['Mod']:edit('allow',false,{ ['no-report']=true }) -ranks['Donator']:edit('allow',false,{ - ['global-chat']=true, +ranks['Sponsor']:edit('allow',false,{ ['jail']=true, ['unjail']=true, - ['set-home']=true, - ['home']=true, - ['return']=true, ['bonus']=true, ['bonus-respawn']=true }) +ranks['Subscription']:edit('allow',false,{ + ['jail']=true, + ['unjail']=true, + ['bonus']=true, + ['bonus-respawn']=true +}) +ranks['Donator']:edit('allow',false,{ + +}) + ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, ['create-poll']=true, From 58e27951c3d133836503c01a6fccd50b117a4b4f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 8 Sep 2018 17:17:28 +0100 Subject: [PATCH 360/392] Added Trainee --- Addons/playerRanks.lua | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index ef498db8..d3acadb2 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -161,13 +161,24 @@ groups['Admin']:add_rank{ is_spectator=true, base_afk_time=false } +groups['Admin']:add_rank{ + name='Trainee', + short_hand='TMod', + tag='[Trainee]', + colour={r=0,g=196,b=137}, + disallow={ + 'server_command' + }, + is_spectator=true, + base_afk_time=false +} groups['Donator']:add_rank{ name='Sponsor', short_hand='Spon', tag='[Sponsor]', colour={r=247,g=246,b=54}, - power=7, + power=8, is_spectator=true, base_afk_time=false } @@ -231,6 +242,11 @@ ranks['Mod']:edit('allow',false,{ ['bring']=true, ['no-report']=true }) +ranks['Trainee']:edit('allow',false,{ + ['go-to']=true, + ['bring']=true, + ['no-report']=true +}) ranks['Sponsor']:edit('allow',false,{ ['jail']=true, From 08c3c4302c1e11c04c8e11d619edf7c19f02efab Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 8 Sep 2018 18:11:28 +0100 Subject: [PATCH 361/392] Changed Short Hand --- Addons/playerRanks.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index d3acadb2..098e31b5 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -88,7 +88,10 @@ groups['Admin']:edit('allow',false,{ ['announcements']=true, ['warp-list']=true, ['polls']=true, - ['global-chat']=true + ['global-chat']=true, + ['set-home']=true, + ['home']=true, + ['return']=true, }) groups['Donator']:edit('allow',false,{ ['player-list']=true, @@ -163,7 +166,7 @@ groups['Admin']:add_rank{ } groups['Admin']:add_rank{ name='Trainee', - short_hand='TMod', + short_hand='TrMod', tag='[Trainee]', colour={r=0,g=196,b=137}, disallow={ From dc01acc01b075290030c25fd41285174ae2750f1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 9 Sep 2018 21:32:20 +0100 Subject: [PATCH 362/392] Changed P2W and Guest --- Addons/playerRanks.lua | 10 +++++----- ExpCore/ranks.lua | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 098e31b5..e15e302d 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -186,17 +186,17 @@ groups['Donator']:add_rank{ base_afk_time=false } groups['Donator']:add_rank{ - name='Subscription', - short_hand='Sub', - tag='[Sub]', + name='Pay to Win', + short_hand='P2W', + tag='[P2W]', colour={r=238,g=172,b=44}, is_spectator=true, base_afk_time=160 } groups['Donator']:add_rank{ name='Donator', - short_hand='P2W', - tag='[P2W]', + short_hand='Don', + tag='[Donator]', colour={r=230,g=99,b=34}, is_spectator=true, base_afk_time=120 diff --git a/ExpCore/ranks.lua b/ExpCore/ranks.lua index b1ba5252..d0707924 100644 --- a/ExpCore/ranks.lua +++ b/ExpCore/ranks.lua @@ -149,7 +149,7 @@ user:add_rank{ name='Guest', short_hand='', tag='', - colour={r=255,g=159,b=27}, + colour={r=132,g=88,b=155}, is_default=true, disallow={ 'build_terrain', From ce8cf366d02042a4cb7414734c87e32a7677b54d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 10 Sep 2018 17:14:01 +0100 Subject: [PATCH 363/392] Forgot home for root group --- Addons/playerRanks.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index e15e302d..9d56bdf5 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -69,7 +69,10 @@ groups['Root']:edit('allow',false,{ ['admin-items']=true, ['all-items']=true, ['repair']=true, - ['global-chat']=true + ['global-chat']=true, + ['set-home']=true, + ['home']=true, + ['return']=true, }) groups['Admin']:edit('allow',false,{ ['player-list']=true, From ddbef36e5f2dc7964c45fb4bbc006cd7a8845bf3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 10 Sep 2018 17:50:24 +0100 Subject: [PATCH 364/392] Fixed Some Bugs --- Addons/playerRanks.lua | 4 ++-- ExpCore/ranks.lua | 2 +- StandAlone/paths.lua | 4 ++-- control.lua | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 9d56bdf5..ad5b55b2 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -149,7 +149,7 @@ groups['Root']:add_rank{ name='Developer', short_hand='Dev', tag='[Dev]', - colour={r=179,g=125,b=46}, + colour={r=57,g=192,b=207}, is_admin = true, is_spectator=true, base_afk_time=false @@ -260,7 +260,7 @@ ranks['Sponsor']:edit('allow',false,{ ['bonus']=true, ['bonus-respawn']=true }) -ranks['Subscription']:edit('allow',false,{ +ranks['Pay to Win']:edit('allow',false,{ ['jail']=true, ['unjail']=true, ['bonus']=true, diff --git a/ExpCore/ranks.lua b/ExpCore/ranks.lua index d0707924..b23fb749 100644 --- a/ExpCore/ranks.lua +++ b/ExpCore/ranks.lua @@ -149,7 +149,7 @@ user:add_rank{ name='Guest', short_hand='', tag='', - colour={r=132,g=88,b=155}, + colour={r=143,g=46,b=46}, is_default=true, disallow={ 'build_terrain', diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index b6524c11..ab4f6024 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -120,8 +120,8 @@ Event.register(defines.events.on_built_entity, function(event) local surface = player.surface if entities[entity.name] then local size = entities[entity.name] - for (x in 0,size) do for (y in 0,size) do - local pos = [entity.position.x+x,entity.position.y+y] + for x in 0,size do for y in 0,size do + local pos = {entity.position.x+x,entity.position.y+y} local tile = surface.get_tile(pos).name if math.random() < paths[tile]*size*10 then down_grade(surface,pos) diff --git a/control.lua b/control.lua index 90226fbb..32e32c95 100644 --- a/control.lua +++ b/control.lua @@ -30,7 +30,7 @@ end _verbose = false -- Set to true for more on the loading of the files function verbose(str) if _verbose then log(str) print(str) end end verbose('============================= START =============================') -require_return_err = false -- Set to false when removing files; set to true for debuging +require_return_err = true -- Set to false when removing files; set to true for debuging _require = require require = function(path) local _path = path From 71d7455a53e15f2826c03174437280b20ae560d2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 10 Sep 2018 17:50:44 +0100 Subject: [PATCH 365/392] Reverted Control.lua to remove debug --- control.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control.lua b/control.lua index 32e32c95..90226fbb 100644 --- a/control.lua +++ b/control.lua @@ -30,7 +30,7 @@ end _verbose = false -- Set to true for more on the loading of the files function verbose(str) if _verbose then log(str) print(str) end end verbose('============================= START =============================') -require_return_err = true -- Set to false when removing files; set to true for debuging +require_return_err = false -- Set to false when removing files; set to true for debuging _require = require require = function(path) local _path = path From a338fc0b57ed9bcbc9c9d0a48c6835960795d6d9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 11 Sep 2018 17:16:11 +0100 Subject: [PATCH 366/392] New Colours --- Addons/playerRanks.lua | 11 +++++++---- ExpCore/ranks.lua | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index ad5b55b2..94c8d6e9 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -149,7 +149,7 @@ groups['Root']:add_rank{ name='Developer', short_hand='Dev', tag='[Dev]', - colour={r=57,g=192,b=207}, + colour={r=179,g=125,b=46}, is_admin = true, is_spectator=true, base_afk_time=false @@ -210,7 +210,7 @@ groups['User']:add_rank{ short_hand='Part', tag='[Partner]', power=0, - colour={r=26,g=118,b=156}, + colour={r=140,g=120,b=200}, base_afk_time=120 } groups['User']:add_rank{ @@ -219,7 +219,7 @@ groups['User']:add_rank{ tag='[Veteran]', time=600, power=1, - colour={r=140,g=120,b=200}, + colour={r=26,g=118,b=156}, base_afk_time=60 } groups['User']:add_rank{ @@ -227,7 +227,7 @@ groups['User']:add_rank{ short_hand='Reg', tag='[Regular]', time=180, - colour={r=24,g=172,b=188}, + colour={r=79,g=155,b=163}, power=3, base_afk_time=30 } @@ -270,6 +270,9 @@ ranks['Donator']:edit('allow',false,{ }) +ranks['Partner']:edit('allow',false,{ + +}) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, ['create-poll']=true, diff --git a/ExpCore/ranks.lua b/ExpCore/ranks.lua index b23fb749..1b4495d2 100644 --- a/ExpCore/ranks.lua +++ b/ExpCore/ranks.lua @@ -149,7 +149,7 @@ user:add_rank{ name='Guest', short_hand='', tag='', - colour={r=143,g=46,b=46}, + colour={r=185,g=187,b=160}, is_default=true, disallow={ 'build_terrain', From c37e66be275d2aada3936b3d2e270b2a20987f8c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 11 Sep 2018 17:31:34 +0100 Subject: [PATCH 367/392] Hopefully fixed desync --- ExpCore/gui.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ExpCore/gui.lua b/ExpCore/gui.lua index d5649e79..b8adeeae 100644 --- a/ExpCore/gui.lua +++ b/ExpCore/gui.lua @@ -172,8 +172,8 @@ Event.register(defines.events.on_player_respawned,function(event) if Gui._global().players and is_type(Gui._global().players,'table') and #Gui._global().players > 0 and Gui._global().players[event.player_index] then local remove = {} for index,cam in pairs(Gui._global().players[event.player_index]) do - Gui.cam_link{cam=cam,entity=Game.get_player(event).character} - if not cam.valid then table.insert(remove,index) end + if not cam.valid then table.insert(remove,index) + else cam.entity=Game.get_player(event).character end end for _,index in pairs(remove) do table.remove(Gui._global().players[event.player_index],index) From 86f61dd17cb40d8ca5c099c81f34b3ccd84d4a69 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 11 Sep 2018 17:45:42 +0100 Subject: [PATCH 368/392] Update to gui cams --- ExpCore/gui.lua | 112 +++++++++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 48 deletions(-) diff --git a/ExpCore/gui.lua b/ExpCore/gui.lua index b8adeeae..488356ae 100644 --- a/ExpCore/gui.lua +++ b/ExpCore/gui.lua @@ -66,32 +66,39 @@ function Gui.set_dropdown_index(dropdown,_item) end Event.register(-1,function(event) - Server.new_thread{ - name='camera-follow', - data={cams={},cam_index=1,players={}} - }:on_event('tick',function(self) - local _cam = self.data.cams[self.data.cam_index] - if not _cam then self.data.cam_index = 1 _cam = self.data.cams[self.data.cam_index] end - if not _cam then return end - if not _cam.cam.valid then table.remove(self.data.cams,self.data.cam_index) - elseif not _cam.entity.valid then table.remove(self.data.cams,self.data.cam_index) - else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end self.data.cam_index = self.data.cam_index+1 - end - end):on_event('error',function(self,err) - -- posible error handling if needed - error(err) - end):on_event(defines.events.on_player_respawned,function(self,event) - if self.data.players[event.player_index] then - local remove = {} - for index,cam in pairs(self.data.players[event.player_index]) do - Gui.cam_link{cam=cam,entity=Game.get_player(event).character} - if not cam.valid then table.insert(remove,index) end + if Server and Server._thread then + Server.new_thread{ + name='camera-follow', + data={cams={},cam_index=1,players={}} + }:on_event('tick',function(self) + local update = 4 + if self.data.cam_index > #self.data.cams then self.data.cam_index = 1 end + if update > #self.data.cams then update = #self.data.cams end + for cam_offset = 0,update do + local _cam = self.data.cams[self.data.cam_index+cam_offset] + if not _cam then break end + if not _cam.cam.valid then table.remove(self.data.cams,self.data.cam_index) + elseif not _cam.entity.valid then table.remove(self.data.cams,self.data.cam_index) + else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end + end end - for _,index in pairs(remove) do - table.remove(self.data.players[event.player_index],index) + self.data.cam_index = self.data.cam_index+update + end):on_event('error',function(self,err) + -- posible error handling if needed + error(err) + end):on_event(defines.events.on_player_respawned,function(self,event) + if self.data.players[event.player_index] then + local remove = {} + for index,cam in pairs(self.data.players[event.player_index]) do + if not cam.valid then table.insert(remove,index) + else cam.entity=Game.get_player(event).character end + end + for _,index in pairs(remove) do + table.remove(self.data.players[event.player_index],index) + end end - end - end):open() + end):open() + end end) --- Adds a camera that updates every tick (or less depeading on how many are opening) it will move to follow an entity @@ -153,31 +160,40 @@ function Gui.cam_link(data) return data.cam end -Event.register(defines.events.on_tick, function(event) - if Gui.left and ((event.tick+10)/(3600*game.speed)) % 15 == 0 then - Gui.left.update() - end - if Gui._global().cams and is_type(Gui._global().cams,'table') and #Gui._global().cams > 0 then - local _cam = Gui._global().cams[Gui._global().cam_index] - if not _cam then Gui._global().cam_index = 1 _cam = Gui._global().cams[Gui._global().cam_index] end - if not _cam then return end - if not _cam.cam.valid then table.remove(Gui._global().cams,Gui._global().cam_index) - elseif not _cam.entity.valid then table.remove(Gui._global().cams,Gui._global().cam_index) - else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end Gui._global().cam_index = Gui._global().cam_index+1 - end - end -end) +Event.register(-1,function(event) + if not Server or not Server._thread then + Event.register(defines.events.on_tick, function(event) + if Gui.left and ((event.tick+10)/(3600*game.speed)) % 15 == 0 then + Gui.left.update() + end + if Gui._global().cams and is_type(Gui._global().cams,'table') and #Gui._global().cams > 0 then + local update = 4 + if Gui._global().cam_index > #Gui._global().cams then Gui._global().cam_index = 1 end + if update > #Gui._global().cams then update = #Gui._global().cams end + for cam_offset = 0,update do + local _cam = Gui._global().cams[Gui._global().cam_index] + if not _cam then break end + if not _cam.cam.valid then table.remove(Gui._global().cams,Gui._global().cam_index) + elseif not _cam.entity.valid then table.remove(Gui._global().cams,Gui._global().cam_index) + else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end Gui._global().cam_index = Gui._global().cam_index+1 + end + end + Gui._global().cam_index = Gui._global().cam_index+update + end + end) -Event.register(defines.events.on_player_respawned,function(event) - if Gui._global().players and is_type(Gui._global().players,'table') and #Gui._global().players > 0 and Gui._global().players[event.player_index] then - local remove = {} - for index,cam in pairs(Gui._global().players[event.player_index]) do - if not cam.valid then table.insert(remove,index) - else cam.entity=Game.get_player(event).character end - end - for _,index in pairs(remove) do - table.remove(Gui._global().players[event.player_index],index) - end + Event.register(defines.events.on_player_respawned,function(event) + if Gui._global().players and is_type(Gui._global().players,'table') and #Gui._global().players > 0 and Gui._global().players[event.player_index] then + local remove = {} + for index,cam in pairs(Gui._global().players[event.player_index]) do + if not cam.valid then table.insert(remove,index) + else cam.entity=Game.get_player(event).character end + end + for _,index in pairs(remove) do + table.remove(Gui._global().players[event.player_index],index) + end + end + end) end end) From 6d71521618cdd5281cd45559aac9c44eec1b0a9a Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 11 Sep 2018 17:51:39 +0100 Subject: [PATCH 369/392] PLayer respwn not wokring for cams --- ExpCore/gui.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ExpCore/gui.lua b/ExpCore/gui.lua index 488356ae..b0aee140 100644 --- a/ExpCore/gui.lua +++ b/ExpCore/gui.lua @@ -72,7 +72,7 @@ Event.register(-1,function(event) data={cams={},cam_index=1,players={}} }:on_event('tick',function(self) local update = 4 - if self.data.cam_index > #self.data.cams then self.data.cam_index = 1 end + if self.data.cam_index >= #self.data.cams then self.data.cam_index = 1 end if update > #self.data.cams then update = #self.data.cams end for cam_offset = 0,update do local _cam = self.data.cams[self.data.cam_index+cam_offset] @@ -91,7 +91,7 @@ Event.register(-1,function(event) local remove = {} for index,cam in pairs(self.data.players[event.player_index]) do if not cam.valid then table.insert(remove,index) - else cam.entity=Game.get_player(event).character end + else Gui.cam_link{cam=cam,entity=Game.get_player(event).character} end end for _,index in pairs(remove) do table.remove(self.data.players[event.player_index],index) @@ -168,7 +168,7 @@ Event.register(-1,function(event) end if Gui._global().cams and is_type(Gui._global().cams,'table') and #Gui._global().cams > 0 then local update = 4 - if Gui._global().cam_index > #Gui._global().cams then Gui._global().cam_index = 1 end + if Gui._global().cam_index >= #Gui._global().cams then Gui._global().cam_index = 1 end if update > #Gui._global().cams then update = #Gui._global().cams end for cam_offset = 0,update do local _cam = Gui._global().cams[Gui._global().cam_index] @@ -187,7 +187,7 @@ Event.register(-1,function(event) local remove = {} for index,cam in pairs(Gui._global().players[event.player_index]) do if not cam.valid then table.insert(remove,index) - else cam.entity=Game.get_player(event).character end + else Gui.cam_link{cam=cam,entity=Game.get_player(event).character} end end for _,index in pairs(remove) do table.remove(Gui._global().players[event.player_index],index) From 3335d43129617d83df28b16452cdddda85a42bec Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 11 Sep 2018 18:32:37 +0100 Subject: [PATCH 370/392] Fixed surface define on paths --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index ab4f6024..c435e549 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -117,7 +117,7 @@ end) Event.register(defines.events.on_built_entity, function(event) local entity = event.entity - local surface = player.surface + local surface = entity.surface if entities[entity.name] then local size = entities[entity.name] for x in 0,size do for y in 0,size do From 01f19bcbc387913f0d8a5dbaed14c0525fd9fc9c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 11 Sep 2018 23:26:13 +0100 Subject: [PATCH 371/392] Hopefully fixed cam desync this time --- ExpCore/gui.lua | 72 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/ExpCore/gui.lua b/ExpCore/gui.lua index b0aee140..5f33bcba 100644 --- a/ExpCore/gui.lua +++ b/ExpCore/gui.lua @@ -89,12 +89,13 @@ Event.register(-1,function(event) end):on_event(defines.events.on_player_respawned,function(self,event) if self.data.players[event.player_index] then local remove = {} + local player = Game.get_player(event) for index,cam in pairs(self.data.players[event.player_index]) do - if not cam.valid then table.insert(remove,index) - else Gui.cam_link{cam=cam,entity=Game.get_player(event).character} end + if cam.valid then table.insert(self.data.cams,{cam=cam,entity=player.character,surface=player.surface}) + else table.insert(remove,index) end end - for _,index in pairs(remove) do - table.remove(self.data.players[event.player_index],index) + for n,index in pairs(remove) do + table.remove(self.data.players[event.player_index],index-n+1) end end end):open() @@ -160,40 +161,39 @@ function Gui.cam_link(data) return data.cam end -Event.register(-1,function(event) - if not Server or not Server._thread then - Event.register(defines.events.on_tick, function(event) - if Gui.left and ((event.tick+10)/(3600*game.speed)) % 15 == 0 then - Gui.left.update() +Event.register(defines.events.on_tick, function(event) + if Gui.left and ((event.tick+10)/(3600*game.speed)) % 15 == 0 then + Gui.left.update() + end + if Server and Server._thread then return end + if Gui._global().cams and is_type(Gui._global().cams,'table') and #Gui._global().cams > 0 then + local update = 4 + if Gui._global().cam_index >= #Gui._global().cams then Gui._global().cam_index = 1 end + if update > #Gui._global().cams then update = #Gui._global().cams end + for cam_offset = 0,update do + local _cam = Gui._global().cams[Gui._global().cam_index] + if not _cam then break end + if not _cam.cam.valid then table.remove(Gui._global().cams,Gui._global().cam_index) + elseif not _cam.entity.valid then table.remove(Gui._global().cams,Gui._global().cam_index) + else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end Gui._global().cam_index = Gui._global().cam_index+1 end - if Gui._global().cams and is_type(Gui._global().cams,'table') and #Gui._global().cams > 0 then - local update = 4 - if Gui._global().cam_index >= #Gui._global().cams then Gui._global().cam_index = 1 end - if update > #Gui._global().cams then update = #Gui._global().cams end - for cam_offset = 0,update do - local _cam = Gui._global().cams[Gui._global().cam_index] - if not _cam then break end - if not _cam.cam.valid then table.remove(Gui._global().cams,Gui._global().cam_index) - elseif not _cam.entity.valid then table.remove(Gui._global().cams,Gui._global().cam_index) - else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end Gui._global().cam_index = Gui._global().cam_index+1 - end - end - Gui._global().cam_index = Gui._global().cam_index+update - end - end) + end + Gui._global().cam_index = Gui._global().cam_index+update + end +end) - Event.register(defines.events.on_player_respawned,function(event) - if Gui._global().players and is_type(Gui._global().players,'table') and #Gui._global().players > 0 and Gui._global().players[event.player_index] then - local remove = {} - for index,cam in pairs(Gui._global().players[event.player_index]) do - if not cam.valid then table.insert(remove,index) - else Gui.cam_link{cam=cam,entity=Game.get_player(event).character} end - end - for _,index in pairs(remove) do - table.remove(Gui._global().players[event.player_index],index) - end - end - end) +Event.register(defines.events.on_player_respawned,function(event) + if Server and Server._thread then return end + if Gui._global().players and is_type(Gui._global().players,'table') and #Gui._global().players > 0 and Gui._global().players[event.player_index] then + local remove = {} + local player = Game.get_player(event) + for index,cam in pairs(Gui._global().players[event.player_index]) do + if cam.valid then table.insert(Gui._global().cams,{cam=cam,entity=player.character,surface=player.surface}) + else table.insert(remove,index) end + end + for n,index in pairs(remove) do + table.remove(Gui._global().players[event.player_index],index-n+1) + end end end) From d0e63a6c73095a6b6a96a23c74fcfbb1f343752e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 13 Sep 2018 17:45:21 +0100 Subject: [PATCH 372/392] Added Alo to pre sync --- Addons/playerRanks.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 94c8d6e9..8723d71f 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -301,5 +301,6 @@ Ranking._base_preset{ ['arty714']='Community Manager', ['cooldude2606']='Developer', ['mark9064']='Admin', - ['propangaseddy']='Admin' + ['propangaseddy']='Admin', + ['aldldl']='Admin' } From f5968f3e9345a6768d149877961d0c8c7920d534 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 14 Sep 2018 17:28:19 +0100 Subject: [PATCH 373/392] Fixed Paths --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index c435e549..ff982631 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -116,7 +116,7 @@ Event.register(defines.events.on_player_changed_position, function(event) end) Event.register(defines.events.on_built_entity, function(event) - local entity = event.entity + local entity = event.created_entity local surface = entity.surface if entities[entity.name] then local size = entities[entity.name] From 489a17a8972b0d394be8c8e297255c979ba6031b Mon Sep 17 00:00:00 2001 From: badgamernl Date: Fri, 14 Sep 2018 20:01:43 +0200 Subject: [PATCH 374/392] Chat/Mention popup (#81) * Chat/Mention popup Creates floating text entity above the player with the chat message content, if this contains a player-name of a online player it creates a floating text entity above them to notify them they have been mentioned. This is useful for people that are not focusing on the chat. BUGS: Text not centered when zooming out, could be changed that the text is not centered but better get some player feedback to see if they even like the feature. Text longer than 128 characters overlaps when zooming out. * Moved Function Up Keeping Conventions --- StandAlone/chat-popup.lua | 41 +++++++++++++++++++++++++++++++++++++++ StandAlone/load.lua | 3 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 StandAlone/chat-popup.lua diff --git a/StandAlone/chat-popup.lua b/StandAlone/chat-popup.lua new file mode 100644 index 00000000..40fc94b1 --- /dev/null +++ b/StandAlone/chat-popup.lua @@ -0,0 +1,41 @@ + +function sendFlyingText(player, text) + local _player = Game.get_player(player) + if not _player then return end + -- Split long text in chunks + local chunkSize = 128 + local chunks = {} + for i=1, #text, chunkSize do + chunks[#chunks+1] = text:sub(i,i+chunkSize - 1) + end + -- Itterate over text chunks and create them as floating text centered above the player + for i,value in ipairs(chunks) do + _player.surface.create_entity{ + name="flying-text", + color=_player.chat_color, + text=value, + position={_player.position.x - (1 / 7.9 * #value), _player.position.y-(2 - (1 / 2 * i))} + } + end +end + +-- Edited health popup to make chat popup https://lua-api.factorio.com/latest/events.html#on_console_chat +Event.register(defines.events.on_console_chat, function(event) + local player = Game.get_player(event.player_index) + if not player then return end + if event.message then + -- Send message player send to player itself + local message = player.name .. ': ' .. event.message + sendFlyingText(player, message) + + -- parse message for players and if it includes player, send him a notification that he has been mentioned in the chat + local player_message = event.message:lower():gsub("%s+", "") + for i,_player in ipairs(game.connected_players) do + if _player.index ~= player.index then + if player_message:match(_player.name:lower()) then + sendFlyingText(_player, 'You\'ve been mentioned by: ' ..player.name .. ' in chat!') + end + end + end + end +end) diff --git a/StandAlone/load.lua b/StandAlone/load.lua index 16841b94..be51306e 100644 --- a/StandAlone/load.lua +++ b/StandAlone/load.lua @@ -13,4 +13,5 @@ require('health') require('spawn') require('starting-items') require('paths') -require('body-marker') \ No newline at end of file +require('body-marker') +require('chat-popup') \ No newline at end of file From 2555469cdc2b22415da0869b7b6d7537cdd859db Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Sep 2018 17:52:27 +0100 Subject: [PATCH 375/392] Added sound to mention popup --- StandAlone/chat-popup.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/StandAlone/chat-popup.lua b/StandAlone/chat-popup.lua index 40fc94b1..3331405a 100644 --- a/StandAlone/chat-popup.lua +++ b/StandAlone/chat-popup.lua @@ -33,6 +33,7 @@ Event.register(defines.events.on_console_chat, function(event) for i,_player in ipairs(game.connected_players) do if _player.index ~= player.index then if player_message:match(_player.name:lower()) then + _player.play_sound{path='utility/scenario_message'} -- plays a deeper sound when mentioned sendFlyingText(_player, 'You\'ve been mentioned by: ' ..player.name .. ' in chat!') end end From 65606edc1e69f64b2448e4dfe08eb6ca52ea3a59 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 17 Sep 2018 16:38:16 +0100 Subject: [PATCH 376/392] Fixed Paths --- StandAlone/paths.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index ff982631..d35ec248 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -2,7 +2,7 @@ -- idea from Mylon - Dirt Path local adjacency_boost = 2 -- makes paths more lickly to be next to each other; must be greater than 0 -local entities = { +local sizes = { ['stone-furnace']=2, ['steel-furnace']=2, ['electric-furnace']=3, @@ -83,8 +83,8 @@ local function down_grade(surface,pos) surface.set_tiles{{name=new_tile,position=pos}} end -Event.register(defines.events.on_player_built_tile, function(event) - local surface = game.surfaces[event.surface_index] +Event.register({defines.events.on_player_built_tile,defines.events.on_robot_built_tile}, function(event) + local surface = event.surface_index and game.surfaces[event.surface_index] or event.robot and event.robot.surface local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do if placed_paths[old_tile.old_tile.name] or old_tile.old_tile.name == 'water' or old_tile.old_tile.name == 'deep-water' then else @@ -115,11 +115,11 @@ Event.register(defines.events.on_player_changed_position, function(event) end end) -Event.register(defines.events.on_built_entity, function(event) +Event.register({defines.events.on_built_entity,on_robot_built_entity}, function(event) local entity = event.created_entity local surface = entity.surface - if entities[entity.name] then - local size = entities[entity.name] + if sizes[entity.name] then + local size = sizes[entity.name] for x in 0,size do for y in 0,size do local pos = {entity.position.x+x,entity.position.y+y} local tile = surface.get_tile(pos).name From 2d556a3416ebfd941f051d081801f125bbd26ad0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 17 Sep 2018 17:06:05 +0100 Subject: [PATCH 377/392] Fixed Paths Again --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index d35ec248..ff2a0ad9 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -120,7 +120,7 @@ Event.register({defines.events.on_built_entity,on_robot_built_entity}, function( local surface = entity.surface if sizes[entity.name] then local size = sizes[entity.name] - for x in 0,size do for y in 0,size do + for x = 0,size do for y = 0,size do local pos = {entity.position.x+x,entity.position.y+y} local tile = surface.get_tile(pos).name if math.random() < paths[tile]*size*10 then From 4597140e7a9c01201ddbd0d5a11b598afe96c85d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 17 Sep 2018 20:11:34 +0100 Subject: [PATCH 378/392] Fixed deepwater with paths --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index ff2a0ad9..425e8d38 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -87,7 +87,7 @@ Event.register({defines.events.on_player_built_tile,defines.events.on_robot_buil local surface = event.surface_index and game.surfaces[event.surface_index] or event.robot and event.robot.surface local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do - if placed_paths[old_tile.old_tile.name] or old_tile.old_tile.name == 'water' or old_tile.old_tile.name == 'deep-water' then else + if placed_paths[old_tile.old_tile.name] or old_tile.old_tile.name == 'water' or old_tile.old_tile.name == 'deepwater' then else if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name -- not a mistake, this makes it have dimising returns end From 39b1ef2d75940061f49683274b3d2a469c4326b7 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 18 Sep 2018 20:34:31 +0100 Subject: [PATCH 379/392] Update to paths --- StandAlone/paths.lua | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 425e8d38..954d5254 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -2,6 +2,7 @@ -- idea from Mylon - Dirt Path local adjacency_boost = 2 -- makes paths more lickly to be next to each other; must be greater than 0 +adjacency_boost = 10/adjacency_boost -- dont change this line local sizes = { ['stone-furnace']=2, ['steel-furnace']=2, @@ -40,7 +41,7 @@ local placed_paths = { } local paths = { -- ['tile name'] = {health,convert to} - -- health is the average number of steps in hundards before it changes + -- the greater health is the lower the chance it will be down graded, must be grater than 0 ['refined-concrete']={70,'concrete'}, ['refined-hazard-concrete-right']={70,'hazard-concrete-right'}, ['refined-hazard-concrete-left']={70,'hazard-concrete-left'}, @@ -48,25 +49,25 @@ local paths = { ['hazard-concrete-right']={50,'stone-path'}, ['hazard-concrete-left']={50,'stone-path'}, ['stone-path']={40,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player - ['sand-1']={1,'sand-2'}, - ['sand-2']={3,'sand-3'}, - ['sand-3']={1,'red-desert-3'}, - ['red-desert-3']={1,'red-desert-2'}, - ['red-desert-2']={3,'dirt-1'}, - ['grass-2']={1,'grass-1'}, - ['grass-1']={1,'grass-3'}, - ['grass-3']={3,'red-desert-0'}, - ['red-desert-0']={1,'red-desert-1'}, - ['red-desert-1']={3,'dirt-1'}, - ['dirt-1']={1,'dirt-2'}, - ['dirt-2']={1,'dirt-3'}, - ['dirt-3']={3,'dirt-4'}, - ['dirt-4']={1,'dirt-5'}, - ['dirt-5']={1,'dirt-6'}, - ['grass-4']={3,'dirt-4'} + ['sand-1']={5,'sand-2'}, + ['sand-2']={10,'sand-3'}, + ['sand-3']={5,'red-desert-3'}, + ['red-desert-3']={5,'red-desert-2'}, + ['red-desert-2']={10,'dirt-1'}, + ['grass-2']={5,'grass-1'}, + ['grass-1']={5,'grass-3'}, + ['grass-3']={10,'red-desert-0'}, + ['red-desert-0']={5,'red-desert-1'}, + ['red-desert-1']={10,'dirt-1'}, + ['dirt-1']={5,'dirt-2'}, + ['dirt-2']={5,'dirt-3'}, + ['dirt-3']={10,'dirt-4'}, + ['dirt-4']={5,'dirt-5'}, + ['dirt-5']={5,'dirt-6'}, + ['grass-4']={10,'dirt-4'} } for tile,value in pairs(paths) do - value[1]=1/(value[1]*125) + value[1]=-1/value[1] end local function global_key(surface,pos) @@ -102,14 +103,14 @@ Event.register(defines.events.on_player_changed_position, function(event) local pos = player.position local tile_name = surface.get_tile(pos).name if not paths[tile_name] then return end - local chance = paths[tile_name][1] - local count = 1 + local count = -9 -- this value is important for x = -1,1 do for y = -1,1 do local _pos = {pos.x+x,pos.y+y} if placed_paths[tile_name] and not placed_paths[surface.get_tile(_pos).name] or surface.get_tile(_pos).name == paths[tile_name][2] - then chance=chance*((adjacency_boost+8)/count) count=count+1 end + then count=count+1 end end end + local chance = paths[tile_name][1]/(count-adjacency_boost) if math.random() < chance then down_grade(surface,pos) end From bcb4d47963544931932463faae503e1b0d714770 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 19 Sep 2018 20:25:51 +0100 Subject: [PATCH 380/392] Fixed Paths --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 954d5254..5b77cf5a 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -124,7 +124,7 @@ Event.register({defines.events.on_built_entity,on_robot_built_entity}, function( for x = 0,size do for y = 0,size do local pos = {entity.position.x+x,entity.position.y+y} local tile = surface.get_tile(pos).name - if math.random() < paths[tile]*size*10 then + if math.random() < paths[tile][1]*size*(-10) then down_grade(surface,pos) end end end From 7d36b51ab86beb43b6f44802c3860f36328382f9 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 21 Sep 2018 17:56:36 +0100 Subject: [PATCH 381/392] Attempt to fix entity place downgrade --- StandAlone/paths.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 5b77cf5a..0bfe24e9 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -120,8 +120,8 @@ Event.register({defines.events.on_built_entity,on_robot_built_entity}, function( local entity = event.created_entity local surface = entity.surface if sizes[entity.name] then - local size = sizes[entity.name] - for x = 0,size do for y = 0,size do + local size = sizes[entity.name]-1 + for x = -size,0 do for y = -size,0 do local pos = {entity.position.x+x,entity.position.y+y} local tile = surface.get_tile(pos).name if math.random() < paths[tile][1]*size*(-10) then From 6d7ca0dd48066866205ad9471587ed0e4c82b2c5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 21 Sep 2018 21:30:03 +0100 Subject: [PATCH 382/392] Fixed error in paths on_entiy placed --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 0bfe24e9..5bf74cf7 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -124,7 +124,7 @@ Event.register({defines.events.on_built_entity,on_robot_built_entity}, function( for x = -size,0 do for y = -size,0 do local pos = {entity.position.x+x,entity.position.y+y} local tile = surface.get_tile(pos).name - if math.random() < paths[tile][1]*size*(-10) then + if paths[tile] and math.random() < paths[tile][1]*size*(-10) then down_grade(surface,pos) end end end From a9029e0801770ca318a47eabbfb49588c757bd5c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 28 Sep 2018 22:30:47 +0100 Subject: [PATCH 383/392] Fixed Paths Error --- StandAlone/paths.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua index 5bf74cf7..b72b287e 100644 --- a/StandAlone/paths.lua +++ b/StandAlone/paths.lua @@ -122,7 +122,7 @@ Event.register({defines.events.on_built_entity,on_robot_built_entity}, function( if sizes[entity.name] then local size = sizes[entity.name]-1 for x = -size,0 do for y = -size,0 do - local pos = {entity.position.x+x,entity.position.y+y} + local pos = {x=entity.position.x+x,y=entity.position.y+y} local tile = surface.get_tile(pos).name if paths[tile] and math.random() < paths[tile][1]*size*(-10) then down_grade(surface,pos) From 9e8b4c96ad11e4eef896881f3a17b6ddc72fb78b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 29 Sep 2018 23:07:57 +0100 Subject: [PATCH 384/392] Added popcorn --- Addons/Admin/auto-chat.lua | 6 ++++++ Addons/playerRanks.lua | 2 +- locale/en/chat-bot.cfg | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index e59b45f4..0379ff4e 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -46,6 +46,7 @@ local commands = { ['lenny']={'chat-bot.lenny'}, ['feedback']={'chat-bot.feedback'}, ['wiki']={'chat-bot.wiki'}, + ['blame']=function(player) local options = {'?','.','!','!!!'} return {'chat-bot.hodor',options[math.random(#options)]} end, ['evolution']=function(player) return {'chat-bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, @@ -96,6 +97,11 @@ local commands = { }:on_event('timeout',function(self) if self.data then game.print{'chat-bot.message',{'chat-bot.make-tea-2',self.data}} end end):open() return {'chat-bot.make-tea-1'} end, + ['popcorn']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.get-popcorn-2',self.data}} end + end):open() return {'chat-bot.get-popcorn-1'} end, ['meadplease']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data=player.name }:on_event('timeout',function(self) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 8723d71f..993f6897 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -271,7 +271,7 @@ ranks['Donator']:edit('allow',false,{ }) ranks['Partner']:edit('allow',false,{ - + ['global-chat']=true }) ranks['Veteran']:edit('allow',false,{ ['tree-decon']=true, diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 0e81ea5f..492bad9c 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -44,3 +44,4 @@ 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/ +hodor=Hodor! \ No newline at end of file From 579c9f7774ab9a205a960e01ef8760e293918bfd Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 29 Sep 2018 23:08:29 +0100 Subject: [PATCH 385/392] Fixed error in locale --- locale/en/chat-bot.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 492bad9c..11449b4d 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -44,4 +44,4 @@ 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/ -hodor=Hodor! \ No newline at end of file +hodor=Hodor \ No newline at end of file From 4b76460c50cb3f751bc2b66e86288a629bd434e5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 30 Sep 2018 01:07:50 +0100 Subject: [PATCH 386/392] Badgamer fix --- Addons/Admin/auto-chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 0379ff4e..1f2970e1 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -46,7 +46,7 @@ local commands = { ['lenny']={'chat-bot.lenny'}, ['feedback']={'chat-bot.feedback'}, ['wiki']={'chat-bot.wiki'}, - ['blame']=function(player) local options = {'?','.','!','!!!'} return {'chat-bot.hodor',options[math.random(#options)]} end, + ['hodor']=function(player) local options = {'?','.','!','!!!'} return {'chat-bot.hodor',options[math.random(#options)]} end, ['evolution']=function(player) return {'chat-bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, From 7e7ad128d555f6f6aa2abf75c30aad0f13bdc9cc Mon Sep 17 00:00:00 2001 From: arty714 Date: Tue, 16 Oct 2018 20:58:27 +0200 Subject: [PATCH 387/392] Changes to S3, S5, S7 descriptions --- locale/en/readme.cfg | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg index 45d9d809..64c02823 100644 --- a/locale/en/readme.cfg +++ b/locale/en/readme.cfg @@ -29,20 +29,22 @@ links-cap4=Patreon: links-cap5=Our wiki: servers-name=Servers servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. +servers-singleline=Welcome to the Explosive Gaming Community! S1-S2 are staggered resets. servers-format=S__1__: __2__ servers-cap1=Public -servers-des1=A place for all players, this map resets every 144H At 16:00 UTC. +servers-des1=A place for all players, this map resets every 48H at 16:00 UTC. servers-cap2=Public -servers-des2=A place for all players, this map resets every 144H At 16:00 UTC. +servers-des2=A place for all players, this map resets every 48H at 16:00 UTC. servers-cap3=Public -servers-des3=A place for all players, this map resets every 144H At 16:00 UTC. +servers-des3=A place for all players, this map resets every week on Friday at 22:00 UTC. servers-cap4=Modded servers-des4=A Modded server for all players. Link on Discord for members. servers-cap5=Events -servers-des5=Server for events (everyone can join) - May require a password. Join Discord for more info +servers-des5=An anarchy server (WIP) (Everyone can join. No bans, except for blatant heavy lack for respect). Join Discord for more info. servers-cap6=Donator servers-des6=For players who support us financially. Changes can be made per request. +servers-cap7=Events +servers-des7=Server for events (everyone can join) - May require a password. Join Discord for more info. rules-name=Rules rules-tooltip=The full list of ExplosiveGaming rules. rules-singleline=Although the guidelines cover most of our rules, the full list always have more priority and override any guideline. It is advised to be familiar with all rules to prevent warnings or bans. From 13b08cbdea83b455d105b6d9764d010e982b51b8 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 31 Oct 2018 18:05:29 +0000 Subject: [PATCH 388/392] Added Drahc_pro as hardcoded admin --- Addons/playerRanks.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 993f6897..dd5216d2 100644 --- a/Addons/playerRanks.lua +++ b/Addons/playerRanks.lua @@ -301,6 +301,7 @@ Ranking._base_preset{ ['arty714']='Community Manager', ['cooldude2606']='Developer', ['mark9064']='Admin', + ['Drahc_pro']='Admin', ['propangaseddy']='Admin', ['aldldl']='Admin' } From 90fa79d0b680361dac42e89a0639b3aaf9bfdc52 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 11 Jan 2019 22:39:03 +0000 Subject: [PATCH 389/392] Merge Clean Up --- Addons/Admin/admin.lua | 229 --------------- Addons/Admin/afk-kick.lua | 39 --- Addons/Admin/auto-chat.lua | 141 --------- Addons/Admin/auto-message.lua | 61 ---- Addons/Admin/base-damage.lua | 47 --- Addons/Admin/discord.lua | 54 ---- Addons/Admin/inventory-search.lua | 79 ----- Addons/Admin/player-info.lua | 40 --- Addons/Admin/reports.lua | 276 ------------------ Addons/Admin/tree-decon.lua | 54 ---- Addons/Commands/admin.lua | 81 ----- Addons/Commands/bonus.lua | 66 ----- Addons/Commands/cheat-mode.lua | 15 - Addons/Commands/home.lua | 37 --- Addons/Commands/kill.lua | 21 -- Addons/Commands/repair.lua | 47 --- Addons/Commands/tags.lua | 30 -- Addons/Commands/tp.lua | 31 -- Addons/Guis/admin-gui.lua | 177 ----------- Addons/Guis/announcements.lua | 99 ------- Addons/Guis/game-settings.lua | 182 ------------ Addons/Guis/player-list.lua | 115 -------- Addons/Guis/polls.lua | 260 ----------------- Addons/Guis/rank-changer.lua | 132 --------- Addons/Guis/readme.lua | 132 --------- Addons/Guis/reports.lua | 53 ---- Addons/Guis/rockets.lua | 104 ------- Addons/Guis/science.lua | 102 ------- Addons/Guis/tasklist.lua | 193 ------------ Addons/Guis/warp-system.lua | 237 --------------- README.md | 54 ---- StandAlone/body-marker.lua | 28 -- StandAlone/chat-popup.lua | 42 --- StandAlone/colours.lua | 32 -- StandAlone/health.lua | 29 -- StandAlone/paths.lua | 146 --------- StandAlone/spawn.lua | 213 -------------- StandAlone/starting-items.lua | 32 -- locale/de/DeconControl.cfg | 3 - locale/de/ExpGamingAdmin.AdminLib.cfg | 15 - locale/de/ExpGamingAdmin.Warnings.cfg | 11 - locale/de/ExpGamingAdmin.cfg | 15 - locale/de/ExpGamingBot.autoChat.cfg | 20 -- locale/de/ExpGamingBot.autoMessage.cfg | 9 - locale/de/ExpGamingCore.Command.cfg | 9 - locale/de/ExpGamingCore.Commands.cfg | 9 - locale/de/ExpGamingCore.Gui.cfg | 4 - locale/de/ExpGamingCore.Ranking.cfg | 7 - locale/de/ExpGamingInfo.Readme.cfg | 68 ----- locale/de/ExpGamingInfo.Rockets.cfg | 12 - locale/de/ExpGamingInfo.Science.cfg | 14 - locale/de/ExpGamingInfo.Tasklist.cfg | 4 - locale/de/ExpGamingPlayer.inventorySearch.cfg | 4 - locale/de/ExpGamingPlayer.playerInfo.cfg | 8 - locale/de/ExpGamingPlayer.playerList.cfg | 5 - locale/de/ExpGamingPlayer.polls.cfg | 7 - locale/de/GameSettingsGui.cfg | 31 -- locale/de/GuiAnnouncements.cfg | 6 - locale/de/WarpPoints.cfg | 9 - locale/de/admin.cfg | 15 - locale/de/announcements.cfg | 6 - locale/de/base-damage.cfg | 3 - locale/de/chat-bot.cfg | 20 -- locale/de/exp-core.cfg | 22 -- locale/de/game-settings.cfg | 31 -- locale/de/inventory-search.cfg | 4 - locale/de/player-info.cfg | 8 - locale/de/player-list.cfg | 5 - locale/de/polls.cfg | 7 - locale/de/rank-changer.cfg | 9 - locale/de/readme.cfg | 68 ----- locale/de/reports.cfg | 15 - locale/de/rockets.cfg | 12 - locale/de/science.cfg | 14 - locale/de/tasklist.cfg | 4 - locale/de/tree-decon.cfg | 3 - locale/de/warp-system.cfg | 9 - locale/en/admin.cfg | 15 - locale/en/announcements.cfg | 6 - locale/en/base-damage.cfg | 3 - locale/en/chat-bot.cfg | 47 --- locale/en/game-settings.cfg | 31 -- locale/en/inventory-search.cfg | 4 - locale/en/player-info.cfg | 8 - locale/en/player-list.cfg | 5 - locale/en/polls.cfg | 7 - locale/en/rank-changer.cfg | 9 - locale/en/readme.cfg | 71 ----- locale/en/reports.cfg | 16 - locale/en/rockets.cfg | 12 - locale/en/science.cfg | 14 - locale/en/tasklist.cfg | 4 - locale/en/tree-decon.cfg | 3 - locale/en/warp-system.cfg | 10 - locale/fr/admin.cfg | 15 - locale/fr/announcements.cfg | 6 - locale/fr/base-damage.cfg | 3 - locale/fr/chat-bot.cfg | 20 -- locale/fr/exp-core.cfg | 22 -- locale/fr/game-settings.cfg | 31 -- locale/fr/inventory-search.cfg | 4 - locale/fr/player-info.cfg | 8 - locale/fr/player-list.cfg | 5 - locale/fr/polls.cfg | 7 - locale/fr/rank-changer.cfg | 9 - locale/fr/readme.cfg | 68 ----- locale/fr/reports.cfg | 15 - locale/fr/rockets.cfg | 12 - locale/fr/science.cfg | 14 - locale/fr/tasklist.cfg | 4 - locale/fr/tree-decon.cfg | 3 - locale/fr/warp-system.cfg | 9 - locale/nl/admin.cfg | 15 - locale/nl/announcements.cfg | 6 - locale/nl/base-damage.cfg | 3 - locale/nl/chat-bot.cfg | 20 -- locale/nl/exp-core.cfg | 22 -- locale/nl/game-settings.cfg | 31 -- locale/nl/inventory-search.cfg | 4 - locale/nl/player-info.cfg | 8 - locale/nl/player-list.cfg | 5 - locale/nl/polls.cfg | 7 - locale/nl/rank-changer.cfg | 9 - locale/nl/readme.cfg | 68 ----- locale/nl/reports.cfg | 15 - locale/nl/rockets.cfg | 12 - locale/nl/science.cfg | 14 - locale/nl/tasklist.cfg | 4 - locale/nl/tree-decon.cfg | 3 - locale/nl/warp-system.cfg | 9 - locale/sv-SE/admin.cfg | 15 - locale/sv-SE/announcements.cfg | 7 - locale/sv-SE/base-damage.cfg | 3 - locale/sv-SE/chat-bot.cfg | 25 -- locale/sv-SE/exp-core.cfg | 22 -- locale/sv-SE/game-settings.cfg | 31 -- locale/sv-SE/inventory-search.cfg | 4 - locale/sv-SE/player-info.cfg | 8 - locale/sv-SE/player-list.cfg | 5 - locale/sv-SE/polls.cfg | 7 - locale/sv-SE/rank-changer.cfg | 9 - locale/sv-SE/readme.cfg | 69 ----- locale/sv-SE/reports.cfg | 14 - locale/sv-SE/rockets.cfg | 13 - locale/sv-SE/science.cfg | 15 - locale/sv-SE/tasklist.cfg | 4 - locale/sv-SE/tree-decon.cfg | 3 - locale/sv-SE/warp-system.cfg | 9 - 148 files changed, 5273 deletions(-) delete mode 100644 Addons/Admin/admin.lua delete mode 100644 Addons/Admin/afk-kick.lua delete mode 100644 Addons/Admin/auto-chat.lua delete mode 100644 Addons/Admin/auto-message.lua delete mode 100644 Addons/Admin/base-damage.lua delete mode 100644 Addons/Admin/discord.lua delete mode 100644 Addons/Admin/inventory-search.lua delete mode 100644 Addons/Admin/player-info.lua delete mode 100644 Addons/Admin/reports.lua delete mode 100644 Addons/Admin/tree-decon.lua delete mode 100644 Addons/Commands/admin.lua delete mode 100644 Addons/Commands/bonus.lua delete mode 100644 Addons/Commands/cheat-mode.lua delete mode 100644 Addons/Commands/home.lua delete mode 100644 Addons/Commands/kill.lua delete mode 100644 Addons/Commands/repair.lua delete mode 100644 Addons/Commands/tags.lua delete mode 100644 Addons/Commands/tp.lua delete mode 100644 Addons/Guis/admin-gui.lua delete mode 100644 Addons/Guis/announcements.lua delete mode 100644 Addons/Guis/game-settings.lua delete mode 100644 Addons/Guis/player-list.lua delete mode 100644 Addons/Guis/polls.lua delete mode 100644 Addons/Guis/rank-changer.lua delete mode 100644 Addons/Guis/readme.lua delete mode 100644 Addons/Guis/reports.lua delete mode 100644 Addons/Guis/rockets.lua delete mode 100644 Addons/Guis/science.lua delete mode 100644 Addons/Guis/tasklist.lua delete mode 100644 Addons/Guis/warp-system.lua delete mode 100644 README.md delete mode 100644 StandAlone/body-marker.lua delete mode 100644 StandAlone/chat-popup.lua delete mode 100644 StandAlone/colours.lua delete mode 100644 StandAlone/health.lua delete mode 100644 StandAlone/paths.lua delete mode 100644 StandAlone/spawn.lua delete mode 100644 StandAlone/starting-items.lua delete mode 100644 locale/de/DeconControl.cfg delete mode 100644 locale/de/ExpGamingAdmin.AdminLib.cfg delete mode 100644 locale/de/ExpGamingAdmin.Warnings.cfg delete mode 100644 locale/de/ExpGamingAdmin.cfg delete mode 100644 locale/de/ExpGamingBot.autoChat.cfg delete mode 100644 locale/de/ExpGamingBot.autoMessage.cfg delete mode 100644 locale/de/ExpGamingCore.Command.cfg delete mode 100644 locale/de/ExpGamingCore.Commands.cfg delete mode 100644 locale/de/ExpGamingCore.Gui.cfg delete mode 100644 locale/de/ExpGamingCore.Ranking.cfg delete mode 100644 locale/de/ExpGamingInfo.Readme.cfg delete mode 100644 locale/de/ExpGamingInfo.Rockets.cfg delete mode 100644 locale/de/ExpGamingInfo.Science.cfg delete mode 100644 locale/de/ExpGamingInfo.Tasklist.cfg delete mode 100644 locale/de/ExpGamingPlayer.inventorySearch.cfg delete mode 100644 locale/de/ExpGamingPlayer.playerInfo.cfg delete mode 100644 locale/de/ExpGamingPlayer.playerList.cfg delete mode 100644 locale/de/ExpGamingPlayer.polls.cfg delete mode 100644 locale/de/GameSettingsGui.cfg delete mode 100644 locale/de/GuiAnnouncements.cfg delete mode 100644 locale/de/WarpPoints.cfg delete mode 100644 locale/de/admin.cfg delete mode 100644 locale/de/announcements.cfg delete mode 100644 locale/de/base-damage.cfg delete mode 100644 locale/de/chat-bot.cfg delete mode 100644 locale/de/exp-core.cfg delete mode 100644 locale/de/game-settings.cfg delete mode 100644 locale/de/inventory-search.cfg delete mode 100644 locale/de/player-info.cfg delete mode 100644 locale/de/player-list.cfg delete mode 100644 locale/de/polls.cfg delete mode 100644 locale/de/rank-changer.cfg delete mode 100644 locale/de/readme.cfg delete mode 100644 locale/de/reports.cfg delete mode 100644 locale/de/rockets.cfg delete mode 100644 locale/de/science.cfg delete mode 100644 locale/de/tasklist.cfg delete mode 100644 locale/de/tree-decon.cfg delete mode 100644 locale/de/warp-system.cfg delete mode 100644 locale/en/admin.cfg delete mode 100644 locale/en/announcements.cfg delete mode 100644 locale/en/base-damage.cfg delete mode 100644 locale/en/chat-bot.cfg delete mode 100644 locale/en/game-settings.cfg delete mode 100644 locale/en/inventory-search.cfg delete mode 100644 locale/en/player-info.cfg delete mode 100644 locale/en/player-list.cfg delete mode 100644 locale/en/polls.cfg delete mode 100644 locale/en/rank-changer.cfg delete mode 100644 locale/en/readme.cfg delete mode 100644 locale/en/reports.cfg delete mode 100644 locale/en/rockets.cfg delete mode 100644 locale/en/science.cfg delete mode 100644 locale/en/tasklist.cfg delete mode 100644 locale/en/tree-decon.cfg delete mode 100644 locale/en/warp-system.cfg delete mode 100644 locale/fr/admin.cfg delete mode 100644 locale/fr/announcements.cfg delete mode 100644 locale/fr/base-damage.cfg delete mode 100644 locale/fr/chat-bot.cfg delete mode 100644 locale/fr/exp-core.cfg delete mode 100644 locale/fr/game-settings.cfg delete mode 100644 locale/fr/inventory-search.cfg delete mode 100644 locale/fr/player-info.cfg delete mode 100644 locale/fr/player-list.cfg delete mode 100644 locale/fr/polls.cfg delete mode 100644 locale/fr/rank-changer.cfg delete mode 100644 locale/fr/readme.cfg delete mode 100644 locale/fr/reports.cfg delete mode 100644 locale/fr/rockets.cfg delete mode 100644 locale/fr/science.cfg delete mode 100644 locale/fr/tasklist.cfg delete mode 100644 locale/fr/tree-decon.cfg delete mode 100644 locale/fr/warp-system.cfg delete mode 100644 locale/nl/admin.cfg delete mode 100644 locale/nl/announcements.cfg delete mode 100644 locale/nl/base-damage.cfg delete mode 100644 locale/nl/chat-bot.cfg delete mode 100644 locale/nl/exp-core.cfg delete mode 100644 locale/nl/game-settings.cfg delete mode 100644 locale/nl/inventory-search.cfg delete mode 100644 locale/nl/player-info.cfg delete mode 100644 locale/nl/player-list.cfg delete mode 100644 locale/nl/polls.cfg delete mode 100644 locale/nl/rank-changer.cfg delete mode 100644 locale/nl/readme.cfg delete mode 100644 locale/nl/reports.cfg delete mode 100644 locale/nl/rockets.cfg delete mode 100644 locale/nl/science.cfg delete mode 100644 locale/nl/tasklist.cfg delete mode 100644 locale/nl/tree-decon.cfg delete mode 100644 locale/nl/warp-system.cfg delete mode 100644 locale/sv-SE/admin.cfg delete mode 100644 locale/sv-SE/announcements.cfg delete mode 100644 locale/sv-SE/base-damage.cfg delete mode 100644 locale/sv-SE/chat-bot.cfg delete mode 100644 locale/sv-SE/exp-core.cfg delete mode 100644 locale/sv-SE/game-settings.cfg delete mode 100644 locale/sv-SE/inventory-search.cfg delete mode 100644 locale/sv-SE/player-info.cfg delete mode 100644 locale/sv-SE/player-list.cfg delete mode 100644 locale/sv-SE/polls.cfg delete mode 100644 locale/sv-SE/rank-changer.cfg delete mode 100644 locale/sv-SE/readme.cfg delete mode 100644 locale/sv-SE/reports.cfg delete mode 100644 locale/sv-SE/rockets.cfg delete mode 100644 locale/sv-SE/science.cfg delete mode 100644 locale/sv-SE/tasklist.cfg delete mode 100644 locale/sv-SE/tree-decon.cfg delete mode 100644 locale/sv-SE/warp-system.cfg diff --git a/Addons/Admin/admin.lua b/Addons/Admin/admin.lua deleted file mode 100644 index 7523c739..00000000 --- a/Addons/Admin/admin.lua +++ /dev/null @@ -1,229 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -Admin = Admin or {} - -local function append_name(reason,name) - local reason = reason or 'No Reason' - if not string.find(string.lower(reason),string.lower(name)) then return reason..' - '..name - else return reason end -end - -local function open(player,pre_select_player,pre_select_action) - if Admin.center then Gui.center.clear(player) Admin.center.open(player,pre_select_player,pre_select_action) end -end - -function Admin.allowed(player) - local player = Game.get_player(player) - local lowest_admin_power = Ranking.get_group('Admin').lowest.power - return lowest_admin_power >= Ranking.get_rank(player).power -end - -function Admin.btn_flow(frame,buttons) - local frame = frame.add{ - type='flow', - name='admin' - } - frame.add{ - type='label', - caption='', - name='player' - }.style.visible = false - local function format(btn) - btn.style.height = 30 - btn.style.width = 30 - end - if not buttons or buttons.ban then format(Admin.ban_btn:draw(frame)) end - if not buttons or buttons.kick then format(Admin.kick_btn:draw(frame)) end - if not buttons or buttons.jail then format(Admin.jail_btn:draw(frame)) end - if not buttons or buttons.go_to then format(Admin.go_to_btn:draw(frame)) end - if not buttons or buttons.bring then format(Admin.bring_btn:draw(frame)) end - return frame.player -end - -function Admin.take_action(action,player,by_player,reason) - if action == 'Ban' then Admin.ban(player,by_player,reason) - elseif action == 'Temp Ban' and Admin.temp_ban then Admin.temp_ban(player,by_player,reason) - elseif action == 'Kick' then Admin.kick(player,by_player,reason) - elseif action == 'Jail' then Admin.jail(player,by_player,reason) - elseif action == 'GoTo' then Admin.go_to(player,by_player) - elseif action == 'Bring' then Admin.bring(player,by_player) - end -end - -local inventorys = { - defines.inventory.player_main, - defines.inventory.player_quickbar, - defines.inventory.player_trash, - defines.inventory.player_guns, - defines.inventory.player_ammo, - defines.inventory.player_armor, - defines.inventory.player_armor -} - -function Admin.move_item_to_spawn(item,surface,chests) - local chests = chests or surface.find_entities_filtered{area={{-10,-10},{10,10}},name='iron-chest'} or {} - local chest = nil - while not chest or not chest.get_inventory(defines.inventory.chest).can_insert(item) do - chest = table.remove(chests,1) - if not chest then chest = surface.create_entity{ - name='iron-chest', - position=surface.find_non_colliding_position('iron-chest',{0,0},32,1) - } end - end - chest.get_inventory(defines.inventory.chest).insert(item) - table.insert(chests,chest) - return chests -end - -function Admin.move_inventory(player) - local player = Game.get_player(player) - if not player then return end - local chests = player.surface.find_entities_filtered{area={{-10,-10},{10,10}},name='iron-chest'} or {} - for _,_inventory in pairs(inventorys) do - local inventory = player.get_inventory(_inventory) - if inventory then - for item,count in pairs(inventory.get_contents()) do - local item = {name=item,count=count} - chests = Admin.move_item_to_spawn(item,player.surface,chests) - end - inventory.clear() - end - end -end - -Admin.ban_btn = Gui.inputs.add{ - type='button', - name='admin-ban', - caption='utility/danger_icon', - tooltip={'admin-commands.tooltip-ban'} -}:on_event('click',function(event) - local parent = event.element.parent - pre_select_player = parent.player and parent.player.caption or nil - open(event.player_index,pre_select_player,'Ban') -end) - -function Admin.ban(player,by_player,reason) - local player = Game.get_player(player) - local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' - local reason = append_name(reason,by_player_name) - Sync.emit_embeded{ - title='Player Ban', - color=Color.to_hex(defines.text_color.crit), - description='There was a player banned.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=reason - } - Admin.move_inventory(player) - Server.interface(game.ban_player,true,player,reason) -end - -Admin.kick_btn = Gui.inputs.add{ - type='button', - name='admin-kick', - caption='utility/warning_icon', - tooltip={'admin-commands.tooltip-kick'} -}:on_event('click',function(event) - local parent = event.element.parent - pre_select_player = parent.player and parent.player.caption or nil - open(event.player_index,pre_select_player,'Kick') -end) - -function Admin.kick(player,by_player,reason) - local player = Game.get_player(player) - local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' - local reason = append_name(reason,by_player_name) - Sync.emit_embeded{ - title='Player Kick', - color=Color.to_hex(defines.text_color.high), - description='There was a player kicked.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=reason - } - Admin.move_inventory(player) - Server.interface(game.kick_player,true,player,reason) -end - -Admin.jail_btn = Gui.inputs.add{ - type='button', - name='admin-jail', - caption='utility/clock', - tooltip={'admin-commands.tooltip-jail'} -}:on_event('click',function(event) - local parent = event.element.parent - pre_select_player = parent.player and parent.player.caption or nil - open(event.player_index,pre_select_player,'Jail') -end) - -function Admin.jail(player,by_player,reason) - local player = Game.get_player(player) - local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' - local reason = append_name(reason,by_player_name) - Sync.emit_embeded{ - title='Player Jail', - color=Color.to_hex(defines.text_color.med), - description='There was a player jailed.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=reason - } - Admin.move_inventory(player) - Ranking._presets().last_jail = player.name - Server.interface(Ranking.give_rank,true,player,'Jail',by_player_name) -end - -Admin.go_to_btn = Gui.inputs.add{ - type='button', - name='admin-go-to', - caption='utility/export_slot', - tooltip={'admin-commands.tooltip-go-to'} -}:on_event('click',function(event) - local parent = event.element.parent - pre_select_player = parent.player and parent.player.caption or nil - Admin.go_to(pre_select_player,event.player_index) -end) - -function Admin.go_to(player,by_player) - local player = Game.get_player(player) - local _player = Game.get_player(by_player) - _player.teleport(player.surface.find_non_colliding_position('player',player.position,32,1),player.surface) -end - -Admin.bring_btn = Gui.inputs.add{ - type='button', - name='admin-bring', - caption='utility/import_slot', - tooltip={'admin-commands.tooltip-bring'} -}:on_event('click',function(event) - local parent = event.element.parent - pre_select_player = parent.player and parent.player.caption or nil - Admin.bring(pre_select_player,event.player_index) -end) - -function Admin.bring(player,by_player) - local player = Game.get_player(player) - local _player = Game.get_player(by_player) - if not player or not _player then return end - player.teleport(_player.surface.find_non_colliding_position('player',_player.position,32,1),_player.surface) -end - -function Admin.tp(from_playaer, to_player) - local _from_player = Game.get_player(from_player) - local _to_player = Game.get_player(to_player) - - if not _from_player or not _to_player then return end - - if Game.players[_from_player].health >= 0 then return end - if Game.players[_to_player].health >= 0 then return end - - _from_player.teleport(_to_player.surface.find_non_colliding_position('player',_to_player.position,32,1),_to_player.surface) -end diff --git a/Addons/Admin/afk-kick.lua b/Addons/Admin/afk-kick.lua deleted file mode 100644 index 68a66a00..00000000 --- a/Addons/Admin/afk-kick.lua +++ /dev/null @@ -1,39 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -function get_allowed_afk_time(player) - local rank = Ranking.get_rank(player) - local count = #game.connected_players - local base = rank.base_afk_time or false - if not base then return false end - return (base/5)*count -end - -Event.register(-1,function(event) - Server.new_thread{ - name='afk-kick', - }:on_event('tick',function(self) - if (game.tick%3600) ~= 0 then return end - for _,player in pairs(game.connected_players) do - local afk = #game.connected_players < 3 and 10 or get_allowed_afk_time(player) - if afk then - if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end - end - end - end):on_event('error',function(self,err) - Sync.emit_embeded{ - title='Auto Kick Error', - color=Color.to_hex(defines.text_color.bg), - description='Auto Kick Error - Closed Thread', - Error=err - } - self:close() - end):open() -end) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua deleted file mode 100644 index 1f2970e1..00000000 --- a/Addons/Admin/auto-chat.lua +++ /dev/null @@ -1,141 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - --- white spaces removed and made into lower --- these messages are sent only to the player -local messages = { - ['discord']={'chat-bot.discord'}, - ['expgaming']={'chat-bot.website'}, - ['website']={'chat-bot.website'}, - ['command']={'chat-bot.custom-commands'}, - ['commands']={'chat-bot.custom-commands'}, - ['softmod']={'chat-bot.softmod'}, - ['script']={'chat-bot.softmod'}, - ['link']={'chat-bot.links'}, - ['links']={'chat-bot.links'}, - ['loop']={'chat-bot.loops'}, - ['loops']={'chat-bot.loops'}, - --Thadius suggestion start - ['rhd']={'chat-bot.lhd'}, - --Thadius suggestion end - ['roundabout']={'chat-bot.loops'}, - ['roundabouts']={'chat-bot.loops'}, - ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'chat-bot.afk',max.name,tick_to_display_format(max.afk_time)} end -} --- white spaces removed and made into lower --- these are global chat commands that can be used --- comands start with ! (all messages are also commands) -local command_syntax = '!' -local commands = { - ['online']=function(player) return {'chat-bot.players-online',#game.connected_players} end, - ['playtime']=function(player) return {'chat-bot.map-time',tick_to_display_format(game.tick)} end, - ['players']=function(player) return {'chat-bot.players',#game.players} end, - ['dev']={'chat-bot.not-real-dev'}, - ['blame']=function(player) local names = {'Cooldude2606','arty714','badgamernl',player.name} return {'chat-bot.blame',names[math.random(#names)]} end, - ['readme']={'chat-bot.read-readme'}, - ['magic']={'chat-bot.magic'}, - ['aids']={'chat-bot.aids'}, - ['riot']={'chat-bot.riot'}, - ['lenny']={'chat-bot.lenny'}, - ['feedback']={'chat-bot.feedback'}, - ['wiki']={'chat-bot.wiki'}, - ['hodor']=function(player) local options = {'?','.','!','!!!'} return {'chat-bot.hodor',options[math.random(#options)]} end, - ['evolution']=function(player) return {'chat-bot.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, - --Jokes about food and drink - ['whattoeat']={'chat-bot.food'}, - ['makepopcorn']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'chat-bot.message',{'chat-bot.get-popcorn-2',self.data}} end - end):open() return {'chat-bot.get-popcorn-1'} end, - ['orderpizza']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2]+1 - end):open() return {'chat-bot.order-pizza-1'} end, - ['passsomesnaps']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.get-snaps-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.get-snaps-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2]+1 - end):open() return {'chat-bot.get-snaps-1'} end, - ['makecocktail']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.get-cocktail-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.get-cocktail-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2]+1 - end):open() return {'chat-bot.get-cocktail-1'} end, - ['makecoffee']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'chat-bot.message',{'chat-bot.make-coffee-2',self.data}} end - end):open() return {'chat-bot.make-coffee-1'} end, - ['orderpizza']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2] + 1 - end):open() return {'chat-bot.order-pizza-1'} end, - ['maketea']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'chat-bot.message',{'chat-bot.make-tea-2',self.data}} end - end):open() return {'chat-bot.make-tea-1'} end, - ['popcorn']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'chat-bot.message',{'chat-bot.get-popcorn-2',self.data}} end - end):open() return {'chat-bot.get-popcorn-1'} end, - ['meadplease']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'chat-bot.message',{'chat-bot.get-mead-2',self.data}} end - end):open() return {'chat-bot.get-mead-1'} end, - ['passabeer']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'chat-bot.message',{'chat-bot.get-beer-2',self.data}} end - end):open() return {'chat-bot.get-beer-1'} end -} - -Event.register(defines.events.on_console_chat,function(event) - local player = Game.get_player(event) - if not player then return end - local player_message = event.message:lower():gsub("%s+", "") - local allowed = Ranking.get_rank(player):allowed('global-chat') - for to_find,message in pairs(messages) do - if player_message:match(command_syntax..to_find) then - if allowed then - if is_type(message,'function') then message=message(player) end - game.print{'chat-bot.message',message} - else player_return({'chat-bot.rank-error'},nil,player) end - elseif player_message:match(to_find) then - if is_type(message,'function') then message=message(player) end - player_return({'chat-bot.message',message},nil,player) - end - end - for to_find,message in pairs(commands) do - if player_message:match(command_syntax..to_find) then - if allowed then - if is_type(message,'function') then message=message(player) end - game.print{'chat-bot.message',message} - else player_return({'chat-bot.rank-error'},nil,player) end - end - end -end) diff --git a/Addons/Admin/auto-message.lua b/Addons/Admin/auto-message.lua deleted file mode 100644 index 9e0deb5b..00000000 --- a/Addons/Admin/auto-message.lua +++ /dev/null @@ -1,61 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- -Event.register(-1,function(event) - Server.new_thread{ - name='auto-message', - timeout=54000, -- 3240000 = 15 hours dont make the mistake i did, 54000 is 15 minutes - reopen=true, - data={ - high_rank= 'Owner', - low_rank= 'Regular', - low={ - {'chat-bot.join-us'}, - {'chat-bot.discord'}, - {'chat-bot.website'}, - {'chat-bot.custom-commands'}, - {'chat-bot.read-readme'} - } - } - }:on_event('timeout',function(self) - local data = self.data - if not data.high_rank or not data.low_rank - or not data.low then self.reopen = false return end - local _high = Ranking.get_rank(data.high_rank) - game.print{'chat-bot.message',{'chat-bot.players-online',#game.connected_players}} - game.print{'chat-bot.message',{'chat-bot.map-time',tick_to_display_format(game.tick)}} - --[[local _low = Ranking.get_rank(data.low_rank) - Ranking.print(_high,{'chat-bot.players-online',#game.connected_players},nil,true) - Ranking.print(_high,{'chat-bot.map-time',tick_to_display_format(game.tick)},nil,true) - for _,line in pairs(data.low) do - Ranking.print(_low,line,nil,true) - end]] - self.reopen = true - end):on_event(defines.events.on_player_joined_game,function(self,event) - local player = Game.get_player(event) - if not player then return end - local data = self.data - if not data.high_rank or not data.low_rank - or not data.low then self.reopen = false return end - -- idk but this stoped working for no appent reason so i added more checks for nil values - if Ranking.get_rank(player).power <= Ranking.get_rank(data.low_rank).power then return end - for _,message in pairs(data.low) do - player_return({'chat-bot.message',message},nil,player) - end - end):on_event('error',function(self,err) - Sync.emit_embeded{ - title='Auto Message Error', - color=Color.to_hex(defines.text_color.bg), - description='Auto Message Error - Closed Thread', - Error=err - } - self.reopen = false - self:close() - end):open() -end) \ No newline at end of file diff --git a/Addons/Admin/base-damage.lua b/Addons/Admin/base-damage.lua deleted file mode 100644 index 7954705d..00000000 --- a/Addons/Admin/base-damage.lua +++ /dev/null @@ -1,47 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - --- alot of this is copied from redmew - but it has been reworked to use the ExpCore --- https://github.com/Valansch/RedMew/blob/develop/nuke_control.lua - -local function _damage(reset) - global.addons = not reset and global.addons or {} - global.addons.damage = not reset and global.addons.damage or {} - return global.addons.damage -end - -Event.register(defines.events.on_entity_damaged,function(event) - if event.force == nil or event.force ~= event.entity.force then return end - if event.cause == nil or event.cause.name ~= 'player' then return end - local player = Game.get_player(event.cause.player) - if Ranking.get_rank(player):allowed('base-damage') then return end - if not _damage()[player.index] then _damage()[player.index] = {0,0} end - _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) - Admin.give_warning(player,'','Damaged something inside the base. Total Delt: '.._damage()[player.index][1],4) - end -end) - -Event.register(defines.events.on_player_ammo_inventory_changed,function(event) - local player = Game.get_player(event) - if Ranking.get_rank(player):allowed('nuke') then return end - local found = player.remove_item({name='atomic-bomb',count=1000}) - 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) - if _damage()[player.index][2] < event.tick-300 then - _damage()[player.index][2] = event.tick - Admin.give_warning(player,'','Nukes are not allowed for your rank.',4) - end - end -end) \ No newline at end of file diff --git a/Addons/Admin/discord.lua b/Addons/Admin/discord.lua deleted file mode 100644 index 9ec03be5..00000000 --- a/Addons/Admin/discord.lua +++ /dev/null @@ -1,54 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -Event.register(defines.events.on_console_command,function(event) - local command = event.command - local args = {} - if event.parameters then for word in event.parameters:gmatch('%S+') do table.insert(args,word) end end - local data = {} - data.title = string.gsub(command,'^%l',string.upper) - data.by = event.player_index and game.players[event.player_index].name or '' - if data.by == '' then return end - if command == 'config' or command == 'banlist' then - Sync.emit_embeded{ - title='Edit To '..data.title, - color=Color.to_hex(defines.text_color.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.reason = table.concat(args,' ',2) - elseif command == 'kick' then - data.colour = Color.to_hex(defines.text_color.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) - else return end - data.username = args[1] - if not Game.get_player(data.username) then return end - if string.sub(command,-1) == 'e' then data.command = command..'d' else data.command = command..'ed' end - data.reason = data.reason and data.reason ~= '' and data.reason or 'No Reason Required' - Sync.emit_embeded{ - title='Player '..data.title, - color=data.colour, - description='There was a player '..data.command..'.', - ['Player:']='<>'..data.username, - ['By:']='<>'..data.by, - ['Reason:']=data.reason - } - end -end) \ No newline at end of file diff --git a/Addons/Admin/inventory-search.lua b/Addons/Admin/inventory-search.lua deleted file mode 100644 index 0ce81b4f..00000000 --- a/Addons/Admin/inventory-search.lua +++ /dev/null @@ -1,79 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - --- removed from none admin ranks, no further action -local low_items = { - 'loader', - 'fast-loader', - 'express-loader', - 'small-plane', - 'player-port', - 'coin', - 'programmable-speaker' -} - --- removed for admin and non-admin ranks, gives warnings to non-admins -local med_items = { - 'railgun', - 'railgun-dart', - 'belt-immunity-equipment' -} - --- temp-ban for any rank, this is a very hard enforcement, admin ranks lose rank -local high_items = { - 'electric-energy-interface', - 'infinity-chest' -} - -local inventorys = { - defines.inventory.player_main, - defines.inventory.player_quickbar, - defines.inventory.player_trash -} - -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,'','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,'','Found A Banned Item') - else return end -end - -function search_player(player) - for category,items in pairs(_root_tree) do - if category ~= 'low_items' or not Ranking.get_rank(player):allowed('admin-items') then - for _,_inventory in pairs(inventorys) do - local inventory = player.get_inventory(_inventory) - if inventory then - for _,item in pairs(items) do - local found = inventory.remove(item) - if found > 0 then take_action(player,item,category) end - end - end - end - end - end -end - -Event.register({defines.events.on_player_main_inventory_changed,defines.events.on_player_quickbar_inventory_changed},function(event) - local player = Game.get_player(event) - if player and player.name == 'freek18' then search_player(player) end -end) - -Event.register(defines.events.on_tick,function(event) - if (game.tick%900) == 0 then - local players = game.connected_players - if #players == 0 then return end - local player = players[math.random(#players)] - if Ranking.get_rank(player):allowed('all-items') then return end - search_player(player) - end -end) \ No newline at end of file diff --git a/Addons/Admin/player-info.lua b/Addons/Admin/player-info.lua deleted file mode 100644 index 465a8a21..00000000 --- a/Addons/Admin/player-info.lua +++ /dev/null @@ -1,40 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -function get_player_info(player,frame,add_cam) - local player = Game.get_player(player) - if not player then return {} end - local _player = {} - _player.index = player.index - _player.name = player.name - _player.online = player.connected - _player.tag = player.tag - _player.color = player.color - _player.admin = player.admin - _player.online_time = player.online_time - _player.rank = Ranking.get_rank(player).name - _player.group = Ranking.get_group(player).name - if frame then - local frame = frame.add{type='frame',direction='vertical',style='image_frame'} - frame.style.width = 200 - frame.style.height = 275 - frame.add{type='label',caption={'player-info.name',_player.index,_player.name},style='caption_label'} - local _online = {'player-info.no'}; if _player.online then _online = {'player-info.yes'} end - frame.add{type='label',caption={'player-info.online',_online,tick_to_display_format(_player.online_time)}} - local _admin = {'player-info.no'}; if _player.admin then _admin = {'player-info.yes'} end - frame.add{type='label',caption={'player-info.admin',_admin}} - frame.add{type='label',caption={'player-info.group',_player.group}} - frame.add{type='label',caption={'player-info.rank',_player.rank}} - if add_cam then - Gui.cam_link{entity=player.character,frame=frame,width=200,height=150,zoom=0.5,respawn_open=true} - end - end - return _player -end \ No newline at end of file diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua deleted file mode 100644 index ccea1637..00000000 --- a/Addons/Admin/reports.lua +++ /dev/null @@ -1,276 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local report_to_warnings = 1 -- used in count_reports -local varified_to_warings = 3 -- used in count_reports -local reports_needed_for_jail = 6 -local min_time_to_remove_warning = 18000 -- this is in ticks -local take_action = 8 -- below this number no action is taken, the first admin given warning jumps to this number -local punishments = { - {'nothing'}, - {'nothing'}, - {'nothing'}, - {'nothing'}, - {'nothing'}, - {'message',{'reports.message'},defines.text_color.info}, - {'message',{'reports.message'},defines.text_color.info}, - {'report',{'reports.reported'},defines.text_color.med}, - {'message',{'reports.kick-warn'},defines.text_color.med}, - {'kick'}, - {'message',{'reports.temp-warn'},defines.text_color.high}, - {'temp-ban'}, - {'message',{'reports.ban-warn'},defines.text_color.high}, - {'message',{'reports.last-warn'},defines.text_color.crit}, - {'ban'} -} - -local actions = { - none=0, - report=1, - jail=2, - kick=3, - temp=4, - ban=5 -} - -local function valid_players(player,by_player) - local player = Game.get_player(player) - local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' - local rank = Ranking.get_rank(by_player_name) - return player, by_player_name, rank -end - -local function _reports(reset) - global.addons = not reset and global.addons or {} - global.addons.reports = not reset and global.addons.reports or {warnings={},reports={},varified={},actions={}} - return global.addons.reports -end - -local function get_warnings(player) - local player = Game.get_player(player) - return _reports().warnings[player.name] or 0 -end - -local function report_message(player,by_player,reason) - local low_rank = Ranking.get_group('User').highest - local high_rank = Ranking.get_group('Admin').lowest - local player, by_player_name = valid_players(player,by_player) - if not player then return end - if _reports().actions[player.name] == actions.report then return end - Ranking.print(low_rank,{'reports.low-print',player.name,reason},defines.text_color.info,true) - Ranking.print(high_rank,{'reports.high-print',player.name,by_player_name,reason},defines.text_color.med) - Sync.emit_embeded{ - title='Player Report', - color=Color.to_hex(defines.text_color.med), - description='A player was reported.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=reason - } -end - -local function count_reports(player) - local player = Game.get_player(player) - if not player then return 0 end - local _count = 0 - local data = _reports() - if data.reports[player.name] then - for _,report in pairs(data.reports[player.name]) do - _count=_count+report_to_warnings - end - end - if data.varified[player.name] then - for _,report in pairs(data.varified[player.name]) do - _count=_count+varified_to_warings - end - end - return _count -end - -local function cheak_reports(player) - local player = Game.get_player(player) - if not player then return end - local reports = count_reports(player) - if reports >= reports_needed_for_jail and _reports().actions[player.name] ~= 'report-jail' and Ranking.get_rank(player).group.name ~= 'Jail' then - _reports().actions[player.name] = actions.report - Admin.jail(player,'','Too many user reports. Contact an Admin to be unjailed.') - end -end - -local function give_punishment(player,by_player,reason) - local player, by_player_name = valid_players(player,by_player) - local warnings = get_warnings(player) - local punishment = punishments[warnings] - local reason = reason or 'No Other Reason' - if not punishment or punishment[1] == 'nothing' then return - elseif punishment[1] == 'message' then - local message = punishment[2] - local colour = punishment[3] - player_return(message,colour,player) - elseif punishment[1] == 'report' then - local message = punishment[2] - local colour = punishment[3] - player_return(message,colour,player) - report_message(player,'',reason) - elseif punishment[1] == 'kick' then - _reports().actions[player.name] = actions.kick - Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) - elseif punishment[1] == 'temp-ban' then - --_reports().actions[player.name] = actions.temp -- see Admin.temp-ban - Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) - elseif punishment[1] == 'ban' then - _reports().actions[player.name] = actions.ban - Admin.ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) - end -end - -function Admin.give_warning(player,by_player,reason,min) - local player, by_player_name = valid_players(player,by_player) - if not player then return end - local min = Game.get_player(by_player) and take_action or min or 0 - local warnings = get_warnings(player) - if warnings < min then warnings = min end - warnings = warnings+1 - _reports().warnings[player.name] = warnings - if warnings > take_action then - player_return({'reports.warning-given-by',by_player_name},defines.text_color.info,player) - game.print({'reports.player-warning',player.name,by_player_name,reason}) - end - give_punishment(player,by_player,reason) -end - -function Admin.report(player,by_player,reason) - local player, by_player_name = valid_players(player,by_player) - if not player or Ranking.get_rank(player):allowed('no-report') then return end - if Admin.is_banned(by_player) or Ranking.get_group(by_player).name == 'Jail' then return end - if Ranking.get_rank(by_player):allowed('varified') then - _reports().varified[player.name] = _reports().varified[player.name] or {} - local reports = _reports().varified[player.name] - for _,value in pairs(reports) do - if value[1] == by_player_name then return end - end - table.insert(reports,{by_player_name,reason}) - else - _reports().reports[player.name] = _reports().reports[player.name] or {} - local reports = _reports().reports[player.name] - for _,value in pairs(reports) do - if value[1] == by_player_name then return end - end - table.insert(reports,{by_player_name,reason}) - end - report_message(player,by_player,reason) - cheak_reports(player) -end - -function Admin.clear_warings(player,by_player,no_emit) - local player, by_player_name = valid_players(player,by_player) - if not player then return end - _reports().warnings[player.name]=0 - if not no_emit then - Sync.emit_embeded{ - title='Player Clear', - color=Color.to_hex(defines.text_color.low), - description='A player had their warnings cleared.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - } - end -end - -function Admin.clear_reports(player,by_player,no_emit) - local player, by_player_name = valid_players(player,by_player) - if not player then return end - _reports().reports[player.name]={} - _reports().varified[player.name]={} - if not no_emit then - Sync.emit_embeded{ - title='Player Clear', - color=Color.to_hex(defines.text_color.low), - description='A player had their reports cleared.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - } - end -end - -function Admin.clear_player(player,by_player) - local player, by_player_name = valid_players(player,by_player) - if not player then return end - Admin.clear_warings(player,by_player,true) - Admin.clear_reports(player,by_player,true) - _reports().actions[player.name]=actions.none - if Ranking.get_rank(player).group.name == 'Jail' then Server.interface(Ranking.revert,true,player,by_player) end - Sync.emit_embeded{ - title='Player Clear', - color=Color.to_hex(defines.text_color.low), - description='A player had their reports and warnings cleared.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - } -end - -function Admin.temp_ban(player,by_player,reason) - local function append_name(reason,name) - local reason = reason or 'No Reason' - if not string.find(string.lower(reason),string.lower(name)) then return reason..' - '..name - else return reason end - end - local player, by_player_name = valid_players(player,by_player) - if not player or Admin.is_banned(player) then return end - _reports().actions[player.name] = actions.temp - Sync.emit_embeded{ - title='Player Temp-Ban', - color=Color.to_hex(defines.text_color.high), - description='A player was jailed.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=append_name(reason,by_player_name) - } - game.print({'reports.temp-ban',player.name,by_player_name,reason},defines.text_color.info) - Admin.move_inventory(player) - Ranking._presets().last_jail = player.name - Server.interface(Ranking.give_rank,true,player,'Jail',by_player_name) -end - -function Admin.is_banned(player) - local player=Game.get_player(player) - if not player then return false end - local action = _reports().actions[player.name] - if action == actions.temp then return 'temp' - elseif action == actions.ban then return true - else return false end -end - -Event.register(defines.events.on_tick,function(event) - if not _reports().remove_warnings_time then - _reports().remove_warnings_time = {} - local highest = nil - for power,rank in pairs(Ranking._ranks()) do - 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 _reports().remove_warnings_time[power] = 0 - else _reports().remove_warnings_time[power] = min_time_to_remove_warning*_power end - end - end - if (game.tick % min_time_to_remove_warning) == 0 then - for name,warnings in pairs(_reports().warnings) do - if warnings > 0 then - local rank = Ranking.get_rank(name) - local time_to_remove = _reports().remove_warnings_time[rank.power] - if (game.tick % time_to_remove) == 0 then - _reports().warnings[name]=warnings-1 - if _reports().warnings[name] > 5 then - player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines.text_color.low,name) - end - end - end - end - end -end) diff --git a/Addons/Admin/tree-decon.lua b/Addons/Admin/tree-decon.lua deleted file mode 100644 index 78aa7bc1..00000000 --- a/Addons/Admin/tree-decon.lua +++ /dev/null @@ -1,54 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -Event.register(-1,function(event) - Server.new_thread{ - name='tree-decon', - data={trees={},chache={},clear=0} - }:on_event('tick',function(self) - local trees = self.data.trees - if self.data.clear ~= 0 and self.data.clear < game.tick then self.data.chache = {} self.data.clear = 0 end - if #trees == 0 then return end - for i = 0,math.ceil(#trees/10) do - local tree = table.remove(trees,1) - if tree and tree.valid then tree.destroy() end - end - end):on_event(defines.events.on_marked_for_deconstruction,function(self,event) - local chache = self.data.chache[event.player_index] - if not chache then - local player = Game.get_player(event) - if not player then return end - local rank = Ranking.get_rank(player) - if rank:allowed('tree-decon') then self.data.chache[event.player_index] = {'tree-decon',false} - elseif not rank:allowed('decon') then self.data.chache[event.player_index] = {'no-decon',false} - else self.data.chache[event.player_index] = {'decon',false} end - chache = self.data.chache[event.player_index] - end - if not event.entity.last_user or event.entity.name == 'entity-ghost' then - if chache[1] == 'tree-decon' then - table.insert(self.data.trees,event.entity) - self.data.clear = game.tick + 10 - end - else - if chache[1] == 'no-decon' then - event.entity.cancel_deconstruction('player') - 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) - local rank = Ranking.get_group('Admin').lowest - Ranking.print(rank,{'tree-decon.rank-print',player.name},defines.text_color.info) - Admin.give_warning(player,'','Trying To Decon The Base') - end - self.data.clear = game.tick + 10 - end - end - end):open() -end) \ No newline at end of file diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua deleted file mode 100644 index 775df6d1..00000000 --- a/Addons/Commands/admin.lua +++ /dev/null @@ -1,81 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -commands.add_command('report', 'Reports a player', {'player','reason',true}, function(event,args) - local _player = Game.get_player(event) - local player = Game.get_player(args.player) - local reason = args.reason - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end - for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end - for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end - Admin.report(player,event.player_index,reason) -end) - -commands.add_command('warn', 'Gives a player a warning', {'player','reason',true}, function(event,args) - local player = Game.get_player(args.player) - local reason = args.reason - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end - Admin.give_warning(player,event.player_index,reason) -end) - -commands.add_command('jail', 'Jails a player', {'player','reason',true}, function(event,args) - local player = Game.get_player(args.player) - local reason = args.reason - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end - Admin.jail(player,event.player_index,reason) -end) - -commands.add_command('unjail', 'Returns a player\'s old rank', {'player',true}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end - Server.interface(Ranking.revert,true,player,event.player_index) -end) - -commands.add_command('temp-ban', 'Temporarily ban a player', {'player','reason',true}, function(event,args) - local player = Game.get_player(args.player) - local reason = args.reason - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end - Admin.temp_ban(player,event.player_index,reason) -end) - -commands.add_command('clear-inv', 'Clears a player\'s invetory', {'player'}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end - Admin.move_inventory(player) -end) - -commands.add_command('clear-warnings', 'Clears a player\'s warnings', {'player'}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end - Admin.clear_warings(player,event.player_index) -end) - -commands.add_command('clear-reports', 'Clears a player\'s reports', {'player'}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end - Admin.clear_reports(player,event.player_index) -end) - -commands.add_command('clear-all', 'Clears a player of any temp-ban, reports or warnings', {'player'}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - Admin.clear_player(player,event.player_index) -end) diff --git a/Addons/Commands/bonus.lua b/Addons/Commands/bonus.lua deleted file mode 100644 index d38af150..00000000 --- a/Addons/Commands/bonus.lua +++ /dev/null @@ -1,66 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local settings = { - {key='character_mining_speed_modifier',scale=3}, - {key='character_crafting_speed_modifier',scale=3}, - {key='character_running_speed_modifier',scale=3}, - {key='character_build_distance_bonus',scale=20}, - {key='character_reach_distance_bonus',scale=20}, - {key='character_inventory_slots_bonus',scale=200} -} - -local function _bonus(reset) - global.addons = not reset and global.addons or {} - global.addons.bonus = not reset and global.addons.bonus or {} - return global.addons.bonus -end - -commands.add_command('bonus', 'Set your player bonus (default is 20, guest has 0)', {'bonus'}, function(event,args) - local player = Game.get_player(event) - local bonus = tonumber(args.bonus) - if not bonus or bonus < 0 or bonus > 50 then player_return{'commands.invalid-range',0,50} return commands.error end - for _,setting in pairs(settings) do player[setting.key] = setting.scale*math.floor(bonus)*0.01 end - _bonus()[player.index]=bonus - player_return('Bonus set to: '..math.floor(bonus)..'%') -end) - -Event.register(defines.events.rank_change,function(event) - local player = Game.get_player(event) - if event.new_rank:allowed('bonus') then - for _,setting in pairs(settings) do player[setting.key] = setting.scale*0.2 end - _bonus()[player.index]=20 - else - for _,setting in pairs(settings) do player[setting.key] = 0 end - _bonus()[player.index]=nil - end -end) - -Event.register(defines.events.on_player_respawned,function(event) - local player = Game.get_player(event) - local bonus = _bonus()[player.index] - if bonus then - for _,setting in pairs(settings) do player[setting.key] = setting.scale*math.floor(bonus)*0.01 end - end -end) - -Event.register(defines.events.on_pre_player_died,function(event) - local player = Game.get_player(event) - if Ranking.get_rank(player):allowed('bonus-respawn') then - player.ticks_to_respawn = 120 - -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death - Event.dispatch{ - name=defines.events.on_player_died, - tick=event.tick, - player_index=event.player_index, - cause = event.cause - } - end -end) diff --git a/Addons/Commands/cheat-mode.lua b/Addons/Commands/cheat-mode.lua deleted file mode 100644 index 7fc17e17..00000000 --- a/Addons/Commands/cheat-mode.lua +++ /dev/null @@ -1,15 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -commands.add_command('cheat-mode', 'Toggles cheat mode for a player', {'player'}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if player.cheat_mode == true then player.cheat_mode = false else player.cheat_mode = true end -end) diff --git a/Addons/Commands/home.lua b/Addons/Commands/home.lua deleted file mode 100644 index 5f7d92d8..00000000 --- a/Addons/Commands/home.lua +++ /dev/null @@ -1,37 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local function _homes(reset) - global.addons = not reset and global.addons or {} - global.addons.homes = not reset and global.addons.homes or {} - return global.addons.homes -end - -commands.add_command('set-home', 'Set your home position', {}, function(event,args) - local player = Game.get_player(event) - if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - _homes()[player.index][1] = {math.floor(player.position.x),math.floor(player.position.y)} - player_return('Home set at: ('..math.floor(player.position.x)..','..math.floor(player.position.y)..')') -end) - -commands.add_command('home', 'Go to you home position', {}, function(event,args) - local player = Game.get_player(event) - if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - _homes()[player.index][2] = {math.floor(player.position.x),math.floor(player.position.y)} - player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][1],32,1),player.surface) -end) - -commands.add_command('return', 'Return to your previous position after using /home', {}, function(event,args) - local player = Game.get_player(event) - if not _homes()[player.index] then _homes()[player.index] = {player.force.get_spawn_position(player.surface),player.force.get_spawn_position(player.surface)} end - local _temp = {math.floor(player.position.x),math.floor(player.position.y)} - player.teleport(player.surface.find_non_colliding_position('player',_homes()[player.index][2],32,1),player.surface) - _homes()[player.index][2] = _temp -end) diff --git a/Addons/Commands/kill.lua b/Addons/Commands/kill.lua deleted file mode 100644 index a48f9143..00000000 --- a/Addons/Commands/kill.lua +++ /dev/null @@ -1,21 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -commands.add_command('kill', 'Kills a player. Must be either yourself (/kill self) or a person of a lower rank', {'player'}, function(event,args) - local _player = Game.get_player(event) - local player = Game.get_player(args.player) - if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if args.player == 'self' or _player.name == player.name then - if _player.character then _player.character.die() else player_return({'commands.dead-player'}) return commands.error end - elseif Ranking.get_rank(player).power > Ranking.get_rank(_player).power then - if player.connected then else player_return({'commands.offline-player'}) return commands.error end - if player.character then player.character.die() else player_return({'commands.dead-player'}) return commands.error end - else player_return({'commands.unauthorized'}) return commands.error end -end) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua deleted file mode 100644 index ed6a534f..00000000 --- a/Addons/Commands/repair.lua +++ /dev/null @@ -1,47 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - --- Set an item to true to disallow it from being repaired -local disallow = { - ['loader']=true, - ['fast-loader']=true, - ['express-loader']=true, - ['electric-energy-interface']=true, - ['infinity-chest']=true -} - -local const = 100 --- Given const = 100: admin+ has unlimited, admin has const (100), mod has const / 2 (50), member has const / 5 (20) - -commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area.', {'range'}, function(event,args) - local range = tonumber(args.range) - local player = Game.get_player(event) - local rank = Ranking.get_rank(player) - local highest_admin_power = Ranking.get_group('Admin').highest.power-1 - local max_range = rank.power-highest_admin_power > 0 and const/(rank.power-highest_admin_power) or nil - local center = player and player.position or {x=0,y=0} - if not range or max_range and range > max_range then player_return({'commands.invalid-range',0,math.floor(max_range)}) return commands.error end - local area = {{center.x-range,center.y-range},{center.x+range,center.y+range}} - local max_time_to_live = 2^32 - 1 - local sq_range = range^2 - for key, entity in pairs(player.surface.find_entities_filtered({area=area,type='entity-ghost'})) do - if entity.force == player.force and (entity.position.x-center.x)^2+(entity.position.y-center.y)^2 < sq_range then - if disallow[entity.ghost_prototype.name] then - player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.text_color.crit,player) - Admin.temp_ban(player,'','Attempt To Repair A Banned Item') - entity.destroy() - elseif entity.time_to_live ~= max_time_to_live then - entity.revive() end - end - end - for key, entity in pairs(player.surface.find_entities(area)) do - if entity.force == player.force and (entity.position.x-center.x)^2+(entity.position.y-center.y)^2 < sq_range and entity.health then entity.health = 10000 end - end -end) diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua deleted file mode 100644 index 2b1defc5..00000000 --- a/Addons/Commands/tags.lua +++ /dev/null @@ -1,30 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local const = 20 --- this is the max lenth of a tag - -commands.add_command('tag', 'Give yourself a custom tag. Use /tag-clear self to remove tag', {'tag',true}, function(event,args) - local player = Game.get_player(event) - local rank = Ranking.get_rank(player) - if string.len(args.tag) > const then player_return({'commands.invalid-length',const}) return commands.error end - player.tag = rank.tag..' - '..args.tag -end) - -commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self)', {'player'}, function(event,args) - local _player = Game.get_player(event) - local _rank = Ranking.get_rank(_player) - local player = Game.get_player(args.player) - local rank = Ranking.get_rank(player) - if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end - if args.player == 'self' or _player.name == player.name then _player.tag = _rank.tag - elseif _rank.power < rank.power then player.tag = rank.tag - else player_return({'commands.unauthorized'}) return commands.error end -end) diff --git a/Addons/Commands/tp.lua b/Addons/Commands/tp.lua deleted file mode 100644 index 852f379d..00000000 --- a/Addons/Commands/tp.lua +++ /dev/null @@ -1,31 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -commands.add_command('go-to', 'Go to a player\'s location', {'player'}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - Admin.go_to(player,event) -end) - -commands.add_command('bring', 'Bring a player to your location', {'player'}, function(event,args) - local player = Game.get_player(args.player) - if not player then player_return({'commands.invalid-player',args.player}) return commands.error end - Admin.bring(player,event) -end) - -commands.add_command('tp', 'Teleport a player to another player\'s location', {'from', 'to'}, function(event,args) - local from_player = Game.get_player(args.from) - if not from_player then player_return({'commands.invalid-player',args.from_player}) return commands.error end - - local to_player = Game.get_player(args.to) - if not to_player then player_return({'commands.invalid-player',args.to_player}) return commands.error end - - Admin.tp(from_player, to_player) -end) diff --git a/Addons/Guis/admin-gui.lua b/Addons/Guis/admin-gui.lua deleted file mode 100644 index 3360a321..00000000 --- a/Addons/Guis/admin-gui.lua +++ /dev/null @@ -1,177 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -Admin = Admin or {} - -local get_player_info = get_player_info or function(player,frame) - frame.add{ - type='label', - caption={'admin-commands.no-info-file'} - } -end - -local function _players(_player,root_frame,state) - local players = {'Select Player'} - local _players = state and game.players or game.connected_players - for _,player in pairs(_players) do - if player.name ~= _player.name then - if Admin.is_banned and Admin.is_banned(player) then else - table.insert(players,player.name) - end - end - end - return players -end - -local online_check = Gui.inputs.add_checkbox('online-check-admin-commands',false,'Show Offline',false,function(player,element) - element.parent['player-drop-down-admin-commands'].items = _players(player,element.parent,true) - element.parent['player-drop-down-admin-commands'].selected_index = 1 -end,function(player,element) - element.parent['player-drop-down-admin-commands'].items = _players(player,element.parent,false) - element.parent['player-drop-down-admin-commands'].selected_index = 1 -end) - -local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-admin-commands',_players,1,function(player,selected,items,element) - element.parent.parent.player.caption = selected - local player_info_flow = element.parent.parent.info_flow - player_info_flow.clear() - if selected == 'Select Player' then return - else get_player_info(selected,player_info_flow,true) end - local rank = Ranking.get_rank(player) - local _rank = Ranking.get_rank(selected) - if rank.power >= _rank.power then element.parent.warning.caption = {'admin-commands.warning'} - else element.parent.warning.caption = '' end -end) - -local reason_input = Gui.inputs.add_text('reason-input-admin-commands',false,'Enter Reason',function(player,text,element) - if string.len(text) < 20 or text == 'Enter Reason' then - element.parent.warning.caption = {'admin-commands.short-reason'} - else - element.parent.warning.caption = '' - end -end) - -local function _actions(player) - return { - 'Select Action', - 'GoTo', - 'Bring', - 'Jail', - 'Kick', - 'Temp Ban', - 'Ban' - } -end - -local action_drop_down = Gui.inputs.add_drop_down('action-drop-down-rank-change',_actions,1,function(player,selected,items,element) - element.parent.parent.action.caption = selected - if selected == 'Jail' or selected == 'Kick' or selected == 'Ban' or selected == 'Temp Ban' then - element.parent['reason-input-admin-commands'].style.visible = true - else - element.parent['reason-input-admin-commands'].style.visible = false - end -end) - -local take_action = Gui.inputs.add{ - type='button', - name='admin-commands-take', - caption={'admin-commands.take-action'} -}:on_event('click',function(event) - local dropdowns = event.element.parent - local rank = Ranking.get_rank(event.player_index) - local _action= dropdowns.parent.action.caption ~= 'Select Action' and dropdowns.parent.action.caption or nil - local _player = Game.get_player(dropdowns.parent.player.caption) - if not _player or not _action then dropdowns.warning.caption = {'admin-commands.invalid'} return end - local _rank = Ranking.get_rank(_player) - if rank.power >= _rank.power then dropdowns.warning.caption = {'admin-commands.rank-high'} return end - local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text - if (_action == 'Jail' or _action == 'Kick' or _action == 'Ban' or _action == 'Temp Ban') and (_reason == 'Enter Reason' or string.len(_reason) < 20) then return end - Admin.take_action(_action,_player,event.player_index,_reason) - Gui.center.clear(event) -end) - -Admin.center = Gui.center.add{ - name='admin-commands', - caption='utility/danger_icon', - tooltip={'admin-commands.tooltip'}, - open=function(event,pre_select_player,pre_select_action) - local _player = Game.get_player(pre_select_player) - local player = Game.get_player(event) - local _center = Gui._get_data('center')['admin-commands'] - local center_flow = Gui.center.get_flow(player) - if center_flow[_center.name] then Gui.center.clear(player) return end - local center_frame = center_flow.add{ - name=_center.name, - type='frame', - direction='vertical', - style=mod_gui.frame_style - } - -- only edit i made was passing diffrent arguments to the draw function - local success, err = pcall(_center.draw,center_frame,_player,pre_select_action) - if not success then error(err) end - player.opened=center_frame - end, - draw=function(frame,pre_select_player,pre_select_action) - frame.caption={'admin-commands.name'} - local frame = frame.add{ - type='flow', - direction='horizontal' - } - local dropdowns = frame.add{ - type='flow', - direction='vertical' - } - local player_info_flow = frame.add{ - name='info_flow', - type='flow', - direction='vertical' - } - player_info_flow.style.height = 280 - player_info_flow.style.width = 200 - local label = dropdowns.add{ - type='label', - caption={'admin-commands.message'} - } - label.style.single_line = false - label.style.width = 200 - online_check:draw(dropdowns) - local _drop = player_drop_down:draw(dropdowns) - if pre_select_player then Gui.set_dropdown_index(_drop,pre_select_player.name) end - local _drop = action_drop_down:draw(dropdowns) - Gui.set_dropdown_index(_drop,pre_select_action) - local _text = reason_input:draw(dropdowns) - if pre_select_action == 'Jail' or pre_select_action == 'Kick' or pre_select_action == 'Ban' then - _text.style.visible = true else _text.style.visible = false - end - if pre_select_player then get_player_info(pre_select_player,player_info_flow,true) end - _text.style.width = 200 - local label = dropdowns.add{ - name='warning', - type='label', - caption='', - style='bold_red_label' - } - label.style.single_line = false - label.style.width = 200 - take_action:draw(dropdowns) - local _caption = pre_select_player and pre_select_player.name or '' - frame.add{ - name='player', - type='label', - caption=_caption - }.style.visible = false - local _caption = pre_select_action or '' - frame.add{ - name='action', - type='label', - caption=_caption - }.style.visible = false - end -} \ No newline at end of file diff --git a/Addons/Guis/announcements.lua b/Addons/Guis/announcements.lua deleted file mode 100644 index 9de20b06..00000000 --- a/Addons/Guis/announcements.lua +++ /dev/null @@ -1,99 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local function _ranks(player) - local ranks = {'Select Rank'} - local _rank = Ranking.get_rank(player) - for _,rank in pairs(Ranking._ranks()) do - if rank.power >= _rank.power then - table.insert(ranks,rank.name) - end - end - return ranks -end - -local rank_drop_down = Gui.inputs.add_drop_down('rank-drop-down-annoncements',_ranks,1,function(player,selected,items,element) - element.parent.rank.caption = selected - if selected == 'Select Rank' then element.parent['send-annoncement'].style.visible = false - else element.parent['send-annoncement'].style.visible = true end -end) - -local send_popup = Gui.inputs.add{ - type='button', - name='send-annoncement', - caption='utility/export_slot' -}:on_event('click',function(event) - local meta_data = Ranking._presets().meta - local default = Ranking.get_rank(meta_data.default) - local player = Game.get_player(event) - local rank = Ranking.get_rank(player) - local _rank = Ranking.get_rank(event.element.parent.rank.caption); if not _rank then return end - local sent_by = {'announcements.sent-by',player.name,rank.name} - local rank_name = _rank.name..'s'; if rank_name == default.name..'s' then rank_name = 'Everyone' end - local sent_to = {'announcements.sent-to',rank_name} - local message = event.element.parent.parent.message.text - for power,__rank in pairs(Ranking._ranks()) do - if power <= _rank.power then - Gui.popup.open('announcements',{sent_by=sent_by,sent_to=sent_to,message=message},__rank:get_players(true)) - event.element.parent.parent.message.text = '' - end - end -end) - -Gui.popup.add{ - name='announcements', - caption={'announcements.name'}, - draw=function(frame,data) - frame.style.right_padding = 5 - frame.style.bottom_padding = 5 - frame.add{type='label',caption=data.sent_by,style='caption_label'} - frame.add{type='label',caption=data.sent_to,style='caption_label'} - local text_box = frame.add{type='text-box'} - text_box.text = data.message - text_box.style.width = 400 - text_box.read_only = true - text_box.word_wrap = true - text_box.selectable = true - end -}:add_left{ - caption='item/programmable-speaker', - tooltip={'announcements.tooltip'}, - draw=function(frame) - frame.caption = {'announcements.name'} - local frame = frame.add{ - type='flow', - direction='vertical' - } - local text_box = frame.add{ - type='text-box', - name='message' - } - text_box.style.width = 400 - text_box.style.minimal_height = 100 - text_box.read_only = false - text_box.word_wrap = true - text_box.selectable = true - local flow = frame.add{type='flow'} - flow.add{ - type='label', - caption={'announcements.select-rank'} - } - rank_drop_down:draw(flow) - local btn = send_popup:draw(flow) - btn.style.visible = false - btn.style.height = 25 - btn.style.width = 25 - flow.add{ - type='label', - name='rank', - caption='' - }.style.visible = false - end -} \ No newline at end of file diff --git a/Addons/Guis/game-settings.lua b/Addons/Guis/game-settings.lua deleted file mode 100644 index 949a494f..00000000 --- a/Addons/Guis/game-settings.lua +++ /dev/null @@ -1,182 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - ---{type='slider',object='',key='',name='',min=x,max=y} ---{type='function',object='',key='',name='',param={}} -local basic_settings = { - {type='slider',object='force',key='manual_mining_speed_modifier',name='mining-speed',min=0,max=10}, - {type='slider',object='force',key='manual_crafting_speed_modifier',name='craft-speed',min=0,max=10}, - {type='slider',object='force',key='character_running_speed_modifier',name='running-speed',min=0,max=10}, - {type='slider',object='force',key='character_build_distance_bonus',name='build-distance',min=0,max=50}, - {type='slider',object='force',key='character_reach_distance_bonus',name='reach-distance',min=0,max=50}, - {type='slider',object='force',key='worker_robots_speed_modifier',name='bot-speed',min=0,max=10}, - {type='slider',object='force',key='laboratory_speed_modifier',name='lab-speed',min=0,max=10}, - {type='slider',object='force',key='stack_inserter_capacity_bonus',name='stack-bonus',min=1,max=30} -} - -local advanced_settings = { - {type='slider',object='force',key='quickbar_count',name='quickbar-count',min=1,max=5}, - {type='slider',object='force',key='character_inventory_slots_bonus',name='inventory-size',min=0,max=1000}, - {type='slider',object='force',key='mining_drill_productivity_bonus',name='mining-prod',min=0,max=10}, - {type='slider',object='game',key='speed',name='game-speed',min=0.01,max=5}, - {type='function',object='game',key='server_save',name='save'}, - {type='function',object='force',key='reset_technology_effects',name='reload-effects'}, - {type='function',object='enemy',key='kill_all_units',name='kill-biters'}, - {type='function',object='force',key='rechart',name='reload-map'}, - {type='function',object='game',key='force_crc',name='crc'}, - {type='function',object='force',key='reset',name='reset-force'} -} - -local personal_settings = { - {type='slider',object='player',key='character_mining_speed_modifier',name='mining-speed',min=0,max=10}, - {type='slider',object='player',key='character_crafting_speed_modifier',name='craft-speed',min=0,max=10}, - {type='slider',object='player',key='character_running_speed_modifier',name='running-speed',min=0,max=10}, - {type='slider',object='player',key='character_build_distance_bonus',name='build-distance',min=0,max=50}, - {type='slider',object='player',key='character_reach_distance_bonus',name='reach-distance',min=0,max=50}, - {type='slider',object='player',key='character_inventory_slots_bonus',name='inventory-size',min=0,max=1000}, - {type='slider',object='player',key='quickbar_count_bonus',name='quickbar-count',min=0,max=5} -} - -local _root_list = {basic_settings=basic_settings,advanced_settings=advanced_settings,personal_settings=personal_settings} - -local function _get_data(root_frame) - local object = root_frame.name - local key = root_frame.setting_name.caption - for _,setting in pairs(_root_list[object]) do - if key == setting.key then return setting end - end -end - -local function _object_list(player) return {game=game,player=player,force=player.force,enemy=game.forces['enemy']} end - -for name,group in pairs(_root_list) do - for key,setting in pairs(group) do - local _added = nil - if setting.type == 'slider' then - _added = Gui.inputs.add_slider('game-settings-'..setting.name,'horizontal',setting.min,setting.max, - function(player,root_frame) - local data = _get_data(root_frame) - local objects = _object_list(player) - local object = objects[data.object] - return object[data.key] or 1 - end, - function(player,value,percent,element) - local data = _get_data(element.parent) - local objects = _object_list(player) - local object = objects[data.object] - local _caption = string.format('%.2f',value); if value > 2 then _caption = string.format('%.2f',math.floor(value)) end - object[data.key] = tonumber(_caption) - element.parent.counter.caption = _caption - end - ) - elseif setting.type == 'function' then - _added = Gui.inputs.add_checkbox('game-settings-'..setting.name,true,nil,false,function(player,element) - local data = _get_data(element.parent.parent) - local objects = _object_list(player) - local object = objects[data.object] - pcall(object[data.key],unpack(data.params)) - Server.new_thread{ - timeout=60, - data=element - }:on_event('timeout',function(self) - if self.data and self.data.valid then - element.parent.parent['game-settings-are-you-sure'].state = false - self.data.parent.style.visible = false - self.data.state = false - end - end):open() - end) - if not setting.params then setting.params = {} end - end - setting._loaded = _added - setting._group = name - end -end - -local are_you_sure = Gui.inputs.add_checkbox('game-settings-are-you-sure',true,nil,false,function(player,element) - element.parent.sure.style.visible = true - Server.new_thread{ - timeout=600, - data=element - }:on_event('timeout',function(self) - if self.data and self.data.valid then - self.data.state = false - self.data.parent.sure.style.visible = false - end - end):open() -end) - -local function _draw_setting(frame,setting) - local frame = frame.add{type='flow'} - local frame = frame.add{ - type='flow', - name=setting._group - } - frame.add{ - type='label', - caption={'game-settings.effect-'..setting.name}, - style='caption_label' - } - frame.add{ - type='label', - caption=setting.key, - name='setting_name' - }.style.visible = false - if setting.type == 'slider' then - local slider = setting._loaded:draw(frame) - slider.style.width = 300 - local _caption = string.format('%.2f',slider.slider_value); if slider.slider_value > 2 then _caption = tostring(math.floor(slider.slider_value)) end - frame.add{ - type='label', - name='counter', - caption=_caption - } - elseif setting.type == 'function' then - are_you_sure:draw(frame) - local flow = frame.add{type='flow',name='sure'} - flow.style.visible = false - flow.add{ - type='label', - caption={'game-settings.sure'}, - style='bold_red_label' - } - setting._loaded:draw(flow) - end -end - -Gui.center.add{ - name='game-settings', - caption='utility/no_building_material_icon', - tooltip={'game-settings.tooltip'} -}:add_tab('basic',{'game-settings.basic-name'},{'game-settings.basic-name'},function(frame) - frame.add{ - type='label', - caption={'game-settings.basic-message'} - }.style.single_line = false - for _,setting in pairs(basic_settings) do - _draw_setting(frame,setting) - end -end):add_tab('advanced',{'game-settings.advanced-name'},{'game-settings.advanced-tooltip'},function(frame) - frame.add{ - type='label', - caption={'game-settings.advanced-message'} - }.style.single_line = false - for _,setting in pairs(advanced_settings) do - _draw_setting(frame,setting) - end -end):add_tab('personal',{'game-settings.personal-name'},{'game-settings.personal-tooltip'},function(frame) - frame.add{ - type='label', - caption={'game-settings.personal-message'} - }.style.single_line = false - for _,setting in pairs(personal_settings) do - _draw_setting(frame,setting) - end -end) \ No newline at end of file diff --git a/Addons/Guis/player-list.lua b/Addons/Guis/player-list.lua deleted file mode 100644 index ff04748f..00000000 --- a/Addons/Guis/player-list.lua +++ /dev/null @@ -1,115 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local function _global(reset) - global.addons = not reset and global.addons or {} - global.addons.player_list = not reset and global.addons.player_list or {update=0,delay=10,intervial=54000} - return global.addons.player_list -end - -local get_player_info = get_player_info or function(player,frame) - frame.add{ - type='label', - caption={'player-list.no-info-file'} - } -end - -local function update() - Gui.left.update('player-list') -end - -local function queue_update(tick) - local data = _global() - local tick = is_type(tick,'table') and tick.tick or is_type(tick,'number') and tick or game.tick - if tick + data.delay > data.update - data.intervial then - data.update = tick + data.delay - end -end - -local back_btn = Gui.inputs.add{ - type='button', - caption='utility/enter', - name='player-list-back' -}:on_event('click',function(event) - event.element.parent.parent.scroll.style.visible = true - event.element.parent.destroy() -end) - -Gui.left.add{ - name='player-list', - caption='entity/player', - tooltip={'player-list.tooltip'}, - draw=function(frame) - frame.caption = '' - local player_list = frame.add{ - name='scroll', - type = 'scroll-pane', - direction = 'vertical', - vertical_scroll_policy='auto', - horizontal_scroll_policy='never' - } - player_list.vertical_scroll_policy = 'auto' - player_list.style.maximal_height=195 - for _,rank in pairs(Ranking._ranks()) do - for _,player in pairs(rank:get_players(true)) do - local flow = player_list.add{type='flow'} - if rank.short_hand == '' then - flow.add{ - type='label', - name=player.name, - style='caption_label', - caption={'player-list.format-nil',tick_to_display_format(player.online_time),player.name} - }.style.font_color = rank.colour - else - flow.add{ - type='label', - name=player.name, - style='caption_label', - caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand} - }.style.font_color = rank.colour - end - if Admin.report_btn then - if not rank:allowed('no-report') and player.index ~= frame.player_index then - local btn = Admin.report_btn:draw(flow) - btn.style.height = 20 - btn.style.width = 20 - end - end - end - end - end, - open_on_join=true -} - -Event.register(defines.events.on_tick,function(event) - local data = _global() - if event.tick > data.update then - update() - data.update = event.tick + data.intervial - end -end) - -Event.register(defines.events.on_gui_click,function(event) - if event.element and event.element.valid - and event.element.parent and event.element.parent.parent and event.element.parent.parent.parent - and event.element.parent.parent.parent.name == 'player-list' then else return end - if event.button == defines.mouse_button_type.right then else return end - local player_list = event.element.parent.parent.parent - player_list.scroll.style.visible = false - local flow = player_list.add{type='flow',direction='vertical'} - back_btn:draw(flow) - get_player_info(event.element.name,flow,true) - if Game.get_player(event.element.name) and event.player_index == Game.get_player(event.element.name).index then return end - if Admin and Admin.allowed(event.player_index) then Admin.btn_flow(flow).caption = event.element.name end -end) - -Event.register(defines.events.on_player_joined_game,queue_update) -Event.register(defines.events.on_player_left_game,queue_update) -Event.register(defines.events.rank_change,queue_update) \ No newline at end of file diff --git a/Addons/Guis/polls.lua b/Addons/Guis/polls.lua deleted file mode 100644 index eb6d5c5c..00000000 --- a/Addons/Guis/polls.lua +++ /dev/null @@ -1,260 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local poll_time_out = 90 -- In seconds - -local function _polls(reset) - global.addons = not reset and global.addons or {} - global.addons.polls = not reset and global.addons.polls or {active={},old={}} - return global.addons.polls -end - -function _poll_end(self) - local uuid = self.data.poll_uuid - local poll = _polls().active[uuid] - if not poll then return end - local highest = {nil,-1} - local _votes = {} - for index,answer in pairs(poll.answers) do - local _result = poll.votes[index] or 0 - if _result > highest[2] then highest = {answer,_result} end - _votes[answer] = _result - end - local uuid = poll.uuid - poll.uuid = nil - poll.votes = _votes - poll.answers = nil - 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) -end - -local function _poll_data(question,answers) - local poll = { - uuid=Server.new_uuid(), - question=question, - answers=answers or {'None'}, - votes={}, - voted={} - } - Server.new_thread{ - data={poll_uuid=poll.uuid}, - timeout=poll_time_out*60 - }:on_event('timeout',_poll_end):open() - -- This time out is known to cause desyncs and so I have moved it to a hard coded function - _polls().active[poll.uuid]=poll - return poll.uuid -end - -local function draw_poll(frame) - frame.clear() - local index = tonumber(frame.parent.current_index.caption) - local poll = _polls().old[index] - if not poll then - frame.add{ - type='label', - caption={'polls.no-poll'} - } - return - end - frame.add{ - type='label', - caption='Question: '..poll.question - } - for answer,votes in pairs(poll.votes) do - frame.add{ - type='label', - caption=answer..') '..votes - } - end -end - -local function _opptions(player,root_frame) - local opptions = {'Please Select An Opption'} - local uuid = root_frame.name - local poll = _polls().active[uuid] - if not poll then return {'Invalid Poll'} end - for _,answer in pairs(poll.answers) do - table.insert(opptions,answer) - end - return opptions -end - -local opption_drop_down = Gui.inputs.add_drop_down('opption-drop-down-polls',_opptions,1,function(player,selected,items,element) - local uuid = element.parent.name - local poll = _polls().active[uuid] - if not poll then return end - if poll.voted[player.index] and poll.voted[player.index] > 1 then - local old_vote = poll.voted[player.index] - poll.votes[old_vote-1] = poll.votes[old_vote-1] and poll.votes[old_vote-1]-1 or 0 - end - if element.selected_index > 1 then - poll.votes[element.selected_index-1] = poll.votes[element.selected_index-1] and poll.votes[element.selected_index-1]+1 or 1 - end - poll.voted[player.index]=element.selected_index - element.parent.answer.caption = 'Your Answer: '..selected -end) - -local prev = Gui.inputs.add{ - type='button', - name='prev-poll', - caption='utility/hint_arrow_left' -}:on_event('click',function(event) - local parent = event.element.parent - local index = parent.parent.current_index.caption - local _index = tonumber(index)-1 - if _index < 1 then _index = #_polls().old end - parent.parent.current_index.caption = _index - parent.parent.title.title.caption = 'Viewing Poll: '.._index - draw_poll(parent.parent.poll_area) -end) - -local next = Gui.inputs.add{ - type='button', - name='next-poll', - caption='utility/hint_arrow_right' -}:on_event('click',function(event) - local parent = event.element.parent - local index = parent.parent.current_index.caption - local _index = tonumber(index)+1 - if _index > #_polls().old then _index = 1 end - parent.parent.current_index.caption = _index - parent.parent.title.title.caption = 'Viewing Poll: '.._index - draw_poll(parent.parent.poll_area) -end) - -local poll_question_input = Gui.inputs.add_text('poll-question-input',true,'Question',function(player,text,element) - local options = element.parent.options - if not options.question then options.add{type='label',name='question',caption=''} - else options.question.caption = text end -end) - -local _self_referace_poll_option_input = nil -local poll_option_input = Gui.inputs.add_text('poll-option-input',true,'Enter Option',function(player,text,element) - local options = element.parent.parent.parent.options - if not options[element.parent.name] then options.add{type='label',name=element.parent.name,caption=text} - else options[element.parent.name].caption = text end - if options.last.caption == element.parent.name then - options.last.caption = tonumber(options.last.caption)+1 - _self_referace_poll_option_input:draw(element.parent.parent.add{type='flow',name=options.last.caption}).style.minimal_width = 200 - end -end) -_self_referace_poll_option_input = poll_option_input - -local function poll_assembler(frame) - frame.clear() - local options = frame.add{type='flow',name='options'} - options.style.visible = false - options.add{type='label',name='last',caption='2'} - poll_question_input:draw(frame).style.minimal_width = 200 - local flow = frame.add{type='flow',direction='vertical'} - poll_option_input:draw(flow.add{type='flow',name='1'}).style.minimal_width = 200 - poll_option_input:draw(flow.add{type='flow',name='2'}).style.minimal_width = 200 -end - -local create_poll = Gui.inputs.add{ - type='button', - name='create-poll', - caption='utility/add' -}:on_event('click',function(event) - local parent = event.element.parent - if event.element.sprite == 'utility/enter' then - local inputs = parent.parent.poll_area.options - if not inputs then - event.element.sprite = 'utility/add' - draw_poll(parent.parent.poll_area) - return - end - local options = {} - for _,option in pairs(inputs.children) do - if option.name ~= 'question' and option.name ~= 'last' then - if option.caption ~= 'Enter Option' and option.caption ~= '' then table.insert(options,option.caption) end - end - end - if not inputs.question or #options == 0 then - event.element.sprite = 'utility/add' - draw_poll(parent.parent.poll_area) - return - end - local uuid = _poll_data(inputs.question.caption,options) - Gui.popup.open('polls',{uuid=uuid}) - event.element.sprite = 'utility/add' - draw_poll(parent.parent.poll_area) - else - event.element.sprite = 'utility/enter' - poll_assembler(parent.parent.poll_area) - end -end) - -Gui.popup.add{ - name='polls', - caption={'polls.name'}, - draw=function(frame,data) - frame.style.right_padding = 5 - frame.style.bottom_padding = 5 - local uuid = data.uuid - local poll = _polls().active[uuid] - if not poll then return end - local flow = frame.add{ - type='flow', - name=uuid, - direction='vertical' - } - flow.add{type='label',caption={'polls.time-left',poll_time_out}} - flow.add{type='label',caption='Question: '..poll.question} - flow.add{type='label',name='answer',caption='Your Answer: None'} - opption_drop_down:draw(flow) - end -}:add_left{ - caption='utility/item_editor_icon', - tooltip={'polls.tooltip'}, - draw=function(frame) - frame.caption={'polls.name'} - frame.add{ - type='label', - name='current_index', - caption=1 - }.style.visible = false - local title = frame.add{ - type='flow', - name='title' - } - local btn = prev:draw(title) - btn.style.width = 20 - btn.style.height = 20 - title.add{ - type='label', - name='title', - caption='Viewing Poll: 1', - style='caption_label' - } - local btn = next:draw(title) - btn.style.width = 20 - btn.style.height = 20 - if Ranking.get_rank(frame.player_index):allowed('create-poll') then - local btn = create_poll:draw(title) - btn.style.width = 20 - btn.style.height = 20 - end - local flow = frame.add{ - type='flow', - name='poll_area', - direction='vertical' - } - draw_poll(flow) - end, - can_open=function(player) - if #_polls().old > 0 then return true - elseif Ranking.get_rank(player):allowed('create-poll') then return true - else return {'polls.no-poll'} end - end -} diff --git a/Addons/Guis/rank-changer.lua b/Addons/Guis/rank-changer.lua deleted file mode 100644 index 86c72a8b..00000000 --- a/Addons/Guis/rank-changer.lua +++ /dev/null @@ -1,132 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local get_player_info = get_player_info or function(player,frame) - frame.add{ - type='label', - caption={'rank-changer.no-info-file'} - } -end - -local function _players(_player,root_frame,state) - local players = {'Select Player'} - local _players = state and game.players or game.connected_players - for _,player in pairs(_players) do - if player.name ~= _player.name then - if Admin.is_banned and Admin.is_banned(player) then else - table.insert(players,player.name) - end - end - end - return players -end - -local online_check = Gui.inputs.add_checkbox('online-check-rank-change',false,'Show Offline',false,function(player,element) - element.parent['player-drop-down-rank-change'].items = _players(player,element.parent,true) - element.parent['player-drop-down-rank-change'].selected_index = 1 -end,function(player,element) - element.parent['player-drop-down-rank-change'].items = _players(player,element.parent,false) - element.parent['player-drop-down-rank-change'].selected_index = 1 -end) - -local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-rank-change',_players,1,function(player,selected,items,element) - element.parent.parent.player.caption = selected - local player_info_flow = element.parent.parent.info_flow - player_info_flow.clear() - if selected == 'Select Player' then return - else get_player_info(selected,player_info_flow,true) end - local rank = Ranking.get_rank(player) - local _rank = Ranking.get_rank(selected) - if rank.power >= _rank.power then element.parent.warning.caption = {'rank-changer.warning'} - else element.parent.warning.caption = '' end -end) - -local function _ranks(player) - local ranks = {'Select Rank'} - local _rank = Ranking.get_rank(player) - for _,rank in pairs(Ranking._ranks()) do - if rank.power > _rank.power then - table.insert(ranks,rank.name) - end - end - return ranks -end - -local rank_drop_down = Gui.inputs.add_drop_down('rank-drop-down-rank-change',_ranks,1,function(player,selected,items,element) - element.parent.parent.rank.caption = selected -end) - -local set_rank = Gui.inputs.add{ - type='button', - name='rank-change-set', - caption={'rank-changer.set-rank'} -}:on_event('click',function(event) - local dropdowns = event.element.parent - local rank = Ranking.get_rank(event.player_index) - local _rank = Ranking.get_rank(dropdowns.parent.rank.caption) - local _player = Game.get_player(dropdowns.parent.player.caption) - if not _player or not _rank then dropdowns.warning.caption = {'rank-changer.invalid'} return end - local __rank = Ranking.get_rank(_player) - if rank.power >= __rank.power then dropdowns.warning.caption = {'rank-changer.rank-high'} return end - Ranking.give_rank(_player,_rank,event) - Gui.center.clear(event) -end) - -Gui.center.add{ - name='rank-changer', - caption='utility/circuit_network_panel', - tooltip={'rank-changer.tooltip'}, - draw=function(self,frame) - frame.caption={'rank-changer.name'} - local frame = frame.add{ - type='flow', - direction='horizontal' - } - local dropdowns = frame.add{ - type='flow', - direction='vertical' - } - local player_info_flow = frame.add{ - name='info_flow', - type='flow', - direction='vertical' - } - player_info_flow.style.height = 200 - player_info_flow.style.width = 200 - local label = dropdowns.add{ - type='label', - caption={'rank-changer.message'} - } - label.style.single_line = false - label.style.width = 200 - online_check:draw(dropdowns) - player_drop_down:draw(dropdowns) - rank_drop_down:draw(dropdowns) - local label = dropdowns.add{ - name='warning', - type='label', - caption='', - style='bold_red_label' - } - label.style.single_line = false - label.style.width = 200 - set_rank:draw(dropdowns) - frame.add{ - name='player', - type='label', - caption='///' - }.style.visible = false - frame.add{ - name='rank', - type='label', - caption='///' - }.style.visible = false - end -} \ No newline at end of file diff --git a/Addons/Guis/readme.lua b/Addons/Guis/readme.lua deleted file mode 100644 index 09c2a895..00000000 --- a/Addons/Guis/readme.lua +++ /dev/null @@ -1,132 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local function format_label(label) - label.style.maximal_width = 480 - label.style.single_line = false -end - -Gui.center.add{ - name='readme', - caption='utility/questionmark', - tooltip={'readme.tooltip'} -}:add_tab('guildlines',{'readme.guildlines-name'},{'readme.guildlines-tooltip'},function(frame) - for i = 1,10 do - local style=nil; if i == 1 then style = 'caption_label' end - format_label(frame.add{ - type='label', - caption={'readme.guildlines-line'..tostring(i)}, - style=style - }) - end -end):add_tab('chat',{'readme.chat-name'},{'readme.chat-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'readme.chat-singleline'} - }) -end):add_tab('commands',{'readme.commands-name'},{'readme.commands-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'readme.commands-singleline'} - }) - Gui.bar(frame,480) - local table = frame.add{name='command_table',type='table',column_count=2} - table.add{ - type='label', - caption={'readme.commands-col1'}, - style='caption_label' - } - table.add{ - type='label', - caption={'readme.commands-col2'}, - style='caption_label' - } - table.style.width = 480 - table.draw_vertical_lines = true - table.draw_horizontal_line_after_headers = true - for _,command in pairs(commands.get_commands(frame.player_index)) do - table.add{ - type='label', - caption='/'..command.name - } - local discription = table.add{ - type='label', - caption=command.description, - } - discription.style.maximal_width = 400 - discription.style.single_line = false - end -end):add_tab('links',{'readme.links-name'},{'readme.links-tooltip'},function(frame) - local links={ - 'https://discord.explosivegaming.nl', - 'https://explosivegaming.nl', - 'http://steamcommunity.com/groups/tntexplosivegaming', - 'https://www.patreon.com/badgamernl', - 'https://wiki.explosivegaming.nl/' - } - local function format(text_box) - text_box.style.minimal_width=400 - text_box.read_only = true - text_box.word_wrap = true - text_box.selectable = true - end - for i,link in pairs(links) do - frame.add{ - type="label", - caption={'readme.links-cap'..tostring(i)}, - style='caption_label' - } - format(frame.add{ - type='text-box', - text=link - }) - end -end):add_tab('servers',{'readme.servers-name'},{'readme.servers-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'readme.servers-singleline'} - }) - Gui.bar(frame,480) - for i = 1,6 do - frame.add{ - type='label', - caption={'readme.servers-format',tostring(i),{'readme.servers-cap'..tostring(i)}}, - style='caption_label' - } - format_label(frame.add{ - type='label', - caption={'readme.servers-des'..tostring(i)} - }) - end -end):add_tab('rules',{'readme.rules-name'},{'readme.rules-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'readme.rules-singleline'} - }) - Gui.bar(frame,480) - for i = 1,20 do - format_label(frame.add{ - type='label', - caption={'readme.rules-format',i,{'readme.rules-rule'..tostring(i)}} - }) - end -end) - -Sync.add_to_gui(Gui.inputs.add_button('readme-sync-guildlines','View Guildlines','View the guildlines in the readme',function(player,element) - Gui.center.open_tab(player,'readme','guildlines') -end)) - -Sync.add_to_gui(Gui.inputs.add_button('readme-sync-links','View Other Links','View the links in the readme',function(player,element) - Gui.center.open_tab(player,'readme','links') -end)) - -Sync.add_to_gui(Gui.inputs.add_button('readme-sync-rules','View All Rules','View the all rules in the readme',function(player,element) - Gui.center.open_tab(player,'readme','rules') -end)) diff --git a/Addons/Guis/reports.lua b/Addons/Guis/reports.lua deleted file mode 100644 index 5205775c..00000000 --- a/Addons/Guis/reports.lua +++ /dev/null @@ -1,53 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local confirm_report = Gui.inputs.add{ - type='button', - name='admin-report-confirm', - caption='utility/spawn_flag', - tooltip={'reports.name'} -}:on_event('click',function(event) - local parent = event.element.parent - local player = Game.get_player(parent.player.caption) - local reason = parent.reason.text - Admin.report(player,event.player_index,reason) - Gui.center.clear(event.player_index) -end) - -Admin.report_btn = Gui.inputs.add{ - type='button', - name='admin-report', - caption='utility/spawn_flag', - tooltip={'reports.name'} -}:on_event('click',function(event) - local parent = event.element.parent - local player = Game.get_player(parent.children[1].name) - if not player then return end - local _player = Game.get_player(event) - Gui.center.clear(_player) - local frame = Gui.center.get_flow(_player).add{ - type='frame', - name='report-gui' - } - _player.opened=frame - frame.caption={'reports.name'} - frame.add{ - type='textfield', - name='reason' - }.style.width = 300 - local btn = confirm_report:draw(frame) - btn.style.height = 30 - btn.style.width = 30 - frame.add{ - type='label', - name='player', - caption=player.name - }.style.visible = false -end) \ No newline at end of file diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua deleted file mode 100644 index 6ef4ce44..00000000 --- a/Addons/Guis/rockets.lua +++ /dev/null @@ -1,104 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local function _global(reset) - global.addons = not reset and global.addons or {} - global.addons.rockets = not reset and global.addons.rockets or {update=0,first=0,_last=0,last=0,fastest=0,milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0,m1000=0,m2000=0,m5000=0}} - return global.addons.rockets -end -Gui.left.add{ - name='rockets', - caption='item/rocket-silo', - tooltip={'rockets.tooltip'}, - draw=function(frame) - frame.caption = {'rockets.name'} - local player = Game.get_player(frame.player_index) - local data = _global() - local satellites = player.force.get_item_launched('satellite') - local time = {'rockets.nan'} - if satellites == 1 then time = tick_to_display_format(game.tick) - elseif satellites > 1 then time = tick_to_display_format((game.tick-data.first)/satellites) end - if satellites ~= data.update then - data.update = satellites - if data.first == 0 then data.first = game.tick end - data._last = data.last - data.last = game.tick - if data.last-data._last < data.fastest or data.fastest == 0 then data.fastest = data.last-data._last end - end - frame.add{ - type='label', - caption={'rockets.sent',satellites} - } - frame.add{ - type='label', - caption={'rockets.first',tick_to_display_format(data.first)} - } - frame.add{ - type='label', - caption={'rockets.last',tick_to_display_format(data.last-data._last)} - } - frame.add{ - type='label', - caption={'rockets.time',time} - } - frame.add{ - type='label', - caption={'rockets.fastest',tick_to_display_format(data.fastest)} - } - frame.add{ - type='label', - caption={'rockets.milestones'}, - style='caption_label' - } - local milestones = frame.add{ - type='flow', - direction='vertical' - } - for milestone,time in pairs(data.milestones) do - local milestone = tonumber(milestone:match('%d+')) - if time == 0 and satellites == milestone then - data.milestones['m'..milestone] = data.last - time = data.last - Gui.left.open('rockets') - end - local _time = {'rockets.nan'} - if time > 0 then _time = tick_to_display_format(time) end - milestones.add{ - type='label', - caption={'rockets.format',tostring(milestone),_time} - } - if time == 0 then break end - end - end, - can_open=function(player) - if player.force.get_item_launched('satellite') > 0 then return true - else return {'rockets.none'} end - end -} - -Event.register(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) -Sync.add_update('rockets',function() - local _return = {} - local data = _global() - local satellites = game.forces.player.get_item_launched('satellite') - local time = {'rockets.nan'} - if satellites == 1 then time = tick_to_display_format(game.tick) - elseif satellites > 1 then time = tick_to_display_format((game.tick-data.first)/satellites) end - _return.total = satellites - _return.first = Sync.tick_format(data.first) - _return.last = Sync.tick_format(data.last-data._last) - _return.time = Sync.tick_format(time) - _return.fastest = Sync.tick_format(data.fastest) - _return.milestones = {} - for milestone,time in pairs(data.milestones) do - _return.milestones[milestone] = Sync.tick_format(time) - end - return _return -end) \ No newline at end of file diff --git a/Addons/Guis/science.lua b/Addons/Guis/science.lua deleted file mode 100644 index 1cdf7887..00000000 --- a/Addons/Guis/science.lua +++ /dev/null @@ -1,102 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local science_packs = { - 'science-pack-1', - 'science-pack-2', - 'science-pack-3', - 'military-science-pack', - 'production-science-pack', - 'high-tech-science-pack', - 'space-science-pack' -} - -local function _global(reset) - global.addons = not reset and global.addons or {} - global.addons.science = not reset and global.addons.science or {_base={update=0,_update=0,made={0,0,0,0,0,0,0},_made={0,0,0,0,0,0,0}}} - return global.addons.science -end - -Gui.left.add{ - name='science', - caption='item/lab', - tooltip={'science.tooltip'}, - draw=function(frame) - local data = _global() - local player = Game.get_player(frame.player_index) - if not data[player.force.name] then - data[player.force.name] = table.deepcopy(data._base) - end - data = data[player.force.name] - frame.caption = {'science.name'} - frame.add{ - type='label', - caption={'science.total'}, - style='caption_label' - } - local totals = frame.add{ - type='flow', - direction='vertical' - } - frame.add{ - type='label', - caption={'science.time'}, - style='caption_label' - } - local times = frame.add{ - type='flow', - direction='vertical' - } - if data.update < game.tick-100 then - data._update = data.update - data._made = table.deepcopy(data.made) - for i,name in pairs(science_packs) do - data.made[i] = player.force.item_production_statistics.get_input_count(name) - end - data.update = game.tick - end - for i,name in pairs(science_packs) do - local made = data.made[i] - if made > 0 then - totals.add{ - type='label', - caption={'science.format',{'science.'..name},made} - } - local _made = string.format('%.2f',(made-data._made[i])/((data.update-data._update)/(3600*game.speed))) - times.add{ - type='label', - caption={'science.format',{'science.'..name},_made} - } - end - end - end, - can_open=function(player) - if player.force.item_production_statistics.get_input_count('science-pack-1') > 0 then return true - else return {'science.none'} end - end -} - -Event.register(defines.events.on_research_finished,function(event) Gui.left.update('science') end) -Sync.add_update('science',function() - local _return = {} - local _data = _global() - for force_name,data in pairs(_data) do - if force_name ~= '_base' then - _return[force_name] = {totals={},times={}} - for i,name in pairs(science_packs) do - local made = data.made[i] - _return[force_name].totals[name] = made - local _made = string.format('%.2f',(made-data._made[i])/((data.update-data._update)/(3600*game.speed))) - _return[force_name].times[name] = _made - end - end - end - return _return -end) \ No newline at end of file diff --git a/Addons/Guis/tasklist.lua b/Addons/Guis/tasklist.lua deleted file mode 100644 index f4cb2262..00000000 --- a/Addons/Guis/tasklist.lua +++ /dev/null @@ -1,193 +0,0 @@ ---[[ - Explosive Gaming - - This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local function _global(reset) - global.addons = not reset and global.addons or {} - global.addons.tasklist = not reset and global.addons.tasklist or {tasks={},_edit={},_base={_edit=false,_tasks={},_editing={}}} - return global.addons.tasklist -end - -local edit = Gui.inputs.add{ - name='tasklist-edit', - type='button', - caption='utility/rename_icon_normal' -}:on_event('click',function(event) - local text_flow = event.element.parent.parent.text_flow - local data = _global()._edit[event.player_index] - if not data._edit then data._tasks = table.deepcopy(_global().tasks) end - if text_flow.input.type == 'label' then - data._editing[tonumber(text_flow.parent.name)]=true - Gui.left.update('tasklist',event.player_index) - elseif text_flow.input.type == 'textfield' then - local text = text_flow.input.text - data._editing[tonumber(text_flow.parent.name)]=false - data._tasks[tonumber(text_flow.parent.name)]=text - Gui.left.update('tasklist',event.player_index) - end -end) - -local function _edit(frame) - local element = edit:draw(frame) - element.style.height = 20 - element.style.width = 20 - local text_flow = element.parent.parent.text_flow - local data = _global()._edit[frame.player_index] - data._tasks[text_flow.parent.name]=text - if data._editing[tonumber(text_flow.parent.name)] then - element.style.height = 30 - element.style.width = 30 - local text = text_flow.input.caption - text_flow.clear() - local _text = text_flow.add{ - name='input', - type='textfield', - text=text - } - _text.style.width = 200 - element.sprite = 'utility/enter' - end -end - -local remove = Gui.inputs.add{ - name='tasklist-remove', - type='button', - caption='utility/remove' -}:on_event('click',function(event) - local frame = event.element.parent.parent - local data = _global()._edit[event.player_index] - if data._edit then - table.remove(data._tasks,tonumber(frame.name)) - table.remove(data._editing,tonumber(frame.name)) - else - table.remove(_global().tasks,tonumber(frame.name)) - Gui.left.update('tasklist') - end - Gui.left.update('tasklist',event.player_index) -end) - -local add = Gui.inputs.add{ - name='tasklist-add', - type='button', - caption='utility/add' -}:on_event('click',function(event) - local frame = event.element.parent.parent - local data = _global()._edit[event.player_index] - if data._edit then - table.insert(data._tasks,tonumber(frame.name)+1,'New Value') - table.insert(data._editing,tonumber(frame.name)+1,true) - else - data._tasks = table.deepcopy(_global().tasks) - table.insert(data._tasks,tonumber(frame.name)+1,'New Value') - table.insert(data._editing,tonumber(frame.name)+1,true) - end - Gui.left.update('tasklist',event.player_index) -end) - -local function _tasks(player) - local player = Game.get_player(player) - local data = _global()._edit[player.index] - if not data then return _global().tasks end - local _edit = false - for _,v in pairs(data._editing) do - if v == true then - _edit = true - break - end - end - if data._edit and not _edit then - _global().tasks = table.deepcopy(data._tasks) - _global()._edit[player.index] = table.deepcopy(_global()._base) - Gui.left.update('tasklist') - return _global().tasks - elseif not data._edit and _edit then - data._edit = true - for key,_ in pairs(data._tasks) do if not data._editing[key] then data._editing[key] = false end end - return data._tasks - elseif _edit then return data._tasks - else return _global().tasks - end -end - -Gui.left.add{ - name='tasklist', - caption='utility/not_enough_repair_packs_icon', - tooltip={'tasklist.tooltip'}, - draw=function(frame) - frame.caption = '' - local title = frame.add{ - type='flow', - direction='horizontal' - } - title.add{ - type='label', - caption={'tasklist.name'}, - style='caption_label' - } - local data = _global() - local player = Game.get_player(frame.player_index) - local rank = Ranking.get_rank(player) - if rank:allowed('edit-tasklist') then - if not data._edit[player.index] then data._edit[player.index] = table.deepcopy(data._base) end - end - for i,task in pairs(_tasks(player)) do - local flow = frame.add{ - name=i, - type='flow', - direction='horizontal' - } - local text_flow = flow.add{ - name='text_flow', - type='flow', - direction='horizontal' - } - text_flow.add{ - name='input', - type='label', - caption=task - } - local button_flow = flow.add{ - type='flow', - direction='horizontal' - } - if rank:allowed('edit-tasklist') then - _edit(button_flow) - if data._edit[player.index]._editing[i] then - local element = remove:draw(button_flow) - element.style.height = 30 - element.style.width = 30 - local _element = add:draw(button_flow) - _element.style.height = 30 - _element.style.width = 30 - end - end - end - if rank:allowed('edit-tasklist') then - local flow = title.add{ - name=#_tasks(player), - type='flow', - direction='horizontal' - } - local button_flow = flow.add{ - type='flow', - direction='horizontal' - } - local element = add:draw(button_flow) - element.style.height = 20 - element.style.width = 20 - end - if #_tasks(player) == 0 and not rank:allowed('edit-tasklist') then frame.style.visible = false end - end, - can_open=function(player) - local rank = Ranking.get_rank(player) - if rank:allowed('edit-tasklist') or #_global().tasks > 0 then return true - else return {'tasklist.none'} end - end, - open_on_join=true -} \ No newline at end of file diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua deleted file mode 100644 index ddad3638..00000000 --- a/Addons/Guis/warp-system.lua +++ /dev/null @@ -1,237 +0,0 @@ ---[[ -Explosive Gaming - -This file can be used with permission but this and the credit below must remain in the file. -Contact a member of management on our discord to seek permission to use our code. -Any changes that you may make to the code are yours but that does not make the script yours. -Discord: https://discord.gg/r6dC2uK -]] ---Please Only Edit Below This Line----------------------------------------------------------- - -local warp_tiles = { - {-3,-2},{-3,-1},{-3,0},{-3,1},{-3,2},{3,-2},{3,-1},{3,0},{3,1},{3,2}, - {-2,-3},{-1,-3},{0,-3},{1,-3},{2,-3},{-2,3},{-1,3},{0,3},{1,3},{2,3} -} - -local warp_entities = { - {'small-lamp',-3,-2},{'small-lamp',-3,2},{'small-lamp',3,-2},{'small-lamp',3,2}, - {'small-lamp',-2,-3},{'small-lamp',2,-3},{'small-lamp',-2,3},{'small-lamp',2,3}, - {'small-electric-pole',-3,-3},{'small-electric-pole',3,3},{'small-electric-pole',-3,3},{'small-electric-pole',3,-3} -} - -local warp_radius = 4 -local spawn_warp_scale = 5 -local warp_tile = 'tutorial-grid' -local warp_limit = 60 -local warp_item = 'discharge-defense-equipment' -local global_offset = {x=0,y=0} - -local function _warps(reset) - global.addons = not reset and global.addons or {} - global.addons.warps = not reset and global.addons.warps or {warps={},cooldowns={}} - return global.addons.warps -end - -local function remove_warp_point(name) - local warp = _warps().warps[name] - if not warp then return end - local surface = warp.surface - local offset = warp.position - local tiles = {} - local tiles = {} - for x = -warp_radius-2, warp_radius+2 do - for y = -warp_radius-2, warp_radius+2 do - if x^2+y^2 < (warp_radius+1)^2 then - table.insert(tiles,{name=warp.old_tile,position={x+offset.x,y+offset.y}}) - local entities = surface.find_entities_filtered{area={{x+offset.x-1,y+offset.y-1},{x+offset.x,y+offset.y}}} - for _,entity in pairs(entities) do if entity.name ~= 'player' then entity.destroy() end end - end - end - end - surface.set_tiles(tiles) - if warp.tag.valid then warp.tag.destroy() end - _warps().warps[name] = nil - Gui.left.update('warp-list') -end - -local function make_warp_point(position,surface,force,name) - local warp = _warps().warps[name] - if warp then return end; warp = nil - local offset = {x=math.floor(position.x),y=math.floor(position.y)} - local old_tile = surface.get_tile(offset).name - local base_tiles = {} - local tiles = {} - -- this makes a base plate to make the warp point - for x = -warp_radius-2, warp_radius+2 do - for y = -warp_radius-2, warp_radius+2 do - if x^2+y^2 < warp_radius^2 then - table.insert(base_tiles,{name=warp_tile,position={x+offset.x,y+offset.y}}) - end - end - end - surface.set_tiles(base_tiles) - -- this adds the patern and entities - for _,position in pairs(warp_tiles) do - table.insert(tiles,{name=warp_tile,position={position[1]+offset.x+global_offset.x,position[2]+offset.y+global_offset.y}}) - end - surface.set_tiles(tiles) - for _,entity in pairs(warp_entities) do - local entity = surface.create_entity{name=entity[1],position={entity[2]+offset.x+global_offset.x,entity[3]+offset.y+global_offset.y},force='neutral'} - entity.destructible = false; entity.health = 0; entity.minable = false; entity.rotatable = false - end - local tag = force.add_chart_tag(surface,{ - position={offset.x+0.5,offset.y+0.5}, - text='Warp: '..name, - icon={type='item',name=warp_item} - }) - _warps().warps[name] = {tag=tag,surface=surface,position=tag.position,old_tile=old_tile} - local _temp = {Spawn=_warps().warps.Spawn} - _warps().warps.Spawn = nil - for name,data in pairs(table.keysort(_warps().warps)) do _temp[name] = data end - _warps().warps = _temp - Gui.left.update('warp-list') -end - -commands.add_command('make-warp', 'Make a warp point at your location', {'name',true}, function(event,args) - 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 - -- to do add a test for all warps - make_warp_point(position,game.player.surface,game.player.force,name) -end) - -local remove_warp = Gui.inputs.add{ - type='button', - name='remove-warp-point', - caption='utility/remove', - tooltip={'warp-system.remove-tooltip'} -}:on_event('click',function(event) - local name = event.element.parent.name - remove_warp_point(name) -end) - -local go_to_warp = Gui.inputs.add{ - type='button', - name='go-to-warp-point', - caption='utility/export_slot', - tooltip={'warp-system.go-to-tooltip'} -}:on_event('click',function(event) - local player = Game.get_player(event) - local cooldown = _warps().cooldowns[event.player_index] or 0 - local warp = _warps().warps[event.element.parent.name] - if cooldown > 0 then player_return({'warp-system.cooldown',cooldown},nil,event) return end - if player.vehicle then player.vehicle.set_driver(nil) end - if player.vehicle then player.vehicle.set_passenger(nil) end - if player.vehicle then return end - player.teleport(warp.surface.find_non_colliding_position('player',warp.position,32,1),warp.surface) - if not Ranking.get_rank(player):allowed('always-warp') then - event.element.parent.parent.parent.parent.style.visible = false - _warps().cooldowns[event.player_index] = warp_limit - end -end) - -Gui.left.add{ - name='warp-list', - caption='item/'..warp_item, - tooltip={'warp-system.tooltip'}, - draw=function(frame) - local player = Game.get_player(frame.player_index) - frame.caption={'warp-system.name'} - local warp_list = frame.add{ - type='scroll-pane', - direction='vertical', - vertical_scroll_policy='auto', - horizontal_scroll_policy='never' - } - warp_list.vertical_scroll_policy = 'auto' - warp_list.style.maximal_height = 150 - local table = warp_list.add{ - type='table', - column_count=2 - } - for name,warp in pairs(_warps().warps) do - if not warp.tag or not warp.tag.valid then - warp.tag = player.force.add_chart_tag(warp.surface,{ - position=warp.position, - text='Warp: '..name, - icon={type='item',name=warp_item} - }) - end - table.add{ - type='label', - caption=name, - style='caption_label' - } - local _flow = table.add{ - type='flow', - name=name - } - local btn = go_to_warp:draw(_flow) - btn.style.height = 20 - btn.style.width = 20 - if Ranking.get_rank(player):allowed('make-warp') and name ~= 'Spawn' then - local btn = remove_warp:draw(_flow) - btn.style.height = 20 - btn.style.width = 20 - end - end - local cooldown = _warps().cooldowns[player.index] or 0 - if cooldown > 0 then frame.style.visible = false return - elseif Ranking.get_rank(player):allowed('always-warp') then return - elseif player.surface.get_tile(player.position).name == warp_tile - and player.surface.name == 'nauvis' - then return - elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return - else frame.style.visible = false end - end, - can_open=function(player) - local cooldown = _warps().cooldowns[player.index] or 0 - if Ranking.get_rank(player):allowed('always-warp') then return true - elseif player.surface.get_tile(player.position).name == warp_tile - and player.surface.name == 'nauvis' - then return true - elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return true - elseif cooldown > 0 then return {'warp-system.cooldown',cooldown} - else return {'warp-system.not-on-warp'} end - end, - open_on_join=true -} - -Event.register(defines.events.on_tick,function(event) - if not (event.tick % 60 == 0) then return end - 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 - end - end -end) - -Event.register(defines.events.on_player_changed_position, function(event) - local player = Game.get_player(event) - local cooldown = _warps().cooldowns[player.index] or 0 - local tile = player.surface.get_tile(player.position).name - if not Ranking.get_rank(player):allowed('always-warp') and cooldown == 0 then - if tile == warp_tile and player.surface.name == 'nauvis' then - mod_gui.get_frame_flow(player)['warp-list'].style.visible = true - elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then - mod_gui.get_frame_flow(player)['warp-list'].style.visible = true - else mod_gui.get_frame_flow(player)['warp-list'].style.visible = false end - end -end) - -Event.register(defines.events.on_player_created, function(event) - if event.player_index == 1 then - local player = Game.get_player(event) - player.force.chart(player.surface, {{player.position.x - 20, player.position.y - 20}, {player.position.x + 20, player.position.y + 20}}) - local tag = player.force.add_chart_tag(player.surface,{ - position={0,0}, - text='Warp: Spawn', - icon={type='item',name=warp_item} - }) - _warps().warps['Spawn'] = {tag=tag,surface=player.surface,position={0,0}} - end -end) diff --git a/README.md b/README.md deleted file mode 100644 index c63887d5..00000000 --- a/README.md +++ /dev/null @@ -1,54 +0,0 @@ -

- logo -
- - Release - - - Downloads - - - Star - - - Fork - - - CodeFactor - - - Discord - -

-

ExpGaming Scenario Repository

- -#### Using The Core Files -1. Copy the core folder and the StdLib File -2. Copy the control.lua and edit the load.lua in each file -3. The require order is important in the control.lua -4. Use playerRanks.lua to edit the rank system -5. Add your own files to the addons folder and require them in the load.lua - -#### Using The Addons -1. Copy the addons folder -2. Remove any you do not wish to have -3. Remove the require inside the addons load.lua - -#### Making Your Own Addons -* You must have the core files and StdLib -* The load.lua is the only file outside your own you need to edit -* Keep the core files updated with the core branch -* Try not to edit StdLib or the core files -* There is many comments inside the core files to describe how to use them. - -#### Stand Alone File -* This file contains a few scripts from else where which don't require any lib -* StdLib and ExpLib are the only exceptions as these are very basic functions -* Any files added to this folder must be given proper sources -* Each file must be self contained with no _G variables - -#### Forks and Pull Requests -* We are happy for people to make pull requests if you wish to help make our server better -* You can add comments at the start of files to mark any changes you make, so you are credited -* Don't make small changes to the core files, please only big meaningful changes -* Don't be afraid to make a pull request as if it fixes something then it's a good change diff --git a/StandAlone/body-marker.lua b/StandAlone/body-marker.lua deleted file mode 100644 index 92ed9666..00000000 --- a/StandAlone/body-marker.lua +++ /dev/null @@ -1,28 +0,0 @@ --- made by cooldude - this just adds a marker to the map which is removed when the body is removed - -Event.register(defines.events.on_player_died, function(event) - local player = game.players[event.player_index] - local tag = player.force.add_chart_tag(player.surface,{ - position=player.position, - text='Death: '..player.name..' ('..tick_to_display_format(event.tick)..')' - }) - if not global.corpses then global.corpses = {} end - table.insert(global.corpses,tag) -end) - -Event.register(defines.events.on_tick, function(event) - if (game.tick%3600) ~= 0 then return end - if not global.corpses then global.corpses = {} end - local key = 1 - while key <= #global.corpses do - local tag = global.corpses[key] - if not tag or not tag.valid then table.remove(global.corpses,key) else - if not tag.target then - local entity = tag.surface.find_entity('character-corpse',tag.position) - if entity then tag.target = entity - else tag.destroy() table.remove(global.corpses,key) key=key-1 end - elseif not tag.target.valid then tag.destroy() table.remove(global.corpses,key) key=key-1 end - end - key=key+1 - end -end) \ No newline at end of file diff --git a/StandAlone/chat-popup.lua b/StandAlone/chat-popup.lua deleted file mode 100644 index 3331405a..00000000 --- a/StandAlone/chat-popup.lua +++ /dev/null @@ -1,42 +0,0 @@ - -function sendFlyingText(player, text) - local _player = Game.get_player(player) - if not _player then return end - -- Split long text in chunks - local chunkSize = 128 - local chunks = {} - for i=1, #text, chunkSize do - chunks[#chunks+1] = text:sub(i,i+chunkSize - 1) - end - -- Itterate over text chunks and create them as floating text centered above the player - for i,value in ipairs(chunks) do - _player.surface.create_entity{ - name="flying-text", - color=_player.chat_color, - text=value, - position={_player.position.x - (1 / 7.9 * #value), _player.position.y-(2 - (1 / 2 * i))} - } - end -end - --- Edited health popup to make chat popup https://lua-api.factorio.com/latest/events.html#on_console_chat -Event.register(defines.events.on_console_chat, function(event) - local player = Game.get_player(event.player_index) - if not player then return end - if event.message then - -- Send message player send to player itself - local message = player.name .. ': ' .. event.message - sendFlyingText(player, message) - - -- parse message for players and if it includes player, send him a notification that he has been mentioned in the chat - local player_message = event.message:lower():gsub("%s+", "") - for i,_player in ipairs(game.connected_players) do - if _player.index ~= player.index then - if player_message:match(_player.name:lower()) then - _player.play_sound{path='utility/scenario_message'} -- plays a deeper sound when mentioned - sendFlyingText(_player, 'You\'ve been mentioned by: ' ..player.name .. ' in chat!') - end - end - end - end -end) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua deleted file mode 100644 index 2bdb3299..00000000 --- a/StandAlone/colours.lua +++ /dev/null @@ -1,32 +0,0 @@ - --- made by cooldude - we are lazy and we want to always have the same colour, also uses std lib to auto assign random colours - -local default_colours = { - BADgamerNL={r=255,g=20,b=147}, - arty714={r=150,g=68,b=161}, - Cooldude2606={r=57,g=192,b=207}, - mark9064={r=99,g=0,b=255}, - eissturm={r=25,g=25,b=112}, - Sakama={r=20,g=213,b=80}, - Sakama={r=20,g=213,b=80}, - freek18={r=50,g=0,b=255}, - aldldl={r=0,g=131,b=255}, - NAD4X4={r=135,g=206,b=250}, - cydes={r=82,g=249,b=155}, - UUBlueFire={r=0,g=204,b=255} -} - -Event.register(defines.events.on_player_created, function(event) - local player = game.players[event.player_index] - local colours = table.keys(defines.color) - player.color = defines.color.black - while player.color.r == defines.color.black.r and player.color.g == defines.color.black.g and player.color.b == defines.color.black.b - or player.color.r == defines.color.white.r and player.color.g == defines.color.white.g and player.color.b == defines.color.white.b do - player.color = defines.color[colours[math.random(#colours)]] - if default_colours[player.name] then - local c = default_colours[player.name] - player.color = Color.from_rgb(c.r,c.g,c.b) - end - end - player.chat_color = player.color -end) diff --git a/StandAlone/health.lua b/StandAlone/health.lua deleted file mode 100644 index d753c72b..00000000 --- a/StandAlone/health.lua +++ /dev/null @@ -1,29 +0,0 @@ - --- not made by cooldude :O - still i just copyed from a mod and made a few editing --- https://mods.factorio.com/mods/chocolateTthunder/Show_Health --- edits include: tick limit to avoid lag, only shows health when it is lost - -Event.register(defines.events.on_entity_damaged, function(event) - if event.entity.name ~= 'player' then return end - local player = Game.get_player(event.entity.player) - if player.character then - if player.character.health == nil then return end - local index = player.index - local health = math.ceil(player.character.health) - if global.player_health == nil then global.player_health = {} end - if global.player_health[index] == nil then global.player_health[index] = health end - if global.player_health[index] ~= health then - if health < global.player_health[index] then - local text = health..' (-'..math.floor(event.final_damage_amount)..')' - if health > 200 then - player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}} - elseif health > 100 then - player.surface.create_entity{name="flying-text", color={r = 1, g = 1, b = 0}, text=text, position= {player.position.x, player.position.y-2}} - else - player.surface.create_entity{name="flying-text", color={b = 0.1, r= 1, g = 0, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}} - end - end - global.player_health[index] = health - end - end -end) \ No newline at end of file diff --git a/StandAlone/paths.lua b/StandAlone/paths.lua deleted file mode 100644 index b72b287e..00000000 --- a/StandAlone/paths.lua +++ /dev/null @@ -1,146 +0,0 @@ --- made by cooldude --- idea from Mylon - Dirt Path - -local adjacency_boost = 2 -- makes paths more lickly to be next to each other; must be greater than 0 -adjacency_boost = 10/adjacency_boost -- dont change this line -local sizes = { - ['stone-furnace']=2, - ['steel-furnace']=2, - ['electric-furnace']=3, - ['assembling-machine-1']=3, - ['assembling-machine-2']=3, - ['assembling-machine-3']=3, - ['beacon']=3, - ['centrifuge']=3, - ['chemical-plant']=3, - ['oil-refinery']=7, - ['storage-tank']=3, - ['nuclear-reactor']=5, - ['steam-engine']=4, - ['steam-turbine']=4, - ['boiler']=3, - ['heat-exchanger']=3, - ['stone-wall']=1, - ['gate']=1, - ['gun-turret']=2, - ['laser-turret']=2, - ['radar']=3, - ['lab']=3, - ['big-electric-pole']=2, - ['substation']=2, - ['rocket-silo']=7 -} -local placed_paths = { - ['refined-concrete']=true, - ['refined-hazard-concrete-right']=true, - ['refined-hazard-concrete-left']=true, - ['concrete']=true, - ['hazard-concrete-right']=true, - ['hazard-concrete-left']=true, - ['stone-path']=true -} -local paths = { - -- ['tile name'] = {health,convert to} - -- the greater health is the lower the chance it will be down graded, must be grater than 0 - ['refined-concrete']={70,'concrete'}, - ['refined-hazard-concrete-right']={70,'hazard-concrete-right'}, - ['refined-hazard-concrete-left']={70,'hazard-concrete-left'}, - ['concrete']={50,'stone-path'}, - ['hazard-concrete-right']={50,'stone-path'}, - ['hazard-concrete-left']={50,'stone-path'}, - ['stone-path']={40,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player - ['sand-1']={5,'sand-2'}, - ['sand-2']={10,'sand-3'}, - ['sand-3']={5,'red-desert-3'}, - ['red-desert-3']={5,'red-desert-2'}, - ['red-desert-2']={10,'dirt-1'}, - ['grass-2']={5,'grass-1'}, - ['grass-1']={5,'grass-3'}, - ['grass-3']={10,'red-desert-0'}, - ['red-desert-0']={5,'red-desert-1'}, - ['red-desert-1']={10,'dirt-1'}, - ['dirt-1']={5,'dirt-2'}, - ['dirt-2']={5,'dirt-3'}, - ['dirt-3']={10,'dirt-4'}, - ['dirt-4']={5,'dirt-5'}, - ['dirt-5']={5,'dirt-6'}, - ['grass-4']={10,'dirt-4'} -} -for tile,value in pairs(paths) do - value[1]=-1/value[1] -end - -local function global_key(surface,pos) - return 'S'..surface.name..'X'..math.floor(pos.x)..'Y'..math.floor(pos.y) -end - -local function down_grade(surface,pos) - local tile = surface.get_tile(pos).name - local new_tile = paths[tile][2] - if new_tile == 'world-gen' then - if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable - new_tile = global.paths[global_key(surface,pos)] or 'grass-1' - end - surface.set_tiles{{name=new_tile,position=pos}} -end - -Event.register({defines.events.on_player_built_tile,defines.events.on_robot_built_tile}, function(event) - local surface = event.surface_index and game.surfaces[event.surface_index] or event.robot and event.robot.surface - local old_tiles = event.tiles - for _,old_tile in pairs(old_tiles) do - if placed_paths[old_tile.old_tile.name] or old_tile.old_tile.name == 'water' or old_tile.old_tile.name == 'deepwater' then else - if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable - global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name -- not a mistake, this makes it have dimising returns - end - end -end) - -Event.register(defines.events.on_player_changed_position, function(event) - local player = Game.get_player(event) - if player and player.valid and game.tick > 10 then else return end - if player.afk_time > 300 then return end - local surface = player.surface - local pos = player.position - local tile_name = surface.get_tile(pos).name - if not paths[tile_name] then return end - local count = -9 -- this value is important - for x = -1,1 do for y = -1,1 do - local _pos = {pos.x+x,pos.y+y} - if placed_paths[tile_name] and not placed_paths[surface.get_tile(_pos).name] - or surface.get_tile(_pos).name == paths[tile_name][2] - then count=count+1 end - end end - local chance = paths[tile_name][1]/(count-adjacency_boost) - if math.random() < chance then - down_grade(surface,pos) - end -end) - -Event.register({defines.events.on_built_entity,on_robot_built_entity}, function(event) - local entity = event.created_entity - local surface = entity.surface - if sizes[entity.name] then - local size = sizes[entity.name]-1 - for x = -size,0 do for y = -size,0 do - local pos = {x=entity.position.x+x,y=entity.position.y+y} - local tile = surface.get_tile(pos).name - if paths[tile] and math.random() < paths[tile][1]*size*(-10) then - down_grade(surface,pos) - end - end end - end -end) - ---[[ -/interface -local tile_name = tile.name -local chance = paths[tile_name][1] -local count = 1 -for x = -1,1 do for y = -1,1 do - local _pos = {position.x+x,position.y+y} - if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] - or surface.get_tile(_pos).name == paths[tile_name][2] - then game.print('boost '..tostring(count)) chance=chance=chance*(adjacency_boost/count) count=count+1 end end -end -return chance -]] diff --git a/StandAlone/spawn.lua b/StandAlone/spawn.lua deleted file mode 100644 index 49ff3e09..00000000 --- a/StandAlone/spawn.lua +++ /dev/null @@ -1,213 +0,0 @@ - --- made by cooldude - this makes a spawn area and auto refill turents to protect the afk people, idk what it is at this point, but feel ffree to try and make it yours - ---[[ -note for positions -{-1,-1} {0,-1} {1,-1} -{-1,0} {0,0} {1,0} -{-1,1} {0,1} {1,1} ---]] -local tile_positions = { - {-49,-3},{-49,-2},{-49,1},{-49,2},{-49,5},{-49,6},{-48,-4},{-48,-3},{-48,-2},{-48,1},{-48,2},{-48,5},{-48,6},{-48,7},{-47,-7},{-47,-6},{-47,-5},{-47,-4},{-47,-3},{-47,-2},{-47,5},{-47,6},{-47,7},{-47,8},{-47,9},{-47,10},{-46,-8},{-46,-7},{-46,-6},{-46,-5}, - {-46,-4},{-46,-3},{-46,-2},{-46,-1},{-46,4},{-46,5},{-46,6},{-46,7},{-46,8},{-46,9},{-46,10},{-46,11},{-45,-17},{-45,-16},{-45,-15},{-45,-14},{-45,-13},{-45,-12},{-45,-9},{-45,-8},{-45,-7},{-45,-2},{-45,-1},{-45,0},{-45,1},{-45,2},{-45,3},{-45,4},{-45,5},{-45,10}, - {-45,11},{-45,12},{-45,15},{-45,16},{-45,17},{-45,18},{-45,19},{-45,20},{-44,-18},{-44,-17},{-44,-16},{-44,-15},{-44,-14},{-44,-13},{-44,-12},{-44,-9},{-44,-8},{-44,-1},{-44,0},{-44,1},{-44,2},{-44,3},{-44,4},{-44,11},{-44,12},{-44,15},{-44,16},{-44,17},{-44,18},{-44,19}, - {-44,20},{-44,21},{-43,-19},{-43,-18},{-43,-17},{-43,-1},{-43,0},{-43,1},{-43,2},{-43,3},{-43,4},{-43,20},{-43,21},{-43,22},{-42,-19},{-42,-18},{-42,-1},{-42,0},{-42,1},{-42,2},{-42,3},{-42,4},{-42,21},{-42,22},{-41,-25},{-41,-24},{-41,-19},{-41,-18},{-41,-13},{-41,-12}, - {-41,-11},{-41,-10},{-41,-5},{-41,-4},{-41,7},{-41,8},{-41,13},{-41,14},{-41,15},{-41,16},{-41,21},{-41,22},{-41,27},{-41,28},{-40,-26},{-40,-25},{-40,-24},{-40,-20},{-40,-19},{-40,-18},{-40,-13},{-40,-12},{-40,-11},{-40,-10},{-40,-5},{-40,-4},{-40,7},{-40,8},{-40,13},{-40,14}, - {-40,15},{-40,16},{-40,21},{-40,22},{-40,23},{-40,27},{-40,28},{-40,29},{-39,-27},{-39,-26},{-39,-25},{-39,-24},{-39,-21},{-39,-20},{-39,-19},{-39,-13},{-39,-12},{-39,-5},{-39,-4},{-39,-3},{-39,-2},{-39,-1},{-39,0},{-39,1},{-39,2},{-39,3},{-39,4},{-39,5},{-39,6},{-39,7}, - {-39,8},{-39,15},{-39,16},{-39,22},{-39,23},{-39,24},{-39,27},{-39,28},{-39,29},{-39,30},{-38,-27},{-38,-26},{-38,-25},{-38,-24},{-38,-21},{-38,-20},{-38,-13},{-38,-12},{-38,-5},{-38,-4},{-38,-3},{-38,-2},{-38,-1},{-38,0},{-38,1},{-38,2},{-38,3},{-38,4},{-38,5},{-38,6}, - {-38,7},{-38,8},{-38,15},{-38,16},{-38,23},{-38,24},{-38,27},{-38,28},{-38,29},{-38,30},{-37,-17},{-37,-16},{-37,-13},{-37,-12},{-37,-11},{-37,-10},{-37,-4},{-37,-3},{-37,-2},{-37,-1},{-37,0},{-37,3},{-37,4},{-37,5},{-37,6},{-37,7},{-37,13},{-37,14},{-37,15},{-37,16}, - {-37,19},{-37,20},{-36,-17},{-36,-16},{-36,-13},{-36,-12},{-36,-11},{-36,-10},{-36,-9},{-36,-3},{-36,-2},{-36,-1},{-36,0},{-36,3},{-36,4},{-36,5},{-36,6},{-36,12},{-36,13},{-36,14},{-36,15},{-36,16},{-36,19},{-36,20},{-35,-29},{-35,-28},{-35,-23},{-35,-22},{-35,-17},{-35,-16}, - {-35,-12},{-35,-11},{-35,-10},{-35,-9},{-35,-8},{-35,11},{-35,12},{-35,13},{-35,14},{-35,15},{-35,19},{-35,20},{-35,25},{-35,26},{-35,31},{-35,32},{-34,-30},{-34,-29},{-34,-28},{-34,-23},{-34,-22},{-34,-17},{-34,-16},{-34,-15},{-34,-11},{-34,-10},{-34,-9},{-34,-8},{-34,11},{-34,12}, - {-34,13},{-34,14},{-34,18},{-34,19},{-34,20},{-34,25},{-34,26},{-34,31},{-34,32},{-34,33},{-33,-31},{-33,-30},{-33,-29},{-33,-28},{-33,-23},{-33,-22},{-33,-16},{-33,-15},{-33,-14},{-33,-5},{-33,-4},{-33,-1},{-33,0},{-33,3},{-33,4},{-33,7},{-33,8},{-33,17},{-33,18},{-33,19}, - {-33,25},{-33,26},{-33,31},{-33,32},{-33,33},{-33,34},{-32,-32},{-32,-31},{-32,-30},{-32,-29},{-32,-28},{-32,-27},{-32,-23},{-32,-22},{-32,-21},{-32,-15},{-32,-14},{-32,-6},{-32,-5},{-32,-4},{-32,-1},{-32,0},{-32,3},{-32,4},{-32,7},{-32,8},{-32,9},{-32,17},{-32,18},{-32,24}, - {-32,25},{-32,26},{-32,30},{-32,31},{-32,32},{-32,33},{-32,34},{-32,35},{-31,-33},{-31,-32},{-31,-31},{-31,-30},{-31,-29},{-31,-28},{-31,-27},{-31,-26},{-31,-22},{-31,-21},{-31,-20},{-31,-19},{-31,-18},{-31,-11},{-31,-10},{-31,-9},{-31,-8},{-31,-7},{-31,-6},{-31,-5},{-31,-1},{-31,0}, - {-31,1},{-31,2},{-31,3},{-31,4},{-31,8},{-31,9},{-31,10},{-31,11},{-31,12},{-31,13},{-31,14},{-31,21},{-31,22},{-31,23},{-31,24},{-31,25},{-31,29},{-31,30},{-31,31},{-31,32},{-31,33},{-31,34},{-31,35},{-31,36},{-30,-33},{-30,-32},{-30,-31},{-30,-30},{-30,-29},{-30,-28}, - {-30,-27},{-30,-26},{-30,-21},{-30,-20},{-30,-19},{-30,-18},{-30,-11},{-30,-10},{-30,-9},{-30,-8},{-30,-7},{-30,-6},{-30,-1},{-30,0},{-30,1},{-30,2},{-30,3},{-30,4},{-30,9},{-30,10},{-30,11},{-30,12},{-30,13},{-30,14},{-30,21},{-30,22},{-30,23},{-30,24},{-30,29},{-30,30}, - {-30,31},{-30,32},{-30,33},{-30,34},{-30,35},{-30,36},{-29,-37},{-29,-36},{-29,-30},{-29,-29},{-29,-28},{-29,-27},{-29,-26},{-29,-15},{-29,-14},{-29,-10},{-29,-9},{-29,-8},{-29,-7},{-29,10},{-29,11},{-29,12},{-29,13},{-29,17},{-29,18},{-29,29},{-29,30},{-29,31},{-29,32},{-29,33}, - {-29,39},{-29,40},{-28,-38},{-28,-37},{-28,-36},{-28,-29},{-28,-28},{-28,-27},{-28,-26},{-28,-16},{-28,-15},{-28,-14},{-28,-9},{-28,-8},{-28,11},{-28,12},{-28,17},{-28,18},{-28,19},{-28,29},{-28,30},{-28,31},{-28,32},{-28,39},{-28,40},{-28,41},{-27,-39},{-27,-38},{-27,-37},{-27,-36}, - {-27,-23},{-27,-22},{-27,-19},{-27,-18},{-27,-17},{-27,-16},{-27,-15},{-27,-5},{-27,-4},{-27,-1},{-27,0},{-27,1},{-27,2},{-27,3},{-27,4},{-27,7},{-27,8},{-27,18},{-27,19},{-27,20},{-27,21},{-27,22},{-27,25},{-27,26},{-27,39},{-27,40},{-27,41},{-27,42},{-26,-39},{-26,-38}, - {-26,-37},{-26,-36},{-26,-24},{-26,-23},{-26,-22},{-26,-19},{-26,-18},{-26,-17},{-26,-16},{-26,-6},{-26,-5},{-26,-4},{-26,-1},{-26,0},{-26,1},{-26,2},{-26,3},{-26,4},{-26,7},{-26,8},{-26,9},{-26,19},{-26,20},{-26,21},{-26,22},{-26,25},{-26,26},{-26,27},{-26,39},{-26,40}, - {-26,41},{-26,42},{-25,-33},{-25,-32},{-25,-31},{-25,-30},{-25,-25},{-25,-24},{-25,-23},{-25,-22},{-25,-19},{-25,-18},{-25,-17},{-25,-9},{-25,-8},{-25,-7},{-25,-6},{-25,-5},{-25,-4},{-25,-1},{-25,0},{-25,1},{-25,2},{-25,3},{-25,4},{-25,7},{-25,8},{-25,9},{-25,10},{-25,11}, - {-25,12},{-25,20},{-25,21},{-25,22},{-25,25},{-25,26},{-25,27},{-25,28},{-25,33},{-25,34},{-25,35},{-25,36},{-24,-33},{-24,-32},{-24,-31},{-24,-30},{-24,-29},{-24,-25},{-24,-24},{-24,-23},{-24,-22},{-24,-19},{-24,-18},{-24,-9},{-24,-8},{-24,-7},{-24,-6},{-24,-5},{-24,-4},{-24,-1}, - {-24,0},{-24,1},{-24,2},{-24,3},{-24,4},{-24,7},{-24,8},{-24,9},{-24,10},{-24,11},{-24,12},{-24,21},{-24,22},{-24,25},{-24,26},{-24,27},{-24,28},{-24,32},{-24,33},{-24,34},{-24,35},{-24,36},{-23,-37},{-23,-36},{-23,-30},{-23,-29},{-23,-28},{-23,-19},{-23,-18},{-23,-15}, - {-23,-14},{-23,-9},{-23,-8},{-23,-7},{-23,-6},{-23,-5},{-23,0},{-23,1},{-23,2},{-23,3},{-23,8},{-23,9},{-23,10},{-23,11},{-23,12},{-23,17},{-23,18},{-23,21},{-23,22},{-23,31},{-23,32},{-23,33},{-23,39},{-23,40},{-22,-38},{-22,-37},{-22,-36},{-22,-29},{-22,-28},{-22,-19}, - {-22,-18},{-22,-15},{-22,-14},{-22,-13},{-22,-9},{-22,-8},{-22,-7},{-22,-6},{-22,1},{-22,2},{-22,9},{-22,10},{-22,11},{-22,12},{-22,16},{-22,17},{-22,18},{-22,21},{-22,22},{-22,31},{-22,32},{-22,39},{-22,40},{-22,41},{-21,-41},{-21,-40},{-21,-39},{-21,-38},{-21,-37},{-21,-29}, - {-21,-28},{-21,-25},{-21,-24},{-21,-23},{-21,-22},{-21,-21},{-21,-20},{-21,-19},{-21,-18},{-21,-15},{-21,-14},{-21,-13},{-21,-12},{-21,-3},{-21,-2},{-21,5},{-21,6},{-21,15},{-21,16},{-21,17},{-21,18},{-21,21},{-21,22},{-21,23},{-21,24},{-21,25},{-21,26},{-21,27},{-21,28},{-21,31}, - {-21,32},{-21,40},{-21,41},{-21,42},{-21,43},{-21,44},{-20,-42},{-20,-41},{-20,-40},{-20,-39},{-20,-38},{-20,-29},{-20,-28},{-20,-25},{-20,-24},{-20,-23},{-20,-22},{-20,-21},{-20,-20},{-20,-19},{-20,-18},{-20,-15},{-20,-14},{-20,-13},{-20,-12},{-20,-3},{-20,-2},{-20,-1},{-20,4},{-20,5}, - {-20,6},{-20,15},{-20,16},{-20,17},{-20,18},{-20,21},{-20,22},{-20,23},{-20,24},{-20,25},{-20,26},{-20,27},{-20,28},{-20,31},{-20,32},{-20,41},{-20,42},{-20,43},{-20,44},{-20,45},{-19,-43},{-19,-42},{-19,-41},{-19,-35},{-19,-34},{-19,-33},{-19,-32},{-19,-25},{-19,-24},{-19,-23}, - {-19,-15},{-19,-14},{-19,-13},{-19,-9},{-19,-8},{-19,-7},{-19,-6},{-19,-2},{-19,-1},{-19,0},{-19,1},{-19,2},{-19,3},{-19,4},{-19,5},{-19,9},{-19,10},{-19,11},{-19,12},{-19,16},{-19,17},{-19,18},{-19,26},{-19,27},{-19,28},{-19,35},{-19,36},{-19,37},{-19,38},{-19,44}, - {-19,45},{-19,46},{-18,-43},{-18,-42},{-18,-35},{-18,-34},{-18,-33},{-18,-32},{-18,-31},{-18,-26},{-18,-25},{-18,-24},{-18,-15},{-18,-14},{-18,-10},{-18,-9},{-18,-8},{-18,-7},{-18,-6},{-18,-1},{-18,0},{-18,1},{-18,2},{-18,3},{-18,4},{-18,9},{-18,10},{-18,11},{-18,12},{-18,13}, - {-18,17},{-18,18},{-18,27},{-18,28},{-18,29},{-18,34},{-18,35},{-18,36},{-18,37},{-18,38},{-18,45},{-18,46},{-17,-43},{-17,-42},{-17,-32},{-17,-31},{-17,-30},{-17,-27},{-17,-26},{-17,-25},{-17,-21},{-17,-20},{-17,-19},{-17,-18},{-17,-17},{-17,-16},{-17,-15},{-17,-14},{-17,-11},{-17,-10}, - {-17,-9},{-17,-8},{-17,-7},{-17,-6},{-17,0},{-17,1},{-17,2},{-17,3},{-17,9},{-17,10},{-17,11},{-17,12},{-17,13},{-17,14},{-17,17},{-17,18},{-17,19},{-17,20},{-17,21},{-17,22},{-17,23},{-17,24},{-17,28},{-17,29},{-17,30},{-17,33},{-17,34},{-17,35},{-17,45},{-17,46}, - {-16,-43},{-16,-42},{-16,-31},{-16,-30},{-16,-27},{-16,-26},{-16,-21},{-16,-20},{-16,-19},{-16,-18},{-16,-17},{-16,-16},{-16,-15},{-16,-14},{-16,-11},{-16,-10},{-16,-9},{-16,-8},{-16,-7},{-16,-6},{-16,1},{-16,2},{-16,9},{-16,10},{-16,11},{-16,12},{-16,13},{-16,14},{-16,17},{-16,18}, - {-16,19},{-16,20},{-16,21},{-16,22},{-16,23},{-16,24},{-16,29},{-16,30},{-16,33},{-16,34},{-16,45},{-16,46},{-15,-43},{-15,-42},{-15,-39},{-15,-38},{-15,-37},{-15,-36},{-15,-35},{-15,-34},{-15,-20},{-15,-19},{-15,-18},{-15,-17},{-15,-10},{-15,-9},{-15,-8},{-15,-7},{-15,-3},{-15,-2}, - {-15,1},{-15,2},{-15,5},{-15,6},{-15,10},{-15,11},{-15,12},{-15,13},{-15,20},{-15,21},{-15,22},{-15,23},{-15,37},{-15,38},{-15,39},{-15,40},{-15,41},{-15,42},{-15,45},{-15,46},{-14,-43},{-14,-42},{-14,-39},{-14,-38},{-14,-37},{-14,-36},{-14,-35},{-14,-34},{-14,-33},{-14,-19}, - {-14,-18},{-14,-9},{-14,-8},{-14,-4},{-14,-3},{-14,-2},{-14,1},{-14,2},{-14,5},{-14,6},{-14,7},{-14,11},{-14,12},{-14,21},{-14,22},{-14,36},{-14,37},{-14,38},{-14,39},{-14,40},{-14,41},{-14,42},{-14,45},{-14,46},{-13,-39},{-13,-38},{-13,-35},{-13,-34},{-13,-33},{-13,-32}, - {-13,-29},{-13,-28},{-13,-15},{-13,-14},{-13,-5},{-13,-4},{-13,-3},{-13,-2},{-13,5},{-13,6},{-13,7},{-13,8},{-13,17},{-13,18},{-13,31},{-13,32},{-13,35},{-13,36},{-13,37},{-13,38},{-13,41},{-13,42},{-12,-39},{-12,-38},{-12,-35},{-12,-34},{-12,-33},{-12,-32},{-12,-29},{-12,-28}, - {-12,-27},{-12,-16},{-12,-15},{-12,-14},{-12,-13},{-12,-5},{-12,-4},{-12,-3},{-12,-2},{-12,5},{-12,6},{-12,7},{-12,8},{-12,16},{-12,17},{-12,18},{-12,19},{-12,30},{-12,31},{-12,32},{-12,35},{-12,36},{-12,37},{-12,38},{-12,41},{-12,42},{-11,-43},{-11,-42},{-11,-34},{-11,-33}, - {-11,-32},{-11,-29},{-11,-28},{-11,-27},{-11,-26},{-11,-23},{-11,-22},{-11,-21},{-11,-20},{-11,-17},{-11,-16},{-11,-15},{-11,-14},{-11,-13},{-11,-12},{-11,-9},{-11,-8},{-11,1},{-11,2},{-11,11},{-11,12},{-11,15},{-11,16},{-11,17},{-11,18},{-11,19},{-11,20},{-11,23},{-11,24},{-11,25}, - {-11,26},{-11,29},{-11,30},{-11,31},{-11,32},{-11,35},{-11,36},{-11,37},{-11,45},{-11,46},{-10,-44},{-10,-43},{-10,-42},{-10,-33},{-10,-32},{-10,-29},{-10,-28},{-10,-27},{-10,-26},{-10,-23},{-10,-22},{-10,-21},{-10,-20},{-10,-17},{-10,-16},{-10,-15},{-10,-14},{-10,-13},{-10,-12},{-10,-9}, - {-10,-8},{-10,-7},{-10,0},{-10,1},{-10,2},{-10,3},{-10,10},{-10,11},{-10,12},{-10,15},{-10,16},{-10,17},{-10,18},{-10,19},{-10,20},{-10,23},{-10,24},{-10,25},{-10,26},{-10,29},{-10,30},{-10,31},{-10,32},{-10,35},{-10,36},{-10,45},{-10,46},{-10,47},{-9,-45},{-9,-44}, - {-9,-43},{-9,-29},{-9,-28},{-9,-27},{-9,-23},{-9,-22},{-9,-21},{-9,-20},{-9,-17},{-9,-16},{-9,-15},{-9,-14},{-9,-13},{-9,-8},{-9,-7},{-9,-6},{-9,-5},{-9,-1},{-9,0},{-9,1},{-9,2},{-9,3},{-9,4},{-9,8},{-9,9},{-9,10},{-9,11},{-9,16},{-9,17},{-9,18}, - {-9,19},{-9,20},{-9,23},{-9,24},{-9,25},{-9,26},{-9,30},{-9,31},{-9,32},{-9,46},{-9,47},{-9,48},{-8,-45},{-8,-44},{-8,-30},{-8,-29},{-8,-28},{-8,-24},{-8,-23},{-8,-22},{-8,-21},{-8,-20},{-8,-17},{-8,-16},{-8,-15},{-8,-14},{-8,-7},{-8,-6},{-8,-5},{-8,-4}, - {-8,-1},{-8,0},{-8,1},{-8,2},{-8,3},{-8,4},{-8,7},{-8,8},{-8,9},{-8,10},{-8,17},{-8,18},{-8,19},{-8,20},{-8,23},{-8,24},{-8,25},{-8,26},{-8,27},{-8,31},{-8,32},{-8,33},{-8,47},{-8,48},{-7,-45},{-7,-44},{-7,-39},{-7,-38},{-7,-37},{-7,-36}, - {-7,-31},{-7,-30},{-7,-29},{-7,-25},{-7,-24},{-7,-23},{-7,-22},{-7,-21},{-7,-11},{-7,-10},{-7,-7},{-7,-6},{-7,-5},{-7,-4},{-7,7},{-7,8},{-7,9},{-7,10},{-7,13},{-7,14},{-7,24},{-7,25},{-7,26},{-7,27},{-7,28},{-7,32},{-7,33},{-7,34},{-7,39},{-7,40}, - {-7,41},{-7,42},{-7,47},{-7,48},{-6,-46},{-6,-45},{-6,-44},{-6,-39},{-6,-38},{-6,-37},{-6,-36},{-6,-35},{-6,-31},{-6,-30},{-6,-25},{-6,-24},{-6,-23},{-6,-22},{-6,-12},{-6,-11},{-6,-10},{-6,-6},{-6,-5},{-6,8},{-6,9},{-6,13},{-6,14},{-6,15},{-6,25},{-6,26}, - {-6,27},{-6,28},{-6,33},{-6,34},{-6,38},{-6,39},{-6,40},{-6,41},{-6,42},{-6,47},{-6,48},{-6,49},{-5,-47},{-5,-46},{-5,-45},{-5,-44},{-5,-37},{-5,-36},{-5,-35},{-5,-34},{-5,-19},{-5,-18},{-5,-13},{-5,-12},{-5,-11},{-5,-10},{-5,-1},{-5,0},{-5,1},{-5,2}, - {-5,3},{-5,4},{-5,13},{-5,14},{-5,15},{-5,16},{-5,21},{-5,22},{-5,37},{-5,38},{-5,39},{-5,40},{-5,47},{-5,48},{-5,49},{-5,50},{-4,-47},{-4,-46},{-4,-45},{-4,-44},{-4,-43},{-4,-37},{-4,-36},{-4,-35},{-4,-34},{-4,-19},{-4,-18},{-4,-17},{-4,-13},{-4,-12}, - {-4,-11},{-4,-10},{-4,-2},{-4,-1},{-4,0},{-4,1},{-4,2},{-4,3},{-4,4},{-4,5},{-4,13},{-4,14},{-4,15},{-4,16},{-4,20},{-4,21},{-4,22},{-4,37},{-4,38},{-4,39},{-4,40},{-4,46},{-4,47},{-4,48},{-4,49},{-4,50},{-3,-44},{-3,-43},{-3,-42},{-3,-41}, - {-3,-40},{-3,-37},{-3,-36},{-3,-35},{-3,-34},{-3,-31},{-3,-30},{-3,-29},{-3,-28},{-3,-25},{-3,-24},{-3,-23},{-3,-22},{-3,-18},{-3,-17},{-3,-16},{-3,-7},{-3,-6},{-3,-3},{-3,-2},{-3,-1},{-3,0},{-3,3},{-3,4},{-3,5},{-3,6},{-3,9},{-3,10},{-3,19},{-3,20}, - {-3,21},{-3,25},{-3,26},{-3,27},{-3,28},{-3,31},{-3,32},{-3,33},{-3,34},{-3,37},{-3,38},{-3,39},{-3,40},{-3,43},{-3,44},{-3,45},{-3,46},{-3,47},{-2,-43},{-2,-42},{-2,-41},{-2,-40},{-2,-37},{-2,-36},{-2,-35},{-2,-34},{-2,-31},{-2,-30},{-2,-29},{-2,-28}, - {-2,-25},{-2,-24},{-2,-23},{-2,-22},{-2,-21},{-2,-17},{-2,-16},{-2,-15},{-2,-8},{-2,-7},{-2,-6},{-2,-3},{-2,-2},{-2,-1},{-2,0},{-2,3},{-2,4},{-2,5},{-2,6},{-2,9},{-2,10},{-2,11},{-2,18},{-2,19},{-2,20},{-2,24},{-2,25},{-2,26},{-2,27},{-2,28}, - {-2,31},{-2,32},{-2,33},{-2,34},{-2,37},{-2,38},{-2,39},{-2,40},{-2,43},{-2,44},{-2,45},{-2,46},{-1,-47},{-1,-46},{-1,-43},{-1,-42},{-1,-41},{-1,-40},{-1,-37},{-1,-36},{-1,-29},{-1,-28},{-1,-25},{-1,-24},{-1,-23},{-1,-22},{-1,-21},{-1,-20},{-1,-17},{-1,-16}, - {-1,-15},{-1,-14},{-1,-13},{-1,-12},{-1,-9},{-1,-8},{-1,-7},{-1,-6},{-1,-3},{-1,-2},{-1,5},{-1,6},{-1,9},{-1,10},{-1,11},{-1,12},{-1,15},{-1,16},{-1,17},{-1,18},{-1,19},{-1,20},{-1,23},{-1,24},{-1,25},{-1,26},{-1,27},{-1,28},{-1,31},{-1,32}, - {-1,39},{-1,40},{-1,43},{-1,44},{-1,45},{-1,46},{-1,49},{-1,50},{0,-47},{0,-46},{0,-43},{0,-42},{0,-41},{0,-40},{0,-37},{0,-36},{0,-29},{0,-28},{0,-25},{0,-24},{0,-23},{0,-22},{0,-21},{0,-20},{0,-17},{0,-16},{0,-15},{0,-14},{0,-13},{0,-12}, - {0,-9},{0,-8},{0,-7},{0,-6},{0,-3},{0,-2},{0,5},{0,6},{0,9},{0,10},{0,11},{0,12},{0,15},{0,16},{0,17},{0,18},{0,19},{0,20},{0,23},{0,24},{0,25},{0,26},{0,27},{0,28},{0,31},{0,32},{0,39},{0,40},{0,43},{0,44}, - {0,45},{0,46},{0,49},{0,50},{1,-43},{1,-42},{1,-41},{1,-40},{1,-37},{1,-36},{1,-35},{1,-34},{1,-31},{1,-30},{1,-29},{1,-28},{1,-25},{1,-24},{1,-23},{1,-22},{1,-21},{1,-17},{1,-16},{1,-15},{1,-8},{1,-7},{1,-6},{1,-3},{1,-2},{1,-1}, - {1,0},{1,3},{1,4},{1,5},{1,6},{1,9},{1,10},{1,11},{1,18},{1,19},{1,20},{1,24},{1,25},{1,26},{1,27},{1,28},{1,31},{1,32},{1,33},{1,34},{1,37},{1,38},{1,39},{1,40},{1,43},{1,44},{1,45},{1,46},{2,-44},{2,-43}, - {2,-42},{2,-41},{2,-40},{2,-37},{2,-36},{2,-35},{2,-34},{2,-31},{2,-30},{2,-29},{2,-28},{2,-25},{2,-24},{2,-23},{2,-22},{2,-18},{2,-17},{2,-16},{2,-7},{2,-6},{2,-3},{2,-2},{2,-1},{2,0},{2,3},{2,4},{2,5},{2,6},{2,9},{2,10}, - {2,19},{2,20},{2,21},{2,25},{2,26},{2,27},{2,28},{2,31},{2,32},{2,33},{2,34},{2,37},{2,38},{2,39},{2,40},{2,43},{2,44},{2,45},{2,46},{2,47},{3,-47},{3,-46},{3,-45},{3,-44},{3,-43},{3,-37},{3,-36},{3,-35},{3,-34},{3,-19}, - {3,-18},{3,-17},{3,-13},{3,-12},{3,-11},{3,-10},{3,-2},{3,-1},{3,0},{3,1},{3,2},{3,3},{3,4},{3,5},{3,13},{3,14},{3,15},{3,16},{3,20},{3,21},{3,22},{3,37},{3,38},{3,39},{3,40},{3,46},{3,47},{3,48},{3,49},{3,50}, - {4,-47},{4,-46},{4,-45},{4,-44},{4,-37},{4,-36},{4,-35},{4,-34},{4,-19},{4,-18},{4,-13},{4,-12},{4,-11},{4,-10},{4,-1},{4,0},{4,1},{4,2},{4,3},{4,4},{4,13},{4,14},{4,15},{4,16},{4,21},{4,22},{4,37},{4,38},{4,39},{4,40}, - {4,47},{4,48},{4,49},{4,50},{5,-46},{5,-45},{5,-44},{5,-39},{5,-38},{5,-37},{5,-36},{5,-35},{5,-31},{5,-30},{5,-25},{5,-24},{5,-23},{5,-22},{5,-12},{5,-11},{5,-10},{5,-6},{5,-5},{5,8},{5,9},{5,13},{5,14},{5,15},{5,25},{5,26}, - {5,27},{5,28},{5,33},{5,34},{5,38},{5,39},{5,40},{5,41},{5,42},{5,47},{5,48},{5,49},{6,-45},{6,-44},{6,-39},{6,-38},{6,-37},{6,-36},{6,-31},{6,-30},{6,-29},{6,-25},{6,-24},{6,-23},{6,-22},{6,-21},{6,-11},{6,-10},{6,-7},{6,-6}, - {6,-5},{6,-4},{6,7},{6,8},{6,9},{6,10},{6,13},{6,14},{6,24},{6,25},{6,26},{6,27},{6,28},{6,32},{6,33},{6,34},{6,39},{6,40},{6,41},{6,42},{6,47},{6,48},{7,-45},{7,-44},{7,-30},{7,-29},{7,-28},{7,-24},{7,-23},{7,-22}, - {7,-21},{7,-20},{7,-17},{7,-16},{7,-15},{7,-14},{7,-7},{7,-6},{7,-5},{7,-4},{7,-1},{7,0},{7,1},{7,2},{7,3},{7,4},{7,7},{7,8},{7,9},{7,10},{7,17},{7,18},{7,19},{7,20},{7,23},{7,24},{7,25},{7,26},{7,27},{7,31}, - {7,32},{7,33},{7,47},{7,48},{8,-45},{8,-44},{8,-43},{8,-29},{8,-28},{8,-27},{8,-23},{8,-22},{8,-21},{8,-20},{8,-17},{8,-16},{8,-15},{8,-14},{8,-13},{8,-8},{8,-7},{8,-6},{8,-5},{8,-1},{8,0},{8,1},{8,2},{8,3},{8,4},{8,8}, - {8,9},{8,10},{8,11},{8,16},{8,17},{8,18},{8,19},{8,20},{8,23},{8,24},{8,25},{8,26},{8,30},{8,31},{8,32},{8,46},{8,47},{8,48},{9,-44},{9,-43},{9,-42},{9,-33},{9,-32},{9,-29},{9,-28},{9,-27},{9,-26},{9,-23},{9,-22},{9,-21}, - {9,-20},{9,-17},{9,-16},{9,-15},{9,-14},{9,-13},{9,-12},{9,-9},{9,-8},{9,-7},{9,0},{9,1},{9,2},{9,3},{9,10},{9,11},{9,12},{9,15},{9,16},{9,17},{9,18},{9,19},{9,20},{9,23},{9,24},{9,25},{9,26},{9,29},{9,30},{9,31}, - {9,32},{9,35},{9,36},{9,45},{9,46},{9,47},{10,-43},{10,-42},{10,-34},{10,-33},{10,-32},{10,-29},{10,-28},{10,-27},{10,-26},{10,-23},{10,-22},{10,-21},{10,-20},{10,-17},{10,-16},{10,-15},{10,-14},{10,-13},{10,-12},{10,-9},{10,-8},{10,1},{10,2},{10,11}, - {10,12},{10,15},{10,16},{10,17},{10,18},{10,19},{10,20},{10,23},{10,24},{10,25},{10,26},{10,29},{10,30},{10,31},{10,32},{10,35},{10,36},{10,37},{10,45},{10,46},{11,-39},{11,-38},{11,-35},{11,-34},{11,-33},{11,-32},{11,-29},{11,-28},{11,-27},{11,-16}, - {11,-15},{11,-14},{11,-13},{11,-5},{11,-4},{11,-3},{11,-2},{11,5},{11,6},{11,7},{11,8},{11,16},{11,17},{11,18},{11,19},{11,30},{11,31},{11,32},{11,35},{11,36},{11,37},{11,38},{11,41},{11,42},{12,-39},{12,-38},{12,-35},{12,-34},{12,-33},{12,-32}, - {12,-29},{12,-28},{12,-15},{12,-14},{12,-5},{12,-4},{12,-3},{12,-2},{12,5},{12,6},{12,7},{12,8},{12,17},{12,18},{12,31},{12,32},{12,35},{12,36},{12,37},{12,38},{12,41},{12,42},{13,-43},{13,-42},{13,-39},{13,-38},{13,-37},{13,-36},{13,-35},{13,-34}, - {13,-33},{13,-19},{13,-18},{13,-9},{13,-8},{13,-4},{13,-3},{13,-2},{13,1},{13,2},{13,5},{13,6},{13,7},{13,11},{13,12},{13,21},{13,22},{13,36},{13,37},{13,38},{13,39},{13,40},{13,41},{13,42},{13,45},{13,46},{14,-43},{14,-42},{14,-39},{14,-38}, - {14,-37},{14,-36},{14,-35},{14,-34},{14,-20},{14,-19},{14,-18},{14,-17},{14,-10},{14,-9},{14,-8},{14,-7},{14,-3},{14,-2},{14,1},{14,2},{14,5},{14,6},{14,10},{14,11},{14,12},{14,13},{14,20},{14,21},{14,22},{14,23},{14,37},{14,38},{14,39},{14,40}, - {14,41},{14,42},{14,45},{14,46},{15,-43},{15,-42},{15,-31},{15,-30},{15,-27},{15,-26},{15,-21},{15,-20},{15,-19},{15,-18},{15,-17},{15,-16},{15,-15},{15,-14},{15,-11},{15,-10},{15,-9},{15,-8},{15,-7},{15,-6},{15,1},{15,2},{15,9},{15,10},{15,11},{15,12}, - {15,13},{15,14},{15,17},{15,18},{15,19},{15,20},{15,21},{15,22},{15,23},{15,24},{15,29},{15,30},{15,33},{15,34},{15,45},{15,46},{16,-43},{16,-42},{16,-32},{16,-31},{16,-30},{16,-27},{16,-26},{16,-25},{16,-21},{16,-20},{16,-19},{16,-18},{16,-17},{16,-16}, - {16,-15},{16,-14},{16,-11},{16,-10},{16,-9},{16,-8},{16,-7},{16,-6},{16,0},{16,1},{16,2},{16,3},{16,9},{16,10},{16,11},{16,12},{16,13},{16,14},{16,17},{16,18},{16,19},{16,20},{16,21},{16,22},{16,23},{16,24},{16,28},{16,29},{16,30},{16,33}, - {16,34},{16,35},{16,45},{16,46},{17,-43},{17,-42},{17,-35},{17,-34},{17,-33},{17,-32},{17,-31},{17,-26},{17,-25},{17,-24},{17,-15},{17,-14},{17,-10},{17,-9},{17,-8},{17,-7},{17,-6},{17,-1},{17,0},{17,1},{17,2},{17,3},{17,4},{17,9},{17,10},{17,11}, - {17,12},{17,13},{17,17},{17,18},{17,27},{17,28},{17,29},{17,34},{17,35},{17,36},{17,37},{17,38},{17,45},{17,46},{18,-43},{18,-42},{18,-41},{18,-35},{18,-34},{18,-33},{18,-32},{18,-25},{18,-24},{18,-23},{18,-15},{18,-14},{18,-13},{18,-9},{18,-8},{18,-7}, - {18,-6},{18,-2},{18,-1},{18,0},{18,1},{18,2},{18,3},{18,4},{18,5},{18,9},{18,10},{18,11},{18,12},{18,16},{18,17},{18,18},{18,26},{18,27},{18,28},{18,35},{18,36},{18,37},{18,38},{18,44},{18,45},{18,46},{19,-42},{19,-41},{19,-40},{19,-39}, - {19,-38},{19,-29},{19,-28},{19,-25},{19,-24},{19,-23},{19,-22},{19,-21},{19,-20},{19,-19},{19,-18},{19,-15},{19,-14},{19,-13},{19,-12},{19,-3},{19,-2},{19,-1},{19,4},{19,5},{19,6},{19,15},{19,16},{19,17},{19,18},{19,21},{19,22},{19,23},{19,24},{19,25}, - {19,26},{19,27},{19,28},{19,31},{19,32},{19,41},{19,42},{19,43},{19,44},{19,45},{20,-41},{20,-40},{20,-39},{20,-38},{20,-37},{20,-29},{20,-28},{20,-25},{20,-24},{20,-23},{20,-22},{20,-21},{20,-20},{20,-19},{20,-18},{20,-15},{20,-14},{20,-13},{20,-12},{20,-3}, - {20,-2},{20,5},{20,6},{20,15},{20,16},{20,17},{20,18},{20,21},{20,22},{20,23},{20,24},{20,25},{20,26},{20,27},{20,28},{20,31},{20,32},{20,40},{20,41},{20,42},{20,43},{20,44},{21,-38},{21,-37},{21,-36},{21,-29},{21,-28},{21,-19},{21,-18},{21,-15}, - {21,-14},{21,-13},{21,-9},{21,-8},{21,-7},{21,-6},{21,1},{21,2},{21,9},{21,10},{21,11},{21,12},{21,16},{21,17},{21,18},{21,21},{21,22},{21,31},{21,32},{21,39},{21,40},{21,41},{22,-37},{22,-36},{22,-30},{22,-29},{22,-28},{22,-19},{22,-18},{22,-15}, - {22,-14},{22,-9},{22,-8},{22,-7},{22,-6},{22,-5},{22,0},{22,1},{22,2},{22,3},{22,8},{22,9},{22,10},{22,11},{22,12},{22,17},{22,18},{22,21},{22,22},{22,31},{22,32},{22,33},{22,39},{22,40},{23,-33},{23,-32},{23,-31},{23,-30},{23,-29},{23,-25}, - {23,-24},{23,-23},{23,-22},{23,-19},{23,-18},{23,-9},{23,-8},{23,-7},{23,-6},{23,-5},{23,-4},{23,-1},{23,0},{23,1},{23,2},{23,3},{23,4},{23,7},{23,8},{23,9},{23,10},{23,11},{23,12},{23,21},{23,22},{23,25},{23,26},{23,27},{23,28},{23,32}, - {23,33},{23,34},{23,35},{23,36},{24,-33},{24,-32},{24,-31},{24,-30},{24,-25},{24,-24},{24,-23},{24,-22},{24,-19},{24,-18},{24,-17},{24,-9},{24,-8},{24,-7},{24,-6},{24,-5},{24,-4},{24,-1},{24,0},{24,1},{24,2},{24,3},{24,4},{24,7},{24,8},{24,9}, - {24,10},{24,11},{24,12},{24,20},{24,21},{24,22},{24,25},{24,26},{24,27},{24,28},{24,33},{24,34},{24,35},{24,36},{25,-39},{25,-38},{25,-37},{25,-36},{25,-24},{25,-23},{25,-22},{25,-19},{25,-18},{25,-17},{25,-16},{25,-6},{25,-5},{25,-4},{25,-1},{25,0}, - {25,1},{25,2},{25,3},{25,4},{25,7},{25,8},{25,9},{25,19},{25,20},{25,21},{25,22},{25,25},{25,26},{25,27},{25,39},{25,40},{25,41},{25,42},{26,-39},{26,-38},{26,-37},{26,-36},{26,-23},{26,-22},{26,-19},{26,-18},{26,-17},{26,-16},{26,-15},{26,-5}, - {26,-4},{26,-1},{26,0},{26,1},{26,2},{26,3},{26,4},{26,7},{26,8},{26,18},{26,19},{26,20},{26,21},{26,22},{26,25},{26,26},{26,39},{26,40},{26,41},{26,42},{27,-38},{27,-37},{27,-36},{27,-29},{27,-28},{27,-27},{27,-26},{27,-16},{27,-15},{27,-14}, - {27,-9},{27,-8},{27,11},{27,12},{27,17},{27,18},{27,19},{27,29},{27,30},{27,31},{27,32},{27,39},{27,40},{27,41},{28,-37},{28,-36},{28,-30},{28,-29},{28,-28},{28,-27},{28,-26},{28,-15},{28,-14},{28,-10},{28,-9},{28,-8},{28,-7},{28,10},{28,11},{28,12}, - {28,13},{28,17},{28,18},{28,29},{28,30},{28,31},{28,32},{28,33},{28,39},{28,40},{29,-33},{29,-32},{29,-31},{29,-30},{29,-29},{29,-28},{29,-27},{29,-26},{29,-21},{29,-20},{29,-19},{29,-18},{29,-11},{29,-10},{29,-9},{29,-8},{29,-7},{29,-6},{29,-1},{29,0}, - {29,1},{29,2},{29,3},{29,4},{29,9},{29,10},{29,11},{29,12},{29,13},{29,14},{29,21},{29,22},{29,23},{29,24},{29,29},{29,30},{29,31},{29,32},{29,33},{29,34},{29,35},{29,36},{30,-33},{30,-32},{30,-31},{30,-30},{30,-29},{30,-28},{30,-27},{30,-26}, - {30,-22},{30,-21},{30,-20},{30,-19},{30,-18},{30,-11},{30,-10},{30,-9},{30,-8},{30,-7},{30,-6},{30,-5},{30,-1},{30,0},{30,1},{30,2},{30,3},{30,4},{30,8},{30,9},{30,10},{30,11},{30,12},{30,13},{30,14},{30,21},{30,22},{30,23},{30,24},{30,25}, - {30,29},{30,30},{30,31},{30,32},{30,33},{30,34},{30,35},{30,36},{31,-32},{31,-31},{31,-30},{31,-29},{31,-28},{31,-27},{31,-23},{31,-22},{31,-21},{31,-15},{31,-14},{31,-6},{31,-5},{31,-4},{31,-1},{31,0},{31,3},{31,4},{31,7},{31,8},{31,9},{31,17}, - {31,18},{31,24},{31,25},{31,26},{31,30},{31,31},{31,32},{31,33},{31,34},{31,35},{32,-31},{32,-30},{32,-29},{32,-28},{32,-23},{32,-22},{32,-16},{32,-15},{32,-14},{32,-5},{32,-4},{32,-1},{32,0},{32,3},{32,4},{32,7},{32,8},{32,17},{32,18},{32,19}, - {32,25},{32,26},{32,31},{32,32},{32,33},{32,34},{33,-30},{33,-29},{33,-28},{33,-23},{33,-22},{33,-17},{33,-16},{33,-15},{33,-11},{33,-10},{33,-9},{33,-8},{33,11},{33,12},{33,13},{33,14},{33,18},{33,19},{33,20},{33,25},{33,26},{33,31},{33,32},{33,33}, - {34,-29},{34,-28},{34,-23},{34,-22},{34,-17},{34,-16},{34,-12},{34,-11},{34,-10},{34,-9},{34,-8},{34,11},{34,12},{34,13},{34,14},{34,15},{34,19},{34,20},{34,25},{34,26},{34,31},{34,32},{35,-17},{35,-16},{35,-13},{35,-12},{35,-11},{35,-10},{35,-9},{35,-3}, - {35,-2},{35,-1},{35,0},{35,3},{35,4},{35,5},{35,6},{35,12},{35,13},{35,14},{35,15},{35,16},{35,19},{35,20},{36,-17},{36,-16},{36,-13},{36,-12},{36,-11},{36,-10},{36,-4},{36,-3},{36,-2},{36,-1},{36,0},{36,3},{36,4},{36,5},{36,6},{36,7}, - {36,13},{36,14},{36,15},{36,16},{36,19},{36,20},{37,-27},{37,-26},{37,-25},{37,-24},{37,-21},{37,-20},{37,-13},{37,-12},{37,-5},{37,-4},{37,-3},{37,-2},{37,-1},{37,0},{37,1},{37,2},{37,3},{37,4},{37,5},{37,6},{37,7},{37,8},{37,15},{37,16}, - {37,23},{37,24},{37,27},{37,28},{37,29},{37,30},{38,-27},{38,-26},{38,-25},{38,-24},{38,-21},{38,-20},{38,-19},{38,-13},{38,-12},{38,-5},{38,-4},{38,-3},{38,-2},{38,-1},{38,0},{38,1},{38,2},{38,3},{38,4},{38,5},{38,6},{38,7},{38,8},{38,15}, - {38,16},{38,22},{38,23},{38,24},{38,27},{38,28},{38,29},{38,30},{39,-26},{39,-25},{39,-24},{39,-20},{39,-19},{39,-18},{39,-13},{39,-12},{39,-11},{39,-10},{39,-5},{39,-4},{39,7},{39,8},{39,13},{39,14},{39,15},{39,16},{39,21},{39,22},{39,23},{39,27}, - {39,28},{39,29},{40,-25},{40,-24},{40,-19},{40,-18},{40,-13},{40,-12},{40,-11},{40,-10},{40,-5},{40,-4},{40,7},{40,8},{40,13},{40,14},{40,15},{40,16},{40,21},{40,22},{40,27},{40,28},{41,-19},{41,-18},{41,-1},{41,0},{41,1},{41,2},{41,3},{41,4}, - {41,21},{41,22},{42,-19},{42,-18},{42,-17},{42,-1},{42,0},{42,1},{42,2},{42,3},{42,4},{42,20},{42,21},{42,22},{43,-18},{43,-17},{43,-16},{43,-15},{43,-14},{43,-13},{43,-12},{43,-9},{43,-8},{43,-1},{43,0},{43,1},{43,2},{43,3},{43,4},{43,11}, - {43,12},{43,15},{43,16},{43,17},{43,18},{43,19},{43,20},{43,21},{44,-17},{44,-16},{44,-15},{44,-14},{44,-13},{44,-12},{44,-9},{44,-8},{44,-7},{44,-2},{44,-1},{44,0},{44,1},{44,2},{44,3},{44,4},{44,5},{44,10},{44,11},{44,12},{44,15},{44,16}, - {44,17},{44,18},{44,19},{44,20},{45,-8},{45,-7},{45,-6},{45,-5},{45,-4},{45,-3},{45,-2},{45,-1},{45,4},{45,5},{45,6},{45,7},{45,8},{45,9},{45,10},{45,11},{46,-7},{46,-6},{46,-5},{46,-4},{46,-3},{46,-2},{46,5},{46,6},{46,7},{46,8}, - {46,9},{46,10},{47,-4},{47,-3},{47,-2},{47,1},{47,2},{47,5},{47,6},{47,7},{48,-3},{48,-2},{48,1},{48,2},{48,5},{48,6} -} - -local entitys = { - {"stone-wall",-10,-6},{"stone-wall",-10,-5},{"stone-wall",-10,-4},{"stone-wall",-10,-3},{"stone-wall",-10,-2},{"stone-wall",-10,-1},{"stone-wall",-10,0},{"stone-wall",-10,3},{"stone-wall",-10,4},{"stone-wall",-10,5}, - {"stone-wall",-10,6},{"stone-wall",-10,7},{"stone-wall",-10,8},{"stone-wall",-10,9},{"stone-wall",-8,-8},{"small-lamp",-8,-4},{"small-lamp",-8,-1},{"iron-chest",-8,0},{"iron-chest",-8,3},{"small-lamp",-8,4}, - {"small-lamp",-8,7},{"stone-wall",-8,11},{"stone-wall",-7,-8},{"small-electric-pole",-7,-2},{"iron-chest",-7,0},{"iron-chest",-7,3},{"small-electric-pole",-7,5},{"stone-wall",-7,11},{"stone-wall",-6,-8},{"small-lamp",-6,-6}, - {"iron-chest",-6,0},{"iron-chest",-6,3},{"small-lamp",-6,9},{"stone-wall",-6,11},{"stone-wall",-5,-8},{"small-lamp",-5,-1},{"iron-chest",-5,0},{"iron-chest",-5,3},{"small-lamp",-5,4},{"stone-wall",-5,11}, - {"stone-wall",-4,-8},{"small-electric-pole",-4,-5},{"iron-chest",-4,0},{"iron-chest",-4,3},{"small-electric-pole",-4,8},{"stone-wall",-4,11},{"stone-wall",-3,-8},{"small-lamp",-3,-6},{"small-lamp",-3,-3},{"small-lamp",-3,6}, - {"small-lamp",-3,9},{"stone-wall",-3,11},{"stone-wall",-2,-8},{"iron-chest",-2,-6},{"iron-chest",-2,-5},{"iron-chest",-2,-4},{"iron-chest",-2,-3},{"iron-chest",-2,-2},{"iron-chest",-2,5},{"iron-chest",-2,6}, - {"iron-chest",-2,7},{"iron-chest",-2,8},{"iron-chest",-2,9},{"stone-wall",-2,11},{"stone-wall",1,-8},{"iron-chest",1,-6}, - {"iron-chest",1,-5},{"iron-chest",1,-4},{"iron-chest",1,-3},{"iron-chest",1,-2},{"iron-chest",1,5},{"iron-chest",1,6},{"iron-chest",1,7},{"iron-chest",1,8},{"iron-chest",1,9},{"stone-wall",1,11}, - {"stone-wall",2,-8},{"small-lamp",2,-6},{"small-lamp",2,-3},{"small-lamp",2,6},{"small-lamp",2,9},{"stone-wall",2,11},{"stone-wall",3,-8},{"small-electric-pole",3,-5},{"iron-chest",3,0},{"iron-chest",3,3}, - {"small-electric-pole",3,8},{"stone-wall",3,11},{"stone-wall",4,-8},{"small-lamp",4,-1},{"iron-chest",4,0},{"iron-chest",4,3},{"small-lamp",4,4},{"stone-wall",4,11},{"stone-wall",5,-8},{"small-lamp",5,-6}, - {"iron-chest",5,0},{"iron-chest",5,3},{"small-lamp",5,9},{"stone-wall",5,11},{"stone-wall",6,-8},{"small-electric-pole",6,-2},{"iron-chest",6,0},{"iron-chest",6,3},{"small-electric-pole",6,5},{"stone-wall",6,11}, - {"stone-wall",7,-8},{"small-lamp",7,-4},{"small-lamp",7,-1},{"iron-chest",7,0},{"iron-chest",7,3},{"small-lamp",7,4},{"small-lamp",7,7},{"stone-wall",7,11},{"stone-wall",9,-6},{"stone-wall",9,-5}, - {"stone-wall",9,-4},{"stone-wall",9,-3},{"stone-wall",9,-2},{"stone-wall",9,-1},{"stone-wall",9,0},{"stone-wall",9,3},{"stone-wall",9,4},{"stone-wall",9,5},{"stone-wall",9,6},{"stone-wall",9,7}, - {"stone-wall",9,8},{"stone-wall",9,9} -} - -local turrets = {{-3,-3},{-3,3},{3,-3},{3,3}} -local turret_ammo = 'uranium-rounds-magazine' - -local global_offset = {x=0,y=-2} -local decon_radius = 20 -local decon_tile = 'concrete' -local partern_radius = 50 -local partern_tile = 'stone-path' - -local function afk_belt(surface,offset) - local belts = {{-0.5,-0.5,2},{0.5,-0.5,4},{-0.5,0.5,0},{0.5,0.5,6}} - for _,pos in pairs(belts) do - local position = {pos[1]+offset[1],pos[2]+offset[2]} - local belt = surface.create_entity{name='transport-belt',position=position,force='neutral',direction=pos[3]} - belt.destructible = false; belt.health = 0; belt.minable = false; belt.rotatable = false - end -end - -local function spawn_turrets() - local surface = game.surfaces[1] - if not game.forces['spawn'] then game.create_force('spawn').set_cease_fire('player',true) game.forces['player'].set_cease_fire('spawn',true) end - for _,pos in pairs(turrets) do - local turret = surface.find_entity('gun-turret',pos) - if not turret then - turret = surface.create_entity{name='gun-turret',position=pos,force='spawn'} - turret.destructible = false; turret.health = 0; turret.minable = false; turret.rotatable = false; turret.operable = false; turret.health = 0 - end - if turret.get_inventory(defines.inventory.turret_ammo).can_insert{name=turret_ammo,count=10} then - turret.get_inventory(defines.inventory.turret_ammo).insert{name=turret_ammo,count=10} - end - end -end - -Event.register(defines.events.on_tick,function(event) - if event.tick % 3600 then - spawn_turrets() - end -end) - -Event.register(defines.events.on_player_created, function(event) - if event.player_index == 1 then - local player = Game.get_player(event) - local surface = player.surface - local offset = {x=0,y=0} - local partern_base_tile = surface.get_tile(player.position).name - if partern_base_tile == 'deepwater' or partern_base_tile == 'water' then partern_base_tile = 'grass-1' end - local base_tiles = {} - local tiles = {} - for x = -partern_radius-5, partern_radius+5 do - for y = -partern_radius-5, partern_radius+5 do - if x^2+y^2 < decon_radius^2 then - table.insert(base_tiles,{name=decon_tile,position={x+offset.x,y+offset.y}}) - local entities = surface.find_entities_filtered{area={{x+offset.x-1,y+offset.y-1},{x+offset.x,y+offset.y}}} - for _,entity in pairs(entities) do if entity.name ~= 'player' then entity.destroy() end end - elseif x^2+y^2 < partern_radius^2 then - table.insert(base_tiles,{name=partern_base_tile,position={x+offset.x,y+offset.y}}) - end - end - end - surface.set_tiles(base_tiles) - for _,position in pairs(tile_positions) do - table.insert(tiles,{name=partern_tile,position={position[1]+offset.x+global_offset.x,position[2]+offset.y+global_offset.y}}) - end - surface.set_tiles(tiles) - for _,entity in pairs(entitys) do - local entity = surface.create_entity{name=entity[1],position={entity[2]+offset.x+global_offset.x,entity[3]+offset.y+global_offset.y},force='neutral'} - entity.destructible = false; entity.health = 0; entity.minable = false; entity.rotatable = false - end - spawn_turrets() - afk_belt(surface,{offset.x-5,offset.y-5}) - afk_belt(surface,{offset.x+5,offset.y-5}) - afk_belt(surface,{offset.x-5,offset.y+5}) - afk_belt(surface,{offset.x+5,offset.y+5}) - player.force.set_spawn_position(offset,surface) - player.teleport(offset,surface) - end -end) \ No newline at end of file diff --git a/StandAlone/starting-items.lua b/StandAlone/starting-items.lua deleted file mode 100644 index 5a3db04f..00000000 --- a/StandAlone/starting-items.lua +++ /dev/null @@ -1,32 +0,0 @@ - --- made by cooldude - this just allows condidtions on stating items and custom ammounts to be added, ie more iron made means more starting iron - -local items = { - ['iron-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 8 else return (made*10)/math.pow(tick_to_min(game.tick),2) end end, - ['copper-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*8)/math.pow(tick_to_min(game.tick),2) end end, - ['electronic-circuit']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*6)/math.pow(tick_to_min(game.tick),2) end end, - ['iron-gear-wheel']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*6)/math.pow(tick_to_min(game.tick),2) end end, - ['steel-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return(made*4)/math.pow(tick_to_min(game.tick),2) end end, - ['pistol']=function(player,made) if player.force.item_production_statistics.get_input_count('submachine-gun') > 5 then return 0 else return 1 end end, - ['submachine-gun']=function(player,made) if made > 5 then return 1 else return 0 end end, - ['firearm-magazine']=function(player,made) if player.force.item_production_statistics.get_input_count('piercing-rounds-magazine') > 100 then return 0 else return 10 end end, - ['piercing-rounds-magazine']=function(player,made) if made > 100 then return 10 else return 0 end end, - ['light-armor']=function(player,made) if made > 5 and player.force.item_production_statistics.get_input_count('heavy-armor') <= 5 then return 1 else return 0 end end, - ['heavy-armor']=function(player,made) if made > 5 then return 1 else return 0 end end, - ['burner-mining-drill']=function(player,made) if tick_to_min(game.tick) < 5 then return 4 else return 0 end end, - ['stone-furnace']=function(player,made) if tick_to_min(game.tick) < 5 then return 4 else return 0 end end, - ['iron-axe']=function(player,made) if made > 5 and player.force.item_production_statistics.get_input_count('steel-axe') <= 5 then return 1 else return 0 end end, - ['steel-axe']=function(player,made) if made > 5 then return 1 else return 0 end end -} -Event.register(defines.events.on_player_created, function(event) - local player = game.players[event.player_index] - if event.player_index == 1 then - player.force.friendly_fire = false - game.map_settings.enemy_expansion.enabled = false - player.force.chart(player.surface, {{player.position.x - 400, player.position.y - 400}, {player.position.x + 400, player.position.y + 400}}) - end - for item,count in pairs(items) do - if type(count) == 'function' then count = math.floor(count(player,player.force.item_production_statistics.get_input_count(item))) end - if count > 0 then player.insert{name=item, count=count} end - end -end) \ No newline at end of file diff --git a/locale/de/DeconControl.cfg b/locale/de/DeconControl.cfg deleted file mode 100644 index efab5765..00000000 --- a/locale/de/DeconControl.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=Du darfst dies noch nicht entfernen. Du benötigst dazu den Rang Regular, den du nach 3 Stunden auf dem Server automatisch erhältst. -rank-print=__1__ versuchte etwas zu entfernen. \ No newline at end of file diff --git a/locale/de/ExpGamingAdmin.AdminLib.cfg b/locale/de/ExpGamingAdmin.AdminLib.cfg deleted file mode 100644 index 299b094f..00000000 --- a/locale/de/ExpGamingAdmin.AdminLib.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -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 \ No newline at end of file diff --git a/locale/de/ExpGamingAdmin.Warnings.cfg b/locale/de/ExpGamingAdmin.Warnings.cfg deleted file mode 100644 index c48f518a..00000000 --- a/locale/de/ExpGamingAdmin.Warnings.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[ExpGamingAdmin-Warnings] -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. \ No newline at end of file diff --git a/locale/de/ExpGamingAdmin.cfg b/locale/de/ExpGamingAdmin.cfg deleted file mode 100644 index 299b094f..00000000 --- a/locale/de/ExpGamingAdmin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -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 \ No newline at end of file diff --git a/locale/de/ExpGamingBot.autoChat.cfg b/locale/de/ExpGamingBot.autoChat.cfg deleted file mode 100644 index 32fea59f..00000000 --- a/locale/de/ExpGamingBot.autoChat.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[ExpGamingBot-autoChat] -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 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) \ No newline at end of file diff --git a/locale/de/ExpGamingBot.autoMessage.cfg b/locale/de/ExpGamingBot.autoMessage.cfg deleted file mode 100644 index 49d19ede..00000000 --- a/locale/de/ExpGamingBot.autoMessage.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -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) \ No newline at end of file diff --git a/locale/de/ExpGamingCore.Command.cfg b/locale/de/ExpGamingCore.Command.cfg deleted file mode 100644 index 1ea17d9b..00000000 --- a/locale/de/ExpGamingCore.Command.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingCore_Command] -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. \ No newline at end of file diff --git a/locale/de/ExpGamingCore.Commands.cfg b/locale/de/ExpGamingCore.Commands.cfg deleted file mode 100644 index 1ea17d9b..00000000 --- a/locale/de/ExpGamingCore.Commands.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingCore_Command] -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. \ No newline at end of file diff --git a/locale/de/ExpGamingCore.Gui.cfg b/locale/de/ExpGamingCore.Gui.cfg deleted file mode 100644 index fbdba2f7..00000000 --- a/locale/de/ExpGamingCore.Gui.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_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. \ No newline at end of file diff --git a/locale/de/ExpGamingCore.Ranking.cfg b/locale/de/ExpGamingCore.Ranking.cfg deleted file mode 100644 index 8889c096..00000000 --- a/locale/de/ExpGamingCore.Ranking.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[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. \ No newline at end of file diff --git a/locale/de/ExpGamingInfo.Readme.cfg b/locale/de/ExpGamingInfo.Readme.cfg deleted file mode 100644 index 4fc2512b..00000000 --- a/locale/de/ExpGamingInfo.Readme.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. -commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap2=Public -servers-des2=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap3=Public -servers-des3=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. -servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. -servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. -rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. diff --git a/locale/de/ExpGamingInfo.Rockets.cfg b/locale/de/ExpGamingInfo.Rockets.cfg deleted file mode 100644 index 8fd5471e..00000000 --- a/locale/de/ExpGamingInfo.Rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Raketeninfo -tooltip=Detailliste über gestartete Raketen. -none=Es wurden noch keine Rakten gestartet. -nan=NaN -sent=Gestartete Raketen: __1__ -first=Erster Start: __1__ -last=Dauer bis zum letzten Start: __1__ -time=Durchschnittliche Starzeit: __1__ -fastest=Schnellster Start: __1__ -milestones=Meilensteine: -format=__1__: __2__ \ No newline at end of file diff --git a/locale/de/ExpGamingInfo.Science.cfg b/locale/de/ExpGamingInfo.Science.cfg deleted file mode 100644 index e10b31a4..00000000 --- a/locale/de/ExpGamingInfo.Science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Wissenschaftsinfo -tooltip=Detailliste über Wissenschaftspakete -total=Gemachte Pakete: -time=Pakete pro Minute: -format=__1__: __2__ -science-pack-1=Rot -science-pack-2=Grün -science-pack-3=Blau -military-science-pack=Militär -production-science-pack=Produktion -high-tech-science-pack=Hochtechnologie -space-science-pack=Weltraum -none=Es wurden noch keine Wissenschaftspakete gemacht. \ No newline at end of file diff --git a/locale/de/ExpGamingInfo.Tasklist.cfg b/locale/de/ExpGamingInfo.Tasklist.cfg deleted file mode 100644 index 48573724..00000000 --- a/locale/de/ExpGamingInfo.Tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Taskliste -tooltip=Welche Aufgaben müssen rund um die Fabrik erledigt werden? -none=Es sind aktuell keine Tasks erfasst, frage einen Member um einen hinzuzufügen. \ No newline at end of file diff --git a/locale/de/ExpGamingPlayer.inventorySearch.cfg b/locale/de/ExpGamingPlayer.inventorySearch.cfg deleted file mode 100644 index 895707f4..00000000 --- a/locale/de/ExpGamingPlayer.inventorySearch.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Dein Inventar wurde durchsucht und __1__ wurde entfernt. -med=Dein Inventar wurde durchsucht und __1__ wurde entfernt. Dir wird hiermit eine Warnung erteilt! Versuche es nicht erneut! -high=Dein inventar wurde durchsucht und __1__ wurde gefunden, dies ist auf GAR KEINEN Fall erlaubt, dein Inventar wurde zum Spawnpunkt transferiert. \ No newline at end of file diff --git a/locale/de/ExpGamingPlayer.playerInfo.cfg b/locale/de/ExpGamingPlayer.playerInfo.cfg deleted file mode 100644 index 1d52251f..00000000 --- a/locale/de/ExpGamingPlayer.playerInfo.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Ja -no=Nein -name=[__1__] __2__ -online=Ist online: __1__ (__2__) -admin=Hat Admin Rang: __1__ -group=In Benutzer Gruppe: __1__ -role=Hat Rang: __1__ \ No newline at end of file diff --git a/locale/de/ExpGamingPlayer.playerList.cfg b/locale/de/ExpGamingPlayer.playerList.cfg deleted file mode 100644 index ed48069f..00000000 --- a/locale/de/ExpGamingPlayer.playerList.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -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. \ No newline at end of file diff --git a/locale/de/ExpGamingPlayer.polls.cfg b/locale/de/ExpGamingPlayer.polls.cfg deleted file mode 100644 index b476a903..00000000 --- a/locale/de/ExpGamingPlayer.polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Umfragen -tooltip=Alte Umfragen ansehen -no-poll=Keine alten Umfragen -end=Die Umfrage hat gerade geendet: __1__ -winner=__1__ hatte die meisten Stimmen. -time-left=Du hast noch __1__s um deine Wahl zu erfassen. \ No newline at end of file diff --git a/locale/de/GameSettingsGui.cfg b/locale/de/GameSettingsGui.cfg deleted file mode 100644 index dece78e7..00000000 --- a/locale/de/GameSettingsGui.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Spieleinstellungen -tooltip=Erlaubt das Modifizieren von Spieleinstellungen. Bitte mit Bedacht benutzen. -basic-name=Einfache Einstellungen -basic-tooltip=Diese Einstellungen sind ohne Probleme veränderbar, sie verursachen keine großen Probleme im nachhinein. -basic-message=Dies sind fraktionsweite Einstellungen, welche genutzt werden können um das Spiel zu vereinfachen und es für Alle angenehmer zu machen. -advanced-name=Erweiterte Einstellungen -advanced-tooltip=Diese Einstellungen sollten nicht von Leuten benutzt werden, die nicht wissen was sie tun. -advanced-message=Bitte ändere keine dieser Einstellungen ausser du bist dir 100% sicher was sie tun,lass game.speed allein, da es einen viel größeren Effekt hat als du denkst. -personal-name=Persönliche Einstellungen -personal-tooltip=Diese Einstellungen betreffen nur deinen Spieler. Wenn man dich beim cheaten erwischt bist du auf dich allein gestellt. -personal-message=Diese Einstellungen betreffen nur deinen Spieler, übertreib es nicht ansonsten besteht die Gefahr, dass dich normale Spieler (gierige Kleinkinder) dabei erwischen (und rumheulen). -sure=Bist du dir Sicher?! -effect-mining-speed=Abbaugeschwindigkeit -effect-craft-speed=Herstellgeschwindigkeit -effect-running-speed=Laufgeschwindigkeit -effect-build-distance=Baudistanz -effect-reach-distance=Armreichweite -effect-bot-speed=Robotergeschwindigkeit -effect-lab-speed=Laborgeschwindigkeit -effect-stack-bonus=Stapelnonuss -effect-quickbar-count=Anzahl Schnellleistenelemente -effect-inventory-size=Inventargröße -effect-mining-prod=Abbauproduktivität -effect-game-speed=Spielgeschwindigkeit -effect-save=Spiel speichern -effect-reload-effects=Effekte neu laden -effect-reload-map=Minimap neu laden -effect-kill-biters=Töte alle Beisser -effect-crc=Forciere CRC check -effect-reset-force=Fraktion zurücksetzen \ No newline at end of file diff --git a/locale/de/GuiAnnouncements.cfg b/locale/de/GuiAnnouncements.cfg deleted file mode 100644 index 9744da36..00000000 --- a/locale/de/GuiAnnouncements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Ankündigung -tooltip=Eine Ankündigung an Spieler senden -sent-to=Dies wurde zu __1__ gesendet -sent-by=Dies wurde von __1__ mit Rang __2__ gesendet -select-rank=Diese Nachricht wird gesendet an: \ No newline at end of file diff --git a/locale/de/WarpPoints.cfg b/locale/de/WarpPoints.cfg deleted file mode 100644 index fac81895..00000000 --- a/locale/de/WarpPoints.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=Die Liste mit den Warp-Punkten -remove-tooltip=Entferne Warp-Punkt -go-to-tooltip=Gehe zu Warp-Punkt -cooldown=Warte, bis der Cooldown abgelaufen ist. Verbleibende Zeit: __1__ -cooldown-zero=Dein Cooldown ist abgelaufen, du kannst jetzt wieder Warp-Punkte verwenden. -name-used=Dieser Name ist schon vergeben. -not-on-warp=Du bist nicht auf einem Warp-Punkt. Gehe auf einen Warp-Punkt, um zu einem anderen zu springen. \ No newline at end of file diff --git a/locale/de/admin.cfg b/locale/de/admin.cfg deleted file mode 100644 index 1d457aab..00000000 --- a/locale/de/admin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[admin-commands] -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 \ No newline at end of file diff --git a/locale/de/announcements.cfg b/locale/de/announcements.cfg deleted file mode 100644 index 37821915..00000000 --- a/locale/de/announcements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[announcements] -name=Ankündigung -tooltip=Eine Ankündigung an Spieler senden -sent-to=Dies wurde zu __1__ gesendet -sent-by=Dies wurde von __1__ mit Rang __2__ gesendet -select-rank=Diese Nachricht wird gesendet an: \ No newline at end of file diff --git a/locale/de/base-damage.cfg b/locale/de/base-damage.cfg deleted file mode 100644 index 1133598a..00000000 --- a/locale/de/base-damage.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[capsules] -used=Du hast __1__ benutzt und damit Gebäude von eigenen oder anderen Spielern getroffen. Bitte sei aufmerksamer! Zum Glück ist kein Schaden dabei entstanden. -nuke=Atombomben sind nicht erlaubt für deinen Rang. Tut uns Leid, aber so beugen wir Griefer vor. \ No newline at end of file diff --git a/locale/de/chat-bot.cfg b/locale/de/chat-bot.cfg deleted file mode 100644 index e4bbbe31..00000000 --- a/locale/de/chat-bot.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[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 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) \ No newline at end of file diff --git a/locale/de/exp-core.cfg b/locale/de/exp-core.cfg deleted file mode 100644 index 8867c3f0..00000000 --- a/locale/de/exp-core.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[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. - -[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. - -[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. \ No newline at end of file diff --git a/locale/de/game-settings.cfg b/locale/de/game-settings.cfg deleted file mode 100644 index c1f2c311..00000000 --- a/locale/de/game-settings.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[game-settings] -name=Spieleinstellungen -tooltip=Erlaubt das Modifizieren von Spieleinstellungen. Bitte mit Bedacht benutzen. -basic-name=Einfache Einstellungen -basic-tooltip=Diese Einstellungen sind ohne Probleme veränderbar, sie verursachen keine großen Probleme im nachhinein. -basic-message=Dies sind fraktionsweite Einstellungen, welche genutzt werden können um das Spiel zu vereinfachen und es für Alle angenehmer zu machen. -advanced-name=Erweiterte Einstellungen -advanced-tooltip=Diese Einstellungen sollten nicht von Leuten benutzt werden, die nicht wissen was sie tun. -advanced-message=Bitte ändere keine dieser Einstellungen ausser du bist dir 100% sicher was sie tun,lass game.speed allein, da es einen viel größeren Effekt hat als du denkst. -personal-name=Persönliche Einstellungen -personal-tooltip=Diese Einstellungen betreffen nur deinen Spieler. Wenn man dich beim cheaten erwischt bist du auf dich allein gestellt. -personal-message=Diese Einstellungen betreffen nur deinen Spieler, übertreib es nicht ansonsten besteht die Gefahr, dass dich normale Spieler (gierige Kleinkinder) dabei erwischen (und rumheulen). -sure=Bist du dir Sicher?! -effect-mining-speed=Abbaugeschwindigkeit -effect-craft-speed=Herstellgeschwindigkeit -effect-running-speed=Laufgeschwindigkeit -effect-build-distance=Baudistanz -effect-reach-distance=Armreichweite -effect-bot-speed=Robotergeschwindigkeit -effect-lab-speed=Laborgeschwindigkeit -effect-stack-bonus=Stapelnonuss -effect-quickbar-count=Anzahl Schnellleistenelemente -effect-inventory-size=Inventargröße -effect-mining-prod=Abbauproduktivität -effect-game-speed=Spielgeschwindigkeit -effect-save=Spiel speichern -effect-reload-effects=Effekte neu laden -effect-reload-map=Minimap neu laden -effect-kill-biters=Töte alle Beisser -effect-crc=Forciere CRC check -effect-reset-force=Fraktion zurücksetzen \ No newline at end of file diff --git a/locale/de/inventory-search.cfg b/locale/de/inventory-search.cfg deleted file mode 100644 index f554f813..00000000 --- a/locale/de/inventory-search.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[inventory-search] -low=Dein Inventar wurde durchsucht und __1__ wurde entfernt. -med=Dein Inventar wurde durchsucht und __1__ wurde entfernt. Dir wird hiermit eine Warnung erteilt! Versuche es nicht erneut! -high=Dein inventar wurde durchsucht und __1__ wurde gefunden, dies ist auf GAR KEINEN Fall erlaubt, dein Inventar wurde zum Spawnpunkt transferiert. \ No newline at end of file diff --git a/locale/de/player-info.cfg b/locale/de/player-info.cfg deleted file mode 100644 index 57e13ea2..00000000 --- a/locale/de/player-info.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[player-info] -yes=Ja -no=Nein -name=[__1__] __2__ -online=Ist online: __1__ (__2__) -admin=Hat Admin Rang: __1__ -group=In Benutzer Gruppe: __1__ -rank=Hat Rang: __1__ \ No newline at end of file diff --git a/locale/de/player-list.cfg b/locale/de/player-list.cfg deleted file mode 100644 index 7caaf627..00000000 --- a/locale/de/player-list.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[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. \ No newline at end of file diff --git a/locale/de/polls.cfg b/locale/de/polls.cfg deleted file mode 100644 index 22f49c42..00000000 --- a/locale/de/polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[polls] -name=Umfragen -tooltip=Alte Umfragen ansehen -no-poll=Keine alten Umfragen -end=Die Umfrage hat gerade geendet: __1__ -winner=__1__ hatte die meisten Stimmen. -time-left=Du hast noch __1__s um deine Wahl zu erfassen. \ No newline at end of file diff --git a/locale/de/rank-changer.cfg b/locale/de/rank-changer.cfg deleted file mode 100644 index 3f41a602..00000000 --- a/locale/de/rank-changer.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[rank-changer] -name=Rangwechsel -tooltip=Setze den Rang eines niedriger gerankten Spielers. -no-info-file=Es wurde keine Informationsdatei gefunden. -message=Bitte wähle einen Spieler und einen Rang. Du kannst nur Spielern mit niedrigerem Rang einen anderen Rang geben. -warning=Achtung, dieser Spieler hat einen höheren Rang als du. Du kannst seinen Rang nicht ändern. -rank-high=Dieser Spieler hat einen höheren Rang als du, Rangwechsel fehlgeschlagen! -invalid=Der Spieler oder der Rang ist ungültig, bitte versuche es erneut! -set-rank=Setze Spielerrang \ No newline at end of file diff --git a/locale/de/readme.cfg b/locale/de/readme.cfg deleted file mode 100644 index 654ce47e..00000000 --- a/locale/de/readme.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. -commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap2=Public -servers-des2=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap3=Public -servers-des3=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. -servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. -servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. -rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. diff --git a/locale/de/reports.cfg b/locale/de/reports.cfg deleted file mode 100644 index b0152d44..00000000 --- a/locale/de/reports.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[reports] -name=Report Player -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 cant be reported. -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. \ No newline at end of file diff --git a/locale/de/rockets.cfg b/locale/de/rockets.cfg deleted file mode 100644 index 93a664e8..00000000 --- a/locale/de/rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[rockets] -name=Raketeninfo -tooltip=Detailliste über gestartete Raketen. -none=Es wurden noch keine Rakten gestartet. -nan=NaN -sent=Gestartete Raketen: __1__ -first=Erster Start: __1__ -last=Dauer bis zum letzten Start: __1__ -time=Durchschnittliche Starzeit: __1__ -fastest=Schnellster Start: __1__ -milestones=Meilensteine: -format=__1__: __2__ \ No newline at end of file diff --git a/locale/de/science.cfg b/locale/de/science.cfg deleted file mode 100644 index e532d761..00000000 --- a/locale/de/science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[science] -name=Wissenschaftsinfo -tooltip=Detailliste über Wissenschaftspakete -total=Gemachte Pakete: -time=Pakete pro Minute: -format=__1__: __2__ -science-pack-1=Rot -science-pack-2=Grün -science-pack-3=Blau -military-science-pack=Militär -production-science-pack=Produktion -high-tech-science-pack=Hochtechnologie -space-science-pack=Weltraum -none=Es wurden noch keine Wissenschaftspakete gemacht. \ No newline at end of file diff --git a/locale/de/tasklist.cfg b/locale/de/tasklist.cfg deleted file mode 100644 index bb567f83..00000000 --- a/locale/de/tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[tasklist] -name=Taskliste -tooltip=Welche Aufgaben müssen rund um die Fabrik erledigt werden? -none=Es sind aktuell keine Tasks erfasst, frage einen Member um einen hinzuzufügen. \ No newline at end of file diff --git a/locale/de/tree-decon.cfg b/locale/de/tree-decon.cfg deleted file mode 100644 index 42c2d06f..00000000 --- a/locale/de/tree-decon.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[tree-decon] -player-print=Du darfst dies noch nicht entfernen. Du benötigst dazu den Rang Regular, den du nach 3 Stunden auf dem Server automatisch erhältst. -rank-print=__1__ versuchte etwas zu entfernen. \ No newline at end of file diff --git a/locale/de/warp-system.cfg b/locale/de/warp-system.cfg deleted file mode 100644 index 590ce5d2..00000000 --- a/locale/de/warp-system.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[warp-system] -name=Warp List -tooltip=Die Liste mit den Warp-Punkten -remove-tooltip=Entferne Warp-Punkt -go-to-tooltip=Gehe zu Warp-Punkt -cooldown=Warte, bis der Cooldown abgelaufen ist. Verbleibende Zeit: __1__ -cooldown-zero=Dein Cooldown ist abgelaufen, du kannst jetzt wieder Warp-Punkte verwenden. -name-used=Dieser Name ist schon vergeben. -not-on-warp=Du bist nicht auf einem Warp-Punkt. Gehe auf einen Warp-Punkt, um zu einem anderen zu springen. \ No newline at end of file diff --git a/locale/en/admin.cfg b/locale/en/admin.cfg deleted file mode 100644 index e02eb650..00000000 --- a/locale/en/admin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[admin-commands] -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 diff --git a/locale/en/announcements.cfg b/locale/en/announcements.cfg deleted file mode 100644 index 78639e4d..00000000 --- a/locale/en/announcements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[announcements] -name=Announcements -tooltip=Sends an announcement to all players -sent-to=This announcement is sent to __1__ -sent-by=This announcement was sent by __1__ ( __2__ ) -select-rank=This announcement will be sent to: \ No newline at end of file diff --git a/locale/en/base-damage.cfg b/locale/en/base-damage.cfg deleted file mode 100644 index 43f65cdc..00000000 --- a/locale/en/base-damage.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[base-damage] -used=You hit some of your own buildings. Please be careful next time! -nuke=Nukes are not allowed at your rank. This is a preventive measure against griefers. diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg deleted file mode 100644 index 11449b4d..00000000 --- a/locale/en/chat-bot.cfg +++ /dev/null @@ -1,47 +0,0 @@ -[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 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. -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/ -hodor=Hodor \ No newline at end of file diff --git a/locale/en/game-settings.cfg b/locale/en/game-settings.cfg deleted file mode 100644 index c7bbb411..00000000 --- a/locale/en/game-settings.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[game-settings] -name=Game Settings -tooltip=Edits Game Settings. Please use responsibly. -basic-name=Basic Settings -basic-tooltip=These settings are safe to edit and have no big impact. -basic-message=Basic Settings can be used to improve game play for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realise. -personal-name=Personal Settings -personal-tooltip=Personal Settings only affect you. -personal-message=Personal Settings only affect your character. If you are spotted as a result of these settings, you are on your own! -sure=Are you sure? -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force diff --git a/locale/en/inventory-search.cfg b/locale/en/inventory-search.cfg deleted file mode 100644 index e67991b6..00000000 --- a/locale/en/inventory-search.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[inventory-search] -low=Your inventory was searched and __1__ was removed. -med=Your inventory was searched and __1__ was removed, you have been given a warning as a result. -high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been temp-banned as a result. \ No newline at end of file diff --git a/locale/en/player-info.cfg b/locale/en/player-info.cfg deleted file mode 100644 index 834ebb19..00000000 --- a/locale/en/player-info.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[player-info] -yes=Yes -no=No -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -rank=Has Rank: __1__ \ No newline at end of file diff --git a/locale/en/player-list.cfg b/locale/en/player-list.cfg deleted file mode 100644 index a385d119..00000000 --- a/locale/en/player-list.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[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 \ No newline at end of file diff --git a/locale/en/polls.cfg b/locale/en/polls.cfg deleted file mode 100644 index 14c5c6d8..00000000 --- a/locale/en/polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[polls] -name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/locale/en/rank-changer.cfg b/locale/en/rank-changer.cfg deleted file mode 100644 index 6ea0209f..00000000 --- a/locale/en/rank-changer.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[rank-changer] -name=Rank Changer -tooltip=Change the rank of a player below you. -no-info-file=No info file was found -message=Select a player and the desired rank. You can only give ranks to people that are below your rank. -warning=Warning: This player outranks you. Therefore, you cannot edit their rank. -rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank. -invalid=The player or the rank is invalid. Please try again! -set-rank=Set Player Rank diff --git a/locale/en/readme.cfg b/locale/en/readme.cfg deleted file mode 100644 index 64c02823..00000000 --- a/locale/en/readme.cfg +++ /dev/null @@ -1,71 +0,0 @@ -[readme] -tooltip=Open the ReadMe if this is your first time joining. -guildlines-name=Guidelines -guildlines-tooltip=These are the guidelines everyone should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2=Here are some guidelines that everyone is obligated to follow. -guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. -guildlines-line7=- Do not remove stuff without asking your fellow players. -guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). No train loops! -guildlines-line9= -guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun! -chat-name=How To Chat -chat-tooltip=How to chat in Factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options. The key you need to change is “Toggle LUA console” -commands-name=Commands -commands-tooltip=Commands that you can use in ExplosiveGaming -commands-singleline=Custom commands that you can use. Base commands are not shown here. -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch with us -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -links-cap5=Our wiki: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! S1-S2 are staggered resets. -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map resets every 48H at 16:00 UTC. -servers-cap2=Public -servers-des2=A place for all players, this map resets every 48H at 16:00 UTC. -servers-cap3=Public -servers-des3=A place for all players, this map resets every week on Friday at 22:00 UTC. -servers-cap4=Modded -servers-des4=A Modded server for all players. Link on Discord for members. -servers-cap5=Events -servers-des5=An anarchy server (WIP) (Everyone can join. No bans, except for blatant heavy lack for respect). Join Discord for more info. -servers-cap6=Donator -servers-des6=For players who support us financially. Changes can be made per request. -servers-cap7=Events -servers-des7=Server for events (everyone can join) - May require a password. Join Discord for more info. -rules-name=Rules -rules-tooltip=The full list of ExplosiveGaming rules. -rules-singleline=Although the guidelines cover most of our rules, the full list always have more priority and override any guideline. It is advised to be familiar with all rules to prevent warnings or bans. -rules-format=__1__) __2__ -rules-rule1=Hacking / cheating / abusing bugs will not be tolerated. -rules-rule2=Any bugs or exploits found should be reported to our team members. (excluding creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Taking all items from a belt or logistics request is forbidden: sharing resources is mandatory. -rules-rule5=Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. -rules-rule6=Do not lay down/remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alerts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in random directions for no reason (to save map size and server resources). -rules-rule11=Do not remove stuff without asking your fellow players. -rules-rule12=Do not rotate belts, deactivate belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains, use the same size other players have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups etc. -rules-rule17=Do not ask for ranks. Our ranks are synchronized with Discord, make sure to join us there. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report players who break the rules. -rules-rule20=Use common sense and what an Admin says goes. diff --git a/locale/en/reports.cfg b/locale/en/reports.cfg deleted file mode 100644 index 8e7423c6..00000000 --- a/locale/en/reports.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[reports] -name=Report Player -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. -cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all -warning-given-by=This warning was given by: __1__ -player-warning=__1__ was given a warning by __2__ for: __3__ -temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset -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. diff --git a/locale/en/rockets.cfg b/locale/en/rockets.cfg deleted file mode 100644 index 0c227069..00000000 --- a/locale/en/rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. -nan=Not available -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: -format=__1__: __2__ \ No newline at end of file diff --git a/locale/en/science.cfg b/locale/en/science.cfg deleted file mode 100644 index f42dbc94..00000000 --- a/locale/en/science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: -format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production -high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file diff --git a/locale/en/tasklist.cfg b/locale/en/tasklist.cfg deleted file mode 100644 index 24fafeb9..00000000 --- a/locale/en/tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[tasklist] -name=Task List -tooltip=Jobs that needs to be completed all around the factory. -none=There are currently no tasks. Ask a Member in-game or through Discord to add tasks. \ No newline at end of file diff --git a/locale/en/tree-decon.cfg b/locale/en/tree-decon.cfg deleted file mode 100644 index b554b454..00000000 --- a/locale/en/tree-decon.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[tree-decon] -player-print=You do not have permission to do this right now. You require the Regular rank which can be obtained through 3 hours of in-game playtime on a server. -rank-print=__1__ tried to deconstruct something. diff --git a/locale/en/warp-system.cfg b/locale/en/warp-system.cfg deleted file mode 100644 index b241d7b4..00000000 --- a/locale/en/warp-system.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[warp-system] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp point -go-to-tooltip=Go To -cooldown=You must wait for the cooldown. Time left: __1__ -cooldown-zero=Your cooldown has expired, You can use warp points again. -name-used=That name is already taken. -too-close=You are too close to an existing warp point to make a new one. -not-on-warp=You are not on a warp point right now, you must be on a warp point to go to one. \ No newline at end of file diff --git a/locale/fr/admin.cfg b/locale/fr/admin.cfg deleted file mode 100644 index 1214477e..00000000 --- a/locale/fr/admin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[admin-commands] -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 diff --git a/locale/fr/announcements.cfg b/locale/fr/announcements.cfg deleted file mode 100644 index c4e55a6a..00000000 --- a/locale/fr/announcements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[announcements] -name=Announcement -tooltip=Sent an announcement to players -sent-to=This is sent to __1__ -sent-by=This was sent by __1__ of rank __2__ -select-rank=This message will be sent to: \ No newline at end of file diff --git a/locale/fr/base-damage.cfg b/locale/fr/base-damage.cfg deleted file mode 100644 index e695107e..00000000 --- a/locale/fr/base-damage.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[capsules] -used=You used __1__ are it hit some of your own buildings, please be more careful, atleast there was no damage. -nuke=Nukes are not allowed for your rank, this is just a way to help provent grifers. \ No newline at end of file diff --git a/locale/fr/chat-bot.cfg b/locale/fr/chat-bot.cfg deleted file mode 100644 index e4bbbe31..00000000 --- a/locale/fr/chat-bot.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[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 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) \ No newline at end of file diff --git a/locale/fr/exp-core.cfg b/locale/fr/exp-core.cfg deleted file mode 100644 index 731d758e..00000000 --- a/locale/fr/exp-core.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[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 - -[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 - -[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 \ No newline at end of file diff --git a/locale/fr/game-settings.cfg b/locale/fr/game-settings.cfg deleted file mode 100644 index cfbcc6e9..00000000 --- a/locale/fr/game-settings.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[game-settings] -name=Game Settings -tooltip=Allows for editing of the game settings, please use resposibliy. -basic-name=Basic Settings -basic-tooltip=These settings are safe to change with no large effects. -basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. -personal-name=Personal Settings -personal-tooltip=These will only effect you, if you are spoted you are on your own. -personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. -sure=Are You Sure! -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force \ No newline at end of file diff --git a/locale/fr/inventory-search.cfg b/locale/fr/inventory-search.cfg deleted file mode 100644 index 20db013b..00000000 --- a/locale/fr/inventory-search.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[inventory-search] -low=Your Inventory Was Search And __1__ was removed. -med=Your Inventory Was Search And __1__ was removed, you have been given a warning. -high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file diff --git a/locale/fr/player-info.cfg b/locale/fr/player-info.cfg deleted file mode 100644 index 834ebb19..00000000 --- a/locale/fr/player-info.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[player-info] -yes=Yes -no=No -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -rank=Has Rank: __1__ \ No newline at end of file diff --git a/locale/fr/player-list.cfg b/locale/fr/player-list.cfg deleted file mode 100644 index 9adacd4d..00000000 --- a/locale/fr/player-list.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[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 \ No newline at end of file diff --git a/locale/fr/polls.cfg b/locale/fr/polls.cfg deleted file mode 100644 index 14c5c6d8..00000000 --- a/locale/fr/polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[polls] -name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/locale/fr/rank-changer.cfg b/locale/fr/rank-changer.cfg deleted file mode 100644 index bbc7a51b..00000000 --- a/locale/fr/rank-changer.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[rank-changer] -name=Rank Changer -tooltip=Change the rank of a player below you. -no-info-file=No info file was found -message=Please select a player and a rank, you can you give ranks to people below you. -warning=Warning, this player is a higher rank so you cant change their rank. -rank-high=This player is a higher rank, rank change failed! -invalid=The player or the rank is invalid please try again! -set-rank=Set Player Rank diff --git a/locale/fr/readme.cfg b/locale/fr/readme.cfg deleted file mode 100644 index 2d65dc10..00000000 --- a/locale/fr/readme.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. -commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map reset every 24h. -servers-cap2=Standard -servers-des2=Before you play make sure you understand the game, reset every 48h. -servers-cap3=Pro -servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. -servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. -servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. -servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. -rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file diff --git a/locale/fr/reports.cfg b/locale/fr/reports.cfg deleted file mode 100644 index b0152d44..00000000 --- a/locale/fr/reports.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[reports] -name=Report Player -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 cant be reported. -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. \ No newline at end of file diff --git a/locale/fr/rockets.cfg b/locale/fr/rockets.cfg deleted file mode 100644 index be434056..00000000 --- a/locale/fr/rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. -nan=NaN -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: -format=__1__: __2__ \ No newline at end of file diff --git a/locale/fr/science.cfg b/locale/fr/science.cfg deleted file mode 100644 index f42dbc94..00000000 --- a/locale/fr/science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: -format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production -high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file diff --git a/locale/fr/tasklist.cfg b/locale/fr/tasklist.cfg deleted file mode 100644 index 1e2baa06..00000000 --- a/locale/fr/tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[tasklist] -name=Task List -tooltip=What jobs need to be done round the factory. -none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file diff --git a/locale/fr/tree-decon.cfg b/locale/fr/tree-decon.cfg deleted file mode 100644 index f1bfe299..00000000 --- a/locale/fr/tree-decon.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[tree-decon] -player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours -rank-print=__1__ tried to deconstruct something. \ No newline at end of file diff --git a/locale/fr/warp-system.cfg b/locale/fr/warp-system.cfg deleted file mode 100644 index 203519fe..00000000 --- a/locale/fr/warp-system.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[warp-system] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/locale/nl/admin.cfg b/locale/nl/admin.cfg deleted file mode 100644 index 822b2916..00000000 --- a/locale/nl/admin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[admin-commands] -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 diff --git a/locale/nl/announcements.cfg b/locale/nl/announcements.cfg deleted file mode 100644 index b755dd4e..00000000 --- a/locale/nl/announcements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[announcements] -name=Mededelingen -tooltip=Verstuurt een mededeling naar iedereen -sent-to=Deze mededeling is gestuurd naar __1__ -sent-by=Deze mededeling is gestuurd door __1__ ( __2__ ) -select-rank=Deze mededeling wordt gestuurd naar: diff --git a/locale/nl/base-damage.cfg b/locale/nl/base-damage.cfg deleted file mode 100644 index c5a3202e..00000000 --- a/locale/nl/base-damage.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[capsules] -used=Je hebt __1__ gebruikt, deze heeft jouw gebouw(en) geraakt. Wees volgende keer wat meer voorzichtig. -nuke=Nukes zijn niet toegestaan op jouw rank. Dit is een preventief middel tegen griefing. diff --git a/locale/nl/chat-bot.cfg b/locale/nl/chat-bot.cfg deleted file mode 100644 index e4bbbe31..00000000 --- a/locale/nl/chat-bot.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[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 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) \ No newline at end of file diff --git a/locale/nl/exp-core.cfg b/locale/nl/exp-core.cfg deleted file mode 100644 index c3400159..00000000 --- a/locale/nl/exp-core.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[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. - -[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. - -[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. diff --git a/locale/nl/game-settings.cfg b/locale/nl/game-settings.cfg deleted file mode 100644 index 91e50cab..00000000 --- a/locale/nl/game-settings.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[game-settings] -name=Game instellingen -tooltip=Maakt het mogelijk om gameinstellingen te wijzigen. Gebruik het verantwoord! -basic-name=Basis instellingen -basic-tooltip=Deze instellingen kunnen veilig worden gewijzigd. -basic-message=Deze instellingen kunnen worden gebruikt om het spelervaring voor de spelers te verbeteren. -advanced-name=Geavanceerde instellingen -advanced-tooltip=Het is ten zeerste aangeraden om niet aan deze instellingen te zitten, tenzij je weet wat je doet. -advanced-message=Waarschuwing: Niet aan deze instellingen zitten tenzij je honderd procent zeker weet wat je aan het doen bent. Het wijzigen van deze instellingen kunnen een groter effect hebben dan je denkt. -personal-name=Persoonlijke instellingen -personal-tooltip=Deze instellingen hebben alleen effect op jouw speler. -personal-message=Deze instellingen hebben alleen effect op jouw speler: gebruik het verantwoord, aangezien het overmatig gebruik van deze instellingen niet zijn toegestaan. -sure=Weet je het zeker? -effect-mining-speed=Mining Snelheid -effect-craft-speed=Crafting Snelheid -effect-running-speed=Ren Snelheid -effect-build-distance=Bouwafstand -effect-reach-distance=Bereik -effect-bot-speed=Bot Snelheid -effect-lab-speed=Lab Snelheid -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory grootte -effect-mining-prod=Mining Productiviteit -effect-game-speed=Gamesnelheid -effect-save=Opslaan -effect-reload-effects=Effecten herladen -effect-reload-map=Minimap herladen -effect-kill-biters=Biters vermoorden -effect-crc=Forceer CRC check -effect-reset-force=Forceren resetten diff --git a/locale/nl/inventory-search.cfg b/locale/nl/inventory-search.cfg deleted file mode 100644 index aa687f4c..00000000 --- a/locale/nl/inventory-search.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[inventory-search] -low=Je inventaris is doorzocht en __1__ is verwijderd. -med=Je inventaris is doorzocht en __1__ is verwijderd, je bent gewaarschuwd. -high=Je inventaris is doorzocht en __1__ is gevonden, dit is ten strengste verboden! Je inventaris is verwijderd. diff --git a/locale/nl/player-info.cfg b/locale/nl/player-info.cfg deleted file mode 100644 index d937eef2..00000000 --- a/locale/nl/player-info.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[player-info] -yes=Ja -no=Nee -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Heeft Admin: __1__ -group=In Groep: __1__ -rank=Heeft Rank: __1__ diff --git a/locale/nl/player-list.cfg b/locale/nl/player-list.cfg deleted file mode 100644 index 4ba8d8b6..00000000 --- a/locale/nl/player-list.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[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. diff --git a/locale/nl/polls.cfg b/locale/nl/polls.cfg deleted file mode 100644 index 5f410073..00000000 --- a/locale/nl/polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[polls] -name=Polls -tooltip=Laat oude polls zien -no-poll=Geen oude polls -end=Poll is zojuist beëindigd: __1__ -winner=__1__ had de meeste stemmen. -time-left=Je hebt __1__s om te kiezen. diff --git a/locale/nl/rank-changer.cfg b/locale/nl/rank-changer.cfg deleted file mode 100644 index 8e2e1383..00000000 --- a/locale/nl/rank-changer.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[rank-changer] -name=Rank wijziger -tooltip=Wijzig de ranken van spelers onder jouw rank. -no-info-file=Geen infobestand gevonden. -message=Selecteer een speler en een rank om deze te wijzigen. -warning=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft. -rank-high=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft. -invalid=Fout: De speler kan niet gevonden worden en/of de actie is onjuist. Probeer opnieuw! -set-rank=Wijzig rank diff --git a/locale/nl/readme.cfg b/locale/nl/readme.cfg deleted file mode 100644 index 597051c0..00000000 --- a/locale/nl/readme.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[readme] -tooltip=Open de ReadMe wanneer je voor het eerst speelt. -guildlines-name=Richtlijnen -guildlines-tooltip=Dit zijn de richtlijnen die je moet volgen. -guildlines-line1=Welkom op de ExplosiveGaming community! -guildlines-line2= -guildlines-line3=Hier zijn een aantal richtlijnen die ieder speler moet volgen. -guildlines-line4=- Hacken / cheaten en bugs misbruiken is niet toegestaan. -guildlines-line5=- Wees aardig en gebruik je gezonde verstand. -guildlines-line6=- Spammen (in de zin van chat, kisten en beton) is niet toegestaan. -guildlines-line7=- Geen spullen verwijderen zonder toestemming van andere spelers. -guildlines-line8=- Treinen (LHD - Left Hand Drive) geen loops. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=Als je vragen hebt over deze regels of over de server in algemeen, aarzel dan niet om contact op te nemen met onze staff. -chat-name=Chatten -chat-tooltip=Chatten in Factorio met standaard instellingen -chat-singleline=Chatten kan moeilijk zijn voor nieuwe spelers omdat de chatmechanisme in Factorio anders is dan andere spellen. Het is simpel: druk op de "GRAVE/TILDE" knop (locatie is onder de ESC knop). Als je deze knop wilt aanpassen, ga naar de Controls tab in Opties. De knop die je moet aanpassen is "Toggle LUA Console" -commands-name=Commands -commands-tooltip=Dit zijn de commands die je kunt gebruiken. -commands-singleline=Er zijn veel verschillende custom commands die je kunt gebruiken. Let er wel op dat basis commands hier niet zichtbaar zijn. -commands-col1=Commando naam -commands-col2=Commando hulp -links-name=Links -links-tooltip=Nuttige links om in contact te komen met de community -links-cap1=Discord server: -links-cap2=Onze website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info over onze andere servers -servers-singleline=Welkom op de ExplosiveGaming community! S1 tot en met S3 heeft geplande resets. -servers-format=S__1__: __2__ -servers-cap1=Openbaar -servers-des1=Server voor alle spelers, deze map reset elke 144 uur om 16:00 UTC. -servers-cap2=Openbaar -servers-des2=A place for all players, deze map reset elke 144 uur om 16:00 UTC. -servers-cap3=Openbaar -servers-des3=A place for all players, deze map reset elke 144 uur om 16:00 UTC. -servers-cap4=Modded -servers-des4=Een modded server voor alle spelers. Links zijn te vinden in de Discord server. -servers-cap5=Events -servers-des5=Server voor events. Links en wachtwoorden zijn te vinden in de Discord server. -servers-cap6=Donator -servers-des6=Voor de spelers die ons financieel ondersteunen. -rules-name=Alle regels -rules-tooltip=Een lijst met regels die van toepassing zijn op alle ExplosiveGaming servers. -rules-singleline=Dit is een lijst met alle regels. De richtlijnen behandelt de meeste punten, maar de volledige lijst is ook van toepassing. -rules-format=__1__) __2__ -rules-rule1=Hacken / cheaten en bugs misbruiken is niet toegestaan. -rules-rule2=Bugs of fouten horen gerapporteerd te worden aan de staff. -rules-rule3=Respecteer iedereen in de server. -rules-rule4=Pak niet alles uit een belt of via logistiekaanvragen: deel je middelen. -rules-rule5=Spammen (in de zin van chat, kisten en beton) is niet toegestaan. -rules-rule6=Bouw geen beton of steen met bots zonder toestemming. -rules-rule7=Gebruik geen actieve providerkist zonder toestemming. -rules-rule8=Gebruik geen speakers (globaal of met alerts) zonder toestemming. -rules-rule9=Verwijder geen grote delen van het fabriek zonder toestemming. -rules-rule10=Loop niet in willekeurige plekken zonder een reden (bespaart mapgrootte en server resources) -rules-rule11=Geen spullen verwijderen zonder toestemming van andere spelers. -rules-rule12=Draai de belts niet, deactiveer belts niet met draden en laat de productie niet stoppen. -rules-rule13=Maak geen treinrotondes of lussen. -rules-rule14=Gebruik de zelfde grootte treinen als andere spelers. -rules-rule15=Treinen zijn alleen LHD (Left Hand Drive) -rules-rule16=Klaag niet over de lag, lage FPS of lage UPS. -rules-rule17=Vraag niet om ranks: ranks zijn synchroon met onze Discord server. -rules-rule18=Maak geen reclame voor andere servers, tenzij je daarvoor bevoegd bent. -rules-rule19=Rapporteer spelers die de regels breken. -rules-rule20=Gebruik gezond verstand. diff --git a/locale/nl/reports.cfg b/locale/nl/reports.cfg deleted file mode 100644 index 4ff8f232..00000000 --- a/locale/nl/reports.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[reports] -name=Rapporteer speler -low-print=__1__ is gerapporteerd door een speler met de reden: __2__ -high-print=__1__ is gerapporteerd door __2__ met de reden: __3__ -cant-report=Deze speler kan niet gerapporteerd worden. -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. diff --git a/locale/nl/rockets.cfg b/locale/nl/rockets.cfg deleted file mode 100644 index b0c00b88..00000000 --- a/locale/nl/rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[rockets] -name=Raket Info -tooltip=Lijst met details over de verstuurde raketten. -none=Er zijn nog geen raketten verstuurd. -nan=Niet beschikbaar -sent=Raketten verstuurd: __1__ -first=Eerste raket gelanceerd op: __1__ -last=Meest recente lancering: __1__ -time=Gemiddelde lanceertijd: __1__ -fastest=Snelste lancering: __1__ -milestones=Mijlpalen: -format=__1__: __2__ diff --git a/locale/nl/science.cfg b/locale/nl/science.cfg deleted file mode 100644 index 34e8acd2..00000000 --- a/locale/nl/science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[science] -name=Wetenschap info -tooltip=Lijst met details over de wetenschaps pakketten. -total=Pakketten gemaakt: -time=Pakketten per minuut: -format=__1__: __2__ -science-pack-1=Rood -science-pack-2=Groen -science-pack-3=Blauw -military-science-pack=Militair -production-science-pack=Productie -high-tech-science-pack=High Tech -space-science-pack=Ruimte -none=Er zijn nog geen wetenschaps pakketten gemaakt. diff --git a/locale/nl/tasklist.cfg b/locale/nl/tasklist.cfg deleted file mode 100644 index 3838ce22..00000000 --- a/locale/nl/tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[tasklist] -name=Taaklijst -tooltip=Wat voor werk er rondom de fabriek gedaan moet worden -none=Er zijn momenteel geen taken. Vraag een Member om taken toe te voegen. diff --git a/locale/nl/tree-decon.cfg b/locale/nl/tree-decon.cfg deleted file mode 100644 index 98c12096..00000000 --- a/locale/nl/tree-decon.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[tree-decon] -player-print=Je moet minstens 3 uur gespeeld hebben om dit uit te voeren. -rank-print=__1__ heeft geprobeerd iets te deconstrueren. diff --git a/locale/nl/warp-system.cfg b/locale/nl/warp-system.cfg deleted file mode 100644 index 203519fe..00000000 --- a/locale/nl/warp-system.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[warp-system] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/locale/sv-SE/admin.cfg b/locale/sv-SE/admin.cfg deleted file mode 100644 index c4432fa8..00000000 --- a/locale/sv-SE/admin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[admin-commands] -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 diff --git a/locale/sv-SE/announcements.cfg b/locale/sv-SE/announcements.cfg deleted file mode 100644 index f3f38a32..00000000 --- a/locale/sv-SE/announcements.cfg +++ /dev/null @@ -1,7 +0,0 @@ - -[announcements] -name=Meddelanden -tooltip=Sänder ett meddelande till alla spelare -sent-to=Det här meddelandet är skickat till __1__ -sent-by=Det här meddelandet är skickat av __1__ ( __2__ ) -select-rank=Det här meddelandet kommer att skickas till: diff --git a/locale/sv-SE/base-damage.cfg b/locale/sv-SE/base-damage.cfg deleted file mode 100644 index 154e28c3..00000000 --- a/locale/sv-SE/base-damage.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[base-damage] -used=Du träffade några av dina egna byggnader. Var försiktig nästa gång! -nuke=Kärnvapen är inte tillåted för din rang. Det här är en förebyggande åtgärd mot griefers (bråkstakar) diff --git a/locale/sv-SE/chat-bot.cfg b/locale/sv-SE/chat-bot.cfg deleted file mode 100644 index 68e0663e..00000000 --- a/locale/sv-SE/chat-bot.cfg +++ /dev/null @@ -1,25 +0,0 @@ - -[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 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/ \ No newline at end of file diff --git a/locale/sv-SE/exp-core.cfg b/locale/sv-SE/exp-core.cfg deleted file mode 100644 index 40791114..00000000 --- a/locale/sv-SE/exp-core.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[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 - -[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. - -[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 \ No newline at end of file diff --git a/locale/sv-SE/game-settings.cfg b/locale/sv-SE/game-settings.cfg deleted file mode 100644 index f8d8fd3d..00000000 --- a/locale/sv-SE/game-settings.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[game-settings] -name=Game Settings -tooltip=Edits Game Settings. Please use responsibly. -basic-name=Basic Settings -basic-tooltip=These settings are safe to edit and have no big impact. -basic-message=Basic Settings can be used to improve game play for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realize. -personal-name=Personal Settings -personal-tooltip=Personal Settings only affects you. -personal-message=Personal Settings only affects your character. If you are spotted as a result of these settings, you are on your own! -sure=Are you sure? -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force diff --git a/locale/sv-SE/inventory-search.cfg b/locale/sv-SE/inventory-search.cfg deleted file mode 100644 index 3de370f6..00000000 --- a/locale/sv-SE/inventory-search.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[inventory-search] -low=Ditt inventarie blev genomsökt och __1__ togs bort. -med=Ditt inventarie blev genomsökt och __1__ togs bort, du har fått en varning på grund av detta. -high=Ditt inventarie blev genomsökt och __1__ togs bort: Det här är inte tillåtet. Som ett resultat av det har du blivit tillfälligt bannlyst. diff --git a/locale/sv-SE/player-info.cfg b/locale/sv-SE/player-info.cfg deleted file mode 100644 index 2f5b5e22..00000000 --- a/locale/sv-SE/player-info.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[player-info] -yes=Ja -no=Nej -name=[__1__] __2__ -online=Är Online: __1__ (__2__) -admin=Har Admin: __1__ -group=I användargrupp: __1__ -rank=Har rang: __1__ diff --git a/locale/sv-SE/player-list.cfg b/locale/sv-SE/player-list.cfg deleted file mode 100644 index b415bf5d..00000000 --- a/locale/sv-SE/player-list.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[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 diff --git a/locale/sv-SE/polls.cfg b/locale/sv-SE/polls.cfg deleted file mode 100644 index 4331b9d7..00000000 --- a/locale/sv-SE/polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[polls] -name=Undersökningar -tooltip=Se gamla undersökningar -no-poll=Inga gamla undersökningar -end=Röstning slutade nyss: __1__ -winner=__1__ hade flest röster. -time-left=Du kommer att få __1__s på dig att välja. \ No newline at end of file diff --git a/locale/sv-SE/rank-changer.cfg b/locale/sv-SE/rank-changer.cfg deleted file mode 100644 index 54a091ae..00000000 --- a/locale/sv-SE/rank-changer.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[rank-changer] -name=Rangbytare -tooltip=Byt rang för en spelare under dig. -no-info-file=Ingen fil kunde hittas. -message=Välj en spelare och en önskad rang. Du kan bara ge ny rang till personer som har lägre rang än du. -warning=Varning: Den här spelaren har högre rang än du. Därför kan du inte redigera dennes rang. -rank-high=Warning: Varning: Den här spelaren har högre rang än du. Därför kan du inte redigera dennes rang. -invalid=Antingen spelaren eller rangen är ogiltig. Var vänlig försök igen! -set-rank=Sätt spelares rang diff --git a/locale/sv-SE/readme.cfg b/locale/sv-SE/readme.cfg deleted file mode 100644 index 9107815c..00000000 --- a/locale/sv-SE/readme.cfg +++ /dev/null @@ -1,69 +0,0 @@ -[readme] -tooltip=Öppna ReadMe om det här är första gången du ansluter dig. -guildlines-name=Riktlinjer -guildlines-tooltip=Det här är riktlinjerna som alla bör följa -guildlines-line1=Välkommen till gemenskapen ExplosiveGaming! -guildlines-line2=Här är riktlinjerna som alla är tvingade att följa. -guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! -guildlines-line4=- Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. -guildlines-line5=- Var artig och använd sunt förnuft. -guildlines-line6=- Spam (genom chat, bottar, obegränsade kistor och betong) är inte tillåtet. -guildlines-line7=- Ta inte bort saker utan att fråga dina medspelare. -guildlines-line8=- Tåg är bara tillåtna med vänstertrafik. Inga tågloopar! -guildlines-line9= -guildlines-line10= Om du har frågor om reglerna, servern eller generelt om Factorio, känn dig fri att fråga dina medspelare eller vårat hjälpsamma team. Ha kul! -chat-name=Hur du chattar -chat-tooltip=Hur du chattar i Factorio med standardinställningar -chat-singleline=Att chatta kan vara svårt för nya spelare efterson det är annurlunda från andra spel. Det är väldigt enkelt, tangenten som du behöver trycka på är "ö".Om du vill byta det, gå in till "kontroller" och ändra tangent för "lua konsol". -commands-name=Kommandon -commands-tooltip=Kommandon som du kan använda i ExplosiveGaming -commands-singleline=Anpassade kommandon som du kan använda. Baskommandon visas inte här. -commands-col1=Kommandonamn -commands-col2=kommandohjälp -links-name=Länkar -links-tooltip=Hjälpfulla länkar som visar vägar att komma i kontakt med oss. -links-cap1=Discord röst- och chatserver: -links-cap2=Våran Webbadress : -links-cap3=Steam: -links-cap4=Patreon: -links-cap5=Vår wiki: -servers-name=Servrar -servers-tooltip=Information om våra servrar -servers-singleline=Välkommen till ExplosiveGamings gemenskap! S1-S3 har förskjutna återställningar (resets). -servers-format=S__1__: __2__ -servers-cap1=Offentlig -servers-des1=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap2=Offentlig -servers-des2=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap3=Offentlig -servers-des3=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap4=Modifierad -servers-des4=En modifierad server för alla spelare. Länk i Discord för medlemmar. -servers-cap5=Evenemang -servers-des5=Server för evenemang (alla kan ansluta sig) - Kan kräva lösenord. Anslut dig till Discord för mer info. -servers-cap6=Donator -servers-des6=För spelare som stöder oss finansiellt. Ändringar kan göras på begäran. -rules-name=Regler -rules-tooltip=Den fullla listan över ExplosiveGamings regler. -rules-singleline=Även om riktlinjerna täcker de flesta av reglerna så har den fulla listan alltid prioritet och går alltid före riktlinjerna. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. -rules-format=__1__) __2__ -rules-rule1=Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. -rules-rule2=Buggar och utnyttjingssätt ska rapporteras till team-medlemmar (exkludera kreativa saker) -rules-rule3=Var inte respektlös mot någon annan spelare i servern. -rules-rule4=Att ta alla saker från ett bälte eller logistikbegäran är förbjudet: att dela med sig av resurserna är obligatoriskt. -rules-rule5=Spam (genom chat, bottar, obegränsade kistor eller betong) är inte tillåtet. -rules-rule6=Gör inga placeringar/borttagningar av betong eller sten med hjälp av bottar utan tillåtelse. -rules-rule7=Använd inte aktiva tillgångskistor utan tillåtelse. -rules-rule8=Använd inte globala högtalare eller varningar utan tillåtelse. -rules-rule9=Ta inte bort eller flytta huvuddelar av fabriken utan tillåtelse. -rules-rule10=Gå inte omkring i slumpvisa riktningar utan anledning (för att spara kartstorlek och serverresurser) -rules-rule11=Ta inte bort saker utan att fråga dina medspelare. -rules-rule12=Rotera inte bälten, deaktivera inte bälten med kabel och orsaka inte produktionsstop. -rules-rule13=Gör inte tågrondeller. Eller någon loop av något slag. -rules-rule14=Vid användning av tåg, använd samma storlek som andra spelare använt sig av. -rules-rule15=Tåg körs endast med vänstertrafik. -rules-rule16=Klaga inte om lag, låg fps, låg ups etc. -rules-rule17=Be inte om högre rang. Våra ranger är synkroniserade med Discord, se till att du ansluter dig till oss där. -rules-rule18=Gör inte reklam för andra servrar om du inte är en betrodd serverägare. -rules-rule19=Rapportera spelare som bryter mot reglerna. -rules-rule20=Använd sunt förnuft och vad en admin säger gäller. diff --git a/locale/sv-SE/reports.cfg b/locale/sv-SE/reports.cfg deleted file mode 100644 index bc9e0c7c..00000000 --- a/locale/sv-SE/reports.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[reports] -name=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. -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. diff --git a/locale/sv-SE/rockets.cfg b/locale/sv-SE/rockets.cfg deleted file mode 100644 index 0f0dbd5a..00000000 --- a/locale/sv-SE/rockets.cfg +++ /dev/null @@ -1,13 +0,0 @@ - -[rockets] -name=Raketinformation -tooltip=Lista över detaljerna kring skickade raketer. -none=Inga raketer har blivit skickade ännu. -nan=Inte tillgängligt -sent=Skickade raketer: __1__ -first=Första uppskjutningen skedde: __1__ -last=Senaste uppskjutningen tog: __1__ -time=Genomsnittlig uppskjutningstid: __1__ -fastest=Snabbaste uppskjutning: __1__ -milestones=Milstolpar: -format=__1__: __2__ diff --git a/locale/sv-SE/science.cfg b/locale/sv-SE/science.cfg deleted file mode 100644 index 0cfdf11e..00000000 --- a/locale/sv-SE/science.cfg +++ /dev/null @@ -1,15 +0,0 @@ - -[science] -name=Vetenskapsinformation -tooltip=Detaljerad lista över vetenskapspaket. -total=Paket gjorda: -time=Paket per minut: -format=__1__: __2__ -science-pack-1=Röda -science-pack-2=Gröna -science-pack-3=Blåa -military-science-pack=Militära -production-science-pack=Produktion -high-tech-science-pack=Högteknologiska -space-science-pack=Rymd -none=Inga vetenskapspaket har blivit gjorda ännu. diff --git a/locale/sv-SE/tasklist.cfg b/locale/sv-SE/tasklist.cfg deleted file mode 100644 index dcfd6e8c..00000000 --- a/locale/sv-SE/tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[tasklist] -name=Uppgiftslista -tooltip=Jobb som behövs slutföras överallt i fabriken -none=Det finns för närvarande inga uppgifter. Fråga en medlem i spelet eller via Discord för att lägga till nya uppgifter. \ No newline at end of file diff --git a/locale/sv-SE/tree-decon.cfg b/locale/sv-SE/tree-decon.cfg deleted file mode 100644 index 5d7e1563..00000000 --- a/locale/sv-SE/tree-decon.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[tree-decon] -player-print=Du har inte tillåtelse med det här just nu. Du behöver ha rang "Regular" vilket kan uppnås genom 3 timmar inne i spelet (den här kartan) hos Explosive Gaming. -rank-print=__1__ försökte dekonstruera något. diff --git a/locale/sv-SE/warp-system.cfg b/locale/sv-SE/warp-system.cfg deleted file mode 100644 index 6c468e82..00000000 --- a/locale/sv-SE/warp-system.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[warp-system] -name=Warp-lista -tooltip=En lista över Warp-punkter. -remove-tooltip=Ta bort Warp-punkt -go-to-tooltip=Gå till -cooldown=Du måste vänta på nedräkningen. Tid kvar: __1__ -cooldown-zero=Din nedräkningstimer har gått ut, så nu kan du använda Warp-punkter igen. -name-used=Det namnet är redan taget. -not-on-warp=Du är inte på en Warp-punkt just nu, för att gå till en Warp-punkt måste du befinna dig på en. From d4921a919673e455cdb66e9af17c72e6e10d63ad Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 11 Jan 2019 23:25:57 +0000 Subject: [PATCH 390/392] Added Readme --- README.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..06976858 --- /dev/null +++ b/README.md @@ -0,0 +1,38 @@ +

+ logo +
+ + Release + + + Downloads + + + Star + + + Fork + + + CodeFactor + + + Discord + +

+

ExpGaming Scenario Repository

+ +#### Use and Installation +* Download the git repo +* Move files into the scenario folder (C:\Users\User\AppData\Roaming\Factorio\scenarios\ExpGamingScenario) +* Make edits to role and group configs as well as any other configs that you want +* Run the scenario under Play > Multiplayer > Host Scenario > ExpGamingScenario +* All modules will be loaded if you have not removed any, any problems see log file + +#### Creation of new modules +* Please see [FactorioSoftmodManager](https://github.com/explosivegaming/FactorioSoftmodManager) for making new modules + +#### Forks and Pull Requests +* We are happy for people to make pull requests if you wish to help make our server better +* Your server is a community server, it is all about the people and feedback is good +* Dont be afraid to make a pull request as if it fixes something then its a good change \ No newline at end of file From 554d374b5b002a26f78fbdcbd92689c4a86548c4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 12 Jan 2019 18:02:42 +0000 Subject: [PATCH 391/392] Fixed Thread Creation --- modules/ExpGamingCore/Server/control.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/ExpGamingCore/Server/control.lua b/modules/ExpGamingCore/Server/control.lua index 82f0ec68..7e5cccc6 100644 --- a/modules/ExpGamingCore/Server/control.lua +++ b/modules/ExpGamingCore/Server/control.lua @@ -81,7 +81,7 @@ Server.threads = setmetatable({},{ -- @usage Server.new_thread{name='foo',data={}} -- @tparam table obj the attributes to give to the thread -- @treturn Server._thread the new thread created -function Server.new_thread(obj) return Server._thread:create(obj) end +function Server.new_thread(obj) return Server._thread.create(obj) end --- Used to get a thread via uuid or name (if one is assigned) -- @usage Server.get_thread('decon') -- return thread @@ -281,7 +281,11 @@ function Server._thread.create(obj) obj._env._ENV = nil -- prevents infinite recursion -- removes any modules from the _env to save space in global (less time to serialize) obj._env._modules = {} - for name,value in pairs(obj._env) do if is_type(value,'table') and value._moduleName and loaded_modules[value._moduleName] == value then obj._env._modules[name] = value._moduleName obj._env[name] = nil end end + for name,value in pairs(obj._env) do + if is_type(value,'table') and value._moduleName and loaded_modules[value._moduleName] == value then + obj._env._modules[name] = value._moduleName obj._env[name] = nil + end + end setmetatable(obj._env,_env_metatable) local name = obj.name or 'Anon' verbose('Created new thread: '..name..' ('..obj.uuid..')') From 4d853ed91355dfcc4f5700149478a93d7f9f92a6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 12 Jan 2019 18:05:58 +0000 Subject: [PATCH 392/392] Fixed Warp Point nil --- modules/WarpPoints/control.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/WarpPoints/control.lua b/modules/WarpPoints/control.lua index 42874bd4..e648b55e 100644 --- a/modules/WarpPoints/control.lua +++ b/modules/WarpPoints/control.lua @@ -129,12 +129,14 @@ local go_to_warp = Gui.inputs{ local player = Game.get_player(event) local cooldown = global.cooldowns[event.player_index] or 0 local warp = global.warps[event.element.parent.name] + if not warp then return end if cooldown > 0 then player_return({'WarpPoints.cooldown',cooldown},nil,event) return end if player.vehicle then player.vehicle.set_driver(nil) end if player.vehicle then player.vehicle.set_passenger(nil) end if player.vehicle then return end - player.teleport(game.surfaces[warp.surface].find_non_colliding_position('player',warp.position,32,1),game.surfaces[warp.surface]) - if not Role and not player.admin or Role and not Role.allowed(player,'always-warp') then + local surface = game.surfaces[warp.surface] + player.teleport(surface.find_non_colliding_position('player',warp.position,32,1),surface) + if not Role and not player.admin or Role and not Role.allowed(player,'always-warp') then event.element.parent.parent.parent.parent.style.visible = false global.cooldowns[event.player_index] = warp_limit end