mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-09-22 17:24:01 +00:00
Move the scenario onto exp_roles and remove the legacy role system
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>
This commit is contained in:
co-authored by
Claude Fable 5
parent
eb715cc176
commit
7034f17b5d
@@ -3,7 +3,7 @@ Adds a task list to the game which players can add, remove and edit items on
|
||||
]]
|
||||
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules.exp_legacy.expcore.roles")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local config = require("modules.exp_legacy.config.gui.tasks")
|
||||
|
||||
local ExpUtil = require("modules/exp_util")
|
||||
@@ -43,8 +43,8 @@ local function has_permission_create_task(player)
|
||||
return true
|
||||
elseif allow_add_task == "admin" then
|
||||
return player.admin
|
||||
elseif allow_add_task == "expcore.roles" then
|
||||
return Roles.player_allowed(player, config.expcore_roles_allow_add_task)
|
||||
elseif allow_add_task == "exp_roles" then
|
||||
return Roles.player_has_permission(player, config.exp_roles_allow_add_task)
|
||||
end
|
||||
|
||||
return false
|
||||
@@ -67,8 +67,8 @@ local function has_permission_edit_task(player, task)
|
||||
return true
|
||||
elseif allow_edit_task == "admin" then
|
||||
return player.admin
|
||||
elseif allow_edit_task == "expcore.roles" then
|
||||
return Roles.player_allowed(player, config.expcore_roles_allow_edit_task)
|
||||
elseif allow_edit_task == "exp_roles" then
|
||||
return Roles.player_has_permission(player, config.exp_roles_allow_edit_task)
|
||||
end
|
||||
|
||||
return false
|
||||
@@ -922,7 +922,7 @@ Gui.toolbar.create_button{
|
||||
sprite = "utility/not_enough_repair_packs_icon",
|
||||
tooltip = { "exp-gui_task-list.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_allowed(player, "gui/task-list")
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.task_list")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -950,7 +950,6 @@ return {
|
||||
events = {
|
||||
[e.on_player_joined_game] = refresh_player_tasks,
|
||||
[e.on_player_changed_force] = refresh_player_tasks,
|
||||
[Roles.events.on_role_assigned] = refresh_player_permissions,
|
||||
[Roles.events.on_role_unassigned] = refresh_player_permissions,
|
||||
[Roles.events.on_player_roles_changed] = refresh_player_permissions,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user