aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Jail forces player into idle state

Browse Source
This commit is contained in:
Cooldude2606
2021-05-10 21:08:12 +01:00
parent 380b114b97
commit 12917fed08
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/addons/discord-alerts.lua
View File

@@ -6,11 +6,12 @@ local Colors = require 'utils.color_presets' --- @dep utils.color_presets
local write_json, format_time = _C.write_json, _C.format_time --- @dep expcore.common local write_json, format_time = _C.write_json, _C.format_time --- @dep expcore.common
local config = require 'config.discord_alerts' --- @dep config.discord_alerts local config = require 'config.discord_alerts' --- @dep config.discord_alerts
local playtime_format = { short = true, hours = true, minutes = true, string = true }
local function append_playtime(player_name) local function append_playtime(player_name)
if not config.show_playtime then return player_name end if not config.show_playtime then return player_name end
local player = game.get_player(player_name) local player = game.get_player(player_name)
if not player then return player_name end if not player then return player_name end
return player.name..' ('..format_time(player.online_time)..')' return player.name..' ('..format_time(player.online_time, playtime_format)..')'
end end
local function get_player_name(event) local function get_player_name(event)

7
modules/control/jail.lua
View File

@@ -91,6 +91,13 @@ function Jail.jail_player(player, by_player_name, reason)
local roles = get_roles(player) local roles = get_roles(player)
old_roles[player.name] = roles old_roles[player.name] = roles
player.walking_state = { walking = false }
player.riding_state = { acceleration = defines.riding.acceleration.nothing, direction = player.riding_state.direction }
player.mining_state = { mining = false }
player.shooting_state = { state = defines.shooting.not_shooting }
player.picking_state = false
player.repair_state = { repairing = false }
assign_roles(player, 'Jail', by_player_name, nil, true) assign_roles(player, 'Jail', by_player_name, nil, true)
unassign_roles(player, roles, by_player_name, nil, true) unassign_roles(player, roles, by_player_name, nil, true)