5.1.0

iiDk-the-actual · Dec 2, 2024 · aa584e2 · aa584e2
1 parent f5e7a42
commit aa584e2
Show file tree

Hide file tree

Showing 21 changed files with 1,495 additions and 618 deletions.
diff --git a/Classes/RigManager.cs b/Classes/RigManager.cs
@@ -1,5 +1,4 @@
-using BepInEx;
-using HarmonyLib;
+using HarmonyLib;
 using Photon.Pun;
 using Photon.Realtime;
 using UnityEngine;
@@ -44,7 +43,7 @@ public static VRRig GetClosestVRRig()
 
         public static PhotonView GetPhotonViewFromVRRig(VRRig p)
         {
-            return (PhotonView)Traverse.Create(p).Field("photonView").GetValue();
+            return GetNetworkViewFromVRRig(p).GetView;
         }
 
         public static NetworkView GetNetworkViewFromVRRig(VRRig p)

diff --git a/Menu/Main.cs b/Menu/Main.cs
diff --git a/Menu/UI.cs b/Menu/UI.cs
@@ -213,6 +213,10 @@ private void OnGUI()
                                     {
                                         toadd = TranslateText(toadd);
                                     }
+                                    if (inputTextColor != "green")
+                                    {
+                                        toadd = toadd.Replace(" <color=grey>[</color><color=green>", " <color=grey>[</color><color=" + inputTextColor + ">");
+                                    }
                                     if (lowercaseMode)
                                     {
                                         toadd = toadd.ToLower();

diff --git a/Mods/Advantages.cs b/Mods/Advantages.cs
@@ -143,7 +143,7 @@ public static void SpamTagSelf()
 
         public static void SpamTagGun()
         {
-            if (rightGrab || Mouse.current.rightButton.isPressed)
+            if (GetGunInput(false))
             {
                 var GunData = RenderGun();
                 RaycastHit Ray = GunData.Ray;
@@ -171,7 +171,7 @@ public static void SpamTagGun()
                         }
                     }
                 }
-                if (rightTrigger > 0.5f || Mouse.current.leftButton.isPressed)
+                if (GetGunInput(true))
                 {
                     VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();
                     if (possibly && possibly != GorillaTagger.Instance.offlineVRRig && !PlayerIsTagged(possibly))
@@ -419,7 +419,7 @@ public static void DisableTagReach()
 
         public static void TagGun()
         {
-            if (rightGrab || Mouse.current.rightButton.isPressed)
+            if (GetGunInput(false))
             {
                 var GunData = RenderGun();
                 RaycastHit Ray = GunData.Ray;
@@ -495,7 +495,7 @@ public static void TagGun()
                         GorillaTagger.Instance.offlineVRRig.enabled = true;
                     }
                 }
-                if (rightTrigger > 0.5f || Mouse.current.leftButton.isPressed)
+                if (GetGunInput(true))
                 {
                     VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();
                     if (possibly && possibly != GorillaTagger.Instance.offlineVRRig && !PlayerIsTagged(possibly))
@@ -527,13 +527,13 @@ public static void TagGun()
 
         public static void UntagGun()
         {
-            if (rightGrab || Mouse.current.rightButton.isPressed)
+            if (GetGunInput(false))
             {
                 var GunData = RenderGun();
                 RaycastHit Ray = GunData.Ray;
                 GameObject NewPointer = GunData.NewPointer;
 
-                if (rightTrigger > 0.5f || Mouse.current.leftButton.isPressed)
+                if (GetGunInput(true))
                 {
                     VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();
                     if (possibly && possibly != GorillaTagger.Instance.offlineVRRig && PlayerIsTagged(possibly))
@@ -552,13 +552,13 @@ public static void UntagGun()
 
         public static void FlickTagGun()
         {
-            if (rightGrab || Mouse.current.rightButton.isPressed)
+            if (GetGunInput(false))
             {
                 var GunData = RenderGun();
                 RaycastHit Ray = GunData.Ray;
                 GameObject NewPointer = GunData.NewPointer;
 
-                if (rightTrigger > 0.5f || Mouse.current.leftButton.isPressed)
+                if (GetGunInput(true))
                 {
                     GorillaLocomotion.Player.Instance.rightControllerTransform.position = Ray.point + new Vector3(0f, 0.3f, 0f);
                 }
@@ -864,13 +864,13 @@ public static void BattleBalloonSpam()
 
         public static void BattleKillGun()
         {
-            if (rightGrab || Mouse.current.rightButton.isPressed)
+            if (GetGunInput(false))
             {
                 var GunData = RenderGun();
                 RaycastHit Ray = GunData.Ray;
                 GameObject NewPointer = GunData.NewPointer;
 
-                if (rightTrigger > 0.5f || Mouse.current.leftButton.isPressed)
+                if (GetGunInput(true))
                 {
                     VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();
                     if (possibly && possibly != GorillaTagger.Instance.offlineVRRig)
@@ -921,13 +921,13 @@ public static void BattleKillAll()
 
         public static void BattleReviveGun()
         {
-            if (rightGrab || Mouse.current.rightButton.isPressed)
+            if (GetGunInput(false))
             {
                 var GunData = RenderGun();
                 RaycastHit Ray = GunData.Ray;
                 GameObject NewPointer = GunData.NewPointer;
 
-                if (rightTrigger > 0.5f || Mouse.current.leftButton.isPressed)
+                if (GetGunInput(true))
                 {
                     VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();
                     if (possibly && possibly != GorillaTagger.Instance.offlineVRRig)