Skip to content
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

some fixes practice #251

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

some fixes practice #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef755f9
some fixes practice
sniperpl Nov 20, 2024
e954acb
;
sniperpl Nov 23, 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
3 changes: 1 addition & 2 deletions ConsoleCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,7 @@ public void OnRestartMatchCommand(CCSPlayerController? player, CommandInfo? comm
}
else
{
// ReplyToUserCommand(player, "Practice mode is active, cannot restart the match.");
ReplyToUserCommand(player, Localizer["matchzy.cc.rrispracc"]);
Server.ExecuteCommand("mp_restartgame 1");
}
}
else
Expand Down
22 changes: 11 additions & 11 deletions PracticeMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ public void StartPracticeMode()
}
GetSpawns();
PrintToAllChat($"Practice mode loaded!");
Server.PrintToChatAll($" {ChatColors.Green}Spawns: {ChatColors.Default}.spawn, .ctspawn, .tspawn, .bestspawn, .worstspawn");
sniperpl marked this conversation as resolved.
Show resolved Hide resolved
Server.PrintToChatAll($" {ChatColors.Green}Bots: {ChatColors.Default}.bot, .nobots, .crouchbot, .boost, .crouchboost");
Server.PrintToChatAll($" {ChatColors.Green}Nades: {ChatColors.Default}.loadnade, .savenade, .importnade, .listnades");
Server.PrintToChatAll($" {ChatColors.Green}Nade Throw: {ChatColors.Default}.rethrow, .throwindex <index>, .lastindex, .delay <number>");
Server.PrintToChatAll($" {ChatColors.Green}Utility & Toggles: {ChatColors.Default}.clear, .fastforward, .last, .back, .solid, .impacts, .traj");
Server.PrintToChatAll($" {ChatColors.Green}Sides & Others: {ChatColors.Default}.ct, .t, .spec, .fas, .god, .dryrun, .break, .exitprac");
PrintToAllChat($" {ChatColors.Green}Spawns: {ChatColors.Default}.spawn, .ctspawn, .tspawn, .bestspawn, .worstspawn");
PrintToAllChat($" {ChatColors.Green}Bots: {ChatColors.Default}.bot, .nobots, .crouchbot, .boost, .crouchboost");
PrintToAllChat($" {ChatColors.Green}Nades: {ChatColors.Default}.loadnade, .savenade, .importnade, .listnades");
PrintToAllChat($" {ChatColors.Green}Nade Throw: {ChatColors.Default}.rethrow, .throwindex <index>, .lastindex, .delay <number>");
PrintToAllChat($" {ChatColors.Green}Utility & Toggles: {ChatColors.Default}.clear, .fastforward, .last, .back, .solid, .impacts, .traj");
PrintToAllChat($" {ChatColors.Green}Sides & Others: {ChatColors.Default}.ct, .t, .spec, .fas, .god, .dryrun, .break, .exitprac");
}

public void GetSpawns()
Expand Down Expand Up @@ -771,11 +771,11 @@ public void OnPracCommand(CCSPlayerController? player, CommandInfo? command)
return;
}

// if (isPractice)
// {
// StartMatchMode();
// return;
// }
if (isPractice)
{
//StartMatchMode();
return;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey!

Thanks for the PR! Though I remember some people want !prac command to re-start the prac, hence this check was commented. It also prints all the help commands again if used, hence I don't think we should return from here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not better using !rr for this?

}

StartPracticeMode();
}
Expand Down