feat: role deference in Roles module itself

modules/control/jail.lua

@@ -18,10 +18,9 @@
 
 local Roles = require 'expcore.roles' --- @dep expcore.roles
 local Game = require 'utils.game' --- @dep utils.game
-local JailOldRole = require 'modules.control.jail_old_role' --- @dep modules.control.jail_old_role
 
 local valid_player = Game.get_player_from_any
-local assign_role = Roles.assign_player
+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
@@ -83,11 +82,6 @@ function Jail.jail_player(player, by_player_name, reason)
 
     if has_role(player, 'Jail') then return end
     local roles = get_roles(player)
-    local old_roles = {}
-    for _, role in ipairs(roles) do
-        old_roles[role.name] = 1
-    end
-    JailOldRole.old_roles[player.name] = old_roles
 
     player.walking_state = { walking = false }
     player.riding_state = { acceleration = defines.riding.acceleration.nothing, direction = player.riding_state.direction }
@@ -96,8 +90,9 @@ function Jail.jail_player(player, by_player_name, reason)
     player.picking_state = false
     player.repair_state = { repairing = false }
 
-    assign_role(player, 'Jail', by_player_name, nil, true)
     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)
 
     event_emit(Jail.events.on_player_jailed, player, by_player_name, reason)
 
@@ -114,27 +109,12 @@ function Jail.unjail_player(player, by_player_name)
     if not by_player_name then return end
 
     if not has_role(player, 'Jail') then return end
-    local roles = JailOldRole.old_roles[player.name] or {}
 
     unassign_roles(player, 'Jail', by_player_name, nil, true)
-    for role, _ in pairs(roles) do
-        assign_role(player, role, by_player_name, nil, true)
-    end
 
     event_emit(Jail.events.on_player_unjailed, player, by_player_name)
 
     return true
 end
 
-function Jail.add_old_role(player, to_assign)
-    player = valid_player(player)
-    if not player then return end
-
-    if not has_role(player, 'Jail') then return end
-    local roles = JailOldRole.old_roles[player.name]
-    if not roles then return end
-
-    table.insert(roles, to_assign)
-end
-
 return Jail

modules/control/jail_old_role.lua

@@ -1,13 +0,0 @@
-local Global = require 'utils.global' --- @dep utils.global
-
-local Jail = {
-    old_roles = {}
-}
-
-local old_roles = Jail.old_roles
-Global.register(old_roles, function(tbl)
-    Jail.old_roles = tbl
-    old_roles = tbl
-end)
-
-return Jail