aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added 2 new adminlevel, admincmd changes

Browse Source
This commit is contained in:
raviatex
2020-01-12 01:21:06 +01:00
parent 077ab01c38
commit 3b0189807e
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReallifeGamemode.Database/AdminLevel.cs
View File

@@ -13,11 +13,12 @@ namespace ReallifeGamemode.Database
public enum AdminLevel : int public enum AdminLevel : int
{ {
PLAYER = 0, PLAYER = 0,
TEAM = 1, MAPPING = 1,
SUPPORTER = 2, ENTWICKLUNG = 2,
ADMIN = 3, SUPPORTER = 3,
ADMIN2 = 4, ADMIN = 4,
ADMIN3 = 5, ADMIN2 = 5,
ADMIN3 = 6,
HEADADMIN = 1337, HEADADMIN = 1337,
PROJEKTLEITUNG = 1338 PROJEKTLEITUNG = 1338
} }

24
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -172,7 +172,7 @@ namespace ReallifeGamemode.Server.Commands
[Command("team", "~m~Benutzung: ~s~/team")] [Command("team", "~m~Benutzung: ~s~/team")]
public void CmdAdminTeam(Client player) public void CmdAdminTeam(Client player)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.TEAM) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? true)
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
@@ -180,7 +180,7 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(player, "Online Teammitglieder:"); ChatService.SendMessage(player, "Online Teammitglieder:");
List<Client> playerlist = NAPI.Pools.GetAllPlayers().FindAll(c => c.GetUser()?.IsAdmin(AdminLevel.TEAM) ?? false).OrderByDescending(c => c.GetUser().AdminLevel).ToList(); List<Client> playerlist = NAPI.Pools.GetAllPlayers().FindAll(c => c.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? false).OrderByDescending(c => c.GetUser().AdminLevel).ToList();
foreach (Client currentPlayer in playerlist) foreach (Client currentPlayer in playerlist)
{ {
ChatService.SendMessage(player, currentPlayer.GetUser().AdminLevel.GetName() + " | " + currentPlayer.Name + " | ID: " + currentPlayer.Handle.Value); ChatService.SendMessage(player, currentPlayer.GetUser().AdminLevel.GetName() + " | " + currentPlayer.Name + " | ID: " + currentPlayer.Handle.Value);
@@ -329,7 +329,7 @@ namespace ReallifeGamemode.Server.Commands
[Command("tc", "~m~Benutzung: ~s~/tc [Nachricht]", GreedyArg = true)] [Command("tc", "~m~Benutzung: ~s~/tc [Nachricht]", GreedyArg = true)]
public void CmdTeamC(Client player, string message) public void CmdTeamC(Client player, string message)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.TEAM) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? true)
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
@@ -337,7 +337,7 @@ namespace ReallifeGamemode.Server.Commands
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
ChatService.BroadcastAdmin("!{#578A83}** TC " + player.Name + ":~w~ " + message, AdminLevel.TEAM); ChatService.BroadcastAdmin("!{#578A83}** TC " + player.Name + ":~w~ " + message, AdminLevel.MAPPING);
} }
[Command("joblist", "~m~Benutzung: ~s~/joblist")] [Command("joblist", "~m~Benutzung: ~s~/joblist")]
@@ -1261,7 +1261,7 @@ namespace ReallifeGamemode.Server.Commands
} }
#endregion #endregion
#region ALevel1337 #region ALevel1337
[Command("gotocp", "~m~Benutzung: ~s~/sethandmoney [Target] [Geld]")] [Command("gotocp", "~m~Benutzung: ~s~/sethandmoney [Name/ID] [Menge]")]
public void CmdAdminGotocp(Client admin) public void CmdAdminGotocp(Client admin)
{ {
admin.TriggerEvent("getCP"); admin.TriggerEvent("getCP");
@@ -1275,7 +1275,7 @@ namespace ReallifeGamemode.Server.Commands
user.Position = pos; user.Position = pos;
} }
[Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Target] [Geld]")] [Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Name/ID] [Menge]")]
public void CmdAdminSetUserHandMoney(Client admin, string targetname, int amount) public void CmdAdminSetUserHandMoney(Client admin, string targetname, int amount)
{ {
if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
@@ -1295,11 +1295,13 @@ namespace ReallifeGamemode.Server.Commands
var user = target.GetUser(context); var user = target.GetUser(context);
user.Handmoney = amount; user.Handmoney = amount;
context.SaveChanges(); context.SaveChanges();
target.TriggerEvent("SERVER:SET_HANDMONEY", amount);
} }
target.TriggerEvent("SERVER:SET_HANDMONEY", amount); ChatService.SendMessage(admin, "~b~[ADMIN]~s~ Du hast das Handgeld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt.");
ChatService.SendMessage(target, "~b~[ADMIN]~s~ Dein Handgeld wurde von Admin " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt.");
} }
[Command("givehandmoney", "~m~Benutzung: ~s~/givehandmoney [Target] [Geld]")] [Command("givehandmoney", "~m~Benutzung: ~s~/givehandmoney [Name/ID] [Menge]")]
public void CmdAdminGiveUserHandMoney(Client admin, string targetname, int amount) public void CmdAdminGiveUserHandMoney(Client admin, string targetname, int amount)
{ {
if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
@@ -1321,6 +1323,8 @@ namespace ReallifeGamemode.Server.Commands
context.SaveChanges(); context.SaveChanges();
target.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); target.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
} }
ChatService.SendMessage(admin, "~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~$" + amount + "~s~ auf die Hand gegeben.");
ChatService.SendMessage(target, "~b~[ADMIN]~s~ Admin " + target.Name + " hat dir ~g~$" + amount + "~s~ auf die Hand gegeben.");
} }
[Command("quicksavemode", "~m~Benutzung: ~s~/quicksavemode [Modus]: ~g~blip, ~g~atm")] [Command("quicksavemode", "~m~Benutzung: ~s~/quicksavemode [Modus]: ~g~blip, ~g~atm")]
@@ -2416,7 +2420,7 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast das Geld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt."); ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast das Geld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt.");
ChatService.SendMessage(target, "~b~[ADMIN]~s~ Dein Geld wurde von Admin " + player.Name + " auf ~g~$" + amount + "~s~ gesetzt."); ChatService.SendMessage(target, "~b~[ADMIN]~s~ Dein Geld wurde von Admin " + player.Name + " auf ~g~$" + amount + "~s~ gesetzt.");
} }
[Command("givemoney", "~m~Benutzung: ~s~/givemoney [Name] [Menge]")] [Command("givemoney", "~m~Benutzung: ~s~/givemoney [Name] [Menge]")]
public void GivePlayerMoney(Client player, string receiver, int amount) public void GivePlayerMoney(Client player, string receiver, int amount)
{ {
@@ -3131,7 +3135,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.PROJEKTLEITUNG) ?? true)
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;

