From 6df98fb16450a7640fe4185e3701ff753f8f463a Mon Sep 17 00:00:00 2001 From: Dawid Bepierszcz <41084667+daffyyyy@users.noreply.github.com> Date: Sun, 18 Aug 2024 22:23:30 +0200 Subject: [PATCH] 1.5.2c - Menu overrides for fun commands --- CS2-SimpleAdmin.cs | 2 +- Menus/FunActionsMenu.cs | 42 ++++++++++++++++++++++++++++++----------- VERSION | 2 +- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin.cs index 0523898..3e52cc5 100644 --- a/CS2-SimpleAdmin.cs +++ b/CS2-SimpleAdmin.cs @@ -41,7 +41,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)"); public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)"; public override string ModuleAuthor => "daffyy & Dliix66"; - public override string ModuleVersion => "1.5.2b"; + public override string ModuleVersion => "1.5.2c"; public CS2_SimpleAdminConfig Config { get; set; } = new(); diff --git a/Menus/FunActionsMenu.cs b/Menus/FunActionsMenu.cs index 7194578..9751649 100644 --- a/Menus/FunActionsMenu.cs +++ b/Menus/FunActionsMenu.cs @@ -48,32 +48,52 @@ namespace CS2_SimpleAdmin.Menus var menu = AdminMenu.CreateMenu(localizer?["sa_menu_fun_commands"] ?? "Fun Commands"); List options = []; - // permissions - var hasCheats = AdminManager.CommandIsOverriden("css_godmode") ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_godmode")) : AdminManager.PlayerHasPermissions(admin, "@css/cheats"); - var hasSlay = AdminManager.CommandIsOverriden("css_slay") ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_slay")) : AdminManager.PlayerHasPermissions(admin, "@css/slay"); - //var hasCheats = AdminManager.PlayerHasPermissions(admin, "@css/cheats"); //var hasSlay = AdminManager.PlayerHasPermissions(admin, "@css/slay"); // options added in order - if (hasCheats) - { - options.Add(new ChatMenuOptionData(localizer?["sa_godmode"] ?? "God Mode", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_godmode"] ?? "God Mode", GodMode))); + if (AdminManager.CommandIsOverriden("css_god") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_god")) + : AdminManager.PlayerHasPermissions(admin, "@css/cheats")) + options.Add(new ChatMenuOptionData(localizer?["sa_godmode"] ?? "God Mode", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_godmode"] ?? "God Mode", GodMode))); + if (AdminManager.CommandIsOverriden("css_noclip") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_noclip")) + : AdminManager.PlayerHasPermissions(admin, "@css/cheats")) options.Add(new ChatMenuOptionData(localizer?["sa_noclip"] ?? "No Clip", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_noclip"] ?? "No Clip", NoClip))); + if (AdminManager.CommandIsOverriden("css_respawn") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_respawn")) + : AdminManager.PlayerHasPermissions(admin, "@css/cheats")) options.Add(new ChatMenuOptionData(localizer?["sa_respawn"] ?? "Respawn", () => PlayersMenu.OpenDeadMenu(admin, localizer?["sa_respawn"] ?? "Respawn", Respawn))); + if (AdminManager.CommandIsOverriden("css_give") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_give")) + : AdminManager.PlayerHasPermissions(admin, "@css/cheats")) options.Add(new ChatMenuOptionData(localizer?["sa_give_weapon"] ?? "Give Weapon", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_give_weapon"] ?? "Give Weapon", GiveWeaponMenu))); - } - if (hasSlay) - { + if (AdminManager.CommandIsOverriden("css_strip") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_strip")) + : AdminManager.PlayerHasPermissions(admin, "@css/slay")) options.Add(new ChatMenuOptionData(localizer?["sa_strip_weapons"] ?? "Strip Weapons", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_strip_weapons"] ?? "Strip Weapons", StripWeapons))); + if (AdminManager.CommandIsOverriden("css_freeze") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_freeze")) + : AdminManager.PlayerHasPermissions(admin, "@css/slay")) options.Add(new ChatMenuOptionData(localizer?["sa_freeze"] ?? "Freeze", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_freeze"] ?? "Freeze", Freeze))); + if (AdminManager.CommandIsOverriden("css_hp") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_hp")) + : AdminManager.PlayerHasPermissions(admin, "@css/slay")) options.Add(new ChatMenuOptionData(localizer?["sa_set_hp"] ?? "Set Hp", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_set_hp"] ?? "Set Hp", SetHpMenu))); + if (AdminManager.CommandIsOverriden("css_speed") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_speed")) + : AdminManager.PlayerHasPermissions(admin, "@css/slay")) options.Add(new ChatMenuOptionData(localizer?["sa_set_speed"] ?? "Set Speed", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_set_speed"] ?? "Set Speed", SetSpeedMenu))); + if (AdminManager.CommandIsOverriden("css_gravity") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_gravity")) + : AdminManager.PlayerHasPermissions(admin, "@css/slay")) options.Add(new ChatMenuOptionData(localizer?["sa_set_gravity"] ?? "Set Gravity", () => PlayersMenu.OpenAliveMenu(admin, localizer?["sa_set_gravity"] ?? "Set Gravity", SetGravityMenu))); + if (AdminManager.CommandIsOverriden("css_money") + ? AdminManager.PlayerHasPermissions(admin, AdminManager.GetPermissionOverrides("css_money")) + : AdminManager.PlayerHasPermissions(admin, "@css/slay")) options.Add(new ChatMenuOptionData(localizer?["sa_set_money"] ?? "Set Money", () => PlayersMenu.OpenMenu(admin, localizer?["sa_set_money"] ?? "Set Money", SetMoneyMenu))); - } foreach (var menuOptionData in options) { diff --git a/VERSION b/VERSION index 3b1470e..d24521f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.2b \ No newline at end of file +1.5.2c \ No newline at end of file