From 686edc85a39a1b101d42ab33144a2b46cec3b8a1 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Thu, 3 Aug 2023 11:45:09 -0400 Subject: [PATCH 1/8] Basic round loop done --- code/Entities/MinigameManager.cs | 30 +++++++++++++++++-- code/Entities/RoundManager.cs | 19 +++++++++++- code/Minigames/Minigame.cs | 3 +- .../RussianRouletteMinigame.cs | 15 ++++++++-- 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/code/Entities/MinigameManager.cs b/code/Entities/MinigameManager.cs index b3b8fa5..111cd39 100644 --- a/code/Entities/MinigameManager.cs +++ b/code/Entities/MinigameManager.cs @@ -14,6 +14,7 @@ public partial class MinigameManager : Entity { [Net] public Minigame LoadedMinigame { get; private set; } private List AvailableMinigames { get; set; } + private List InvolvedPlayers { get; set; } public override void Spawn() { @@ -23,6 +24,7 @@ public partial class MinigameManager : Entity public void StartMinigame(List players, string minigameName = null) { + InvolvedPlayers = players.ToList(); if (CheckForMinigames()) { LoadedMinigame = string.IsNullOrEmpty( minigameName ) ? AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault() : TypeLibrary.Create( minigameName ); @@ -54,13 +56,35 @@ public partial class MinigameManager : Entity { FindMinigames(); } + + private void cleanupPlayerPawns() + { + InvolvedPlayers.ForEach( player => + { + player.Pawn.Delete(); + player.Pawn = null; + } ); + } - public void Tick() + /// + /// Called once per tick by the RoundManager. Ticks any running minigame. + /// + /// true if the current minigame has ended, else false + public bool Tick() { if ( LoadedMinigame is not { IsValid: true } ) { - return; + return false; } - LoadedMinigame.Tick(); + var ended = LoadedMinigame.Tick(); + if ( !ended ) + { + return false; + } + + LoadedMinigame.Cleanup(); + LoadedMinigame = null; + return true; + } } diff --git a/code/Entities/RoundManager.cs b/code/Entities/RoundManager.cs index e4f3780..65b21a3 100644 --- a/code/Entities/RoundManager.cs +++ b/code/Entities/RoundManager.cs @@ -76,7 +76,19 @@ public partial class RoundManager : Entity if ( RoundState == RoundState.InProgress ) { - MinigameManager.Tick(); + var ended = MinigameManager.Tick(); + if ( ended ) + { + MinigamesLeftInRound--; + if ( MinigamesLeftInRound > 0 ) + { + MinigameManager.StartMinigame( Players ); + } + else + { + RoundState = RoundState.NotStarted; + } + } } } @@ -120,6 +132,11 @@ public partial class RoundManager : Entity RoundState = RoundState.InProgress; Players = All.OfType().ToList(); + Players.ForEach( player => + { + player.Ready = false; + } ); + MinigamesLeftInRound = MinigamesPerRound; MinigameManager.StartMinigame( Players, minigameName ); } diff --git a/code/Minigames/Minigame.cs b/code/Minigames/Minigame.cs index c526597..ada9d05 100644 --- a/code/Minigames/Minigame.cs +++ b/code/Minigames/Minigame.cs @@ -21,7 +21,8 @@ public abstract class Minigame : Entity /// /// Once a minigame is loaded and initialized, this method is called once per server tick. /// - public abstract void Tick(); + /// true if the minigame has ended, false otherwise + public abstract bool Tick(); /// /// Cleans up any entities and components created by this minigame. diff --git a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs index 55ab89f..52885bf 100644 --- a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs +++ b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs @@ -16,8 +16,10 @@ public class RussianRouletteMinigame : Minigame public override string Name => "Russian Roulette"; private List Players { get; set; } private Pawn Shooter { get; set; } + private const float ShooterDistance = 80f; private const float TimeBetweenShots = 7f; + private const float TimeBetweenDeathAndEnd = 5f; private int Taunted = 0; private List DeadVictims => Players @@ -26,6 +28,7 @@ public class RussianRouletteMinigame : Minigame .ToList(); private TimeSince TimeSinceShot { get; set; } + private TimeSince TimeSinceDeadVictim { get; set; } public override void Initialize( List players ) { @@ -60,7 +63,7 @@ public class RussianRouletteMinigame : Minigame TimeSinceShot = 0; } - public override void Tick() + public override bool Tick() { if ( DeadVictims.Any() ) { @@ -68,10 +71,14 @@ public class RussianRouletteMinigame : Minigame { ChatBox.AddChatEntry( To.Everyone, "Shooter", "Heh, nothing personnel, kid." ); Taunted = int.MaxValue; + TimeSinceDeadVictim = 0; + } + else if(TimeSinceDeadVictim > TimeBetweenDeathAndEnd) + { + return true; } - return; } - if ( TimeSinceShot > TimeBetweenShots ) + else if ( TimeSinceShot > TimeBetweenShots ) { TimeSinceShot = 0; Taunted = 0; @@ -95,6 +102,8 @@ public class RussianRouletteMinigame : Minigame ChatBox.AddChatEntry( To.Everyone, "Shooter", "Im gettin' ready!" ); Taunted++; } + + return false; } public override void Cleanup() -- 2.49.1 From a5a734b31a69cebdbcf255dfee49796b078646da Mon Sep 17 00:00:00 2001 From: gamer147 Date: Thu, 3 Aug 2023 12:22:24 -0400 Subject: [PATCH 2/8] Pulls in FPS menu so we can make edits --- .sbproj | 15 +- code/Entities/MinigameManager.cs | 10 +- code/Entities/RoundManager.cs | 3 +- code/UI/MainMenu/ActiveLobby.razor | 121 ++++++++++++++ code/UI/MainMenu/FrontPage.razor | 40 +++++ code/UI/MainMenu/LoadingScreen.razor | 31 ++++ code/UI/MainMenu/LoadingScreen.razor.scss | 50 ++++++ code/UI/MainMenu/LobbyBrowser.razor | 66 ++++++++ code/UI/MainMenu/MainMenu.razor | 40 +++++ code/UI/MainMenu/MainMenu.razor.scss | 195 ++++++++++++++++++++++ code/UI/MainMenu/SavedGames.razor | 44 +++++ code/UI/MainMenu/SetupGame.razor | 78 +++++++++ code/UI/MainMenu/SlimPackageCard.razor | 32 ++++ 13 files changed, 722 insertions(+), 3 deletions(-) create mode 100644 code/UI/MainMenu/ActiveLobby.razor create mode 100644 code/UI/MainMenu/FrontPage.razor create mode 100644 code/UI/MainMenu/LoadingScreen.razor create mode 100644 code/UI/MainMenu/LoadingScreen.razor.scss create mode 100644 code/UI/MainMenu/LobbyBrowser.razor create mode 100644 code/UI/MainMenu/MainMenu.razor create mode 100644 code/UI/MainMenu/MainMenu.razor.scss create mode 100644 code/UI/MainMenu/SavedGames.razor create mode 100644 code/UI/MainMenu/SetupGame.razor create mode 100644 code/UI/MainMenu/SlimPackageCard.razor diff --git a/.sbproj b/.sbproj index f6de3ac..0e6ffda 100644 --- a/.sbproj +++ b/.sbproj @@ -37,7 +37,20 @@ "GameSettings": {}, "Addons": "", "PreLaunchCommand": "", - "PostLaunchCommand": "" + "PostLaunchCommand": "lucker_minigames_per_round 1" + } + ], + "PackageSettings": [ + { + "DisplayType": "Integer", + "Choices": [], + "ConVarName": "lucker_minigames_per_round", + "DisplayName": "Minigames Per Round", + "DefaultValue": "0", + "Description": "The number of minigames played per round", + "Group": "Other", + "Minimum": 1, + "Maximum": 12 } ] } diff --git a/code/Entities/MinigameManager.cs b/code/Entities/MinigameManager.cs index 111cd39..a9f6650 100644 --- a/code/Entities/MinigameManager.cs +++ b/code/Entities/MinigameManager.cs @@ -57,8 +57,16 @@ public partial class MinigameManager : Entity FindMinigames(); } - private void cleanupPlayerPawns() + /// + /// Goes through the players included in the loaded minigame and deletes and nulls out any pawns assigned to them + /// + private void CleanupPlayerPawns() { + if ( LoadedMinigame is not { IsValid: true } || InvolvedPlayers == null) + { + Log.Warning( "Attempted to clean up players without a minigame loaded!" ); + return; + } InvolvedPlayers.ForEach( player => { player.Pawn.Delete(); diff --git a/code/Entities/RoundManager.cs b/code/Entities/RoundManager.cs index 65b21a3..5a384b6 100644 --- a/code/Entities/RoundManager.cs +++ b/code/Entities/RoundManager.cs @@ -49,7 +49,8 @@ public partial class RoundManager : Entity private const int MinigamesPerRound = 1; - private int MinigamesLeftInRound { get; set; } + [ConVar.Replicated("lucker_minigames_per_round")] + public static int MinigamesLeftInRound { get; set; } private List Players { get; set; } #endregion diff --git a/code/UI/MainMenu/ActiveLobby.razor b/code/UI/MainMenu/ActiveLobby.razor new file mode 100644 index 0000000..9f5a775 --- /dev/null +++ b/code/UI/MainMenu/ActiveLobby.razor @@ -0,0 +1,121 @@ +@using Sandbox; +@using System; +@using System.Linq; +@using System.Threading.Tasks; +@using Sandbox.Menu; +@using Sandbox.UI; + +@namespace LuckerGame.UI.MainMenu +@inherits Panel + + + + + @if ( Lobby == null ) + { +
+ Loading... + + Return +
+ } + else + { + +
+
+ + +
+ @foreach (var member in Lobby.Members) + { + + } +
+
+ + @if ( Lobby.Owner.IsMe ) + { +
+ @if ( MaxPlayersSupported > 1 ) + { + + + + + + + } + + + + + + + +
+ } + +
+ + + Leave Lobby + + Start + + Return +
+ } + + +@code +{ + Friend Owner => Lobby.Owner; + ILobby Lobby => Game.Menu.Lobby; + + int MaxPlayersSupported { get; set; } = 1; + Package MapPackage { get; set; } + + void OnMapClicked() + { + Game.Overlay.ShowPackageSelector( "type:map sort:popular", OnMapSelected ); + StateHasChanged(); + } + + void OnMapSelected( Package map ) + { + MapPackage = map; + Game.Menu.Lobby.Map = map.FullIdent; + + StateHasChanged(); + } + + public void LeaveLobby() + { + Lobby?.Leave(); + + this.Navigate( "/lobby/list" ); + } + + async Task Start() + { + await Game.Menu.StartServerAsync( Game.Menu.Lobby.MaxMembers, $"{Game.Menu.Lobby.Owner.Name}'s game", Game.Menu.Lobby.Map ); + } + + async void FetchPackage() + { + MapPackage = await Package.FetchAsync( Game.Menu.Lobby?.Map ?? "facepunch.square", true ); + } + + protected override void OnAfterTreeRender( bool firstTime ) + { + FetchPackage(); + } + + protected override void OnParametersSet() + { + MaxPlayersSupported = Game.Menu.Package.GetMeta( "MaxPlayers", 1 ); + } +} \ No newline at end of file diff --git a/code/UI/MainMenu/FrontPage.razor b/code/UI/MainMenu/FrontPage.razor new file mode 100644 index 0000000..8d9d690 --- /dev/null +++ b/code/UI/MainMenu/FrontPage.razor @@ -0,0 +1,40 @@ +@using Sandbox; +@using System.Linq; +@using System.Threading.Tasks; +@using Sandbox.Menu; +@using Sandbox.UI; +@namespace LuckerGame.UI.MainMenu + + +
+ @Game.Menu.Package.Title +
+ +
+ @if (Game.InGame) + { + Leave + } + else + { + Play + + Lobbies + + @if ( Game.Menu.Package.SupportsSavedGames && Game.Menu.SavedGames.Any()) + { + Load Save + } + } + + Quit +
+ + +@code +{ + void LeaveGame() + { + Game.Menu.LeaveServer( "Leaving" ); + } +} \ No newline at end of file diff --git a/code/UI/MainMenu/LoadingScreen.razor b/code/UI/MainMenu/LoadingScreen.razor new file mode 100644 index 0000000..2ec5690 --- /dev/null +++ b/code/UI/MainMenu/LoadingScreen.razor @@ -0,0 +1,31 @@ +@using Sandbox; +@using Sandbox.UI; +@using System.Linq; +@using System.Threading.Tasks; +@using Sandbox.Menu; + +@inherits RootPanel +@implements Sandbox.Menu.ILoadingScreenPanel +@attribute [StyleSheet] +@namespace LuckerGame.UI.MainMenu + + +
+ +
+ +
+ @( Progress.Title ?? "Loading..." ) +
+ + +@code +{ + public LoadingProgress Progress; + + public void OnLoadingProgress( LoadingProgress progress ) + { + Progress = progress; + StateHasChanged(); + } +} diff --git a/code/UI/MainMenu/LoadingScreen.razor.scss b/code/UI/MainMenu/LoadingScreen.razor.scss new file mode 100644 index 0000000..6c5893a --- /dev/null +++ b/code/UI/MainMenu/LoadingScreen.razor.scss @@ -0,0 +1,50 @@ + +LoadingScreen +{ + background-color: #262934; + padding: 128px 128px; + opacity: 1; + flex-direction: column; + font-size: 25px; + width: 100%; + height: 100%; + position: absolute; + transition: all 0.3s ease-out; + color: rgba( white, 0.8 ); + + .background + { + position: absolute; + width: 100%; + height: 100%; + background-image: url( https://files.facepunch.com/tony/1b1311b1/boxes.webm ); + opacity: 0.2; + background-size: contain; + filter: blur( 20px ); + mask: linear-gradient( 45deg, white, white, black ); + mask-scope: filter; + } + + &:intro + { + opacity: 0; + transform: scaleX( 1.1 ); + } + + .game-title + { + font-family: Roboto; + font-weight: 700; + font-size: 70px; + color: rgba( white, 1 ); + } + + .controls + { + flex-direction: column; + gap: 50px; + align-items: flex-start; + font-family: Roboto; + text-transform: uppercase; + } +} diff --git a/code/UI/MainMenu/LobbyBrowser.razor b/code/UI/MainMenu/LobbyBrowser.razor new file mode 100644 index 0000000..fae7358 --- /dev/null +++ b/code/UI/MainMenu/LobbyBrowser.razor @@ -0,0 +1,66 @@ +@using Sandbox; +@using System; +@using System.Linq; +@using System.Threading.Tasks; +@using Sandbox.Menu; +@using Sandbox.UI; +@namespace LuckerGame.UI.MainMenu +@inherits Panel + + + + +
+
+ + refresh +
+ +
+ @foreach ( var lobby in Game.Menu.Lobbies ) + { + JoinLobby( lobby ) ) >@(lobby.Owner.Name)'s lobby (@lobby.MemberCount/@lobby.MaxMembers) + } +
+ +
+ + Create Lobby + Return +
+ + +@code +{ + public async void CreateLobbyAsync() + { + await Game.Menu.CreateLobbyAsync( 64, "game", true ); + Game.Menu.Lobby.Map = "facepunch.square"; + this.Navigate( "/lobby/active" ); + } + + public async void JoinLobby( ILobby lobby ) + { + if ( lobby == null ) return; + + // don't exist in two lobbies at once + Game.Menu.Lobby?.Leave(); + + await lobby.JoinAsync(); + this.Navigate( "/lobby/active" ); + } + + public async void Refresh() + { + await Game.Menu.QueryLobbiesAsync( null, 1 ); + + StateHasChanged(); + } + + protected override int BuildHash() + { + return HashCode.Combine( Game.Menu.Lobbies.Count() ); + } +} \ No newline at end of file diff --git a/code/UI/MainMenu/MainMenu.razor b/code/UI/MainMenu/MainMenu.razor new file mode 100644 index 0000000..1b9f997 --- /dev/null +++ b/code/UI/MainMenu/MainMenu.razor @@ -0,0 +1,40 @@ +@using System; +@using Sandbox; +@using Sandbox.UI; + +@inherits Sandbox.UI.NavHostPanel +@implements Sandbox.Menu.IGameMenuPanel +@attribute [StyleSheet] +@namespace LuckerGame.UI.MainMenu + + +
+
+ + +@code +{ + public MainMenu() + { + DefaultUrl = "/"; + + AddDestination( "/", typeof( FrontPage ) ); + AddDestination( "/setup", typeof( SetupGame ) ); + + AddDestination( "/lobby/list", typeof( LobbyBrowser ) ); + AddDestination( "/lobby/active", typeof( ActiveLobby ) ); + + BindClass( "ingame", () => Game.InGame ); + } + + [GameEvent.Menu.ServerJoined] + public void OnServerJoined() => Navigate( "/" ); + + [GameEvent.Menu.ServerLeave] + public void OnServerLeave() => Navigate ("/" ); + + protected override int BuildHash() + { + return HashCode.Combine( Game.InGame, Game.Menu.Lobby, Game.Menu.Lobby?.Map ); + } +} diff --git a/code/UI/MainMenu/MainMenu.razor.scss b/code/UI/MainMenu/MainMenu.razor.scss new file mode 100644 index 0000000..745df88 --- /dev/null +++ b/code/UI/MainMenu/MainMenu.razor.scss @@ -0,0 +1,195 @@ + +MainMenu +{ + background-color: #262934; + padding: 128px 128px; + opacity: 1; + flex-direction: column; + font-size: 25px; + width: 100%; + height: 100%; + position: absolute; + transition: all 0.3s ease-out; + color: rgba( white, 0.8 ); + + .background + { + position: absolute; + width: 100%; + height: 100%; + background-image: url( https://files.facepunch.com/tony/1b1311b1/boxes.webm ); + opacity: 0.2; + background-size: cover; + filter: blur( 20px ); + mask: linear-gradient( 45deg, white, white, black ); + mask-scope: filter; + background-repeat: no-repeat; + } + + &:intro + { + opacity: 0; + transform: scaleX( 1.1 ); + } + + &.ingame + { + background-color: #262934ee; + backdrop-filter: blur(10px); + + .background + { + opacity: 0; + } + } + + .scroll + { + flex-direction: column; + max-height: 386px; + overflow: scroll; + gap: 50px; + } + + .spacer + { + height: 1px; + background-image: linear-gradient( to right, rgba( white, 0.4 ), rgba( white, 0 ) ); + width: 512px; + margin: 16px 0px; + } + + .game-title + { + font-family: Roboto Condensed; + font-weight: 700; + font-size: 70px; + color: rgba( white, 1 ); + padding-bottom: 64px; + } + + .col + { + flex-direction: column; + gap: 16px; + } + + .controls + { + flex-direction: column; + gap: 50px; + align-items: flex-start; + text-transform: uppercase; + + a, .button + { + font-family: Roboto; + + &:hover + { + color: rgba( white, 1 ); + font-weight: 900; + sound-in: ui.button.over; + cursor: pointer; + } + + &:active + { + sound-in: ui.button.press; + } + } + + .span + { + gap: 128px; + } + } + + .navigator-canvas + { + flex-direction: column; + height: 100%; + flex-grow: 1; + flex-shrink: 0; + } + + .navigator-body + { + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + flex-direction: column; + justify-content: center; + transition: opacity 0.15s ease-out; + + &.hidden + { + opacity: 0; + } + } +} + +FormGroup +{ + flex-direction: column; + min-width: 300px; + gap:16px; +} + +SlimPackageCard +{ + flex-direction: row; + gap: 12px; + align-items: center; + + > i + { + &:hover + { + cursor: pointer; + color: white; + transform: scale( 1.1 ); + sound-in: ui.button.over; + } + + &:active + { + sound-in: ui.button.press; + } + } +} + +i +{ + font-family: Material Icons; + text-transform: lowercase; + + &.with-click + { + &:hover + { + cursor: pointer; + color: white; + transform: scale( 1.1 ); + sound-in: ui.button.over; + } + + &:active + { + sound-in: ui.button.press; + } + } +} + +.avatar +{ + width: 64px; + height: 64px; + + &:hover + { + border: 1px solid white; + } +} \ No newline at end of file diff --git a/code/UI/MainMenu/SavedGames.razor b/code/UI/MainMenu/SavedGames.razor new file mode 100644 index 0000000..1e1903c --- /dev/null +++ b/code/UI/MainMenu/SavedGames.razor @@ -0,0 +1,44 @@ +@using Sandbox; +@using System; +@using System.Linq; +@using Sandbox.UI; +@namespace LuckerGame.UI.MainMenu +@inherits Panel + + + + +
+ @foreach ( var save in Game.Menu.SavedGames.OrderByDescending( x => x.Time ) ) + { + LoadSavedGame( save ))>@save.Name - @save.Time + } + +
+ + Return +
+ + +@code +{ + async void LoadSavedGame( SavedGame save ) + { + if ( save != null ) + { + Game.Menu.Lobby.SavedGame = save.Name; + + if ( !string.IsNullOrEmpty( save.Map ) ) + Game.Menu.Lobby.Map = save.Map; + + await Game.Menu.StartServerAsync( Game.Menu.Lobby.MaxMembers, Game.Menu.Lobby.Title, Game.Menu.Lobby.Map ?? "facepunch.square" ); + } + } + + protected override int BuildHash() + { + return HashCode.Combine( Game.Menu.Lobby, Game.Menu.Lobby?.Map ); + } +} \ No newline at end of file diff --git a/code/UI/MainMenu/SetupGame.razor b/code/UI/MainMenu/SetupGame.razor new file mode 100644 index 0000000..6b70ddd --- /dev/null +++ b/code/UI/MainMenu/SetupGame.razor @@ -0,0 +1,78 @@ +@using Sandbox; +@using System; +@using System.Linq; +@using System.Threading.Tasks; +@using Sandbox.Menu; +@using Sandbox.UI; +@namespace LuckerGame.UI.MainMenu +@inherits Panel + + + + +
+
+ @if ( MaxPlayersSupported > 1 ) + { + + + + + + + } + + + + + + + +
+ +
+ + Start + Return +
+ + +@code +{ + int MaxPlayersSupported { get; set; } = 1; + int MaxPlayers { get; set; } = 1; + Package MapPackage { get; set; } + + void OnMapClicked() + { + Game.Overlay.ShowPackageSelector( "type:map sort:popular", OnMapSelected ); + StateHasChanged(); + } + + void OnMapSelected( Package map ) + { + MapPackage = map; + StateHasChanged(); + } + + protected override async Task OnParametersSetAsync() + { + MaxPlayersSupported = Game.Menu.Package.GetMeta( "MaxPlayers", 1 ); + MaxPlayers = MaxPlayersSupported; + + MapPackage = await Package.FetchAsync( "facepunch.square", false ); + StateHasChanged(); + } + + async Task Play() + { + await Game.Menu.StartServerAsync( MaxPlayers, $"My game", MapPackage.FullIdent ); + } + + protected override int BuildHash() + { + return HashCode.Combine( MaxPlayers, MapPackage ); + } +} \ No newline at end of file diff --git a/code/UI/MainMenu/SlimPackageCard.razor b/code/UI/MainMenu/SlimPackageCard.razor new file mode 100644 index 0000000..7bd4cf5 --- /dev/null +++ b/code/UI/MainMenu/SlimPackageCard.razor @@ -0,0 +1,32 @@ +@using System; +@using Sandbox; +@namespace LuckerGame.UI.MainMenu +@inherits Sandbox.UI.Panel + + + @if ( Package == null ) + { +
Select Package
+ } + else + { +
@Package.Title
+ Game.Overlay.ShowPackageModal( Package.FullIdent ) )>info + } + + +@code +{ + public Package Package { get; set; } + public System.Action OnLaunch { get; set; } + + void OnCardClicked() + { + OnLaunch?.Invoke(); + } + + protected override int BuildHash() + { + return HashCode.Combine( Package ); + } +} -- 2.49.1 From 35b16afd9abe4972459f77ed77ca85174226b073 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Thu, 3 Aug 2023 12:42:39 -0400 Subject: [PATCH 3/8] Change how minigames are found and loaded to avoid needing to reset tons of state in initialize --- code/Entities/MinigameManager.cs | 6 +++--- code/Minigames/RussianRoulette/RussianRouletteMinigame.cs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/Entities/MinigameManager.cs b/code/Entities/MinigameManager.cs index a9f6650..73f1fcf 100644 --- a/code/Entities/MinigameManager.cs +++ b/code/Entities/MinigameManager.cs @@ -13,7 +13,7 @@ namespace LuckerGame.Entities; public partial class MinigameManager : Entity { [Net] public Minigame LoadedMinigame { get; private set; } - private List AvailableMinigames { get; set; } + private List AvailableMinigames { get; set; } private List InvolvedPlayers { get; set; } public override void Spawn() @@ -27,7 +27,7 @@ public partial class MinigameManager : Entity InvolvedPlayers = players.ToList(); if (CheckForMinigames()) { - LoadedMinigame = string.IsNullOrEmpty( minigameName ) ? AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault() : TypeLibrary.Create( minigameName ); + LoadedMinigame = string.IsNullOrEmpty( minigameName ) ? TypeLibrary.Create(AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault().TargetType) : TypeLibrary.Create( minigameName ); ChatBox.AddInformation( To.Everyone, $"Starting {LoadedMinigame.Name}" ); LoadedMinigame.Initialize( players ); } @@ -48,7 +48,7 @@ public partial class MinigameManager : Entity { AvailableMinigames = TypeLibrary.GetTypes() .Where( type => !type.IsAbstract && !type.IsInterface ) - .Select( td => TypeLibrary.Create( td.TargetType ) ).ToList(); + .ToList(); } [Event.Hotload] diff --git a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs index 52885bf..7ca3eed 100644 --- a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs +++ b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs @@ -61,6 +61,7 @@ public class RussianRouletteMinigame : Minigame pawn.LookAt(Shooter.Position); } ); TimeSinceShot = 0; + Taunted = 0; } public override bool Tick() -- 2.49.1 From 8650c75f2bdbd79cb60aad5bf3ec463242f0e7c8 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Thu, 3 Aug 2023 12:47:14 -0400 Subject: [PATCH 4/8] Updates the russian roulette fail noise --- code/Minigames/RussianRoulette/RussianPistol.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Minigames/RussianRoulette/RussianPistol.cs b/code/Minigames/RussianRoulette/RussianPistol.cs index 0b314f2..e64dfc1 100644 --- a/code/Minigames/RussianRoulette/RussianPistol.cs +++ b/code/Minigames/RussianRoulette/RussianPistol.cs @@ -41,7 +41,7 @@ public partial class RussianPistol : Weapon } else { - Pawn.PlaySound( "denyundo" ); + Pawn.PlaySound( "player_use_fail" ); } Ammo--; } -- 2.49.1 From 5f804f5c240ad82c30b5aaea96776df4a01805c1 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Thu, 3 Aug 2023 21:31:47 -0400 Subject: [PATCH 5/8] Adds basic lucker stats component holding score, removes unused client input fixes up lucker entity setting to properly set owner on the target entity --- code/Entities/Lucker.cs | 21 +++++++- code/Entities/MinigameManager.cs | 11 +++++ .../Lucker/LuckerClientInput.cs | 15 ------ code/EntityComponents/Lucker/LuckerStats.cs | 48 +++++++++++++++++++ 4 files changed, 78 insertions(+), 17 deletions(-) delete mode 100644 code/EntityComponents/Lucker/LuckerClientInput.cs create mode 100644 code/EntityComponents/Lucker/LuckerStats.cs diff --git a/code/Entities/Lucker.cs b/code/Entities/Lucker.cs index 3394cd4..4bffd2d 100644 --- a/code/Entities/Lucker.cs +++ b/code/Entities/Lucker.cs @@ -1,4 +1,5 @@ using LuckerGame.Components.Lucker.Cameras; +using LuckerGame.EntityComponents.Lucker; using LuckerGame.Events; using Sandbox; @@ -11,9 +12,22 @@ namespace LuckerGame.Entities; public partial class Lucker : Entity { /// - /// The entity this Player currently controls + /// The entity this player controls. This value is networked and should be accessed through . /// - public Entity Pawn { get; set; } + [Net] private Entity InternalPawn { get; set; } + + /// + /// Accesses or sets the entity this player current controls + /// + public Entity Pawn + { + get => InternalPawn; + set + { + InternalPawn = value; + value.Owner = this; + } + } /// /// Before the round has started, this player indicated they were ready @@ -24,6 +38,8 @@ public partial class Lucker : Entity /// This Lucker's camera /// [BindComponent] public AbstractCamera Camera { get; } + + [BindComponent] public LuckerStats Stats { get; } /// /// Creates and properly sets up a Player entity for a given client @@ -37,6 +53,7 @@ public partial class Lucker : Entity player.Owner = client as Entity; player.Name = client.Name; var camera = player.Components.Create(); + var stats = player.Components.Create(); return player; } diff --git a/code/Entities/MinigameManager.cs b/code/Entities/MinigameManager.cs index 73f1fcf..e478882 100644 --- a/code/Entities/MinigameManager.cs +++ b/code/Entities/MinigameManager.cs @@ -12,8 +12,19 @@ namespace LuckerGame.Entities; /// public partial class MinigameManager : Entity { + /// + /// The currently loaded minigame + /// [Net] public Minigame LoadedMinigame { get; private set; } + + /// + /// A cached list of available minigames. Gets reloaded on a hotreload + /// private List AvailableMinigames { get; set; } + + /// + /// The players involved in the current minigame + /// private List InvolvedPlayers { get; set; } public override void Spawn() diff --git a/code/EntityComponents/Lucker/LuckerClientInput.cs b/code/EntityComponents/Lucker/LuckerClientInput.cs deleted file mode 100644 index 0f0575d..0000000 --- a/code/EntityComponents/Lucker/LuckerClientInput.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Sandbox; - -namespace LuckerGame.EntityComponents.Lucker; - -/// -/// A component for capturing and passing around a client's input for an attached Lucker -/// -public class LuckerClientInput : EntityComponent -{ - [ClientInput] - public Vector3 InputDirection { get; set; } - - [ClientInput] - public Angles ViewAngles { get; set; } -} diff --git a/code/EntityComponents/Lucker/LuckerStats.cs b/code/EntityComponents/Lucker/LuckerStats.cs new file mode 100644 index 0000000..3e801ca --- /dev/null +++ b/code/EntityComponents/Lucker/LuckerStats.cs @@ -0,0 +1,48 @@ +using Sandbox; +using Sandbox.UI; + +namespace LuckerGame.EntityComponents.Lucker; + +/// +/// Handles the stats associated with a lucker during a lobby. +/// +public partial class LuckerStats : EntityComponent, ISingletonComponent +{ + /// + /// The lucker's current score. + /// + [Net] private long Score { get; set; } + + /// + /// Adds points to this lucker's score + /// + /// points to add (or remove if negative) + public void AddScore( long points ) + { + Score += points; + if ( points == 0 ) + { + return; + } + + var message = $"{Entity.Name} {(points > 0 ? "gained" : "lost")} {points} points!"; + ChatBox.AddInformation( To.Everyone, message ); + } + + /// + /// Resets this lucker's score to zero + /// + public void ResetScore() + { + Score = 0; + } + + /// + /// Gets this lucker's current score + /// + /// this lucker's current score + public long GetScore() + { + return Score; + } +} -- 2.49.1 From 1b34af21eec7c7aa607ec5591298364cf7f126cc Mon Sep 17 00:00:00 2001 From: gamer147 Date: Fri, 4 Aug 2023 00:03:51 -0400 Subject: [PATCH 6/8] Updates roulette, fixes camera cursor and lucker entity setting along with minigame cleanup --- code/Entities/Lucker.cs | 5 ++++- code/Entities/MinigameManager.cs | 3 ++- .../RussianRouletteMinigame.cs | 19 ++++++++++++------- code/UI/HudComponents/CameraCursor.razor | 11 +++++++---- code/UI/HudComponents/CameraCursor.razor.scss | 4 +++- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/code/Entities/Lucker.cs b/code/Entities/Lucker.cs index 4bffd2d..072b295 100644 --- a/code/Entities/Lucker.cs +++ b/code/Entities/Lucker.cs @@ -25,7 +25,10 @@ public partial class Lucker : Entity set { InternalPawn = value; - value.Owner = this; + if ( value != null ) + { + value.Owner = this; + } } } diff --git a/code/Entities/MinigameManager.cs b/code/Entities/MinigameManager.cs index e478882..f4b74ef 100644 --- a/code/Entities/MinigameManager.cs +++ b/code/Entities/MinigameManager.cs @@ -80,7 +80,7 @@ public partial class MinigameManager : Entity } InvolvedPlayers.ForEach( player => { - player.Pawn.Delete(); + player.Pawn?.Delete(); player.Pawn = null; } ); } @@ -102,6 +102,7 @@ public partial class MinigameManager : Entity } LoadedMinigame.Cleanup(); + CleanupPlayerPawns(); LoadedMinigame = null; return true; diff --git a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs index 7ca3eed..c44e3b7 100644 --- a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs +++ b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs @@ -20,11 +20,13 @@ public class RussianRouletteMinigame : Minigame private const float ShooterDistance = 80f; private const float TimeBetweenShots = 7f; private const float TimeBetweenDeathAndEnd = 5f; + private const string ShooterName = "The Russian"; private int Taunted = 0; + private Pawn ShooterTarget; private List DeadVictims => Players .Select( player => player.Pawn as Pawn ) - .Where( pawn => !pawn.IsValid || pawn.LifeState != LifeState.Alive ) + .Where( pawn => pawn is not { IsValid: true } || pawn.LifeState != LifeState.Alive ) .ToList(); private TimeSince TimeSinceShot { get; set; } @@ -34,6 +36,7 @@ public class RussianRouletteMinigame : Minigame { Players = players; Shooter = new Pawn(); + Shooter.Name = ShooterName; var shooterInventory = Shooter.Components.Create(); shooterInventory.AddWeapon( new RussianPistol() ); @@ -66,11 +69,12 @@ public class RussianRouletteMinigame : Minigame public override bool Tick() { + // Someone is dead, we're getting ready to end if ( DeadVictims.Any() ) { if ( Taunted != int.MaxValue ) { - ChatBox.AddChatEntry( To.Everyone, "Shooter", "Heh, nothing personnel, kid." ); + ChatBox.AddChatEntry( To.Everyone, Shooter.Name, "Heh, nothing personnel, kid." ); Taunted = int.MaxValue; TimeSinceDeadVictim = 0; } @@ -86,21 +90,22 @@ public class RussianRouletteMinigame : Minigame Shooter.Inventory.ActiveWeapon.PrimaryAttack(); if ( !DeadVictims.Any() ) { - ChatBox.AddChatEntry( To.Everyone, "Shooter", "Fucking lag..." ); + ChatBox.AddChatEntry( To.Everyone, Shooter.Name, "Fucking lag..." ); } } else if ( TimeSinceShot > TimeBetweenShots * .8f && Taunted == 1) { - var victim = Players.Select( player => player.Pawn as Pawn ) + ShooterTarget = Players.Select( player => player.Pawn as Pawn ) .OrderBy( _ => Guid.NewGuid() ) .FirstOrDefault(); - Shooter.LookAt( victim.Position ); - ChatBox.AddChatEntry( To.Everyone, "Shooter", $"I'm gonna eat you up, {victim.Name}" ); + Shooter.LookAt( ShooterTarget.Position ); + var chance = 1f / Shooter.Inventory.ActiveWeapon.Ammo; + ChatBox.AddChatEntry( To.Everyone, Shooter.Name, $"Good luck, {ShooterTarget.Name}! You have a {chance:P0} chance to die!" ); Taunted++; } else if ( TimeSinceShot > TimeBetweenShots / 2 && Taunted == 0) { - ChatBox.AddChatEntry( To.Everyone, "Shooter", "Im gettin' ready!" ); + ChatBox.AddChatEntry( To.Everyone, Shooter.Name, "Im gettin' ready!" ); Taunted++; } diff --git a/code/UI/HudComponents/CameraCursor.razor b/code/UI/HudComponents/CameraCursor.razor index e32e736..93284e7 100644 --- a/code/UI/HudComponents/CameraCursor.razor +++ b/code/UI/HudComponents/CameraCursor.razor @@ -5,10 +5,13 @@ @attribute [StyleSheet] @inherits Panel -@if (ShouldShowCursor) -{ - -} + + @if (ShouldShowCursor) + { +
+ } + + @code { diff --git a/code/UI/HudComponents/CameraCursor.razor.scss b/code/UI/HudComponents/CameraCursor.razor.scss index 82e3b95..a8d2142 100644 --- a/code/UI/HudComponents/CameraCursor.razor.scss +++ b/code/UI/HudComponents/CameraCursor.razor.scss @@ -1,3 +1,5 @@ CameraCursor { - pointer-events: all; + .camera-cursor { + pointer-events: all; + } } \ No newline at end of file -- 2.49.1 From 57350878896078d90ae76e7411d8964ace8d989b Mon Sep 17 00:00:00 2001 From: gamer147 Date: Sat, 5 Aug 2023 22:04:44 -0400 Subject: [PATCH 7/8] Updates based on PR feedback --- .sbproj | 2 +- code/Entities/Lucker.cs | 36 ++++++++--------- code/Entities/MinigameManager.cs | 40 +++++++++++-------- code/Entities/RoundManager.cs | 27 +++++++------ code/Entities/Weapons/Weapon.cs | 2 +- code/Events/PlayerReadyEvent.cs | 10 ++--- code/Minigames/Minigame.cs | 4 +- .../RussianRouletteMinigame.cs | 32 +++++++-------- code/UI/HudComponents/Scoreboard.razor | 6 +-- code/UI/Menus/VotingLobby.razor | 2 +- 10 files changed, 85 insertions(+), 76 deletions(-) diff --git a/.sbproj b/.sbproj index 0e6ffda..1a078c6 100644 --- a/.sbproj +++ b/.sbproj @@ -46,7 +46,7 @@ "Choices": [], "ConVarName": "lucker_minigames_per_round", "DisplayName": "Minigames Per Round", - "DefaultValue": "0", + "DefaultValue": "1", "Description": "The number of minigames played per round", "Group": "Other", "Minimum": 1, diff --git a/code/Entities/Lucker.cs b/code/Entities/Lucker.cs index 072b295..996c762 100644 --- a/code/Entities/Lucker.cs +++ b/code/Entities/Lucker.cs @@ -6,18 +6,18 @@ using Sandbox; namespace LuckerGame.Entities; /// -/// Represents a Player. +/// Represents a person playing the game. /// This could belong to a Client or a Bot and represents a common entity to operate on for games and keeping score /// public partial class Lucker : Entity { /// - /// The entity this player controls. This value is networked and should be accessed through . + /// The entity this lucker controls. This value is networked and should be accessed through . /// [Net] private Entity InternalPawn { get; set; } /// - /// Accesses or sets the entity this player current controls + /// Accesses or sets the entity this lucker currently controls /// public Entity Pawn { @@ -33,7 +33,7 @@ public partial class Lucker : Entity } /// - /// Before the round has started, this player indicated they were ready + /// Before the round has started, this lucker indicated they were ready /// [Net] public bool Ready { get; set; } @@ -45,20 +45,20 @@ public partial class Lucker : Entity [BindComponent] public LuckerStats Stats { get; } /// - /// Creates and properly sets up a Player entity for a given client + /// Creates and properly sets up a entity for a given client /// - /// the client to own the player - /// the newly created player + /// the client to own the lucker + /// the newly created lucker public static Lucker CreateLuckerForClient( IClient client ) { - var player = new Lucker(); - client.Pawn = player; - player.Owner = client as Entity; - player.Name = client.Name; - var camera = player.Components.Create(); - var stats = player.Components.Create(); + var lucker = new Lucker(); + client.Pawn = lucker; + lucker.Owner = client as Entity; + lucker.Name = client.Name; + lucker.Components.Create(); + lucker.Components.Create(); - return player; + return lucker; } /// @@ -69,12 +69,12 @@ public partial class Lucker : Entity public static void ReadyUpCommand(bool readyState) { var client = ConsoleSystem.Caller; - var player = client.Pawn as Lucker; - player.SetReady( readyState ); + var lucker = client.Pawn as Lucker; + lucker.SetReady( readyState ); } /// - /// Sets this player's ready state + /// Sets this lucker's ready state /// /// the ready state being set public void SetReady(bool ready) @@ -82,7 +82,7 @@ public partial class Lucker : Entity Ready = ready; if ( Game.IsServer ) { - Event.Run( LuckerEvent.PlayerReady, this, ready ); + Event.Run( LuckerEvent.LuckerReady, this, ready ); } } diff --git a/code/Entities/MinigameManager.cs b/code/Entities/MinigameManager.cs index f4b74ef..d2ee6d8 100644 --- a/code/Entities/MinigameManager.cs +++ b/code/Entities/MinigameManager.cs @@ -23,9 +23,9 @@ public partial class MinigameManager : Entity private List AvailableMinigames { get; set; } /// - /// The players involved in the current minigame + /// The luckers involved in the current minigame /// - private List InvolvedPlayers { get; set; } + private List InvolvedLuckers { get; set; } public override void Spawn() { @@ -33,14 +33,17 @@ public partial class MinigameManager : Entity FindMinigames(); } - public void StartMinigame(List players, string minigameName = null) + public void StartMinigame(List luckers, string minigameName = null) { - InvolvedPlayers = players.ToList(); + InvolvedLuckers = luckers.ToList(); if (CheckForMinigames()) { - LoadedMinigame = string.IsNullOrEmpty( minigameName ) ? TypeLibrary.Create(AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault().TargetType) : TypeLibrary.Create( minigameName ); + LoadedMinigame = string.IsNullOrEmpty( minigameName ) + ? TypeLibrary.Create( AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault() + .TargetType ) + : TypeLibrary.Create( minigameName ); ChatBox.AddInformation( To.Everyone, $"Starting {LoadedMinigame.Name}" ); - LoadedMinigame.Initialize( players ); + LoadedMinigame.Initialize( luckers ); } } @@ -69,19 +72,19 @@ public partial class MinigameManager : Entity } /// - /// Goes through the players included in the loaded minigame and deletes and nulls out any pawns assigned to them + /// Goes through the luckers included in the loaded minigame and deletes and nulls out any pawns assigned to them /// - private void CleanupPlayerPawns() + private void CleanupLuckerPawns() { - if ( LoadedMinigame is not { IsValid: true } || InvolvedPlayers == null) + if ( LoadedMinigame is not { IsValid: true } || InvolvedLuckers == null) { Log.Warning( "Attempted to clean up players without a minigame loaded!" ); return; } - InvolvedPlayers.ForEach( player => + InvolvedLuckers.ForEach( lucker => { - player.Pawn?.Delete(); - player.Pawn = null; + lucker.Pawn?.Delete(); + lucker.Pawn = null; } ); } @@ -100,11 +103,16 @@ public partial class MinigameManager : Entity { return false; } - - LoadedMinigame.Cleanup(); - CleanupPlayerPawns(); - LoadedMinigame = null; + EndMinigame(); return true; + } + private void EndMinigame() + { + LoadedMinigame.Cleanup(); + CleanupLuckerPawns(); + LoadedMinigame.Delete(); + LoadedMinigame = null; + InvolvedLuckers = null; } } diff --git a/code/Entities/RoundManager.cs b/code/Entities/RoundManager.cs index 5a384b6..a6e5357 100644 --- a/code/Entities/RoundManager.cs +++ b/code/Entities/RoundManager.cs @@ -52,7 +52,7 @@ public partial class RoundManager : Entity [ConVar.Replicated("lucker_minigames_per_round")] public static int MinigamesLeftInRound { get; set; } - private List Players { get; set; } + private List Luckers { get; set; } #endregion /// @@ -83,7 +83,7 @@ public partial class RoundManager : Entity MinigamesLeftInRound--; if ( MinigamesLeftInRound > 0 ) { - MinigameManager.StartMinigame( Players ); + MinigameManager.StartMinigame( Luckers ); } else { @@ -94,11 +94,12 @@ public partial class RoundManager : Entity } /// - /// Is triggered whenever a player readies up + /// Is triggered whenever a lucker readies up or readies down /// - /// the player that readied up, discarded - [LuckerEvent.PlayerReady] - public void HandlePlayerReady( Lucker readyLucker, bool ready ) + /// the lucker that readied up + /// the lucker's ready state + [LuckerEvent.LuckerReady] + public void HandleLuckerReady( Lucker readyLucker, bool ready ) { if ( RoundState != RoundState.NotStarted && RoundState != RoundState.StartCountdown ) { @@ -107,9 +108,9 @@ public partial class RoundManager : Entity Log.Info( $"{readyLucker.Client.Name} set ready to {ready}" ); var message = $"{readyLucker.Client.Name} is {(ready ? "now ready." : "no longer ready.")}"; ChatBox.AddInformation( To.Everyone, message ); - var players = All.OfType().ToList(); - var readiedCount = players.Count( player => player.Ready ); - var totalCount = players.Count; + var luckers = All.OfType().ToList(); + var readiedCount = luckers.Count( lucker => lucker.Ready ); + var totalCount = luckers.Count; if ( (float)readiedCount / totalCount > RequiredReadyPercent && RoundState == RoundState.NotStarted ) { Log.Info( "Countdown started" ); @@ -132,13 +133,13 @@ public partial class RoundManager : Entity } RoundState = RoundState.InProgress; - Players = All.OfType().ToList(); - Players.ForEach( player => + Luckers = All.OfType().ToList(); + Luckers.ForEach( lucker => { - player.Ready = false; + lucker.Ready = false; } ); MinigamesLeftInRound = MinigamesPerRound; - MinigameManager.StartMinigame( Players, minigameName ); + MinigameManager.StartMinigame( Luckers, minigameName ); } [ConCmd.Server( "start_round" )] diff --git a/code/Entities/Weapons/Weapon.cs b/code/Entities/Weapons/Weapon.cs index 95ec514..e6658b0 100644 --- a/code/Entities/Weapons/Weapon.cs +++ b/code/Entities/Weapons/Weapon.cs @@ -76,7 +76,7 @@ public partial class Weapon : AnimatedEntity } /// - /// Called when the weapon is either removed from the player, or holstered. + /// Called when the weapon is either removed from the pawn, or holstered. /// public void OnHolster() { diff --git a/code/Events/PlayerReadyEvent.cs b/code/Events/PlayerReadyEvent.cs index 2bfde23..d587f9c 100644 --- a/code/Events/PlayerReadyEvent.cs +++ b/code/Events/PlayerReadyEvent.cs @@ -4,16 +4,16 @@ namespace LuckerGame.Events; public static partial class LuckerEvent { - public const string PlayerReady = "lucker.playerReady"; + public const string LuckerReady = "lucker.luckerReady"; /// - /// Event is run on the server whenever a player changes ready state - /// The event handler is given the player that readied up and their new ready state + /// Event is run on the server whenever a lucker changes ready state + /// The event handler is given the lucker that readied up and their new ready state /// [MethodArguments(typeof(Entities.Lucker), typeof(bool))] - public class PlayerReadyAttribute : EventAttribute + public class LuckerReadyAttribute : EventAttribute { - public PlayerReadyAttribute() : base(PlayerReady) + public LuckerReadyAttribute() : base(LuckerReady) { } } diff --git a/code/Minigames/Minigame.cs b/code/Minigames/Minigame.cs index ada9d05..200691a 100644 --- a/code/Minigames/Minigame.cs +++ b/code/Minigames/Minigame.cs @@ -15,8 +15,8 @@ public abstract class Minigame : Entity /// /// Initializes the minigame with a list of luckers playing it. /// - /// the players who made it into the minigame - public abstract void Initialize(List players); + /// the luckers who made it into the minigame + public abstract void Initialize(List luckers); /// /// Once a minigame is loaded and initialized, this method is called once per server tick. diff --git a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs index c44e3b7..e9a0a33 100644 --- a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs +++ b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs @@ -14,7 +14,7 @@ namespace LuckerGame.Minigames.RussianRoulette; public class RussianRouletteMinigame : Minigame { public override string Name => "Russian Roulette"; - private List Players { get; set; } + private List Luckers { get; set; } private Pawn Shooter { get; set; } private const float ShooterDistance = 80f; @@ -24,43 +24,43 @@ public class RussianRouletteMinigame : Minigame private int Taunted = 0; private Pawn ShooterTarget; - private List DeadVictims => Players - .Select( player => player.Pawn as Pawn ) + private List DeadVictims => Luckers + .Select( lucker => lucker.Pawn as Pawn ) .Where( pawn => pawn is not { IsValid: true } || pawn.LifeState != LifeState.Alive ) .ToList(); private TimeSince TimeSinceShot { get; set; } private TimeSince TimeSinceDeadVictim { get; set; } - public override void Initialize( List players ) + public override void Initialize( List luckers ) { - Players = players; + Luckers = luckers; Shooter = new Pawn(); Shooter.Name = ShooterName; var shooterInventory = Shooter.Components.Create(); shooterInventory.AddWeapon( new RussianPistol() ); - // Setup cameras for players - Players.ForEach( player => + // Setup cameras for luckers + Luckers.ForEach( lucker => { - player.Components.Create(); - player.Position = Shooter.Position; + lucker.Components.Create(); + lucker.Position = Shooter.Position; } ); - Players.Select((player, i) => (Player: player, Index: i) ).ToList().ForEach( pair => + Luckers.Select((lucker, i) => (Lucker: lucker, Index: i) ).ToList().ForEach( pair => { - var player = pair.Player; + var lucker = pair.Lucker; var index = pair.Index; var pawn = new Pawn(); - pawn.Name = player.Name; + pawn.Name = lucker.Name; pawn.Tags.Add( "victim" ); pawn.Health = 1; - player.Pawn = pawn; - pawn.DressFromClient( player.Client ); + lucker.Pawn = pawn; + pawn.DressFromClient( lucker.Client ); var pawnOffset = ShooterDistance * (index % 2 == 0 ? Vector3.Forward : Vector3.Right) * (index % 4 >= 2 ? -1 : 1); - player.Pawn.Position = Shooter.Position + pawnOffset; + lucker.Pawn.Position = Shooter.Position + pawnOffset; pawn.LookAt(Shooter.Position); } ); TimeSinceShot = 0; @@ -95,7 +95,7 @@ public class RussianRouletteMinigame : Minigame } else if ( TimeSinceShot > TimeBetweenShots * .8f && Taunted == 1) { - ShooterTarget = Players.Select( player => player.Pawn as Pawn ) + ShooterTarget = Luckers.Select( lucker => lucker.Pawn as Pawn ) .OrderBy( _ => Guid.NewGuid() ) .FirstOrDefault(); Shooter.LookAt( ShooterTarget.Position ); diff --git a/code/UI/HudComponents/Scoreboard.razor b/code/UI/HudComponents/Scoreboard.razor index 113d83c..ebf704c 100644 --- a/code/UI/HudComponents/Scoreboard.razor +++ b/code/UI/HudComponents/Scoreboard.razor @@ -10,9 +10,9 @@
- @foreach (var player in Luckers) + @foreach (var lucker in Luckers) { - + }
@@ -23,7 +23,7 @@ protected override int BuildHash() { - return HashCode.Combine(Luckers.Select(player => player.Name).ToList()); + return HashCode.Combine(Luckers.Select(lucker => lucker.Name).ToList()); } } \ No newline at end of file diff --git a/code/UI/Menus/VotingLobby.razor b/code/UI/Menus/VotingLobby.razor index 3a1bf8e..1123163 100644 --- a/code/UI/Menus/VotingLobby.razor +++ b/code/UI/Menus/VotingLobby.razor @@ -27,7 +27,7 @@
@if (RoundManager.RoundState == RoundState.NotStarted) { - + } else { -- 2.49.1 From 90cc343560f40da049116b7c51b4f21186348cab Mon Sep 17 00:00:00 2001 From: gamer147 Date: Sat, 5 Aug 2023 22:08:57 -0400 Subject: [PATCH 8/8] Fixes convar --- code/Entities/RoundManager.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/Entities/RoundManager.cs b/code/Entities/RoundManager.cs index a6e5357..00ba688 100644 --- a/code/Entities/RoundManager.cs +++ b/code/Entities/RoundManager.cs @@ -47,11 +47,20 @@ public partial class RoundManager : Entity #region In Progress State - private const int MinigamesPerRound = 1; - + /// + /// The number of minigames that should be played per round, settable via a convar + /// [ConVar.Replicated("lucker_minigames_per_round")] - public static int MinigamesLeftInRound { get; set; } + private static int MinigamesPerRound { get; set; } + /// + /// The number of minigames left in the current round + /// + public int MinigamesLeftInRound { get; set; } + + /// + /// The luckers playing in the current round + /// private List Luckers { get; set; } #endregion -- 2.49.1