- Minor changes
This commit is contained in:
Dawid Bepierszcz
2024-04-28 02:14:50 +02:00
parent 806b5038ca
commit aefa6c6355
28 changed files with 1268 additions and 1351 deletions

View File

@@ -15,7 +15,7 @@ namespace CS2_SimpleAdmin.Menus
{
if (_weaponsCache == null)
{
Array weaponsArray = Enum.GetValues(typeof(CsItem));
var weaponsArray = Enum.GetValues(typeof(CsItem));
// avoid duplicates in the menu
_weaponsCache = new();
@@ -44,12 +44,12 @@ namespace CS2_SimpleAdmin.Menus
return;
}
BaseMenu menu = AdminMenu.CreateMenu("Fun Actions");
var menu = AdminMenu.CreateMenu("Fun Actions");
List<ChatMenuOptionData> options = new();
// permissions
bool hasCheats = AdminManager.PlayerHasPermissions(admin, "@css/cheats");
bool hasSlay = AdminManager.PlayerHasPermissions(admin, "@css/slay");
var hasCheats = AdminManager.PlayerHasPermissions(admin, "@css/cheats");
var hasSlay = AdminManager.PlayerHasPermissions(admin, "@css/slay");
// TODO: Localize options
// options added in order
@@ -72,35 +72,35 @@ namespace CS2_SimpleAdmin.Menus
options.Add(new ChatMenuOptionData("Set Money", () => PlayersMenu.OpenMenu(admin, "Set Money", SetMoneyMenu)));
}
foreach (ChatMenuOptionData menuOptionData in options)
foreach (var menuOptionData in options)
{
string menuName = menuOptionData.name;
var menuName = menuOptionData.name;
menu.AddMenuOption(menuName, (_, _) => { menuOptionData.action?.Invoke(); }, menuOptionData.disabled);
}
AdminMenu.OpenMenu(admin, menu);
}
private static void GodMode(CCSPlayerController admin, CCSPlayerController player)
private static void GodMode(CCSPlayerController admin, CCSPlayerController? player)
{
CS2_SimpleAdmin.Instance.God(admin, player);
}
private static void NoClip(CCSPlayerController admin, CCSPlayerController player)
private static void NoClip(CCSPlayerController admin, CCSPlayerController? player)
{
CS2_SimpleAdmin.Instance.NoClip(admin, player);
}
private static void Respawn(CCSPlayerController admin, CCSPlayerController player)
private static void Respawn(CCSPlayerController admin, CCSPlayerController? player)
{
CS2_SimpleAdmin.Instance.Respawn(admin, player);
}
private static void GiveWeaponMenu(CCSPlayerController admin, CCSPlayerController player)
{
BaseMenu menu = AdminMenu.CreateMenu($"Give Weapon: {player.PlayerName}");
var menu = AdminMenu.CreateMenu($"Give Weapon: {player.PlayerName}");
foreach (KeyValuePair<int, CsItem> weapon in GetWeaponsCache)
foreach (var weapon in GetWeaponsCache)
{
menu.AddMenuOption(weapon.Value.ToString(), (_, _) => { GiveWeapon(admin, player, weapon.Value); });
}
@@ -113,14 +113,14 @@ namespace CS2_SimpleAdmin.Menus
CS2_SimpleAdmin.Instance.GiveWeapon(admin, player, weaponValue);
}
private static void StripWeapons(CCSPlayerController admin, CCSPlayerController player)
private static void StripWeapons(CCSPlayerController admin, CCSPlayerController? player)
{
CS2_SimpleAdmin.Instance.StripWeapons(admin, player);
}
private static void Freeze(CCSPlayerController admin, CCSPlayerController player)
private static void Freeze(CCSPlayerController admin, CCSPlayerController? player)
{
if (!(player.PlayerPawn?.Value?.IsValid ?? false))
if (!(player?.PlayerPawn?.Value?.IsValid ?? false))
return;
if (player.PlayerPawn.Value.MoveType != MoveType_t.MOVETYPE_OBSOLETE)
@@ -129,9 +129,9 @@ namespace CS2_SimpleAdmin.Menus
CS2_SimpleAdmin.Instance.Unfreeze(admin, player);
}
private static void SetHpMenu(CCSPlayerController admin, CCSPlayerController player)
private static void SetHpMenu(CCSPlayerController admin, CCSPlayerController? player)
{
Tuple<string, int>[] _hpArray = new[]
var hpArray = new[]
{
new Tuple<string, int>("1", 1),
new Tuple<string, int>("10", 10),
@@ -143,25 +143,25 @@ namespace CS2_SimpleAdmin.Menus
new Tuple<string, int>("999", 999)
};
BaseMenu menu = AdminMenu.CreateMenu($"Set HP: {player.PlayerName}");
var menu = AdminMenu.CreateMenu($"Set HP: {player?.PlayerName}");
foreach (Tuple<string, int> hpTuple in _hpArray)
foreach (var hpTuple in hpArray)
{
string optionName = hpTuple.Item1;
var optionName = hpTuple.Item1;
menu.AddMenuOption(optionName, (_, _) => { SetHP(admin, player, hpTuple.Item2); });
}
AdminMenu.OpenMenu(admin, menu);
}
private static void SetHP(CCSPlayerController admin, CCSPlayerController player, int hp)
private static void SetHP(CCSPlayerController admin, CCSPlayerController? player, int hp)
{
CS2_SimpleAdmin.Instance.SetHp(admin, player, hp);
}
private static void SetSpeedMenu(CCSPlayerController admin, CCSPlayerController player)
private static void SetSpeedMenu(CCSPlayerController admin, CCSPlayerController? player)
{
Tuple<string, float>[] _speedArray = new[]
var speedArray = new[]
{
new Tuple<string, float>("0.1", .1f),
new Tuple<string, float>("0.25", .25f),
@@ -173,25 +173,25 @@ namespace CS2_SimpleAdmin.Menus
new Tuple<string, float>("4", 4)
};
BaseMenu menu = AdminMenu.CreateMenu($"Set Speed: {player.PlayerName}");
var menu = AdminMenu.CreateMenu($"Set Speed: {player?.PlayerName}");
foreach (Tuple<string, float> speedTuple in _speedArray)
foreach (var speedTuple in speedArray)
{
string optionName = speedTuple.Item1;
var optionName = speedTuple.Item1;
menu.AddMenuOption(optionName, (_, _) => { SetSpeed(admin, player, speedTuple.Item2); });
}
AdminMenu.OpenMenu(admin, menu);
}
private static void SetSpeed(CCSPlayerController admin, CCSPlayerController player, float speed)
private static void SetSpeed(CCSPlayerController admin, CCSPlayerController? player, float speed)
{
CS2_SimpleAdmin.Instance.SetSpeed(admin, player, speed);
}
private static void SetGravityMenu(CCSPlayerController admin, CCSPlayerController player)
private static void SetGravityMenu(CCSPlayerController admin, CCSPlayerController? player)
{
Tuple<string, float>[] _gravityArray = new[]
var gravityArray = new[]
{
new Tuple<string, float>("0.1", .1f),
new Tuple<string, float>("0.25", .25f),
@@ -201,25 +201,25 @@ namespace CS2_SimpleAdmin.Menus
new Tuple<string, float>("2", 2)
};
BaseMenu menu = AdminMenu.CreateMenu($"Set Gravity: {player.PlayerName}");
var menu = AdminMenu.CreateMenu($"Set Gravity: {player?.PlayerName}");
foreach (Tuple<string, float> gravityTuple in _gravityArray)
foreach (var gravityTuple in gravityArray)
{
string optionName = gravityTuple.Item1;
var optionName = gravityTuple.Item1;
menu.AddMenuOption(optionName, (_, _) => { SetGravity(admin, player, gravityTuple.Item2); });
}
AdminMenu.OpenMenu(admin, menu);
}
private static void SetGravity(CCSPlayerController admin, CCSPlayerController player, float gravity)
private static void SetGravity(CCSPlayerController admin, CCSPlayerController? player, float gravity)
{
CS2_SimpleAdmin.Instance.SetGravity(admin, player, gravity);
}
private static void SetMoneyMenu(CCSPlayerController admin, CCSPlayerController player)
private static void SetMoneyMenu(CCSPlayerController admin, CCSPlayerController? player)
{
Tuple<string, int>[] _moneyArray = new[]
var moneyArray = new[]
{
new Tuple<string, int>("$0", 0),
new Tuple<string, int>("$1000", 1000),
@@ -229,18 +229,18 @@ namespace CS2_SimpleAdmin.Menus
new Tuple<string, int>("$16000", 16000)
};
BaseMenu menu = AdminMenu.CreateMenu($"Set Money: {player.PlayerName}");
var menu = AdminMenu.CreateMenu($"Set Money: {player?.PlayerName}");
foreach (Tuple<string, int> moneyTuple in _moneyArray)
foreach (var moneyTuple in moneyArray)
{
string optionName = moneyTuple.Item1;
var optionName = moneyTuple.Item1;
menu.AddMenuOption(optionName, (_, _) => { SetMoney(admin, player, moneyTuple.Item2); });
}
AdminMenu.OpenMenu(admin, menu);
}
private static void SetMoney(CCSPlayerController admin, CCSPlayerController player, int money)
private static void SetMoney(CCSPlayerController admin, CCSPlayerController? player, int money)
{
CS2_SimpleAdmin.Instance.SetMoney(admin, player, money);
}