mirror of
https://github.com/Nereziel/cs2-WeaponPaints.git
synced 2026-02-17 18:39:07 +00:00
3.1a
- Possibility to change menu type by config `MenuType:` - selectable (each player can change menu type by command css_menus) - dynamic (center + keys) - center (center + chat) - chat - console
This commit is contained in:
14
Commands.cs
14
Commands.cs
@@ -181,7 +181,7 @@ public partial class WeaponPaints
|
||||
.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
|
||||
.ToDictionary(pair => pair.Key, pair => pair.Value);
|
||||
|
||||
var giveItemMenu = MenuApi?.NewMenu(Localizer["wp_knife_menu_title"]);
|
||||
var giveItemMenu = Utility.CreateMenu(Localizer["wp_knife_menu_title"]);
|
||||
|
||||
var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
|
||||
{
|
||||
@@ -265,7 +265,7 @@ public partial class WeaponPaints
|
||||
.Except([new KeyValuePair<string, string>("weapon_knife", "Default Knife")])
|
||||
.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
|
||||
|
||||
var weaponSelectionMenu = MenuApi?.NewMenu(Localizer["wp_skin_menu_weapon_title"]);
|
||||
var weaponSelectionMenu = Utility.CreateMenu(Localizer["wp_skin_menu_weapon_title"]);
|
||||
|
||||
// Function to handle skin selection for a specific weapon
|
||||
var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
|
||||
@@ -280,7 +280,7 @@ public partial class WeaponPaints
|
||||
weaponName?.ToString() == selectedWeaponClassname
|
||||
)?.ToList();
|
||||
|
||||
var skinSubMenu = MenuApi?.NewMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
|
||||
var skinSubMenu = Utility.CreateMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
|
||||
|
||||
// Function to handle skin selection for the chosen weapon
|
||||
var handleSkinSelection = (CCSPlayerController p, ChatMenuOption opt) =>
|
||||
@@ -416,7 +416,7 @@ public partial class WeaponPaints
|
||||
|
||||
private void SetupGlovesMenu()
|
||||
{
|
||||
var glovesSelectionMenu = MenuApi?.NewMenu(Localizer["wp_glove_menu_title"]);
|
||||
var glovesSelectionMenu = Utility.CreateMenu(Localizer["wp_glove_menu_title"]);
|
||||
if (glovesSelectionMenu == null) return;
|
||||
glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
|
||||
|
||||
@@ -625,7 +625,7 @@ public partial class WeaponPaints
|
||||
if (!CommandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
|
||||
DateTime.UtcNow >= (CommandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
|
||||
{
|
||||
var agentsSelectionMenu = MenuApi?.NewMenu(Localizer["wp_agent_menu_title"]);
|
||||
var agentsSelectionMenu = Utility.CreateMenu(Localizer["wp_agent_menu_title"]);
|
||||
if (agentsSelectionMenu == null) return;
|
||||
agentsSelectionMenu.PostSelectAction = PostSelectAction.Close;
|
||||
|
||||
@@ -665,7 +665,7 @@ public partial class WeaponPaints
|
||||
|
||||
private void SetupMusicMenu()
|
||||
{
|
||||
var musicSelectionMenu = MenuApi?.NewMenu(Localizer["wp_music_menu_title"]);
|
||||
var musicSelectionMenu = Utility.CreateMenu(Localizer["wp_music_menu_title"]);
|
||||
if (musicSelectionMenu == null) return;
|
||||
musicSelectionMenu.PostSelectAction = PostSelectAction.Close;
|
||||
|
||||
@@ -800,7 +800,7 @@ public partial class WeaponPaints
|
||||
|
||||
private void SetupPinsMenu()
|
||||
{
|
||||
var pinsSelectionMenu = MenuApi?.NewMenu(Localizer["wp_pins_menu_title"]);
|
||||
var pinsSelectionMenu = Utility.CreateMenu(Localizer["wp_pins_menu_title"]);
|
||||
if (pinsSelectionMenu == null) return;
|
||||
pinsSelectionMenu.PostSelectAction = PostSelectAction.Close;
|
||||
|
||||
|
||||
@@ -99,5 +99,8 @@ namespace WeaponPaints
|
||||
|
||||
[JsonPropertyName("Additional")]
|
||||
public Additional Additional { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("MenuType")]
|
||||
public string MenuType { get; set; } = "selectable";
|
||||
}
|
||||
}
|
||||
28
Utility.cs
28
Utility.cs
@@ -1,6 +1,8 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Translations;
|
||||
using CounterStrikeSharp.API.Modules.Menu;
|
||||
using Dapper;
|
||||
using MenuManager;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
@@ -189,9 +191,31 @@ namespace WeaponPaints
|
||||
Console.ResetColor();
|
||||
}
|
||||
|
||||
internal static string ReplaceTags(string message)
|
||||
internal static IMenu? CreateMenu(string title)
|
||||
{
|
||||
return message.ReplaceColorTags();
|
||||
var menuType = WeaponPaints.Instance.Config.MenuType.ToLower();
|
||||
|
||||
var menu = menuType switch
|
||||
{
|
||||
_ when menuType.Equals("selectable", StringComparison.CurrentCultureIgnoreCase) =>
|
||||
WeaponPaints.MenuApi?.NewMenu(title),
|
||||
|
||||
_ when menuType.Equals("dynamic", StringComparison.CurrentCultureIgnoreCase) =>
|
||||
WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ButtonMenu),
|
||||
|
||||
_ when menuType.Equals("center", StringComparison.CurrentCultureIgnoreCase) =>
|
||||
WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.CenterMenu),
|
||||
|
||||
_ when menuType.Equals("chat", StringComparison.CurrentCultureIgnoreCase) =>
|
||||
WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ChatMenu),
|
||||
|
||||
_ when menuType.Equals("console", StringComparison.CurrentCultureIgnoreCase) =>
|
||||
WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ConsoleMenu),
|
||||
|
||||
_ => WeaponPaints.MenuApi?.NewMenu(title)
|
||||
};
|
||||
|
||||
return menu;
|
||||
}
|
||||
|
||||
internal static async Task CheckVersion(string version, ILogger logger)
|
||||
|
||||
@@ -542,7 +542,6 @@ namespace WeaponPaints
|
||||
var weapon = handle.Value;
|
||||
|
||||
if (weapon == null || !weapon.IsValid) continue;
|
||||
|
||||
if (myWeapons.Count == 1)
|
||||
{
|
||||
var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(CsItem.USP));
|
||||
|
||||
@@ -17,7 +17,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
|
||||
public override string ModuleAuthor => "Nereziel & daffyy";
|
||||
public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based";
|
||||
public override string ModuleName => "WeaponPaints";
|
||||
public override string ModuleVersion => "3.0c";
|
||||
public override string ModuleVersion => "3.1a";
|
||||
|
||||
public override void Load(bool hotReload)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user