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
This commit is contained in:
mark9064
2018-05-20 00:17:11 +01:00
committed by Cooldude2606
parent be8711e1ab
commit 96b428ed37
18 changed files with 79 additions and 79 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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)}

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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
}
}

View File

@@ -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
-- other

View File

@@ -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)

View File

@@ -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
if not success then error(err) end

View File

@@ -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
tooltip-bring=Bring Player

View File

@@ -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/
food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/

View File

@@ -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
cant-open=You can't open this panel right now, reason: __1__
cant-open-no-reason=You can't open this panel right now

View File

@@ -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
effect-reset-force=Reset Force

View File

@@ -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
set-rank=Set Player Rank

View File

@@ -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 <player_name>
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.
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.

View File

@@ -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.
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.