From 745e31b7e729a80b3b150abf7d87bdbf02b990dd Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Thu, 18 Apr 2019 23:40:55 +0100
Subject: [PATCH] Added Commands to roles

---
 config/roles.lua                         | 33 +++++++++++++++++++-----
 modules/addons/random-player-colours.lua |  5 ++--
 modules/commands/warnings.lua            |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/config/roles.lua b/config/roles.lua
index b203201d..8faf42e9 100644
--- a/config/roles.lua
+++ b/config/roles.lua
@@ -33,12 +33,14 @@ Roles.new_role('System','SYS')
 :set_permission_group('Admin')
 :set_flag('is_admin')
 :set_flag('is_spectator')
+:set_flag('report-immune')
 :set_allow_all()
 
 Roles.new_role('Senior Administrator','SAdmin')
 :set_permission_group('Admin')
 :set_flag('is_admin')
 :set_flag('is_spectator')
+:set_flag('report-immune')
 :set_parent('Administrator')
 :allow{
     'command/interface',
@@ -50,6 +52,7 @@ Roles.new_role('Administrator','Admin')
 :set_custom_color{r=233,g=63,b=233}
 :set_flag('is_admin')
 :set_flag('is_spectator')
+:set_flag('report-immune')
 :set_parent('Moderator')
 :allow{
 }
@@ -59,10 +62,19 @@ Roles.new_role('Moderator','Mod')
 :set_custom_color{r=0,g=170,b=0}
 :set_flag('is_admin')
 :set_flag('is_spectator')
+:set_flag('report-immune')
 :set_parent('Trainee')
 :allow{
     'command/assign-role',
-    'command/unassign-role'
+    'command/unassign-role',
+    'command/repair',
+    'command/kill/always',
+    'command/tag-clear/always',
+    'command/go-to-spawn/always',
+    'command/clear-reports',
+    'command/clear-warnings',
+    'command/clear-temp-ban',
+    'command/clear-inventory',
 }
 
 Roles.new_role('Trainee','TrMod')
@@ -70,14 +82,17 @@ Roles.new_role('Trainee','TrMod')
 :set_custom_color{r=0,g=170,b=0}
 :set_flag('is_admin')
 :set_flag('is_spectator')
+:set_flag('report-immune')
 :set_parent('Donator')
 :allow{
     'command/admin-chat',
     'command/teleport',
     'command/bring',
     'command/goto',
-    'command/kill/always',
-    'command/tag-clear/always',
+    'command/temp-ban',
+    'command/give-warning',
+    'command/get-warning',
+    'command/get-reports',
 }
 
 --- Trusted Roles
@@ -85,6 +100,7 @@ Roles.new_role('Sponsor','Spon')
 :set_permission_group('Trusted')
 :set_custom_color{r=247,g=246,b=54}
 :set_flag('is_spectator')
+:set_flag('report-immune')
 :set_parent('Pay to Win')
 :allow{
 }
@@ -93,6 +109,7 @@ Roles.new_role('Pay to Win','P2W')
 :set_permission_group('Trusted')
 :set_custom_color{r=238,g=172,b=44}
 :set_flag('is_spectator')
+:set_flag('report-immune')
 :set_parent('Donator')
 :allow{
 }
@@ -111,6 +128,8 @@ Roles.new_role('Partner','Part')
 :set_flag('is_spectator')
 :set_parent('Veteran')
 :allow{
+    'command/jail',
+    'command/unjail'
 }
 
 Roles.new_role('Veteran','Vet')
@@ -138,7 +157,10 @@ Roles.new_role('Regular','Reg')
 :set_custom_color{r=79,g=155,b=163}
 :set_parent('Guest')
 :allow{
-    'command/kill'
+    'command/kill',
+    'command/rainbow',
+    'command/go-to-spawn',
+    'command/me',
 }
 :set_auto_promote_condition(function(player)
     if player.online_time > 3*216000 then
@@ -151,12 +173,11 @@ local default = Roles.new_role('Guest','')
 :set_permission_group('Guest')
 :set_custom_color{r=185,g=187,b=160}
 :allow{
-    'command/me',
     'command/tag',
     'command/tag-clear',
     'command/chelp',
     'command/list-roles',
-    'command/rainbow'
+    'command/report',
 }
 
 --- Jail role
diff --git a/modules/addons/random-player-colours.lua b/modules/addons/random-player-colours.lua
index 3a6fc2c1..0e347997 100644
--- a/modules/addons/random-player-colours.lua
+++ b/modules/addons/random-player-colours.lua
@@ -1,17 +1,18 @@
 local Colours = require 'resources.color_presets'
 local Game = require 'utils.game'
-local Event = require 'utils.events'
+local Event = require 'utils.event'
 local config = require 'config.preset_player_colours'
 local Global = require 'utils.global'
 require 'utils.table'
 
-Global.reigster(config,function(tbl)
+Global.register(config,function(tbl)
     config = tbl
 end)
 
 local white = Colours.white
 local black = Colours.black
 Event.add(defines.events.on_player_created,function(event)
+    local player = Game.get_player_by_index(event.player_index)
     local color = 'white'
     if config.players[player.name] then
         color = config.players[player.name]
diff --git a/modules/commands/warnings.lua b/modules/commands/warnings.lua
index c4fe12f1..e4b0cb2c 100644
--- a/modules/commands/warnings.lua
+++ b/modules/commands/warnings.lua
@@ -46,7 +46,7 @@ Commands.new_command('get-warnings','Gets the number of warnings a player has. I
     end
 end)
 
-Commands.new_command('clear-warnigns','Clears all warnings (and script warnings) from a player')
+Commands.new_command('clear-warnings','Clears all warnings (and script warnings) from a player')
 :add_param('player',false,'player')
 :register(function(player,action_player,raw)
     WarningsControl.clear_warnings(player,player.name)