mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-09-21 17:04:00 +00:00
bbassieandClaude Fable 5
7034f17b5d
Every call site of expcore.roles now uses exp_roles, and the legacy module, its config, and the glue which refreshed guis on role events are deleted. Where a file only renamed the require and the permission strings the change is mechanical; the rest: - Jail is now "give the Jail role" and unjail "take it away". The role has a higher priority than every other so holding it suppresses them, which is what stashing and restoring the roles was for. - The command role authority derives exp_scenario.command.<name> from the command name, and the role parsers use player_outranks rather than comparing indexes with their own root check. - The admin and spectator triggers, and the gui refresh on role changes, live in exp_scenario/control/roles.lua; the system commands trigger stays with the command authority. - The player list warn button is keyed on create_warning, the permission the command behind it already required, and report on create_report. Both were keyed on names no role held, so only root ever saw them. - The warps and tasks configs say exp_roles where they said expcore.roles. - The role tables the readme and player list read are replaced by get_player_names and get_roles. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
100 lines
4.6 KiB
Lua
100 lines
4.6 KiB
Lua
--[[-- Commands - Teleport
|
|
Adds a command that allows players to teleport to other players and spawn
|
|
]]
|
|
|
|
local ExpUtil = require("modules/exp_util")
|
|
local teleport_player = ExpUtil.teleport_player
|
|
|
|
local Commands = require("modules/exp_commands")
|
|
|
|
local Roles = require("modules/exp_roles")
|
|
local player_has_permission = Roles.player_has_permission
|
|
|
|
--- @class ExpCommands_Teleport.commands
|
|
local commands = {}
|
|
|
|
--- Teleports a player to another player.
|
|
--- @class ExpCommands_Teleport.commands.teleport: ExpCommand
|
|
--- @overload fun(player: LuaPlayer, other_player: LuaPlayer, target_player: LuaPlayer?)
|
|
commands.teleport = Commands.new("teleport", { "exp-commands_teleport.description-teleport" })
|
|
:argument("player", { "exp-commands_teleport.arg-player-teleport" }, Commands.types.player_alive)
|
|
:optional("target", { "exp-commands_teleport.arg-player-to" }, Commands.types.player_alive)
|
|
:add_aliases{ "tp" }
|
|
:add_flags{ "admin_only" }
|
|
:register(function(player, other_player, target_player)
|
|
--- @cast other_player LuaPlayer
|
|
--- @cast target_player LuaPlayer?
|
|
if target_player == nil then
|
|
-- When no player is given, then instead behave like /goto
|
|
if not teleport_player(player, other_player.physical_surface, other_player.physical_position) then
|
|
return Commands.status.error{ "exp-commands_teleport.unavailable" }
|
|
end
|
|
elseif other_player == target_player then
|
|
return Commands.status.invalid_input{ "exp-commands_teleport.same-player" }
|
|
elseif not teleport_player(other_player, target_player.physical_surface, target_player.physical_position) then
|
|
return Commands.status.error{ "exp-commands_teleport.unavailable" }
|
|
end
|
|
end) --[[@as any]]
|
|
|
|
--- Teleports a player to you.
|
|
--- @class ExpCommands_Teleport.commands.bring: ExpCommand
|
|
--- @overload fun(player: LuaPlayer, other_player: LuaPlayer)
|
|
commands.bring = Commands.new("bring", { "exp-commands_teleport.description-bring" })
|
|
:argument("player", { "exp-commands_teleport.arg-player-from" }, Commands.types.player_alive)
|
|
:add_flags{ "admin_only" }
|
|
:register(function(player, other_player)
|
|
--- @cast other_player LuaPlayer
|
|
if player == other_player then
|
|
return Commands.status.invalid_input{ "exp-commands_teleport.same-player" }
|
|
elseif not teleport_player(other_player, player.physical_surface, player.physical_position) then
|
|
return Commands.status.error{ "exp-commands_teleport.unavailable" }
|
|
end
|
|
end) --[[@as any]]
|
|
|
|
--- Teleports you to a player.
|
|
--- @class ExpCommands_Teleport.commands.goto: ExpCommand
|
|
--- @overload fun(player: LuaPlayer, other_player: LuaPlayer)
|
|
commands["goto"] = Commands.new("goto", { "exp-commands_teleport.description-goto" })
|
|
:argument("player", { "exp-commands_teleport.arg-player-to" }, Commands.types.player_alive)
|
|
:add_flags{ "admin_only" }
|
|
:register(function(player, other_player)
|
|
--- @cast other_player LuaPlayer
|
|
if player == other_player then
|
|
return Commands.status.invalid_input{ "exp-commands_teleport.same-player" }
|
|
elseif not teleport_player(player, other_player.physical_surface, other_player.physical_position) then
|
|
return Commands.status.error{ "exp-commands_teleport.unavailable" }
|
|
end
|
|
end) --[[@as any]]
|
|
|
|
--- Teleport to spawn
|
|
--- @class ExpCommands_Teleport.commands.spawn: ExpCommand
|
|
--- @overload fun(player: LuaPlayer, other_player: LuaPlayer)
|
|
commands.spawn = Commands.new("spawn", { "exp-commands_teleport.description-spawn" })
|
|
:optional("player", { "exp-commands_teleport.arg-player-from" }, Commands.types.player_alive)
|
|
:defaults{
|
|
player = function(player)
|
|
if player.character and player.character.health > 0 then
|
|
return player
|
|
end
|
|
end,
|
|
}
|
|
:register(function(player, other_player)
|
|
if not other_player then
|
|
return Commands.status.error{ "exp-commands_teleport.unavailable" }
|
|
elseif other_player == player then
|
|
if not teleport_player(player, game.surfaces.nauvis, { 0, 0 }, "dismount") then
|
|
return Commands.status.error{ "exp-commands_teleport.unavailable" }
|
|
end
|
|
elseif player_has_permission(player, "exp_scenario.command.spawn.always") then
|
|
if not teleport_player(other_player, game.surfaces.nauvis, { 0, 0 }, "dismount") then
|
|
return Commands.status.error{ "exp-commands_teleport.unavailable" }
|
|
end
|
|
else
|
|
return Commands.status.unauthorised()
|
|
end
|
|
end) --[[@as any]]
|
|
|
|
return {
|
|
commands = commands,
|
|
}
|