4
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -44,9 +44,9 @@ namespace ReallifeGamemode.Server.Events
GlobalHelper.DutyAdmins.Remove(player); GlobalHelper.DutyAdmins.Remove(player);
} }
if (player.GetUser().IsAdmin(AdminLevel.TEAM)) if (player.GetUser().IsAdmin(AdminLevel.MAPPING))
{ {
ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.TEAM); ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.MAPPING);
} }
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);

6
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -72,11 +72,11 @@ namespace ReallifeGamemode.Server.Events
if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName)) if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName))
{ {
ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")", AdminLevel.TEAM); ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")", AdminLevel.MAPPING);
} }
else if (user.IsAdmin(AdminLevel.TEAM)) else if (user.IsAdmin(AdminLevel.MAPPING))
{ {
ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name + " [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM); ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name + " [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.MAPPING);
} }
var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList(); var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();

6
ReallifeGamemode.Server/Extensions/EnumExtensions.cs
View File

@@ -18,8 +18,10 @@ namespace ReallifeGamemode.Server.Extensions
{ {
switch (level) switch (level)
{ {
case TEAM: case MAPPING:
return "Team"; return "Mapper";
case ENTWICKLUNG:
return "Entwickler";
case SUPPORTER: case SUPPORTER:
return "Supporter"; return "Supporter";
case ADMIN: case ADMIN: