diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 9f4a938a..ff993e82 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -532,25 +532,6 @@ namespace ReallifeGamemode.Server.Commands } } - [Command("bitcoin", "~m~/bitcoin [ID]")] - public void CmdAdminBitcoin(Player player, string name) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - - Player target = PlayerService.GetPlayerByNameOrId(name); - if (target == null || !target.IsLoggedIn()) - { - ChatService.PlayerNotFound(player); - return; - } - - target.TriggerEvent("CLIENT:PlaySound", "fun/bitcoinnect", "mp3", 50); - } - #endregion Support #region Admin @@ -567,7 +548,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("remspawnschutz", "~m~Benutzung: ~s~/rmss [Target]", Alias = "rmss")] - public void CmdAdminRmss(Player player, String targetname) + public void CmdAdminRemSpawnSchutz(Player player, String targetname) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -620,7 +601,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("ac", "~m~Benutzung: ~s~/ac [Nachricht]", GreedyArg = true)] - public void CmdAdminA(Player player, string message) + public void CmdAdminChat(Player player, string message) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1062,110 +1043,8 @@ namespace ReallifeGamemode.Server.Commands } } - [Command("destroyped", "~m~Benutzung: ~s~/destroyped [PedNr]")] - public void CmdAdminAddPPed(Player player, int PedNr) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - player.TriggerEvent("CLIENT:DestroyPed", PedNr); - //NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - } - - [Command("addpped", "~m~Benutzung: ~s~/addpped [PedNr] [model] [dimension] [Dynamic] [Freezed] [Collision(0-3)] [Weapon] [AttackProof] [Fire/Explosion-Proof] [DrownProof]")] - public void CmdAdminAddPPed(Player player, Array PedNr, string model, uint dimension = 0, bool dynamic = false, bool freeze = false, int collision = 0, string weapon = "none", bool attackproof = false, bool fireexplosionproof = false, bool drownproof = false) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - player.TriggerEvent("CLIENT:AddPed", PedNr, model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension, dynamic, freeze, collision, weapon, attackproof, fireexplosionproof, drownproof); - //NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - } - - [Command("addmped", "~m~Benutzung: ~s~/addmped [model] [dimension]")] - public void CmdAdminAddMPed(Player player, int model, uint dimension = 0) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - player.TriggerEvent("CLIENT:AddPedModel", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); - //NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - } - - [Command("addgped", "~m~Benutzung: ~s~/addgped")] - public void CmdAdminAddGPed(Player player, int model, uint dimension = 0) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - //player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); - Ped Peter = NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); - - //Peter.freezePosition(true); - } - - [Command("addgpedmore", "~m~Benutzung: ~s~/addgpedMore")] - public void CmdAdminAddGPedMore(Player player, int model, uint dimension = 0) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - //player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); - Ped Peter = NAPI.Ped.CreatePed(PedHash.ChickenHawk, new Vector3(player.Position.X + 1, player.Position.Y, player.Position.Z + 2), player.Heading, dimension); - Ped Peter2 = NAPI.Ped.CreatePed(PedHash.MovAlien01, new Vector3(player.Position.X + 2, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter3 = NAPI.Ped.CreatePed(PedHash.Chimp, new Vector3(player.Position.X + 3, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter4 = NAPI.Ped.CreatePed(PedHash.Boar, new Vector3(player.Position.X + 4, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter5 = NAPI.Ped.CreatePed(PedHash.BradCadaverCutscene, new Vector3(player.Position.X + 5, player.Position.Y, player.Position.Z + 2), player.Heading, dimension); - Ped Peter6 = NAPI.Ped.CreatePed(PedHash.Cat, new Vector3(player.Position.X - 1, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter7 = NAPI.Ped.CreatePed(PedHash.Chop, new Vector3(player.Position.X - 2, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter8 = NAPI.Ped.CreatePed(PedHash.Cormorant, new Vector3(player.Position.X - 3, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter9 = NAPI.Ped.CreatePed(PedHash.Cow, new Vector3(player.Position.X - 4, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter10 = NAPI.Ped.CreatePed(PedHash.Deer, new Vector3(player.Position.X - 5, player.Position.Y, player.Position.Z), player.Heading, dimension); - Ped Peter11 = NAPI.Ped.CreatePed(PedHash.Coyote, new Vector3(player.Position.X, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter12 = NAPI.Ped.CreatePed(PedHash.Crow, new Vector3(player.Position.X, player.Position.Y + 2, player.Position.Z + 2), player.Heading, dimension); - Ped Peter13 = NAPI.Ped.CreatePed(PedHash.Humpback, new Vector3(player.Position.X, player.Position.Y + 3, player.Position.Z), player.Heading, dimension); - Ped Peter14 = NAPI.Ped.CreatePed(PedHash.Husky, new Vector3(player.Position.X, player.Position.Y + 4, player.Position.Z), player.Heading, dimension); - Ped Peter15 = NAPI.Ped.CreatePed(PedHash.JohnnyKlebitz, new Vector3(player.Position.X, player.Position.Y + 5, player.Position.Z - 1), player.Heading, dimension); - Ped Peter16 = NAPI.Ped.CreatePed(PedHash.Pig, new Vector3(player.Position.X, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - Ped Peter17 = NAPI.Ped.CreatePed(PedHash.Pigeon, new Vector3(player.Position.X, player.Position.Y - 2, player.Position.Z), player.Heading, dimension); - Ped Peter18 = NAPI.Ped.CreatePed(PedHash.Poodle, new Vector3(player.Position.X, player.Position.Y - 3, player.Position.Z), player.Heading, dimension); - Ped Peter19 = NAPI.Ped.CreatePed(PedHash.Pug, new Vector3(player.Position.X, player.Position.Y - 4, player.Position.Z), player.Heading, dimension); - Ped Peter20 = NAPI.Ped.CreatePed(PedHash.Rabbit, new Vector3(player.Position.X, player.Position.Y - 5, player.Position.Z), player.Heading, dimension); - Ped Peter21 = NAPI.Ped.CreatePed(PedHash.Rat, new Vector3(player.Position.X + 1, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter22 = NAPI.Ped.CreatePed(PedHash.Retriever, new Vector3(player.Position.X + 2, player.Position.Y + 2, player.Position.Z), player.Heading, dimension); - Ped Peter23 = NAPI.Ped.CreatePed(PedHash.Rhesus, new Vector3(player.Position.X + 3, player.Position.Y + 3, player.Position.Z), player.Heading, dimension); - Ped Peter24 = NAPI.Ped.CreatePed(PedHash.Rottweiler, new Vector3(player.Position.X + 4, player.Position.Y + 4, player.Position.Z), player.Heading, dimension); - Ped Peter25 = NAPI.Ped.CreatePed(PedHash.Seagull, new Vector3(player.Position.X + 5, player.Position.Y + 5, player.Position.Z + 2), player.Heading, dimension); - Ped Peter26 = NAPI.Ped.CreatePed(PedHash.Shepherd, new Vector3(player.Position.X - 1, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - Ped Peter27 = NAPI.Ped.CreatePed(PedHash.Stingray, new Vector3(player.Position.X - 2, player.Position.Y - 2, player.Position.Z), player.Heading, dimension); - Ped Peter28 = NAPI.Ped.CreatePed(PedHash.Westy, new Vector3(player.Position.X - 3, player.Position.Y - 3, player.Position.Z), player.Heading, dimension); - Ped Peter29 = NAPI.Ped.CreatePed(PedHash.MountainLion, new Vector3(player.Position.X - 4, player.Position.Y - 4, player.Position.Z), player.Heading, dimension); - Ped Peter30 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X - 5, player.Position.Y - 5, player.Position.Z), player.Heading, dimension); - Ped Peter31 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X + 1, player.Position.Y - 3, player.Position.Z), player.Heading, dimension); - Ped Peter32 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X + 3, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - Ped Peter33 = NAPI.Ped.CreatePed(PedHash.FatCult01AFM, new Vector3(player.Position.X - 1, player.Position.Y + 3, player.Position.Z), player.Heading, dimension); - Ped Peter34 = NAPI.Ped.CreatePed(PedHash.Acult01AMM, new Vector3(player.Position.X - 3, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter35 = NAPI.Ped.CreatePed(PedHash.Acult01AMM, new Vector3(player.Position.X + 5, player.Position.Y + 1, player.Position.Z), player.Heading, dimension); - Ped Peter36 = NAPI.Ped.CreatePed(PedHash.Acult01AMO, new Vector3(player.Position.X + 1, player.Position.Y - 5, player.Position.Z), player.Heading, dimension); - Ped Peter37 = NAPI.Ped.CreatePed(PedHash.Acult01AMO, new Vector3(player.Position.X + 4, player.Position.Y - 2, player.Position.Z), player.Heading, dimension); - Ped Peter38 = NAPI.Ped.CreatePed(PedHash.Acult01AMY, new Vector3(player.Position.X - 5, player.Position.Y + 2, player.Position.Z), player.Heading, dimension); - Ped Peter39 = NAPI.Ped.CreatePed(PedHash.Acult01AMY, new Vector3(player.Position.X - 4, player.Position.Y - 1, player.Position.Z), player.Heading, dimension); - - //Peter.freezePosition(true); - } - [Command("gotox", "~m~Benutzung: ~s~/gotox [X] [Y] [Z]")] - public void CmdAdminGotoxyz(Player player, float x, float y, float z) + public void CmdAdminGotox(Player player, float x, float y, float z) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1515,7 +1394,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("aclear", "~m~Benutzung: ~s~/aclear [Spieler] [Grund]", GreedyArg = true)] - public void CmdFactionClear(Player player, string nameOrId, string reason) + public void CmdAdminClear(Player player, string nameOrId, string reason) { User user = player.GetUser(); if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) @@ -1650,7 +1529,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("vcolor", "~m~Benutzung: ~s~/vcolor [Farb-ID1] [Farb-ID2]")] - public void CmdAdminColor(Player player, int color1, int color2) + public void CmdAdminVColor(Player player, int color1, int color2) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1834,7 +1713,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setsvar", "~m~Benutzung:~s~ /setsvar [ID] [WERT]")] - public void CmdAdmSetSvar(Player player, int varId, int varValue) + public void CmdAdminSetSvar(Player player, int varId, int varValue) { if (!player.GetUser()?.IsAdmin(AdminLevel.PROJEKTLEITUNG) ?? true) { @@ -1845,7 +1724,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("createturf", "~m~Benutzung:~s~ /createturf [radius]")] - public void CmdAdmCreateTurf(Player player, float option) + public void CmdAdminCreateTurf(Player player, float option) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1867,7 +1746,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("cancleturf", "~m~Benutzung:~s~ /cancleturf")] - public void CmdAdmCancleTurf(Player player) + public void CmdAdminCancleTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1878,7 +1757,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("reloadturfs", "~m~Benutzung:~s~ /ReloadTurfs")] - public void CmdAdmReloadTurf(Player player) + public void CmdAdminReloadTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1890,7 +1769,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("deleteturf", "~m~Benutzung:~s~ /DeleteTurfs")] - public void CmdAdmDeleteTurf(Player player) + public void CmdAdminDeleteTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1901,7 +1780,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setturfpoint", "~m~Benutzung:~s~ /setturfpoint")] - public void CmdAdmSetTurfPoint(Player player) + public void CmdAdminSetTurfPoint(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1943,7 +1822,7 @@ namespace ReallifeGamemode.Server.Commands } ChatService.SendMessage(target, "~r~WARNINFO: ~w~Dir wurde von " + adminPlayername + " ein Warn entfernt: " + reason); - ChatService.Broadcast("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " ein Warn entfernt: " + reason); + ChatService.BroadcastAdmin("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " ein Warn entfernt: " + reason, AdminLevel.ADMIN); } [Command("setskill", "~m~Benutzung: ~s~/setskill [Playerid] [Bus/Pilot] [Menge]")] @@ -2124,7 +2003,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setweather", "~m~Benutzung: ~s~/setweather [Wetter]")] - public void CmdAdminSetweather(Player player, string weather) + public void CmdAdminSetWeather(Player player, string weather) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2174,7 +2053,7 @@ namespace ReallifeGamemode.Server.Commands [Command("showtuningmenu", "~m~Benutzung: ~s~/showtuningmenu", Alias = "stm")] - public void CmdAdminShowtuningmenu(Player player) + public void CmdAdminShowTuningMenu(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2244,14 +2123,14 @@ namespace ReallifeGamemode.Server.Commands [Command("wepmod", "~m~Benutzung: ~s~/wepmod [Variable]")] public void CmdWeaponModifier(Player player, float modifier) { - player.SendChatMessage("Modifier steht auf" + modifier); + player.SendChatMessage("Modifier steht auf " + modifier); player.TriggerEvent("SERVER:WeaponModifier2", player, modifier, 1); } [Command("wepmmod", "~m~Benutzung: ~s~/wepmmod [Variable]")] public void CmdWeaponMeeleModifier(Player player, float modifier) { - player.SendChatMessage("MeeleModifier steht auf" + modifier); + player.SendChatMessage("MeeleModifier steht auf " + modifier); player.TriggerEvent("SERVER:WeaponModifier2", player, 1, modifier); } @@ -2269,7 +2148,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Name/ID] [Menge]")] - public void CmdAdminSetUserHandMoney(Player admin, string targetname, int amount) + public void CmdAdminSetHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2296,7 +2175,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("givehandmoney", "~m~Benutzung: ~s~/givehandmoney [Name/ID] [Menge]")] - public void CmdAdminGiveUserHandMoney(Player admin, string targetname, int amount) + public void CmdAdminGiveHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2323,7 +2202,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("quicksavemode", "~m~Benutzung: ~s~/quicksavemode [Modus]: ~g~blip, ~g~atm")] - public void CmdAdminSetQuickSaveMode(Player player, string mode) + public void CmdAdminQuickSaveMode(Player player, string mode) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2373,7 +2252,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setshopitem", "~m~Benutzung: ~s~/setshopitem [Item ID]")] - public void CmdAdminSetItemInShop(Player player, int itemId) + public void CmdAdminSetShopItem(Player player, int itemId) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2419,7 +2298,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("rmshopitem", "~m~Benutzung: ~s~/rmshopitem [Item ID]")] - public void CmdAdminRemoveItemInShop(Player player, int itemId) + public void CmdAdminRmShopItem(Player player, int itemId) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3228,7 +3107,7 @@ namespace ReallifeGamemode.Server.Commands // [Command("managefactionranks", "~m~Benutzung: ~s~/managefactionranks [Fraktions-ID]", Alias = "mfr")] - public void CmdFactionManageFactionRanks(Player player, int factionID) + public void CmdAdminManageFactionRanks(Player player, int factionID) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3342,7 +3221,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setmoney", "~m~Benutzung: ~s~/setmoney [Name] [Menge]")] - public void SetPlayerMoney(Player player, string receiver, int amount) + public void CmdAdminSetMoney(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3367,7 +3246,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("givemoney", "~m~Benutzung: ~s~/givemoney [Name] [Menge]")] - public void GivePlayerMoney(Player player, string receiver, int amount) + public void GiveAdminGiveMoney(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3393,7 +3272,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setbusinessowner", "~m~Benutzung: ~s~/setbusinessowner [Name] [Business ID]")] - public void CmdAdminSetbusinessowner(Player player, string name, int businessid) + public void CmdAdminSetBusinessOwner(Player player, string name, int businessid) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3474,7 +3353,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setbusinessbankbalance", "~m~Benutzung: ~s~/setbusinessbankbalance [Business ID] [Menge]")] - public void CmdAdminGivebusinessbankbalance(Player player, int businessid, int amount) + public void CmdAdminSetBusinessBankBalance(Player player, int businessid, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -4006,7 +3885,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("blind", "~m~Benutzung: ~s~/blind [Spieler] [Mode]")] - public void CmdBlind(Player player, string name, int mode) + public void CmdAdminBlind(Player player, string name, int mode) { if (!player.IsLoggedIn()) return;