4.3.0

iiDk-the-actual · Jul 27, 2024 · 1b411bb · 1b411bb
1 parent 305f157
commit 1b411bb
Show file tree

Hide file tree

Showing 18 changed files with 948 additions and 335 deletions.
diff --git a/Classes/ColorChanger.cs b/Classes/ColorChanger.cs
@@ -39,7 +39,7 @@ public override void Update()
                 }
                 else
                 {
-                    if (!GorillaTagger.Instance.offlineVRRig.mainSkin.material.name.Contains("fected"))
+                    if (!Menu.Main.PlayerIsTagged(GorillaTagger.Instance.offlineVRRig))
                     {
                         gameObjectRenderer.material.color = GorillaTagger.Instance.offlineVRRig.mainSkin.material.color;
                     } else

diff --git a/Menu/Main.cs b/Menu/Main.cs
diff --git a/Mods/Advantages.cs b/Mods/Advantages.cs
diff --git a/Mods/Battle.cs b/Mods/Battle.cs
@@ -26,7 +26,7 @@ public static void BattleStartGame()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 lol.StartBattle();
             }
         }
@@ -42,7 +42,7 @@ public static void BattleEndGame()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 lol.BattleEnd();
             }
         }
@@ -58,7 +58,7 @@ public static void BattleRestartGame()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 lol.BattleEnd();
                 lol.StartBattle();
             }
@@ -75,7 +75,7 @@ public static void BattleBalloonSpamSelf()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 lol.playerLives[PhotonNetwork.LocalPlayer.ActorNumber] = UnityEngine.Random.Range(0, 4);
             }
         }
@@ -91,7 +91,7 @@ public static void BattleBalloonSpam()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 foreach (Photon.Realtime.Player loln in PhotonNetwork.PlayerList)
                 {
                     lol.playerLives[loln.ActorNumber] = UnityEngine.Random.Range(0, 4);
@@ -122,7 +122,7 @@ public static void BattleKillGun()
                         }
                         else
                         {
-                            GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                            GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                             lol.playerLives[owner.ActorNumber] = 0;
                         }
                     }
@@ -141,7 +141,7 @@ public static void BattleKillSelf()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 lol.playerLives[PhotonNetwork.LocalPlayer.ActorNumber] = 0;
             }
         }
@@ -157,7 +157,7 @@ public static void BattleKillAll()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 foreach (Photon.Realtime.Player loln in PhotonNetwork.PlayerList)
                 {
                     lol.playerLives[loln.ActorNumber] = 0;
@@ -188,7 +188,7 @@ public static void BattleReviveGun()
                         }
                         else
                         {
-                            GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                            GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                             lol.playerLives[owner.ActorNumber] = 4;
                         }
                     }
@@ -207,7 +207,7 @@ public static void BattleReviveSelf()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 lol.playerLives[PhotonNetwork.LocalPlayer.ActorNumber] = 4;
             }
         }
@@ -223,7 +223,7 @@ public static void BattleReviveAll()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 foreach (Photon.Realtime.Player loln in PhotonNetwork.PlayerList)
                 {
                     lol.playerLives[loln.ActorNumber] = 4;
@@ -242,7 +242,7 @@ public static void BattleGodMode()
             }
             else
             {
-                GorillaBattleManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaBattleManager>();
+                GorillaPaintbrawlManager lol = GameObject.Find("Gorilla Battle Manager").GetComponent<GorillaPaintbrawlManager>();
                 lol.playerLives[PhotonNetwork.LocalPlayer.ActorNumber] = 4;
                 GorillaLocomotion.Player.Instance.disableMovement = false;
             }