From 9bf7e6d45a3e6a09d0889e9fcac27092fde2e593 Mon Sep 17 00:00:00 2001 From: nahkampfaffe Date: Mon, 24 Sep 2018 05:13:22 +0200 Subject: [PATCH 1/6] added commands: a, team, setweather --- Server/Commands/Admin.cs | 80 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 852fb227..3a18d086 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -8,7 +8,7 @@ using reallife_gamemode.Server.Util; /** * @overview Life of German Reallife - Admin Commands (Admin.cs) -* @author VegaZ, hydrant +* @author VegaZ, hydrant, balbo * @copyright (c) 2008 - 2018 Life of German */ @@ -43,7 +43,7 @@ namespace reallife_gamemode.Server.Commands player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan schon in einem Fahrzeug."); return; } - + Vehicle v = NAPI.Vehicle.CreateVehicle(hash, player.Position, player.Rotation.Z, color1, color2); player.SetIntoVehicle(v.Handle, -1); @@ -99,7 +99,7 @@ namespace reallife_gamemode.Server.Commands Client target = ClientService.GetClientByName(name); - if(target == null) + if (target == null) { ChatService.PlayerNotFound(player); return; @@ -150,13 +150,13 @@ namespace reallife_gamemode.Server.Commands } option = option.ToLower(); - - if(option == "load") + + if (option == "load") { NAPI.World.RequestIpl(name); player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich geladen"); } - else if(option == "remove") + else if (option == "remove") { NAPI.World.RemoveIpl(name); player.SendChatMessage("~g~Das IPL ~s~" + name + " ~g~wurde erfolgreich entladen"); @@ -191,7 +191,7 @@ namespace reallife_gamemode.Server.Commands WeaponHash wHash = NAPI.Util.WeaponNameToModel(weapon); - if(wHash == default(WeaponHash)) + if (wHash == default(WeaponHash)) { player.SendChatMessage("~r~[FEHLER]~s~ Diese Waffe existiert nicht."); return; @@ -199,5 +199,71 @@ namespace reallife_gamemode.Server.Commands target.GiveWeapon(wHash, ammo); } + + [Command("a", "~m~Benutzung: ~s~/a [Nachricht]")] + public void CmdAdminA(Client player, string message) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + List playerlist = NAPI.Pools.GetAllPlayers(); + foreach (Client currentPlayer in playerlist) { + if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + NAPI.Chat.SendChatMessageToPlayer(currentPlayer, "~b~A-Chat: ~w~" + message); + } + } + } + + + [Command("team", "~m~Benutzung: ~s~/team")] + public void CmdAdminTeam(Client player) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + NAPI.Chat.SendChatMessageToPlayer(player, "Online Teammitglieder:"); + + List playerlist = NAPI.Pools.GetAllPlayers(); + foreach (Client currentPlayer in playerlist) + { + if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) + { + NAPI.Chat.SendChatMessageToPlayer(player, "~w~" + NAPI.Player.GetPlayerName(currentPlayer)); + + } + } + } + + [Command("setweather", "~m~Benutzung: ~s~/setweather [WEATHER]")] + public void CmdAdminSetweather(Client player, string weather) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Weather weatherBefore = NAPI.World.GetWeather(); + NAPI.World.SetWeather(weather); + Weather weatherAfter = NAPI.World.GetWeather(); + + if (!weatherBefore.Equals(weatherAfter)) + { + NAPI.Chat.SendChatMessageToPlayer(player, "~w~Weather changed to " + NAPI.World.GetWeather())); + } else + { + NAPI.Chat.SendChatMessageToPlayer(player, "~w~Unable to change weather"); + } + + player.Vehicle.PrimaryColor = 1; + } + } } From fbfbd6cf47e90577abe53cfb6c6ff3ff8c83aa41 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Mon, 24 Sep 2018 20:38:46 +0200 Subject: [PATCH 2/6] Fix target -> player --- Server/Commands/Admin.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 560d4bf6..403de063 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -250,7 +250,7 @@ namespace reallife_gamemode.Server.Commands Client target = ClientService.GetClientByName(name); if (target == null) { - ChatService.PlayerNotFound(target); + ChatService.PlayerNotFound(player); return; } @@ -284,7 +284,7 @@ namespace reallife_gamemode.Server.Commands Client target = ClientService.GetClientByName(name); if (target == null) { - ChatService.PlayerNotFound(target); + ChatService.PlayerNotFound(player); return; } @@ -310,7 +310,7 @@ namespace reallife_gamemode.Server.Commands Client target = ClientService.GetClientByName(name); if (target == null) { - ChatService.PlayerNotFound(target); + ChatService.PlayerNotFound(player); return; } @@ -336,7 +336,7 @@ namespace reallife_gamemode.Server.Commands Client target = ClientService.GetClientByName(name); if (target == null) { - ChatService.PlayerNotFound(target); + ChatService.PlayerNotFound(player); return; } @@ -387,7 +387,7 @@ namespace reallife_gamemode.Server.Commands Client target = ClientService.GetClientByName(name); if (target == null) { - ChatService.PlayerNotFound(target); + ChatService.PlayerNotFound(player); return; } if (target == player) @@ -415,7 +415,7 @@ namespace reallife_gamemode.Server.Commands Client target = ClientService.GetClientByName(name); if (target == null) { - ChatService.PlayerNotFound(target); + ChatService.PlayerNotFound(player); return; } player.RemoveAllWeapons(); @@ -487,7 +487,11 @@ namespace reallife_gamemode.Server.Commands NAPI.Chat.SendChatMessageToAll("Serverzeit auf " + hour + ":" + min + ":" + sec + " gestellt"); } - + [Command("val")] + public void Val(Client player) + { + NAPI.Chat.SendChatMessageToAll("Value of " + player.Name + ": " + player.Handle.Value); + } [Command("rgiveweapon", "~m~Benutzung: ~s~/rgiveweapon [Radius] [Waffe] [Munition]")] public void CmdAdminRangeGiveWeapon(Client player, float radius, string weapon, int munition) { From 468fd1303e06993d6c978b7d0539632f8932dcdd Mon Sep 17 00:00:00 2001 From: nahkampfaffe Date: Mon, 24 Sep 2018 21:21:40 +0200 Subject: [PATCH 3/6] added some admin commands --- Server/Commands/Admin.cs | 77 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 3a18d086..69cd9cae 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -213,7 +213,7 @@ namespace reallife_gamemode.Server.Commands foreach (Client currentPlayer in playerlist) { if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { - NAPI.Chat.SendChatMessageToPlayer(currentPlayer, "~b~A-Chat: ~w~" + message); + NAPI.Chat.SendChatMessageToPlayer(currentPlayer, "~r~Admin " + NAPI.Player.GetPlayerName(player) + "~w~: " + message); } } } @@ -261,9 +261,80 @@ namespace reallife_gamemode.Server.Commands { NAPI.Chat.SendChatMessageToPlayer(player, "~w~Unable to change weather"); } - - player.Vehicle.PrimaryColor = 1; } + [Command("freeze", "~m~Benutzung: ~s~/freeze [Player]")] + public void CmdAdminFreeze(Client player, string targetname) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Client target = ClientService.GetClientByName(targetname); + if (target == null) + { + ChatService.PlayerNotFound(target); + return; + } + target.Freeze(true); + } + + [Command("unfreeze", "~m~Benutzung: ~s~/freeze [Player]")] + public void CmdAdminUnfreeze(Client player, string targetname) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Client target = ClientService.GetClientByName(targetname); + if (target == null) + { + ChatService.PlayerNotFound(target); + return; + } + target.Freeze(false); + } + + [Command("kick", "~m~Benutzung: ~s~/kick [Player] [Grund]")] + public void CmdAdminKick(Client player, string targetname, string reason) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Client target = ClientService.GetClientByName(targetname); + if (target == null) + { + ChatService.PlayerNotFound(target); + return; + } + string targetPlayername = NAPI.Player.GetPlayerName(target); + string adminPlayername = NAPI.Player.GetPlayerName(player); + + NAPI.Chat.SendChatMessageToPlayer(target, "~r~KICKINFO: ~w~Du wurdest von " + adminPlayername + " vom Server gekickt: " + reason); + target.Kick(); + NAPI.Chat.SendChatMessageToAll("~y~INFO: ~w~" + targetPlayername + " wurde von " + adminPlayername + " gekickt: " + reason); + } + + [Command("clearchat", "~m~Benutzung: ~s~/clearchat")] + public void CmdAdminClearchat(Client player) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + for (int i=0; i<20; i++) + { + NAPI.Chat.SendChatMessageToAll(""); + } + } } } From 9fa99b373a047d2d92357f714c76e91fd79da604 Mon Sep 17 00:00:00 2001 From: nahkampfaffe Date: Mon, 24 Sep 2018 21:33:45 +0200 Subject: [PATCH 4/6] fixed some admin commands --- Server/Commands/Admin.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 768b1ffd..a8c9199c 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -570,7 +570,7 @@ namespace reallife_gamemode.Server.Commands List playerlist = NAPI.Pools.GetAllPlayers(); foreach (Client currentPlayer in playerlist) { - if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? false) { NAPI.Chat.SendChatMessageToPlayer(currentPlayer, "~r~Admin " + NAPI.Player.GetPlayerName(player) + "~w~: " + message); } @@ -592,7 +592,7 @@ namespace reallife_gamemode.Server.Commands List playerlist = NAPI.Pools.GetAllPlayers(); foreach (Client currentPlayer in playerlist) { - if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) + if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? false) { NAPI.Chat.SendChatMessageToPlayer(player, "~w~" + NAPI.Player.GetPlayerName(currentPlayer)); @@ -615,7 +615,7 @@ namespace reallife_gamemode.Server.Commands if (!weatherBefore.Equals(weatherAfter)) { - NAPI.Chat.SendChatMessageToPlayer(player, "~w~Weather changed to " + NAPI.World.GetWeather())); + NAPI.Chat.SendChatMessageToPlayer(player, "~w~Weather changed to " + NAPI.World.GetWeather()); } else { NAPI.Chat.SendChatMessageToPlayer(player, "~w~Unable to change weather"); From 1dd25c1642a7e38a39f101c86e79fd59722b491e Mon Sep 17 00:00:00 2001 From: nahkampfaffe Date: Mon, 24 Sep 2018 22:38:58 +0200 Subject: [PATCH 5/6] added up down lt and rt --- Server/Commands/Admin.cs | 134 ++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 22 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index a8c9199c..b22c0daf 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -62,7 +62,7 @@ namespace reallife_gamemode.Server.Commands Vehicle v = NAPI.Vehicle.CreateVehicle(hash, player.Position, player.Rotation.Z, color1, color2); player.SetIntoVehicle(v.Handle, -1); - player.SendChatMessage("Maxspeed: + " +player.Vehicle.MaxSpeed + ""); + player.SendChatMessage("Maxspeed: + " + player.Vehicle.MaxSpeed + ""); } [Command("fv")] @@ -267,7 +267,7 @@ namespace reallife_gamemode.Server.Commands } target.GiveWeapon(wHash, ammo); - target.SendChatMessage("~b~Du hast von " +player.Name +" eine/n " + wHash + " mit einer Munition von " +ammo + " erhalten."); + target.SendChatMessage("~b~Du hast von " + player.Name + " eine/n " + wHash + " mit einer Munition von " + ammo + " erhalten."); player.SendChatMessage("~b~Du hast " + target.Name + " eine/n " + wHash + " mit einer Munition von " + ammo + " gegeben."); } @@ -399,8 +399,8 @@ namespace reallife_gamemode.Server.Commands ChatService.ErrorMsg(player); return; } - target.SendChatMessage("~y~PM von "+ player.Name + ": " + msg +" "); - player.SendChatMessage("~y~PM an "+ target.Name + ": " + msg + " "); + target.SendChatMessage("~y~PM von " + player.Name + ": " + msg + " "); + player.SendChatMessage("~y~PM an " + target.Name + ": " + msg + " "); } [Command("takeweapon", "~m~Benutzung: ~s~/takeweapon [Spieler]")] @@ -445,9 +445,9 @@ namespace reallife_gamemode.Server.Commands foreach (var managedClient in peopleInRange) { managedClient.Health = hp; - managedClient.SendChatMessage("~b~Admin "+ player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt."); + managedClient.SendChatMessage("~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt."); } - player.SendChatMessage("~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf "+ hp + " gesetzt."); + player.SendChatMessage("~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf " + hp + " gesetzt."); } [Command("rsetarmor", "~m~Benutzung: ~s~/rsetarmor [Radius] (Armor)")] @@ -522,9 +522,9 @@ namespace reallife_gamemode.Server.Commands foreach (var managedClient in peopleInRange) { managedClient.GiveWeapon(wHash, munition); - managedClient.SendChatMessage("~b~Admin " +player.Name + " hat im Radius von " + radius + " eine/n " + weapon +" mit " + munition +" Munition vergeben."); + managedClient.SendChatMessage("~b~Admin " + player.Name + " hat im Radius von " + radius + " eine/n " + weapon + " mit " + munition + " Munition vergeben."); } - player.SendChatMessage("~b~Du hast " + peopleInRange.Count +" Spielern eine " + weapon + " mit " + munition + " Munition gegeben"); + player.SendChatMessage("~b~Du hast " + peopleInRange.Count + " Spielern eine " + weapon + " mit " + munition + " Munition gegeben"); } [Command("save", "~m~Benutzung: ~s~/save [Typ = ~g~Blip, ~r~Marker, Ped, Pickup, TextLabel, ~g~Vehicle")] @@ -549,14 +549,14 @@ namespace reallife_gamemode.Server.Commands if (player.IsInVehicle) { Vehicle vehicle = player.Vehicle; - SaveData.SaveVehicleData((VehicleHash) vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, + SaveData.SaveVehicleData((VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, vehicle.EngineStatus, Convert.ToByte(vehicle.Dimension)); } else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!"); break; - + } - + } [Command("a", "~m~Benutzung: ~s~/a [Nachricht]")] @@ -569,7 +569,8 @@ namespace reallife_gamemode.Server.Commands } List playerlist = NAPI.Pools.GetAllPlayers(); - foreach (Client currentPlayer in playerlist) { + foreach (Client currentPlayer in playerlist) + { if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? false) { NAPI.Chat.SendChatMessageToPlayer(currentPlayer, "~r~Admin " + NAPI.Player.GetPlayerName(player) + "~w~: " + message); @@ -595,30 +596,30 @@ namespace reallife_gamemode.Server.Commands if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? false) { NAPI.Chat.SendChatMessageToPlayer(player, "~w~" + NAPI.Player.GetPlayerName(currentPlayer)); - } } } [Command("setweather", "~m~Benutzung: ~s~/setweather [WEATHER]")] public void CmdAdminSetweather(Client player, string weather) - { + { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; } - + Weather weatherBefore = NAPI.World.GetWeather(); NAPI.World.SetWeather(weather); Weather weatherAfter = NAPI.World.GetWeather(); if (!weatherBefore.Equals(weatherAfter)) { - NAPI.Chat.SendChatMessageToPlayer(player, "~w~Weather changed to " + NAPI.World.GetWeather()); - } else + NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter geändert: " + NAPI.World.GetWeather()); + } + else { - NAPI.Chat.SendChatMessageToPlayer(player, "~w~Unable to change weather"); + NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter konnte nicht geändert werden"); } } @@ -630,7 +631,7 @@ namespace reallife_gamemode.Server.Commands ChatService.NotAuthorized(player); return; } - + Client target = ClientService.GetClientByName(targetname); if (target == null) { @@ -655,7 +656,7 @@ namespace reallife_gamemode.Server.Commands ChatService.PlayerNotFound(target); return; } - target.Freeze(false); + target.Freeze(false); } [Command("kick", "~m~Benutzung: ~s~/kick [Player] [Grund]")] @@ -689,11 +690,100 @@ namespace reallife_gamemode.Server.Commands ChatService.NotAuthorized(player); return; } - - for (int i=0; i<20; i++) + + for (int i = 0; i < 20; i++) { NAPI.Chat.SendChatMessageToAll(""); } } + + [Command("up", "~m~Benutzung: ~s~/up [Wert]")] + public void CmdAdminUp(Client player, int value = 5) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y, player.Position.Z + value); + player.Position = playerPosition; + } + + [Command("dn", "~m~Benutzung: ~s~/dn [Wert]")] + public void CmdAdminDn(Client player, int value = 5) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y, player.Position.Z - value); + player.Position = playerPosition; + } + + [Command("rt", "~m~Benutzung: ~s~/rt [Wert]")] + public void CmdAdminRt(Client player, int value = 5) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + + float playerHeading = player.Heading; + + if (playerHeading < 45 || playerHeading >= 315) + { + Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); + player.Position = playerPosition; + + } + else if (playerHeading < 315 && playerHeading >= 225) + { + Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); + player.Position = playerPosition; + } + else if (playerHeading >= 135 && playerHeading < 225) + { + Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); + player.Position = playerPosition; + } + else if (playerHeading >= 45 && playerHeading < 135) + { + Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); + player.Position = playerPosition; + } + } + + [Command("lt", "~m~Benutzung: ~s~/lt [Wert]")] + public void CmdAdminLt(Client player, int value = 5) + { + + float playerHeading = player.Heading; + + if (playerHeading < 45 || playerHeading >= 315) + { + Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); + player.Position = playerPosition; + + } + else if (playerHeading < 315 && playerHeading >= 225) + { + Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); + player.Position = playerPosition; + } + else if (playerHeading >= 135 && playerHeading < 225) + { + Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); + player.Position = playerPosition; + } + else if (playerHeading >= 45 && playerHeading < 135) + { + Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); + player.Position = playerPosition; + } + } } } From 8e4c088e85cde62a51038b3f2e59cf0610ea71c4 Mon Sep 17 00:00:00 2001 From: nahkampfaffe Date: Mon, 24 Sep 2018 22:39:34 +0200 Subject: [PATCH 6/6] fixed up down lt rt commands --- Server/Commands/Admin.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index b22c0daf..f0e0bc1b 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -713,6 +713,7 @@ namespace reallife_gamemode.Server.Commands [Command("dn", "~m~Benutzung: ~s~/dn [Wert]")] public void CmdAdminDn(Client player, int value = 5) { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); @@ -760,6 +761,11 @@ namespace reallife_gamemode.Server.Commands [Command("lt", "~m~Benutzung: ~s~/lt [Wert]")] public void CmdAdminLt(Client player, int value = 5) { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } float playerHeading = player.Heading;