From 29760371605092f79bf9022443b33c0fe81e3427 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 20 May 2018 11:03:44 +0100 Subject: [PATCH] General English Fixes (#52) --- Addons/playerRanks.lua | 30 +++++++++++++++--------------- control.lua | 28 ++++++++++++++-------------- locale/en/exp-core.cfg | 8 ++++---- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua index 665d3d7d..b475c0e3 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/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