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>
33 lines
1.4 KiB
Lua
33 lines
1.4 KiB
Lua
--[[-- Commands - Kill
|
|
Adds a command that allows players to kill themselves and others
|
|
]]
|
|
|
|
local Commands = require("modules/exp_commands")
|
|
|
|
local Roles = require("modules/exp_roles")
|
|
local player_outranks = Roles.player_outranks
|
|
|
|
--- Kills yourself or another player.
|
|
Commands.new("kill", { "exp-commands_kill.description" })
|
|
:optional("player", { "exp-commands_kill.arg-player" }, Commands.types.lower_role_player_alive)
|
|
:defaults{
|
|
player = function(player)
|
|
return player.character and player.character.health > 0 and player or nil
|
|
end
|
|
}
|
|
:register(function(player, other_player)
|
|
--- @cast other_player LuaPlayer?
|
|
if other_player == nil then
|
|
-- Can only be nil if the target is the player and they are already dead
|
|
return Commands.status.error{ "exp-commands_kill.already-dead" }
|
|
elseif other_player == player or player_outranks(player, other_player) then
|
|
-- You can always kill yourself or can kill lower role players
|
|
if script.active_mods["space-age"] then
|
|
other_player.surface.create_entity{ name = "lightning", position = { other_player.position.x, other_player.position.y - 16 }, target = other_player.character }
|
|
end
|
|
assert(other_player.character).die()
|
|
else
|
|
return Commands.status.unauthorised{ "exp-commands_kill.lower-role" }
|
|
end
|
|
end)
|