Skip to content

modify: show as disabled when cannot nominate the map in menu #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fltuna merged 1 commit into from
Jul 26, 2025
Merged

modify: show as disabled when cannot nominate the map in menu #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion MapChooserSharp/Modules/McsMenu/NominationMenu/BuiltInHtml/McsBuiltInHtmlNominationUi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using MapChooserSharp.Modules.McsMenu.Interfaces;
using MapChooserSharp.Modules.McsMenu.NominationMenu.Interfaces;
using MapChooserSharp.Modules.Nomination;
using MapChooserSharp.Modules.Nomination.Interfaces;
using MapChooserSharp.Modules.PluginConfig.Interfaces;
using Microsoft.Extensions.DependencyInjection;
using TNCSSPluginFoundation;
Expand All @@ -31,6 +32,8 @@ public class McsBuiltInHtmlNominationUi(CCSPlayerController playerController, IS

private readonly IMcsInternalMapVoteControllerApi _voteController = provider.GetRequiredService<IMcsInternalMapVoteControllerApi>();

private readonly IMcsInternalNominationApi _nominationApi = provider.GetRequiredService<IMcsInternalNominationApi>();

public int NominationOptionCount => _nominationMenuOptions.Count;

public void OpenMenu()
Expand Down Expand Up @@ -66,8 +69,10 @@ public void OpenMenu()
// TODO() Use Alias name if enabled and available
// TODO() Truncate MapName if too long
builder.Append(_mcsInternalMapConfigProviderApi.GetMapName(option.NominationOption.MapConfig));

bool cannotNominate = _nominationApi.PlayerCanNominateMap(playerController, option.NominationOption.MapConfig) != McsMapNominationController.NominationCheck.Success;

chatMenuOptions.Add(new ChatMenuOption(builder.ToString(), option.MenuDisabled, (_, _) =>
chatMenuOptions.Add(new ChatMenuOption(builder.ToString(), cannotNominate, (_, _) =>
{
_nominationMenuOptions[index].SelectionCallback.Invoke(playerController, option.NominationOption);
}));
Expand Down
10 changes: 7 additions & 3 deletions ...sMenu/NominationMenu/Cs2MenuManager/ScreenMenu/McsCs2MenuManagerScreenMenuNominationUi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
using MapChooserSharp.Modules.MapVote.Interfaces;
using MapChooserSharp.Modules.McsMenu.Interfaces;
using MapChooserSharp.Modules.McsMenu.NominationMenu.Interfaces;
using MapChooserSharp.Modules.Nomination;
using MapChooserSharp.Modules.Nomination.Interfaces;
using Microsoft.Extensions.DependencyInjection;
using TNCSSPluginFoundation;
using TNCSSPluginFoundation.Interfaces;
Expand All @@ -31,6 +33,8 @@ public class McsCs2MenuManagerScreenMenuNominationUi(CCSPlayerController playerC

private readonly IMcsInternalMapVoteControllerApi _voteController = provider.GetRequiredService<IMcsInternalMapVoteControllerApi>();

private readonly IMcsInternalNominationApi _nominationApi = provider.GetRequiredService<IMcsInternalNominationApi>();

public int NominationOptionCount => _nominationMenuOptions.Count;

public void OpenMenu()
Expand Down Expand Up @@ -67,11 +71,11 @@ public void OpenMenu()
{
StringBuilder builder = new();

// TODO() Use Alias name if enabled and available
// TODO() Truncate MapName if too long
builder.Append(_mcsInternalMapConfigProviderApi.GetMapName(option.NominationOption.MapConfig));

bool cannotNominate = _nominationApi.PlayerCanNominateMap(playerController, option.NominationOption.MapConfig) != McsMapNominationController.NominationCheck.Success;

menuOptions.Add(new ItemOption(builder.ToString(), option.MenuDisabled ? DisableOption.DisableShowNumber : DisableOption.None, (_, _) =>
menuOptions.Add(new ItemOption(builder.ToString(), cannotNominate ? DisableOption.DisableShowNumber : DisableOption.None, (_, _) =>
{
_nominationMenuOptions[index].SelectionCallback.Invoke(playerController, option.NominationOption);
}));
Expand Down
8 changes: 5 additions & 3 deletions ...rSharp/Modules/McsMenu/NominationMenu/Cs2ScreenMenuApi/McsCs2ScreenMenuApiNominationUi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
using MapChooserSharp.Modules.MapVote.Interfaces;
using MapChooserSharp.Modules.McsMenu.Interfaces;
using MapChooserSharp.Modules.McsMenu.NominationMenu.Interfaces;
using MapChooserSharp.Modules.Nomination;
using MapChooserSharp.Modules.Nomination.Interfaces;
using Microsoft.Extensions.DependencyInjection;
using TNCSSPluginFoundation;
using TNCSSPluginFoundation.Interfaces;
Expand All @@ -29,6 +31,8 @@ public class McsCs2ScreenMenuApiNominationUi(CCSPlayerController playerControlle
private readonly IDebugLogger _debugLogger = provider.GetRequiredService<IDebugLogger>();

private readonly IMcsInternalMapVoteControllerApi _voteController = provider.GetRequiredService<IMcsInternalMapVoteControllerApi>();

private readonly IMcsInternalNominationApi _nominationApi = provider.GetRequiredService<IMcsInternalNominationApi>();

private Menu? _currentMenu;

Expand Down Expand Up @@ -69,8 +73,6 @@ public void OpenMenu()
{
StringBuilder builder = new();

// TODO() Use Alias name if enabled and available
// TODO() Truncate MapName if too long
builder.Append(_mcsInternalMapConfigProviderApi.GetMapName(option.NominationOption.MapConfig));

menuOptions.Add(new MenuOption
Expand All @@ -80,7 +82,7 @@ public void OpenMenu()
{
_nominationMenuOptions[index].SelectionCallback.Invoke(playerController, option.NominationOption);
},
IsDisabled = option.MenuDisabled
IsDisabled = _nominationApi.PlayerCanNominateMap(playerController, option.NominationOption.MapConfig) != McsMapNominationController.NominationCheck.Success
});
}

Expand Down