aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 19:45:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.0.3'

Browse Source
This commit is contained in:
Cooldude2606
2019-02-15 18:36:43 +00:00
parent 10cc18aeb2 f99c17ef77
commit bec657d8bb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ExpGamingLib/control.lua
View File

@@ -115,8 +115,8 @@ end
function ExpLib.player_return(rtn,colour,player)
colour = ExpLib.is_type(colour,'table') and colour or defines.textcolor[colour] ~= defines.color.white and defines.textcolor[colour] or defines.color[colour]
player = player or game.player
local function _return(callback,rtn)
if ExpLib.is_type(rtn,'table',use_colour) then
local function returnWith(callback,use_colour)
if ExpLib.is_type(rtn,'table',use_colour) then
-- test for: userdata, locale string, table with __tostring meta method, any other table
if ExpLib.is_type(rtn.__self,'userdata') then callback('Cant Display Userdata',use_colour)
elseif ExpLib.is_type(rtn[1],'string') and string.find(rtn[1],'.+[.].+') and not string.find(rtn[1],'%s') then callback(rtn,use_colour)
@@ -133,8 +133,8 @@ function ExpLib.player_return(rtn,colour,player)
if not player then error('Invalid Player given to player_return',2) end
-- plays a nice sound that is different to normal message sound
player.play_sound{path='utility/scenario_message'}
_return(player.print,rtn,colour)
else _return(rcon.print,rtn) end
returnWith(player.print,colour)
else returnWith(rcon.print) end
end
--- Convert ticks to hours