aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2026-01-01 05:01:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Changed add_tag to set_flag on commands

Browse Source
This commit is contained in:
Cooldude2606
2019-04-09 16:16:05 +01:00
parent cbde97e7b0
commit e9a4382277
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
expcore/commands.lua
View File

@@ -60,8 +60,8 @@
return false -- false is returned other wise return false -- false is returned other wise
end end
end) end)
:add_defaults{smiley=false} -- adds false as the default for smiley :set_defaults{smiley=false} -- adds false as the default for smiley
:add_tag('admin_only',true) -- adds the tag admin_only: true which because of the above authenticator means you must be added to use this command :set_flag('admin_only',true) -- adds the tag admin_only: true which because of the above authenticator means you must be added to use this command
:add_alias('name','rname') -- adds two aliases "name" and "rname" for this command which will work as if the ordinal name was used :add_alias('name','rname') -- adds two aliases "name" and "rname" for this command which will work as if the ordinal name was used
--:enable_auto_concat() -- cant be used due to optional param here, but this will make all user input params after the last expected one be added to the last expected one --:enable_auto_concat() -- cant be used due to optional param here, but this will make all user input params after the last expected one be added to the last expected one
:register(function(player,repeat_count,smiley,raw) -- this registers the command to the game, notice the params are what were defined above :register(function(player,repeat_count,smiley,raw) -- this registers the command to the game, notice the params are what were defined above
@@ -119,8 +119,8 @@
return false return false
end end
end) end)
:add_defaults{smiley=false} :set_defaults{smiley=false}
:add_tag('admin_only',true) :set_flag('admin_only',true)
:add_alias('name','rname') :add_alias('name','rname')
:register(function(player,repeat_count,smiley,raw) :register(function(player,repeat_count,smiley,raw)
game.print(player.name..' used a command with input: '..raw) game.print(player.name..' used a command with input: '..raw)
@@ -147,8 +147,8 @@
Commands.add_command(name,help) --- Creates a new command object to added details to, note this does not register the command to the game Commands.add_command(name,help) --- Creates a new command object to added details to, note this does not register the command to the game
Commands._prototype:add_param(name,optional,parse,...) --- Adds a new param to the command this will be displayed in the help and used to parse the input Commands._prototype:add_param(name,optional,parse,...) --- Adds a new param to the command this will be displayed in the help and used to parse the input
Commands._prototype:add_defaults(defaults) --- Adds default values to params only matters if the param is optional Commands._prototype:set_defaults(defaults) --- Adds default values to params only matters if the param is optional
Commands._prototype:add_tag(name,value) --- Adds a tag to the command which is passed via the tags param to the authenticators, can be used to assign command roles or type Commands._prototype:set_flag(name,value) --- Adds a tag to the command which is passed via the tags param to the authenticators, can be used to assign command roles or type
Commands._prototype:add_alias(...) --- Adds an alias or multiple that will also be registered with the same callback, eg /teleport can be /tp with both working Commands._prototype:add_alias(...) --- Adds an alias or multiple that will also be registered with the same callback, eg /teleport can be /tp with both working
Commands._prototype:enable_auto_concat() --- Enables auto concatenation of any params on the end so quotes are not needed for last param Commands._prototype:enable_auto_concat() --- Enables auto concatenation of any params on the end so quotes are not needed for last param
Commands._prototype:register(callback) --- Adds the callback to the command and registers all aliases, params and help message with the game Commands._prototype:register(callback) --- Adds the callback to the command and registers all aliases, params and help message with the game
@@ -399,7 +399,7 @@ end
-- @tparam defaults table a table keyed by the name of the param with the value as the default value {paramName=defaultValue} -- @tparam defaults table a table keyed by the name of the param with the value as the default value {paramName=defaultValue}
-- callback param - player: LuaPlayer - the player using the command, default value does not need to be a function callback -- callback param - player: LuaPlayer - the player using the command, default value does not need to be a function callback
-- @treturn Commands._prototype pass through to allow more functions to be called -- @treturn Commands._prototype pass through to allow more functions to be called
function Commands._prototype:add_defaults(defaults) function Commands._prototype:set_defaults(defaults)
for name,value in pairs(defaults) do for name,value in pairs(defaults) do
if self.params[name] then if self.params[name] then
self.params[name].default = value self.params[name].default = value
@@ -413,7 +413,7 @@ end
-- @tparam value any the tag that you want can be anything that the authenticators are expecting -- @tparam value any the tag that you want can be anything that the authenticators are expecting
-- nb: if value is nil then name will be assumed as the value and added at a numbered index -- nb: if value is nil then name will be assumed as the value and added at a numbered index
-- @treturn Commands._prototype pass through to allow more functions to be called -- @treturn Commands._prototype pass through to allow more functions to be called
function Commands._prototype:add_tag(name,value) function Commands._prototype:set_flag(name,value)
if not value then if not value then
-- value not given so name is the value -- value not given so name is the value
table.insert(self.tags,name) table.insert(self.tags,name)

2
modules/commands/admin-chat.lua
View File

@@ -4,7 +4,7 @@ require 'config.command_parse_general'
Commands.new_command('admin-chat','Sends a message in chat that only admins can see.') Commands.new_command('admin-chat','Sends a message in chat that only admins can see.')
:add_param('message',false) -- the message to send in the admin chat :add_param('message',false) -- the message to send in the admin chat
:enable_auto_concat() :enable_auto_concat()
:add_tag('admin_only',true) :set_flag('admin_only',true)
:add_alias('ac') :add_alias('ac')
:register(function(player,message,raw) :register(function(player,message,raw)
local pcc = player and player.chat_color or {r=255,g=255,b=255} local pcc = player and player.chat_color or {r=255,g=255,b=255}

4
modules/commands/cheat-mode.lua
View File

@@ -3,10 +3,10 @@ require 'config.command_parse_general'
Commands.new_command('toggle-cheat-mode','Toggles cheat mode for your player, or another player.') Commands.new_command('toggle-cheat-mode','Toggles cheat mode for your player, or another player.')
:add_param('player',true,'player') -- player to toggle chest mode of, can be nil for self :add_param('player',true,'player') -- player to toggle chest mode of, can be nil for self
:add_defaults{player=function(player) :set_defaults{player=function(player)
return player -- default is the user using the command return player -- default is the user using the command
end} end}
:add_tag('admin_only',true) :set_flag('admin_only',true)
:register(function(player,action_player,raw) :register(function(player,action_player,raw)
action_player.cheat_mode = not action_player.cheat_mode action_player.cheat_mode = not action_player.cheat_mode
end) end)

2
modules/commands/help.lua
View File

@@ -12,7 +12,7 @@ end)
Commands.new_command('chelp','Searches for a keyword in all commands you are allowed to use.') Commands.new_command('chelp','Searches for a keyword in all commands you are allowed to use.')
:add_param('keyword',true) -- the keyword that will be looked for :add_param('keyword',true) -- the keyword that will be looked for
:add_param('page',true,'integer') -- the keyword that will be looked for :add_param('page',true,'integer') -- the keyword that will be looked for
:add_defaults{keyword='',page=1} :set_defaults{keyword='',page=1}
:register(function(player,keyword,page,raw) :register(function(player,keyword,page,raw)
local player_index = player and player.index or 0 local player_index = player and player.index or 0
-- if keyword is a number then treat it as page number -- if keyword is a number then treat it as page number

2
modules/commands/interface.lua
View File

@@ -48,7 +48,7 @@ end
Commands.new_command('interface','Sends an innovation to be ran and returns the result.') Commands.new_command('interface','Sends an innovation to be ran and returns the result.')
:add_param('innovation',false) -- the message to send in the admin chat :add_param('innovation',false) -- the message to send in the admin chat
:enable_auto_concat() :enable_auto_concat()
:add_tag('admin_only',true) :set_flag('admin_only',true)
:register(function(player,innovation,raw) :register(function(player,innovation,raw)
if not innovation:find('%s') and not innovation:find('return') then if not innovation:find('%s') and not innovation:find('return') then
-- if there are no spaces and return is not present then return is appended to the start -- if there are no spaces and return is not present then return is appended to the start

4
modules/commands/kill.lua
View File

@@ -3,13 +3,13 @@ require 'config.command_parse_general'
Commands.new_command('kill','Kills yourself or another player.') Commands.new_command('kill','Kills yourself or another player.')
:add_param('player',true,'player-alive') -- the player to kill, must be alive to be valid :add_param('player',true,'player-alive') -- the player to kill, must be alive to be valid
:add_defaults{player=function(player) :set_defaults{player=function(player)
-- default is the player unless they are dead -- default is the player unless they are dead
if player.character and player.character.health > 0 then if player.character and player.character.health > 0 then
return player return player
end end
end} end}
:add_tag('admin_only',true) :set_flag('admin_only',true)
:register(function(player,action_player,raw) :register(function(player,action_player,raw)
if not action_player then if not action_player then
-- can only be nil if no player given and the user is dead -- can only be nil if no player given and the user is dead

2
modules/commands/tag.lua
View File

@@ -10,7 +10,7 @@ end)
Commands.new_command('tag-clear','Clears your tag. Or another player if you are admin.') Commands.new_command('tag-clear','Clears your tag. Or another player if you are admin.')
:add_param('player',true,'player') -- player to remove the tag of, nil to apply to self :add_param('player',true,'player') -- player to remove the tag of, nil to apply to self
:add_defaults{player=function(player) :set_defaults{player=function(player)
return player -- default is the user using the command return player -- default is the user using the command
end} end}
:register(function(player,action_player,raw) :register(function(player,action_player,raw)

6
modules/commands/teleport.lua
View File

@@ -14,7 +14,7 @@ Commands.new_command('teleport','Teleports a player to another player.')
:add_param('from_player',false,'player-alive') -- player that will be teleported, must be alive :add_param('from_player',false,'player-alive') -- player that will be teleported, must be alive
:add_param('to_player',false,'player-online') -- player to teleport to, must be online (if dead goes to where they died) :add_param('to_player',false,'player-online') -- player to teleport to, must be online (if dead goes to where they died)
:add_alias('tp') :add_alias('tp')
:add_tag('admin_only',true) :set_flag('admin_only',true)
:register(function(player,from_player,to_player,raw) :register(function(player,from_player,to_player,raw)
if from_player.index == to_player.index then if from_player.index == to_player.index then
-- return if attempting to teleport to self -- return if attempting to teleport to self
@@ -28,7 +28,7 @@ end)
Commands.new_command('bring','Teleports a player to you.') Commands.new_command('bring','Teleports a player to you.')
:add_param('player',false,'player-alive') -- player that will be teleported, must be alive :add_param('player',false,'player-alive') -- player that will be teleported, must be alive
:add_tag('admin_only',true) :set_flag('admin_only',true)
:register(function(player,from_player,raw) :register(function(player,from_player,raw)
if from_player.index == player.index then if from_player.index == player.index then
-- return if attempting to teleport to self -- return if attempting to teleport to self
@@ -43,7 +43,7 @@ end)
Commands.new_command('goto','Teleports you to a player.') Commands.new_command('goto','Teleports you to a player.')
:add_param('player',false,'player-online') -- player to teleport to, must be online (if dead goes to where they died) :add_param('player',false,'player-online') -- player to teleport to, must be online (if dead goes to where they died)
:add_alias('tp-me','tpme') :add_alias('tp-me','tpme')
:add_tag('admin_only',true) :set_flag('admin_only',true)
:register(function(player,to_player,raw) :register(function(player,to_player,raw)
if to_player.index == player.index then if to_player.index == player.index then
-- return if attempting to teleport to self -- return if attempting to teleport to self