Skip to content

Command System Remake #141

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Command System Remake #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52384fc
Added slash commands to default command config.
GL1TCH1337 Apr 24, 2024
82d1ef7
Removed chat event based command handler and remade it with CS# built…
GL1TCH1337 Apr 24, 2024
ad98de4
Removed commented code
GL1TCH1337 Apr 24, 2024
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
49 changes: 20 additions & 29 deletions RetakesAllocator/Menus/AdvancedGunMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,33 @@ public class AdvancedGunMenu
public Dictionary<ulong, int> currentIndexDict = new Dictionary<ulong, int>();
public Dictionary<ulong, bool> buttonPressed = new Dictionary<ulong, bool>();

public HookResult OnEventPlayerChat(EventPlayerChat @event, GameEventInfo info)

public void HandleMenuCommand(int eventplayer)
{
if(string.IsNullOrEmpty(Configs.GetConfigData().InGameGunMenuCenterCommands) || @event == null)return HookResult.Continue;
var eventplayer = @event.Userid;
var eventmessage = @event.Text;

var player = Utilities.GetPlayerFromUserid(eventplayer);

if (player == null || !player.IsValid)return HookResult.Continue;
var playerid = player.SteamID;

if (string.IsNullOrWhiteSpace(eventmessage)) return HookResult.Continue;
string trimmedMessageStart = eventmessage.TrimStart();
string message = trimmedMessageStart.TrimEnd();
string[] CenterMenuCommands = Configs.GetConfigData().InGameGunMenuCenterCommands.Split(',');
if (player == null || !player.IsValid) return;
var playerid = player.SteamID;

if (CenterMenuCommands.Any(cmd => cmd.Equals(message, StringComparison.OrdinalIgnoreCase)))
if (!menuon.ContainsKey(playerid))
{
if (!menuon.ContainsKey(playerid))
{
menuon.Add(playerid, true);
}
if (!mainmenu.ContainsKey(playerid))
{
mainmenu.Add(playerid, 0);
}
if (!currentIndexDict.ContainsKey(playerid))
{
currentIndexDict.Add(playerid, 0);
}
if (!buttonPressed.ContainsKey(playerid))
{
buttonPressed.Add(playerid, false);
}
menuon.Add(playerid, true);
}
if (!mainmenu.ContainsKey(playerid))
{
mainmenu.Add(playerid, 0);
}
if (!currentIndexDict.ContainsKey(playerid))
{
currentIndexDict.Add(playerid, 0);
}
if (!buttonPressed.ContainsKey(playerid))
{
buttonPressed.Add(playerid, false);
}
return HookResult.Continue;
}


public void OnTick()
{
Expand Down
71 changes: 44 additions & 27 deletions RetakesAllocator/RetakesAllocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,50 @@ public override void Load(bool hotReload)
{
HandleHotReload();
}

if (!string.IsNullOrEmpty(Configs.GetConfigData().InGameGunMenuChatCommands))
{
string[] ChatMenuCommands = Configs.GetConfigData().InGameGunMenuChatCommands.Split(',');
if (ChatMenuCommands.Length > 0)
{
foreach (var command in ChatMenuCommands)
{
AddCommand($"css_{command}", "Opens the gun menu", (player, commandInfo) =>
{
if (player == null || !player.IsValid)
{
return;
}

_menuManager.OpenMenuForPlayer(player!, MenuType.Guns);
});
}
}

string[] InGameGunMenuCenterCommands = Configs.GetConfigData().InGameGunMenuCenterCommands.Split(',');
if (InGameGunMenuCenterCommands.Length > 0)
{
foreach (var command in InGameGunMenuCenterCommands)
{
AddCommand($"css_{command}", "Opens the advanced gun menu", (player, commandInfo) =>
{
if (player == null || !player.IsValid)
{
return;
}

_advancedGunMenu.HandleMenuCommand(player.UserId.Value);
});
}
}




}



}

private void ResetState(bool loadConfig = true)
Expand Down Expand Up @@ -626,33 +670,6 @@ public HookResult OnEventPlayerDisconnect(EventPlayerDisconnect @event, GameEven
return HookResult.Continue;
}

[GameEventHandler(HookMode.Post)]
public HookResult OnEventPlayerChat(EventPlayerChat @event, GameEventInfo info)
{
if (@event == null) return HookResult.Continue;
_advancedGunMenu.OnEventPlayerChat(@event, info);

if (string.IsNullOrEmpty(Configs.GetConfigData().InGameGunMenuChatCommands)) return HookResult.Continue;
var eventplayer = @event.Userid;
var eventmessage = @event.Text;
var player = Utilities.GetPlayerFromUserid(eventplayer);

if (player == null || !player.IsValid) return HookResult.Continue;
var playerid = player.SteamID;

if (string.IsNullOrWhiteSpace(eventmessage)) return HookResult.Continue;
string trimmedMessageStart = eventmessage.TrimStart();
string message = trimmedMessageStart.TrimEnd();
string[] ChatMenuCommands = Configs.GetConfigData().InGameGunMenuChatCommands.Split(',');

if (ChatMenuCommands.Any(cmd => cmd.Equals(message, StringComparison.OrdinalIgnoreCase)))
{
_menuManager.OpenMenuForPlayer(player!, MenuType.Guns);
}

return HookResult.Continue;
}

[GameEventHandler]
public HookResult OnEventRoundAnnounceWarmup(EventRoundAnnounceWarmup @event, GameEventInfo info)
{
Expand Down
4 changes: 2 additions & 2 deletions RetakesAllocatorCore/Config/Configs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ public Dictionary<
public LogLevel LogLevel { get; set; } = LogLevel.Information;
public string ChatMessagePluginName { get; set; } = "Retakes";
public string? ChatMessagePluginPrefix { get; set; }
public string InGameGunMenuCenterCommands { get; set; } = "gunsmenu,gunmenu,!gunmenu,!gunsmenu,!menugun,!menuguns";
public string InGameGunMenuChatCommands { get; set; } = "guns,!guns";
public string InGameGunMenuCenterCommands { get; set; } = "gunsmenu,gunmenu,menugun,menuguns";
public string InGameGunMenuChatCommands { get; set; } = "guns";
public ZeusPreference ZeusPreference { get; set; } = ZeusPreference.Never;

public DatabaseProvider DatabaseProvider { get; set; } = DatabaseProvider.Sqlite;
Expand Down