TeamLucker/LuckerGame
3
0
Fork 0
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request 'start_round with minigame name' (#1) from terry-races into master

Browse Source 
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
conco
2023-08-03 06:15:15 +00:00
parent bdb25fd3ce ef88c51454
commit 39b9f71801
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/Entities/MinigameManager.cs
View File

@@ -21,17 +21,25 @@ public partial class MinigameManager : Entity
FindMinigames(); FindMinigames();
} }
public void StartRandomMinigame(List<Lucker> players) public void StartMinigame(List<Lucker> players, string minigameName = null)
{
if (CheckForMinigames())
{
LoadedMinigame = string.IsNullOrEmpty( minigameName ) ? AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault() : TypeLibrary.Create<Minigame>( minigameName );
ChatBox.AddInformation( To.Everyone, $"Starting {LoadedMinigame.Name}" );
LoadedMinigame.Initialize( players );
}
}
private bool CheckForMinigames()
{ {
if ( (AvailableMinigames?.Count ?? 0) == 0 ) if ( (AvailableMinigames?.Count ?? 0) == 0 )
{ {
Log.Error( "Attempted to start minigame, but none available" ); Log.Error( "Attempted to start minigame, but none available" );
return; return false;
} }
LoadedMinigame = AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault(); return true;
ChatBox.AddInformation( To.Everyone, $"Starting {LoadedMinigame.Name}" );
LoadedMinigame.Initialize( players );
} }
private void FindMinigames() private void FindMinigames()

10
code/Entities/RoundManager.cs
View File

@@ -110,7 +110,7 @@ public partial class RoundManager : Entity
} }
} }
private void StartRound() private void StartRound( string minigameName = null )
{ {
if ( RoundState == RoundState.InProgress ) if ( RoundState == RoundState.InProgress )
{ {
@@ -120,12 +120,12 @@ public partial class RoundManager : Entity
RoundState = RoundState.InProgress; RoundState = RoundState.InProgress;
Players = All.OfType<Lucker>().ToList(); Players = All.OfType<Lucker>().ToList();
MinigameManager.StartRandomMinigame( Players ); MinigameManager.StartMinigame( Players, minigameName );
} }
[ConCmd.Server("start_round")] [ConCmd.Server( "start_round" )]
public static void ForceStart() public static void ForceStart( string minigameName = null )
{ {
Entity.All.OfType<RoundManager>().FirstOrDefault()?.StartRound(); Entity.All.OfType<RoundManager>().FirstOrDefault()?.StartRound( minigameName );
} }
} }