style fixes

CrowdedMods · May 15, 2022 · 3922420 · 3922420
1 parent 91b872f
commit 3922420
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/src/CrowdedMod/CrowdedModPlugin.cs b/src/CrowdedMod/CrowdedModPlugin.cs
@@ -12,7 +12,7 @@ namespace CrowdedMod {
     [BepInDependency("gg.reactor.debugger", BepInDependency.DependencyFlags.SoftDependency)] // fix debugger overwriting MinPlayers
     public partial class CrowdedModPlugin : BasePlugin
     {
-        public Harmony Harmony { get; } = new (Id);
+        private Harmony Harmony { get; } = new (Id);
 
         public override void Load()
         {

diff --git a/src/CrowdedMod/Patches/CreateGameOptionsPatches.cs b/src/CrowdedMod/Patches/CreateGameOptionsPatches.cs
@@ -29,7 +29,7 @@ public static unsafe void Postfix(CreateOptionsPicker __instance)
 
                 var playerButtons = __instance.MaxPlayerButtons.ToArray().ToList(); // cringe but works
 
-                SpriteRenderer plusButton = Object.Instantiate(playerButtons.Last(), playerButtons.Last().transform.parent);
+                var plusButton = Object.Instantiate(playerButtons.Last(), playerButtons.Last().transform.parent);
                 plusButton.GetComponentInChildren<TextMeshPro>().text = "+";
                 plusButton.name = "255";
                 plusButton.transform.position = playerButtons.Last().transform.position + new Vector3(offset*2, 0, 0);
@@ -39,20 +39,20 @@ public static unsafe void Postfix(CreateOptionsPicker __instance)
 
                 void plusListener()
                 {
-                    byte curHighest = byte.Parse(playerButtons[__instance.MaxPlayerButtons.Count - 2].name);
-                    int delta = Mathf.Clamp(curHighest + 12, curHighest, maxPlayers) - curHighest;
+                    var curHighest = byte.Parse(playerButtons[__instance.MaxPlayerButtons.Count - 2].name);
+                    var delta = Mathf.Clamp(curHighest + 12, curHighest, maxPlayers) - curHighest;
                     if (delta == 0) return; // fast skip
                     for (byte i = 1; i < 13; i++)
                     {
-                        SpriteRenderer button = theHackyHackButtons[i];
+                        var button = theHackyHackButtons[i];
                         button.name = 
                             button.GetComponentInChildren<TextMeshPro>().text = 
                                 (byte.Parse(button.name) + delta).ToString();
                     }
                     __instance.SetMaxPlayersButtons(__instance.GetTargetOptions().MaxPlayers);
                 }
 
-                SpriteRenderer minusButton = Object.Instantiate(playerButtons.Last(), playerButtons.Last().transform.parent);
+                var minusButton = Object.Instantiate(playerButtons.Last(), playerButtons.Last().transform.parent);
                 minusButton.GetComponentInChildren<TextMeshPro>().text = "-";
                 minusButton.name = "255";
                 minusButton.transform.position = playerButtons.First().transform.position;
@@ -62,12 +62,12 @@ void plusListener()
 
                 void minusListener()
                 {
-                    byte curLowest = byte.Parse(playerButtons[1].name);
-                    int delta = curLowest - Mathf.Clamp(curLowest - 12, 4, curLowest);
+                    var curLowest = byte.Parse(playerButtons[1].name);
+                    var delta = curLowest - Mathf.Clamp(curLowest - 12, 4, curLowest);
                     if (delta == 0) return; // fast skip
                     for (byte i = 1; i < 13; i++)
                     {
-                        SpriteRenderer button = theHackyHackButtons[i];
+                        var button = theHackyHackButtons[i];
                         button.name = 
                             button.GetComponentInChildren<TextMeshPro>().text = 
                                 (byte.Parse(button.name) - delta).ToString();
@@ -81,7 +81,7 @@ void minusListener()
                     button.OnClick.RemoveAllListeners();
                     void defaultListener()
                     {
-                        byte value = byte.Parse(button.name);
+                        var value = byte.Parse(button.name);
                         var targetOptions = __instance.GetTargetOptions();
                         if (value <= targetOptions.NumImpostors)
                         {
@@ -107,7 +107,7 @@ void defaultListener()
 
                 for (byte i = 4; i < 11; i++)
                 {
-                    SpriteRenderer button = Object.Instantiate(impostorButtons.Last(), impostorButtons.Last().transform.parent);
+                    var button = Object.Instantiate(impostorButtons.Last(), impostorButtons.Last().transform.parent);
                     button.GetComponent<PassiveButton>().name = button.GetComponentInChildren<TextMeshPro>().text = i.ToString();
                     button.transform.position += new Vector3(offset, 0, 0);
                     impostorButtons.Add(button);
@@ -119,7 +119,7 @@ void defaultListener()
                     button.OnClick.RemoveAllListeners();
                     void defaultListener()
                     {
-                        byte value = byte.Parse(button.name);
+                        var value = byte.Parse(button.name);
                         if (value >= __instance.GetTargetOptions().MaxPlayers)
                         {
                             return;

diff --git a/src/CrowdedMod/Patches/GenericPatches.cs b/src/CrowdedMod/Patches/GenericPatches.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Linq;
+using System.Linq;
 using HarmonyLib;
-using Hazel;
-using InnerNet;
 using UnhollowerBaseLib;
 using UnityEngine;
 

diff --git a/src/CrowdedMod/Patches/MeetingHudPatches.cs b/src/CrowdedMod/Patches/MeetingHudPatches.cs
@@ -7,7 +7,8 @@ internal static class MeetingHudPatches
     {
         private static string lastTimerText = "";
         private static int currentPage;
-        private static int maxPages => (int)Mathf.Ceil(GameData.Instance.AllPlayers.Count / 15f);
+        private const int maxPerPage = 15;
+        private static int maxPages => (int)Mathf.Ceil(GameData.Instance.AllPlayers.Count / (float)maxPerPage);
 
         [HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Update))]
         public static class VoteGuiPatch {
@@ -20,13 +21,13 @@ public static void Postfix(MeetingHud __instance) {
                 if (__instance.TimerText.text != lastTimerText)
                     __instance.TimerText.text = lastTimerText = __instance.TimerText.text + $" ({currentPage + 1}/{maxPages})";
 
-                PlayerVoteArea[] playerButtons = __instance.playerStates.OrderBy(x => x.AmDead).ToArray();
-                int i = 0;
-                foreach (PlayerVoteArea button in playerButtons) {
-                    if (i >= currentPage * 15 && i < (currentPage + 1) * 15) {
+                var playerButtons = __instance.playerStates.OrderBy(x => x.AmDead).ToArray();
+                var i = 0;
+                foreach (var button in playerButtons) {
+                    if (i >= currentPage * maxPerPage && i < (currentPage + 1) * maxPerPage) {
                         button.gameObject.SetActive(true);
 
-                        int relativeIndex = i % 15;
+                        var relativeIndex = i % maxPerPage;
                         button.transform.localPosition = __instance.VoteOrigin +
                                                          new Vector3(
                                                              __instance.VoteButtonOffsets.x * (relativeIndex % 3),

diff --git a/src/CrowdedMod/Patches/VitalsPatches.cs b/src/CrowdedMod/Patches/VitalsPatches.cs
@@ -20,22 +20,24 @@ public static void Postfix(VitalsMinigame __instance)
                 else if (Input.GetKeyDown(KeyCode.RightArrow) || Input.mouseScrollDelta.y < 0f)
                     currentPage = Mathf.Clamp(currentPage + 1, 0, maxPages - 1);
 
-                int i = 0;
+                var i = 0;
                 //Show/hide/move each panel
-                foreach (VitalsPanel panel in __instance.vitals)
+                foreach (var panel in __instance.vitals)
                 {
                     if (i >= currentPage * maxPerPage && i < (currentPage + 1) * maxPerPage)
                     {
                         panel.gameObject.SetActive(true);
-                        int relativeIndex = i % maxPerPage;
+                        var relativeIndex = i % maxPerPage;
                         panel.transform.localPosition = new Vector3(
                             __instance.XStart + __instance.XOffset * (relativeIndex / 3), 
                             __instance.YStart + __instance.YOffset * (relativeIndex % 3), 
                             -1f
                             );
                     }
                     else
+                    {
                         panel.gameObject.SetActive(false);
+                    }
                     i++;
                 }
             }