From 8b69e65e51507118b014a0426ae6f957b78a0707 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 27 Jul 2023 22:30:22 +0100 Subject: Reformat --- code/ui/Hud.razor | 4 +- code/ui/PlayerInfo.razor | 50 ++++++------ code/ui/health/Health.razor | 38 ++++----- code/ui/mainmenu/MainMenu.razor | 22 +++--- code/ui/overlay/BlindedOverlay.Network.cs | 24 +++--- code/ui/overlay/BlindedOverlay.razor | 70 ++++++++--------- code/ui/overlay/RoleOverlay.cs | 24 +++--- code/ui/overlay/RoleOverlay.razor | 126 +++++++++++++++--------------- code/ui/phase/PhaseInfo.razor | 18 ++--- code/ui/phase/PhaseTimer.razor | 66 ++++++++-------- code/ui/team/TeamInfo.razor | 34 ++++---- code/ui/weapon/Crosshair.razor | 16 ++-- 12 files changed, 246 insertions(+), 246 deletions(-) (limited to 'code/ui') diff --git a/code/ui/Hud.razor b/code/ui/Hud.razor index 6ea6103..7ec500e 100644 --- a/code/ui/Hud.razor +++ b/code/ui/Hud.razor @@ -6,12 +6,12 @@ @attribute [StyleSheet] - + diff --git a/code/ui/PlayerInfo.razor b/code/ui/PlayerInfo.razor index 53a71df..2acdef0 100644 --- a/code/ui/PlayerInfo.razor +++ b/code/ui/PlayerInfo.razor @@ -5,18 +5,18 @@ @inherits Panel @@ -24,18 +24,18 @@ @code { - public string GetTeamColour() - { - var ClientPawn = Game.LocalPawn; - if (ClientPawn is Player) - { - return TeamOperations.GetTeamColour(((Player)ClientPawn).CurrentTeam); - } - return ""; - } + public string GetTeamColour() + { + var ClientPawn = Game.LocalPawn; + if (ClientPawn is Player) + { + return TeamOperations.GetTeamColour(((Player)ClientPawn).CurrentTeam); + } + return ""; + } - protected override int BuildHash() - { - return GetTeamColour().GetHashCode(); - } + protected override int BuildHash() + { + return GetTeamColour().GetHashCode(); + } } diff --git a/code/ui/health/Health.razor b/code/ui/health/Health.razor index 9d7037b..3da2c01 100644 --- a/code/ui/health/Health.razor +++ b/code/ui/health/Health.razor @@ -6,33 +6,33 @@
@code { - public string Colour { get; set; } + public string Colour { get; set; } - public int GetHealth() - { - var ClientPawn = Game.LocalPawn; - if (ClientPawn is Player) - { - return ClientPawn.Health.CeilToInt(); - } - return 0; - } + public int GetHealth() + { + var ClientPawn = Game.LocalPawn; + if (ClientPawn is Player) + { + return ClientPawn.Health.CeilToInt(); + } + return 0; + } - protected override int BuildHash() - { - return GetHealth().GetHashCode(); - } + protected override int BuildHash() + { + return GetHealth().GetHashCode(); + } } diff --git a/code/ui/mainmenu/MainMenu.razor b/code/ui/mainmenu/MainMenu.razor index ffca318..ccdf17a 100644 --- a/code/ui/mainmenu/MainMenu.razor +++ b/code/ui/mainmenu/MainMenu.razor @@ -7,22 +7,22 @@ -
Work in progress! Expect bugs, missing features, and general weird-ness. Things *will* break.
+
Work in progress! Expect bugs, missing features, and general weird-ness. Things *will* break.
diff --git a/code/ui/overlay/BlindedOverlay.Network.cs b/code/ui/overlay/BlindedOverlay.Network.cs index c81751e..0a80628 100644 --- a/code/ui/overlay/BlindedOverlay.Network.cs +++ b/code/ui/overlay/BlindedOverlay.Network.cs @@ -4,17 +4,17 @@ namespace MurderGame; public partial class BlindedOverlay { - [ClientRpc] - public static void Show( ) - { - Instance.SetClass( "hidden", false ); - Instance.ShowOverlay = true; - } + [ClientRpc] + public static void Show( ) + { + Instance.SetClass( "hidden", false ); + Instance.ShowOverlay = true; + } - [ClientRpc] - public static void Hide() - { - Instance.SetClass( "hidden", true ); - Instance.ShowOverlay = false; - } + [ClientRpc] + public static void Hide() + { + Instance.SetClass( "hidden", true ); + Instance.ShowOverlay = false; + } } diff --git a/code/ui/overlay/BlindedOverlay.razor b/code/ui/overlay/BlindedOverlay.razor index 024c31a..0cd397a 100644 --- a/code/ui/overlay/BlindedOverlay.razor +++ b/code/ui/overlay/BlindedOverlay.razor @@ -5,39 +5,39 @@ @inherits Panel
@@ -50,14 +50,14 @@ You shot a bystander! public bool ShowOverlay { get; set; } = false; - public BlindedOverlay() + public BlindedOverlay() { SetClass( "hidden", true ); Instance = this; } - protected override int BuildHash() + protected override int BuildHash() { return ShowOverlay.GetHashCode(); } diff --git a/code/ui/overlay/RoleOverlay.cs b/code/ui/overlay/RoleOverlay.cs index 84758b7..300d0bf 100644 --- a/code/ui/overlay/RoleOverlay.cs +++ b/code/ui/overlay/RoleOverlay.cs @@ -4,17 +4,17 @@ namespace MurderGame; public partial class RoleOverlay { - [ClientRpc] - public static void Show( ) - { - Instance.SetClass( "hidden", false ); - Instance.ShowOverlay = true; - } + [ClientRpc] + public static void Show( ) + { + Instance.SetClass( "hidden", false ); + Instance.ShowOverlay = true; + } - [ClientRpc] - public static void Hide() - { - Instance.SetClass( "hidden", true ); - Instance.ShowOverlay = false; - } + [ClientRpc] + public static void Hide() + { + Instance.SetClass( "hidden", true ); + Instance.ShowOverlay = false; + } } diff --git a/code/ui/overlay/RoleOverlay.razor b/code/ui/overlay/RoleOverlay.razor index c41e359..40cbce0 100644 --- a/code/ui/overlay/RoleOverlay.razor +++ b/code/ui/overlay/RoleOverlay.razor @@ -6,87 +6,87 @@ @inherits Panel
-
- @GetTeamName() -
-
- @GetTeamDescription() -
+
+ @GetTeamName() +
+
+ @GetTeamDescription() +
@code { - public string GetTeamName() - { - if (Game.LocalPawn is Player player) - { - return TeamOperations.GetTeamName(player.CurrentTeam); - } - return ""; - } - public string GetTeamDescription() - { - if (Game.LocalPawn is Player player) - { - return TeamOperations.GetTeamDescription(player.CurrentTeam); - } - return ""; - } - public string GetTeamColour() - { - if (Game.LocalPawn is Player player) - { - return TeamOperations.GetTeamColour(player.CurrentTeam); - } - return ""; - } + public string GetTeamName() + { + if (Game.LocalPawn is Player player) + { + return TeamOperations.GetTeamName(player.CurrentTeam); + } + return ""; + } + public string GetTeamDescription() + { + if (Game.LocalPawn is Player player) + { + return TeamOperations.GetTeamDescription(player.CurrentTeam); + } + return ""; + } + public string GetTeamColour() + { + if (Game.LocalPawn is Player player) + { + return TeamOperations.GetTeamColour(player.CurrentTeam); + } + return ""; + } public static RoleOverlay Instance { get; private set; } public bool ShowOverlay { get; set; } = false; - public RoleOverlay() + public RoleOverlay() { SetClass( "hidden", true ); Instance = this; } - protected override int BuildHash() + protected override int BuildHash() { return ShowOverlay.GetHashCode(); } diff --git a/code/ui/phase/PhaseInfo.razor b/code/ui/phase/PhaseInfo.razor index 74bf237..4509259 100644 --- a/code/ui/phase/PhaseInfo.razor +++ b/code/ui/phase/PhaseInfo.razor @@ -6,18 +6,18 @@ @attribute [StyleSheet]
- @GetPhase().Title + @GetPhase().Title
@code { - public BasePhase GetPhase() - { - return MurderGame.Instance.CurrentPhase; - } + public BasePhase GetPhase() + { + return MurderGame.Instance.CurrentPhase; + } - protected override int BuildHash() - { - return GetPhase().GetHashCode(); - } + protected override int BuildHash() + { + return GetPhase().GetHashCode(); + } } diff --git a/code/ui/phase/PhaseTimer.razor b/code/ui/phase/PhaseTimer.razor index 1fb0baa..9293976 100644 --- a/code/ui/phase/PhaseTimer.razor +++ b/code/ui/phase/PhaseTimer.razor @@ -7,55 +7,55 @@ @if (HasTime()) {
- @GetTime() + @GetTime()
} else {
- @GetPhase() + @GetPhase()
} @code { - public bool HasTime() - { - return MurderGame.Instance.CurrentPhase.TimeLeft >= 0; - } - public string GetTime() - { - TimeSpan timeSpan = TimeSpan.FromSeconds(MurderGame.Instance.CurrentPhase.TimeLeft); - return timeSpan.ToString(@"mm\:ss"); - } - public string GetPhase() - { - return MurderGame.Instance.CurrentPhase.Title; - } + public bool HasTime() + { + return MurderGame.Instance.CurrentPhase.TimeLeft >= 0; + } + public string GetTime() + { + TimeSpan timeSpan = TimeSpan.FromSeconds(MurderGame.Instance.CurrentPhase.TimeLeft); + return timeSpan.ToString(@"mm\:ss"); + } + public string GetPhase() + { + return MurderGame.Instance.CurrentPhase.Title; + } - protected override int BuildHash() - { - return HashCode.Combine(MurderGame.Instance.CurrentPhase.TimeLeft.GetHashCode(), MurderGame.Instance.CurrentPhase.Title.GetHashCode()); - } + protected override int BuildHash() + { + return HashCode.Combine(MurderGame.Instance.CurrentPhase.TimeLeft.GetHashCode(), MurderGame.Instance.CurrentPhase.Title.GetHashCode()); + } } diff --git a/code/ui/team/TeamInfo.razor b/code/ui/team/TeamInfo.razor index 18e1f7f..883dcf0 100644 --- a/code/ui/team/TeamInfo.razor +++ b/code/ui/team/TeamInfo.razor @@ -6,9 +6,9 @@ @@ -18,20 +18,20 @@ @code { - public string Colour { get; set; } + public string Colour { get; set; } - public string GetTeamName() - { - var ClientPawn = Game.LocalPawn; - if (ClientPawn is Player) - { - return TeamOperations.GetTeamName(((Player)ClientPawn).CurrentTeam); - } - return ""; - } + public string GetTeamName() + { + var ClientPawn = Game.LocalPawn; + if (ClientPawn is Player) + { + return TeamOperations.GetTeamName(((Player)ClientPawn).CurrentTeam); + } + return ""; + } - protected override int BuildHash() - { - return GetTeamName().GetHashCode(); - } + protected override int BuildHash() + { + return GetTeamName().GetHashCode(); + } } diff --git a/code/ui/weapon/Crosshair.razor b/code/ui/weapon/Crosshair.razor index 2dc5db1..92cdcd3 100644 --- a/code/ui/weapon/Crosshair.razor +++ b/code/ui/weapon/Crosshair.razor @@ -6,16 +6,16 @@ -- cgit v1.2.3-70-g09d2