.

exp_legacy/module/config/_file_loader.lua

@@ -22,10 +22,8 @@ return {
     --- GUI
     "modules.gui.warp-list",
     "modules.gui.vlayer",
-    "modules.gui._role_updates",
 
     "modules.graftorio.require", -- graftorio
     --- Config Files
     "config.expcore.permission_groups", -- loads some predefined permission groups
-    "config.expcore.roles", -- loads some predefined roles
 }

exp_legacy/module/config/afk_kick.lua

@@ -1,4 +1,4 @@
-local Roles = require("modules.exp_legacy.expcore.roles")
+local Roles = require("modules/exp_roles")
 
 return {
     admin_as_active = true, --- @setting admin_as_active When true admins will be treated as active regardless of afk time
@@ -8,6 +8,7 @@ return {
     trust_time = 3600 * 60 * 10, --- @setting trust_time The time in ticks that a player must be online for to count as trusted
     update_time = 3600 * 30, --- @setting update_time How often in ticks the script checks for active players
     custom_active_check = function(player)
-        return Roles.get_player_highest_role(player).index <= Roles.get_role_from_any("Veteran").index
+        local veteran = Roles.get_role_by_name("Veteran")
+        return veteran ~= nil and not Roles.get_player_highest_role(player):is_lower_than(veteran)
     end,
 }

exp_legacy/module/config/chat_reply.lua

@@ -65,7 +65,7 @@ return {
     },
     allow_command_prefix_for_messages = true, --- @setting allow_command_prefix_for_messages when true any message trigger will print to all player when prefixed
     command_admin_only = false, --- @setting command_admin_only when true will only allow chat commands for admins
-    command_permission = "command/chat-commands", --- @setting command_permission the permission used to allow command prefixes
+    command_permission = "exp_scenario.chat.commands", --- @setting command_permission the permission used to allow command prefixes
     command_prefix = "!", --- @setting command_prefix prefix used for commands below and to print to all players (if enabled above)
     --- @type table<string, LocalisedString | fun(player: LuaPlayer, is_command: boolean): LocalisedString>
     commands = { --- @setting commands will trigger only when command prefix is given

exp_legacy/module/config/gui/player_list_actions.lua

@@ -7,7 +7,7 @@
 
 local ExpUtil = require("modules/exp_util")
 local Gui = require("modules/exp_gui")
-local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
+local Roles = require("modules/exp_roles")
 local Reports = require("modules.exp_legacy.modules.control.reports") --- @dep modules.control.reports
 local Warnings = require("modules.exp_legacy.modules.control.warnings") --- @dep modules.control.warnings
 local Jail = require("modules.exp_legacy.modules.control.jail") --- @dep modules.control.jail
@@ -21,15 +21,6 @@ local function set_accessors(player_getter, action_setter)
     get_selected_player, set_selected_action = player_getter, action_setter
 end
 
--- auth that will only allow when on player's of lower roles
-local function auth_lower_role(player, selected_player_name)
-    local player_highest = Roles.get_player_highest_role(player)
-    local action_player_highest = Roles.get_player_highest_role(selected_player_name)
-    if player_highest.index < action_player_highest.index then
-        return true
-    end
-end
-
 -- gets the action player and a coloured name for the action to be used on
 local function get_action_player(player)
     local selected_player = get_selected_player(player) --[[@as LuaPlayer]]
@@ -94,7 +85,7 @@ local report_player = new_button("utility/spawn_flag", { "exp-gui_player-list.re
         if Reports.is_reported(selected_player.name, player.name) then
             player.print({ "exp-commands_report.already-reported" }, Colors.orange_red)
         else
-            set_selected_action(player, "command/report")
+            set_selected_action(player, "exp_scenario.command.create_report")
         end
     end)
 
@@ -102,7 +93,10 @@ local function report_player_callback(player, reason)
     local selected_player, selected_player_color = get_action_player(player)
     local by_player_name_color = format_player_name(player)
     game.print{ "exp-commands_reports.response", selected_player_color, reason }
-    Roles.print_to_roles_higher("Trainee", { "exp-commands_reports.response-admin", selected_player_color, by_player_name_color, reason })
+    local trainee = Roles.get_role_by_name("Trainee")
+    for _, role in ipairs(trainee and Roles.get_higher_roles(trainee) or {}) do
+        role:print{ "exp-commands_reports.response-admin", selected_player_color, by_player_name_color, reason }
+    end
     Reports.report_player(selected_player.name, player.name, reason)
 end
 
@@ -110,7 +104,7 @@ end
 -- @element warn_player
 local warn_player = new_button("utility/spawn_flag", { "exp-gui_player-list.warn-player" })
     :on_click(function(def, player, element)
-        set_selected_action(player, "command/give-warning")
+        set_selected_action(player, "exp_scenario.command.create_warning")
     end)
 
 local function warn_player_callback(player, reason)
@@ -128,7 +122,7 @@ local jail_player = new_button("utility/multiplayer_waiting_icon", { "exp-gui_pl
         if Jail.is_jailed(selected_player.name) then
             player.print({ "exp-commands_jail.already-jailed", selected_player_color }, Colors.orange_red)
         else
-            set_selected_action(player, "command/jail")
+            set_selected_action(player, "exp_scenario.command.jail")
         end
     end)
 
@@ -143,7 +137,7 @@ end
 -- @element kick_player
 local kick_player = new_button("utility/warning_icon", { "exp-gui_player-list.kick-player" })
     :on_click(function(def, player, element)
-        set_selected_action(player, "command/kick")
+        set_selected_action(player, "exp_scenario.gui.player_list.kick")
     end)
 
 local function kick_player_callback(player, reason)
@@ -155,7 +149,7 @@ end
 -- @element ban_player
 local ban_player = new_button("utility/danger_icon", { "exp-gui_player-list.ban-player" })
     :on_click(function(def, player, element)
-        set_selected_action(player, "command/ban")
+        set_selected_action(player, "exp_scenario.gui.player_list.ban")
     end)
 
 local function ban_player_callback(player, reason)
@@ -166,40 +160,40 @@ end
 return {
     set_accessors = set_accessors,
     buttons = {
-        ["command/teleport"] = {
+        ["exp_scenario.command.teleport"] = {
             auth = function(player, selected_player)
                 return player.name ~= selected_player.name
             end, -- cant teleport to your self
             goto_player,
             bring_player,
         },
-        ["command/report"] = {
+        ["exp_scenario.command.create_report"] = {
             auth = function(player, selected_player)
                 if player == selected_player then return false end
-                if not Roles.player_allowed(player, "command/give-warning") then
-                    return not Roles.player_has_flag(selected_player, "report-immune")
+                if not Roles.player_has_permission(player, "exp_scenario.command.create_warning") then
+                    return not Roles.player_has_permission(selected_player, "exp_scenario.bypass.reports")
                 end
             end, -- can report any player that isn't immune and you aren't able to give warnings
             reason_callback = report_player_callback,
             report_player,
         },
-        ["command/give-warning"] = {
-            auth = auth_lower_role, -- warn a lower user, replaces report
+        ["exp_scenario.command.create_warning"] = {
+            auth = Roles.player_outranks, -- warn a lower user, replaces report
             reason_callback = warn_player_callback,
             warn_player,
         },
-        ["command/jail"] = {
-            auth = auth_lower_role,
+        ["exp_scenario.command.jail"] = {
+            auth = Roles.player_outranks,
             reason_callback = jail_player_callback,
             jail_player,
         },
-        ["command/kick"] = {
-            auth = auth_lower_role,
+        ["exp_scenario.gui.player_list.kick"] = {
+            auth = Roles.player_outranks,
             reason_callback = kick_player_callback,
             kick_player,
         },
-        ["command/ban"] = {
-            auth = auth_lower_role,
+        ["exp_scenario.gui.player_list.ban"] = {
+            auth = Roles.player_outranks,
             reason_callback = ban_player_callback,
             ban_player,
         },

exp_legacy/module/config/gui/rockets.lua

@@ -39,9 +39,9 @@ return {
         allow_zoom_to_map = true, --- @setting allow_zoom_to_map false will disable the zoom to map feature
         allow_remote_launch = true, --- @setting allow_remote_launch false removes the remote launch button for all players
         remote_launch_admins_only = false, --- @setting remote_launch_admins_only true will remove the remote launch button for all non (game) admins
-        remote_launch_role_permission = "gui/rocket-info/remote_launch", --- @setting remote_launch_role_permission value used by custom permission system to allow or disallow the button
+        remote_launch_role_permission = "exp_scenario.gui.rocket_info.remote_launch", --- @setting remote_launch_role_permission value used by custom permission system to allow or disallow the button
         allow_toggle_active = true, --- @setting allow_toggle_active false removes the remote toggle auto launch button for all players
         toggle_active_admins_only = false, --- @setting toggle_active_admins_only true will remove the toggle auto launch button for all non (game) admins
-        toggle_active_role_permission = "gui/rocket-info/toggle-active", --- @setting toggle_active_role_permission value used by custom permission system to allow or disallow the button
+        toggle_active_role_permission = "exp_scenario.gui.rocket_info.toggle_active", --- @setting toggle_active_role_permission value used by custom permission system to allow or disallow the button
     },
 }

exp_legacy/module/config/gui/tasks.lua

@@ -3,11 +3,11 @@
 
 return {
     -- Adding tasks
-    allow_add_task = "all", --- @setting allow_add_task dictates who is allowed to add new tasks; values: all, admin, expcore.roles, none
-    expcore_roles_allow_add_task = "gui/task-list/add", --- @setting expcore_roles_allow_add_task if expcore.roles is used then this is the required permission
+    allow_add_task = "all", --- @setting allow_add_task dictates who is allowed to add new tasks; values: all, admin, exp_roles, none
+    exp_roles_allow_add_task = "exp_scenario.gui.task_list.add", --- @setting exp_roles_allow_add_task if exp_roles is used then this is the required permission
 
     -- Editing tasks
-    allow_edit_task = "expcore.roles", --- @setting allow_edit_task dictates who is allowed to edit existing tasks; values: all, admin, expcore.roles, none
-    expcore_roles_allow_edit_task = "gui/task-list/edit", --- @setting expcore_roles_allow_edit_task if expcore.roles is used then this is the required permission
+    allow_edit_task = "exp_roles", --- @setting allow_edit_task dictates who is allowed to edit existing tasks; values: all, admin, exp_roles, none
+    exp_roles_allow_edit_task = "exp_scenario.gui.task_list.edit", --- @setting exp_roles_allow_edit_task if exp_roles is used then this is the required permission
     user_can_edit_own_tasks = true, --- @settings if true then the user who made the task can edit it regardless of the allow_edit_task setting
 }

exp_legacy/module/config/gui/warps.lua

@@ -8,23 +8,23 @@ return {
     default_icon = { type = "item", name = "discharge-defense-equipment" }, --- @setting default_icon the default icon that will be used for warps
 
     -- Warp cooldowns
-    bypass_warp_cooldown = "expcore.roles", --- @setting bypass_warp_cooldown dictates who the warp cooldown is applied to; values: all, admin, expcore.roles, none
-    expcore_roles_bypass_warp_cooldown = "gui/warp-list/bypass-cooldown", --- @setting expcore_roles_bypass_warp_cooldown if expcore.roles is used then this is the required permission
+    bypass_warp_cooldown = "exp_roles", --- @setting bypass_warp_cooldown dictates who the warp cooldown is applied to; values: all, admin, exp_roles, none
+    exp_roles_bypass_warp_cooldown = "exp_scenario.gui.warp_list.bypass_cooldown", --- @setting exp_roles_bypass_warp_cooldown if exp_roles is used then this is the required permission
     cooldown_duration = 60, --- @setting cooldown_duration the duration of the warp cooldown in seconds
 
     -- Warp proximity
-    bypass_warp_proximity = "expcore.roles", --- @setting bypass_warp_proximity dictates who the warp proximity is applied to; values: all, admin, expcore.roles, none
-    expcore_roles_bypass_warp_proximity = "gui/warp-list/bypass-proximity", --- @setting expcore_roles_bypass_warp_proximity if expcore.roles is used then this is the required permission
+    bypass_warp_proximity = "exp_roles", --- @setting bypass_warp_proximity dictates who the warp proximity is applied to; values: all, admin, exp_roles, none
+    exp_roles_bypass_warp_proximity = "exp_scenario.gui.warp_list.bypass_proximity", --- @setting exp_roles_bypass_warp_proximity if exp_roles is used then this is the required permission
     standard_proximity_radius = 4, --- @setting standard_proximity_radius the minimum distance a player is allowed to be to a warp in order to use it
     spawn_proximity_radius = 20, --- @setting spawn_proximity_radius the minimum distance a player is allowed to be from they spawn point to use warps
 
     -- Adding warps
-    allow_add_warp = "expcore.roles", --- @setting allow_add_warp dictates who is allowed to add warps; values: all, admin, expcore.roles, none
-    expcore_roles_allow_add_warp = "gui/warp-list/add", --- @setting expcore_roles_allow_add_warp if expcore.roles is used then this is the required permission
+    allow_add_warp = "exp_roles", --- @setting allow_add_warp dictates who is allowed to add warps; values: all, admin, exp_roles, none
+    exp_roles_allow_add_warp = "exp_scenario.gui.warp_list.add", --- @setting exp_roles_allow_add_warp if exp_roles is used then this is the required permission
 
     -- Editing warps
-    allow_edit_warp = "expcore.roles", --- @setting allow_edit_warp dictates who is allowed to edit warps; values: all, admin, expcore.roles, none
-    expcore_roles_allow_edit_warp = "gui/warp-list/edit", --- @setting expcore_roles_allow_edit_warp if expcore.roles is used then this is the required permission
+    allow_edit_warp = "exp_roles", --- @setting allow_edit_warp dictates who is allowed to edit warps; values: all, admin, exp_roles, none
+    exp_roles_allow_edit_warp = "exp_scenario.gui.warp_list.edit", --- @setting exp_roles_allow_edit_warp if exp_roles is used then this is the required permission
     user_can_edit_own_warps = false, --- @settings user_can_edit_own_warps if true then the user who made the warp can edit it regardless of the allow_edit_warp setting
 
     -- Warp area generation

exp_legacy/module/config/nukeprotect.lua

@@ -25,6 +25,6 @@ return {
             },
         },
     },
-    ignore_permission = "bypass-nukeprotect", -- @setting ignore_permission The permission that nukeprotect will ignore
+    ignore_permission = "exp_scenario.bypass.nuke_protection", -- @setting ignore_permission The permission that nukeprotect will ignore
     ignore_admins = true, -- @setting ignore_admins Ignore admins, true by default. Allows usage outside of the roles module
 }

exp_legacy/module/config/protection.lua

@@ -1,6 +1,6 @@
 return {
     ignore_admins = true, --- @setting ignore_admins If admins are ignored by the protection filter
-    ignore_permission = "bypass-entity-protection", --- @setting ignore_permission Players with this permission will be ignored by the protection filter, leave nil if expcore.roles is not used
+    ignore_permission = "exp_scenario.bypass.entity_protection", --- @setting ignore_permission Players with this permission will be ignored by the protection filter, leave nil to protect against every player
     repeat_count = 5, --- @setting repeat_count Number of protected entities that must be removed within repeat_lifetime in order to trigger repeated removal protection
     repeat_lifetime = 3600 * 20, --- @setting repeat_lifetime The length of time, in ticks, that protected removals will be remembered for
     refresh_rate = 3600 * 5, --- @setting refresh_rate How often the age of protected removals are checked against repeat_lifetime

exp_legacy/module/locale/en/expcore.cfg

@@ -1,11 +1,3 @@
-[expcore-roles]
-error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
-error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
-game-message-assign=__1__ has been assigned to __2__ by __3__
-game-message-unassign=__1__ has been unassigned from __2__ by __3__
-reject-role=Invalid Role Name.
-reject-player-role=Player has a higher role.
-
 [expcore-data]
 description-preference=Allows you to set/get your data saving preference.
 description-data=Writes all your player data to a file on your computer.

exp_legacy/module/locale/zh-CN/expcore.cfg

@@ -1,11 +1,3 @@
-[expcore-roles]
-error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
-error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
-game-message-assign=__1__ 已被  __3__ 指派到身分組 __2__
-game-message-unassign=__1__ 已被  __3__ 取消指派到身分組 __2__
-reject-role=無效的身分組。
-reject-player-role=用戶已有更高的身分組。
-
 [expcore-data]
 description-preference=允許寫入資料。
 description-data=把用戶資料寫入電腦

exp_legacy/module/locale/zh-TW/expcore.cfg

@@ -1,11 +1,3 @@
-[expcore-roles]
-error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
-error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
-game-message-assign=__1__ 已被  __3__ 指派到身分組 __2__
-game-message-unassign=__1__ 已被  __3__ 取消指派到身分組 __2__
-reject-role=無效的身分組。
-reject-player-role=用戶已有更高的身分組。
-
 [expcore-data]
 description-preference=允許寫入資料。
 description-data=把用戶資料寫入電腦

exp_legacy/module/module.json

@@ -8,6 +8,7 @@
 	"dependencies": {
 		"clusterio": "*",
 		"exp_util": "*",
+		"exp_roles": "*",
 		"exp_gui": "*"
 	}
 }

exp_legacy/module/modules/control/jail.lua

@@ -7,25 +7,25 @@
     -- import the module from the control modules
     local Jail = require("modules.exp_legacy.modules.control.jail") --- @dep modules.control.jail
 
-    -- This will move 'MrBiter' to the jail role and remove all other roles from them
+    -- This will give 'MrBiter' the jail role, which suppresses all of their other roles
     -- the player name and reason are only so they can be included in the event for user feedback
     Jail.jail_player('MrBiter', 'Cooldude2606', 'Likes biters too much')
 
-    -- This will give 'MrBiter' all his roles back and remove him from jail
+    -- This will remove the jail role from 'MrBiter', restoring their other roles
     -- again as above the player name is only used in the event for user feedback
     Jail.unjail_player('MrBiter', 'Cooldude2606')
 ]]
 
-local Roles = require("modules.exp_legacy.expcore.roles")
+local Roles = require("modules/exp_roles")
 
 local valid_player = function(p) return type(p) == "userdata" and p or game.get_player(p) end
-local assign_roles = Roles.assign_player
-local unassign_roles = Roles.unassign_player
-local has_role = Roles.player_has_role
-local get_roles = Roles.get_player_roles
+
+--- The role given to jailed players, it has a higher priority than every other role
+local function jail_role()
+    return assert(Roles.get_role_by_name("Jail"), "The Jail role does not exist")
+end
 
 local Jail = {
-    old_roles = {},
     events = {
         --- When a player is assigned to jail
         -- @event on_player_jailed
@@ -64,10 +64,11 @@ end
 -- @tparam LuaPlayer player the player to check if they are in jail
 -- @treturn boolean whether the player is currently in jail
 function Jail.is_jailed(player)
-    return has_role(valid_player(player), "Jail")
+    local valid = valid_player(player)
+    return valid ~= nil and jail_role():has_player(valid)
 end
 
---- Moves a player to jail and removes all other roles
+--- Moves a player to jail, which suppresses all of their other roles
 -- @tparam LuaPlayer player the player who will be jailed
 -- @tparam string by_player_name the name of the player who is doing the jailing
 -- @tparam[opt='Non given.'] string reason the reason that the player is being jailed
@@ -79,8 +80,8 @@ function Jail.jail_player(player, by_player_name, reason)
 
     reason = reason or "Non given."
 
-    if has_role(player, "Jail") then return end
-    local roles = get_roles(player)
+    local role = jail_role()
+    if role:has_player(player) then return end
 
     player.walking_state = { walking = false, direction = player.walking_state.direction }
     player.riding_state = { acceleration = defines.riding.acceleration.nothing, direction = player.riding_state.direction }
@@ -89,16 +90,14 @@ function Jail.jail_player(player, by_player_name, reason)
     player.picking_state = false
     player.repair_state = { repairing = false, position = player.repair_state.position }
 
-    unassign_roles(player, roles, by_player_name, nil, true)
-    assign_roles(player, "Jail", by_player_name, nil, true)
-    assign_roles(player, roles, by_player_name, nil, true)
+    role:assign(player, { by_player_name = by_player_name, silent = true })
 
     event_emit(Jail.events.on_player_jailed, player, by_player_name, reason)
 
     return true
 end
 
---- Moves a player out of jail and restores all roles previously removed
+--- Moves a player out of jail, which restores all of their other roles
 -- @tparam LuaPlayer player the player that will be unjailed
 -- @tparam string by_player_name the name of the player that is doing the unjail
 -- @treturn boolean whether the player was unjailed successfully
@@ -107,9 +106,10 @@ function Jail.unjail_player(player, by_player_name)
     if not player then return end
     if not by_player_name then return end
 
-    if not has_role(player, "Jail") then return end
+    local role = jail_role()
+    if not role:has_player(player) then return end
 
-    unassign_roles(player, "Jail", by_player_name, nil, true)
+    role:unassign(player, { by_player_name = by_player_name, silent = true })
 
     event_emit(Jail.events.on_player_unjailed, player, by_player_name)
 

exp_legacy/module/modules/control/protection.lua

@@ -33,11 +33,7 @@ for _, config_key in ipairs{ "always_protected_names", "always_protected_types",
     end
 end
 
--- Require roles if a permission is assigned in the config
-local Roles --- @type table<string, any>
-if config.ignore_permission then
-    Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
-end
+local Roles = require("modules/exp_roles")
 
 ----- Storage Variables -----
 --- Variables stored in the global table
@@ -159,7 +155,7 @@ Event.add(defines.events.on_pre_player_mined_item, function(event)
     -- Check if the player should be ignored
     if config.ignore_admins and player.admin then return end
     if entity.last_user == nil or entity.last_user.index == player.index then return end
-    if config.ignore_permission and Roles.player_allowed(player, config.ignore_permission) then return end
+    if config.ignore_permission and Roles.player_has_permission(player, config.ignore_permission) then return end
 
     -- Check if the entity is protected
     if EntityProtection.is_entity_protected(entity)

exp_legacy/module/modules/data/greetings.lua

@@ -8,7 +8,7 @@ local Commands = require("modules/exp_commands")
 local PlayerData = require("modules.exp_legacy.expcore.player_data") --- @dep expcore.player_data
 local CustomMessages = PlayerData.Settings:combine("JoinMessage")
 CustomMessages:set_metadata{
-    permission = "command/join-message",
+    permission = "exp_scenario.command.set_join_message",
 }
 
 --- When a players data loads show their message

exp_legacy/module/modules/data/quickbar.lua

@@ -10,7 +10,7 @@ local config = require("modules.exp_legacy.config.preset_player_quickbar") --- @
 local PlayerData = require("modules.exp_legacy.expcore.player_data") --- @dep expcore.player_data
 local PlayerFilters = PlayerData.Settings:combine("QuickbarFilters")
 PlayerFilters:set_metadata{
-    permission = "command/save-quickbar",
+    permission = "exp_scenario.command.save_quickbar",
     stringify = function(value)
         if not value then return "No filters set" end
         local count = 0

exp_legacy/module/modules/data/tag.lua

@@ -4,17 +4,17 @@
 ]]
 
 local Commands = require("modules/exp_commands")
-local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
+local Roles = require("modules/exp_roles")
 
 --- Stores the tag for a player
 local PlayerData = require("modules.exp_legacy.expcore.player_data") --- @dep expcore.player_data
 local PlayerTags = PlayerData.Settings:combine("Tag")
 local PlayerTagColors = PlayerData.Settings:combine("TagColor")
 PlayerTags:set_metadata{
-    permission = "command/tag",
+    permission = "exp_scenario.command.tag",
 }
 PlayerTagColors:set_metadata{
-    permission = "command/tag-color",
+    permission = "exp_scenario.command.tag_color",
 }
 
 local set_tag = function(player, tag, color)
@@ -72,7 +72,7 @@ Commands.new("tag-clear", "Clears your tag. Or another player if you are admin."
         if other_player == player then
             -- No player given so removes your tag
             PlayerTags:remove(other_player)
-        elseif Roles.player_allowed(player, "command/clear-tag/always") then
+        elseif Roles.player_has_permission(player, "exp_scenario.command.tag_clear.always") then
             -- Player given and user is admin so clears that player's tag
             PlayerTags:remove(other_player)
         else

exp_legacy/module/modules/gui/_role_updates.lua

@@ -1,7 +0,0 @@
-local Gui = require("modules/exp_gui")
-local Roles = require("modules.exp_legacy.expcore.roles")
-local Event = require("modules/exp_legacy/utils/event")
-
---- @diagnostic disable: access-invisible
-Event.add(Roles.events.on_role_assigned, Gui._ensure_consistency)
-Event.add(Roles.events.on_role_unassigned, Gui._ensure_consistency)

exp_legacy/module/modules/gui/vlayer.lua

@@ -5,7 +5,7 @@
 ]]
 
 local Gui = require("modules/exp_gui")
-local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
+local Roles = require("modules/exp_roles")
 local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
 local format_number = require("util").format_number --- @dep util
 local config = require("modules.exp_legacy.config.vlayer") --- @dep config.vlayer
@@ -457,7 +457,7 @@ local vlayer_control_set = Gui.define("vlayer_control_set")
         vlayer_gui_control_see(disp)
         local b = vlayer_gui_control_build(disp)
         local r = vlayer_gui_control_remove(disp)
-        local v = Roles.player_allowed(player, "gui/vlayer-edit")
+        local v = Roles.player_has_permission(player, "exp_scenario.gui.vlayer_edit")
         b.visible = v
         r.visible = v
 
@@ -484,22 +484,21 @@ Gui.toolbar.create_button{
     sprite = "entity/solar-panel",
     tooltip = { "vlayer.main-tooltip" },
     visible = function(player, element)
-        return Roles.player_allowed(player, "gui/vlayer")
+        return Roles.player_has_permission(player, "exp_scenario.gui.vlayer")
     end
 }
 
 --- Update the visibly of the buttons based on a players roles
 local function role_update_event(event)
     local player = game.players[event.player_index]
-    local visible = Roles.player_allowed(player, "gui/vlayer-edit")
+    local visible = Roles.player_has_permission(player, "exp_scenario.gui.vlayer_edit")
     local container = Gui.get_left_element(vlayer_container, player)
     local disp = container.frame["vlayer_st_2"].disp.table
     disp[vlayer_gui_control_build.name].visible = visible
     disp[vlayer_gui_control_remove.name].visible = visible
 end    
 
-Event.add(Roles.events.on_role_assigned, role_update_event)
-Event.add(Roles.events.on_role_unassigned, role_update_event)
+Event.add(Roles.events.on_player_roles_changed, role_update_event)
 
 Event.on_nth_tick(config.update_tick_gui, function(_)
     local stats = vlayer.get_statistics()

exp_legacy/module/modules/gui/warp-list.lua

@@ -9,7 +9,7 @@ local Gui = require("modules/exp_gui")
 local Datastore = require("modules.exp_legacy.expcore.datastore") --- @dep expcore.datastore
 local Storage = require("modules/exp_util/storage")
 local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
-local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
+local Roles = require("modules/exp_roles")
 local Colors = require("modules/exp_util/include/color")
 local config = require("modules.exp_legacy.config.gui.warps") --- @dep config.gui.warps
 local Warps = require("modules.exp_legacy.modules.control.warps") --- @dep modules.control.warps
@@ -68,8 +68,8 @@ local function check_player_permissions(player, action, warp)
         return true
     elseif action_config == "admin" then
         return player.admin
-    elseif action_config == "expcore.roles" then
-        return Roles.player_allowed(player, config["expcore_roles_" .. action])
+    elseif action_config == "exp_roles" then
+        return Roles.player_has_permission(player, config["exp_roles_" .. action])
     end
 
     -- Return false as all other conditions have not been met
@@ -708,7 +708,7 @@ Gui.toolbar.create_button{
     sprite = config.default_icon.type .. "/" .. config.default_icon.name,
     tooltip = { "warp-list.main-tooltip" },
     visible = function(player, element)
-        return Roles.player_allowed(player, "gui/warp-list")
+        return Roles.player_has_permission(player, "exp_scenario.gui.warp_list")
     end
 }:on_click(function(def, player, element)
     -- Set gui keep open state for player that clicked the button: true if visible, false if invisible
@@ -885,8 +885,7 @@ local function role_update_event(event)
     add_new_warp_element.visible = allow_add_warp
 end
 
-Event.add(Roles.events.on_role_assigned, role_update_event)
-Event.add(Roles.events.on_role_unassigned, role_update_event)
+Event.add(Roles.events.on_player_roles_changed, role_update_event)
 
 --- When a chart tag is removed or edited make sure it is not one that belongs to a warp
 local function maintain_tag(event)