From 2e982fc175496c416b3592da8bef9b3e886f6be6 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 19:49:23 +0000 Subject: [PATCH 1/6] Fixing Colour In Server Return --- ExpLib.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ExpLib.lua b/ExpLib.lua index c4c600c6..43570e28 100644 --- a/ExpLib.lua +++ b/ExpLib.lua @@ -43,7 +43,8 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour if not player_message then return 'No Message Found' end local player = game.player or game.players[player_name] local tag = player_tag and player_tag ~= '' and ' '..player_tag or '' - local colour = player_colour or '#FFFFFF' + local colour = player_colour and player_colour ~= '' or '#FFFFFF' + player_return(1,colour) if player then tag = ' '..player.tag colour = player.color @@ -55,6 +56,7 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour colour = Color.from_hex(colour) end end + player_return(1,colour) game.print(player_name..tag..': '..player_message,colour) end From b5d235b2a81e33d61c72d23490d979db2242be93 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 20:05:03 +0000 Subject: [PATCH 2/6] Fixed Debug Code --- ExpLib.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ExpLib.lua b/ExpLib.lua index 43570e28..9edd84a8 100644 --- a/ExpLib.lua +++ b/ExpLib.lua @@ -44,7 +44,7 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour local player = game.player or game.players[player_name] local tag = player_tag and player_tag ~= '' and ' '..player_tag or '' local colour = player_colour and player_colour ~= '' or '#FFFFFF' - player_return(1,colour) + player_return({game.tick..'-1',colour},nil,1) if player then tag = ' '..player.tag colour = player.color @@ -56,7 +56,7 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour colour = Color.from_hex(colour) end end - player_return(1,colour) + player_return({game.tick..'-2',colour},nil,1) game.print(player_name..tag..': '..player_message,colour) end From 4f75313519f15bd77567fe8c1b7c901543c9a074 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 20:07:37 +0000 Subject: [PATCH 3/6] Fixed Colour In Server Return --- ExpLib.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ExpLib.lua b/ExpLib.lua index 9edd84a8..79988cba 100644 --- a/ExpLib.lua +++ b/ExpLib.lua @@ -43,8 +43,7 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour if not player_message then return 'No Message Found' end local player = game.player or game.players[player_name] local tag = player_tag and player_tag ~= '' and ' '..player_tag or '' - local colour = player_colour and player_colour ~= '' or '#FFFFFF' - player_return({game.tick..'-1',colour},nil,1) + local colour = player_colour and player_colour ~= '' and player_colour or '#FFFFFF' if player then tag = ' '..player.tag colour = player.color @@ -56,7 +55,6 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour colour = Color.from_hex(colour) end end - player_return({game.tick..'-2',colour},nil,1) game.print(player_name..tag..': '..player_message,colour) end From 13db02d1933a9339d88504ebba84fd468d18556d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 20:11:08 +0000 Subject: [PATCH 4/6] Still Not Working --- ExpLib.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ExpLib.lua b/ExpLib.lua index 79988cba..1f7f21b9 100644 --- a/ExpLib.lua +++ b/ExpLib.lua @@ -44,6 +44,7 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour local player = game.player or game.players[player_name] local tag = player_tag and player_tag ~= '' and ' '..player_tag or '' local colour = player_colour and player_colour ~= '' and player_colour or '#FFFFFF' + player_return({game.tick..'-1',colour},nil,1) if player then tag = ' '..player.tag colour = player.color @@ -55,6 +56,7 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour colour = Color.from_hex(colour) end end + player_return({game.tick..'-2',colour},nil,1) game.print(player_name..tag..': '..player_message,colour) end From 4f03bf8579ff771023fb4f195c68ae2298050b25 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 20:17:58 +0000 Subject: [PATCH 5/6] Still Testing --- ExpLib.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ExpLib.lua b/ExpLib.lua index 1f7f21b9..a937df2c 100644 --- a/ExpLib.lua +++ b/ExpLib.lua @@ -52,11 +52,13 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour else if defines.color[player_colour] then colour = defines.color[player_colour] + player_return({game.tick..'-2',colour},nil,1) else colour = Color.from_hex(colour) + player_return({game.tick..'-3',colour},nil,1) end end - player_return({game.tick..'-2',colour},nil,1) + player_return({game.tick..'-4',colour},nil,1) game.print(player_name..tag..': '..player_message,colour) end From c66124581659c31c9e52fae7d6edaeaf321d8d41 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 14 Mar 2018 20:23:38 +0000 Subject: [PATCH 6/6] Fixed Colour for the last time --- ExpLib.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ExpLib.lua b/ExpLib.lua index a937df2c..2b448d8d 100644 --- a/ExpLib.lua +++ b/ExpLib.lua @@ -44,21 +44,17 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour local player = game.player or game.players[player_name] local tag = player_tag and player_tag ~= '' and ' '..player_tag or '' local colour = player_colour and player_colour ~= '' and player_colour or '#FFFFFF' - player_return({game.tick..'-1',colour},nil,1) if player then tag = ' '..player.tag colour = player.color player_name = player.name else - if defines.color[player_colour] then - colour = defines.color[player_colour] - player_return({game.tick..'-2',colour},nil,1) - else + if colour:find('#') then colour = Color.from_hex(colour) - player_return({game.tick..'-3',colour},nil,1) + else + colour = defines.color[player_colour] end end - player_return({game.tick..'-4',colour},nil,1) game.print(player_name..tag..': '..player_message,colour) end