From fc79cedf5b3a662f50289fe6d8cb3aeb6154e49c Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Sat, 21 Mar 2020 13:23:17 +0000
Subject: [PATCH 1/3] Added Custom Join Messages

---
 config/join_messages.lua     |  3 +++
 modules/addons/greetings.lua | 25 ++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 config/join_messages.lua

diff --git a/config/join_messages.lua b/config/join_messages.lua
new file mode 100644
index 00000000..866ac6e8
--- /dev/null
+++ b/config/join_messages.lua
@@ -0,0 +1,3 @@
+return {
+    ['Cooldude2606'] = 'Lua lets you set metatables on numbers, did you know that? Cooldude2606 knows this.'
+}
\ No newline at end of file
diff --git a/modules/addons/greetings.lua b/modules/addons/greetings.lua
index 28c3766a..df625656 100644
--- a/modules/addons/greetings.lua
+++ b/modules/addons/greetings.lua
@@ -1,14 +1,25 @@
 --greets players on join
 
 local Event = require 'utils.event' --- @dep utils.event
-local greet = 
-function(event) 
-    local message = {'greetings.greet',{'links.discord'}}
-    game.players[event.player_index].print(message)
+local Game = require 'utils.game' --- @dep utils.event
+local config = require 'config.join_messages' --- @dep config.join_messages
+local Global = require 'utils.global' --- @dep utils.global
+require 'utils.table'
 
+Global.register(config,function(tbl)
+    config = tbl
+end)
+
+local greet =
+function(event)
+    local player = Game.get_player_by_index(event.player_index)
+    local custom_message = config[player.name]
+    if custom_message then
+        game.print(custom_message,player.color)
+    else
+        player.print{'greetings.greet',{'links.discord'}}
+    end
 
 end
 
-
-
-Event.add(defines.events.on_player_joined_game ,greet)
\ No newline at end of file
+Event.add(defines.events.on_player_joined_game, greet)
\ No newline at end of file

From 63c683e8d1818885b778505abc4e1ea20c6fce67 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Sun, 22 Mar 2020 20:29:08 +0000
Subject: [PATCH 2/3] Added some custom join messages

---
 config/join_messages.lua         | 5 ++++-
 config/preset_player_colours.lua | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/join_messages.lua b/config/join_messages.lua
index 866ac6e8..0fdea603 100644
--- a/config/join_messages.lua
+++ b/config/join_messages.lua
@@ -1,3 +1,6 @@
 return {
-    ['Cooldude2606'] = 'Lua lets you set metatables on numbers, did you know that? Cooldude2606 knows this.'
+    Cooldude2606 = 'Lua lets you set metatables on numbers, did you know that? Cooldude2606 knows this.',
+    samy115 = 'Tremble in fear as the banhammer is now here, its owner: samy115',
+    XenoCyber = '"Fire :fire: Fire :fire: Fire" oops wrong game, have no fear XenoCyber is here',
+    HunterOfGames = 'Unable to support HunterOfGames. You must construct additional miners.'
 }
\ No newline at end of file
diff --git a/config/preset_player_colours.lua b/config/preset_player_colours.lua
index d186fa01..b7e0bde7 100644
--- a/config/preset_player_colours.lua
+++ b/config/preset_player_colours.lua
@@ -16,7 +16,10 @@ return {
 		UUBlueFire={r=0,g=204,b=255},
 		CmonMate497={r=103,g=224,b=194},
 		s4sh={r=255,g=120,b=0},
-		ArPiiX={r=0,g=255,b=0}
+		ArPiiX={r=0,g=255,b=0},
+		NextIdea={r=255,g=255,b=255},
+		hamsterbryan={r=0,g=255,b=0},
+		XenoCyber={r=0,g=128,b=255}
 	},
 	disallow = { --- @setting disallow colours which will not given to players; the value does not matter it is only the key which is checked
 		black = {r = 0, g = 0, b = 0},

From a6a500cf03a8b68c73c68bd464eef462bef82259 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Sun, 22 Mar 2020 21:55:01 +0000
Subject: [PATCH 3/3] Removed failed emotes

---
 config/join_messages.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/join_messages.lua b/config/join_messages.lua
index 0fdea603..058435d3 100644
--- a/config/join_messages.lua
+++ b/config/join_messages.lua
@@ -1,6 +1,6 @@
 return {
     Cooldude2606 = 'Lua lets you set metatables on numbers, did you know that? Cooldude2606 knows this.',
     samy115 = 'Tremble in fear as the banhammer is now here, its owner: samy115',
-    XenoCyber = '"Fire :fire: Fire :fire: Fire" oops wrong game, have no fear XenoCyber is here',
+    XenoCyber = '"Fire Fire Fire" oops wrong game, have no fear XenoCyber is here',
     HunterOfGames = 'Unable to support HunterOfGames. You must construct additional miners.'
 }
\ No newline at end of file