iiDk-the-actual
diff --git a/‎Classes/RigManager.cs‎
Lines changed: 2 additions & 3 deletions b/‎Classes/RigManager.cs‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎Menu/Main.cs‎
Lines changed: 128 additions & 34 deletions b/‎Menu/Main.cs‎
Lines changed: 128 additions & 34 deletions
diff --git a/‎Menu/UI.cs‎
Lines changed: 4 additions & 0 deletions b/‎Menu/UI.cs‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎Mods/Advantages.cs‎
Lines changed: 12 additions & 12 deletions b/‎Mods/Advantages.cs‎
Lines changed: 12 additions & 12 deletions
@@ -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)
 
@@ -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();
 
@@ -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)
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using BepInEx;`
`2`		`-using HarmonyLib;`
	`1`	`+using HarmonyLib;`
`3`	`2`	`using Photon.Pun;`
`4`	`3`	`using Photon.Realtime;`
`5`	`4`	`using UnityEngine;`
`@@ -44,7 +43,7 @@ public static VRRig GetClosestVRRig()`
`44`	`43`
`45`	`44`	`public static PhotonView GetPhotonViewFromVRRig(VRRig p)`
`46`	`45`	`{`
`47`		`- return (PhotonView)Traverse.Create(p).Field("photonView").GetValue();`
	`46`	`+ return GetNetworkViewFromVRRig(p).GetView;`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`public static NetworkView GetNetworkViewFromVRRig(VRRig p)`
Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,10 @@ private void OnGUI()`
`213`	`213`	`{`
`214`	`214`	`toadd = TranslateText(toadd);`
`215`	`215`	`}`
	`216`	`+ if (inputTextColor != "green")`
	`217`	`+ {`
	`218`	`+ toadd = toadd.Replace(" <color=grey>[</color><color=green>", " <color=grey>[</color><color=" + inputTextColor + ">");`
	`219`	`+ }`
`216`	`220`	`if (lowercaseMode)`
`217`	`221`	`{`
`218`	`222`	`toadd = toadd.ToLower();`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public static void SpamTagSelf()`
`143`	`143`
`144`	`144`	`public static void SpamTagGun()`
`145`	`145`	`{`
`146`		`- if (rightGrab \|\| Mouse.current.rightButton.isPressed)`
	`146`	`+ if (GetGunInput(false))`
`147`	`147`	`{`
`148`	`148`	`var GunData = RenderGun();`
`149`	`149`	`RaycastHit Ray = GunData.Ray;`
`@@ -171,7 +171,7 @@ public static void SpamTagGun()`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`}`
`174`		`- if (rightTrigger > 0.5f \|\| Mouse.current.leftButton.isPressed)`
	`174`	`+ if (GetGunInput(true))`
`175`	`175`	`{`
`176`	`176`	`VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();`
`177`	`177`	`if (possibly && possibly != GorillaTagger.Instance.offlineVRRig && !PlayerIsTagged(possibly))`
`@@ -419,7 +419,7 @@ public static void DisableTagReach()`
`419`	`419`
`420`	`420`	`public static void TagGun()`
`421`	`421`	`{`
`422`		`- if (rightGrab \|\| Mouse.current.rightButton.isPressed)`
	`422`	`+ if (GetGunInput(false))`
`423`	`423`	`{`
`424`	`424`	`var GunData = RenderGun();`
`425`	`425`	`RaycastHit Ray = GunData.Ray;`
`@@ -495,7 +495,7 @@ public static void TagGun()`
`495`	`495`	`GorillaTagger.Instance.offlineVRRig.enabled = true;`
`496`	`496`	`}`
`497`	`497`	`}`
`498`		`- if (rightTrigger > 0.5f \|\| Mouse.current.leftButton.isPressed)`
	`498`	`+ if (GetGunInput(true))`
`499`	`499`	`{`
`500`	`500`	`VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();`
`501`	`501`	`if (possibly && possibly != GorillaTagger.Instance.offlineVRRig && !PlayerIsTagged(possibly))`
`@@ -527,13 +527,13 @@ public static void TagGun()`
`527`	`527`
`528`	`528`	`public static void UntagGun()`
`529`	`529`	`{`
`530`		`- if (rightGrab \|\| Mouse.current.rightButton.isPressed)`
	`530`	`+ if (GetGunInput(false))`
`531`	`531`	`{`
`532`	`532`	`var GunData = RenderGun();`
`533`	`533`	`RaycastHit Ray = GunData.Ray;`
`534`	`534`	`GameObject NewPointer = GunData.NewPointer;`
`535`	`535`
`536`		`- if (rightTrigger > 0.5f \|\| Mouse.current.leftButton.isPressed)`
	`536`	`+ if (GetGunInput(true))`
`537`	`537`	`{`
`538`	`538`	`VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();`
`539`	`539`	`if (possibly && possibly != GorillaTagger.Instance.offlineVRRig && PlayerIsTagged(possibly))`
`@@ -552,13 +552,13 @@ public static void UntagGun()`
`552`	`552`
`553`	`553`	`public static void FlickTagGun()`
`554`	`554`	`{`
`555`		`- if (rightGrab \|\| Mouse.current.rightButton.isPressed)`
	`555`	`+ if (GetGunInput(false))`
`556`	`556`	`{`
`557`	`557`	`var GunData = RenderGun();`
`558`	`558`	`RaycastHit Ray = GunData.Ray;`
`559`	`559`	`GameObject NewPointer = GunData.NewPointer;`
`560`	`560`
`561`		`- if (rightTrigger > 0.5f \|\| Mouse.current.leftButton.isPressed)`
	`561`	`+ if (GetGunInput(true))`
`562`	`562`	`{`
`563`	`563`	`GorillaLocomotion.Player.Instance.rightControllerTransform.position = Ray.point + new Vector3(0f, 0.3f, 0f);`
`564`	`564`	`}`
`@@ -864,13 +864,13 @@ public static void BattleBalloonSpam()`
`864`	`864`
`865`	`865`	`public static void BattleKillGun()`
`866`	`866`	`{`
`867`		`- if (rightGrab \|\| Mouse.current.rightButton.isPressed)`
	`867`	`+ if (GetGunInput(false))`
`868`	`868`	`{`
`869`	`869`	`var GunData = RenderGun();`
`870`	`870`	`RaycastHit Ray = GunData.Ray;`
`871`	`871`	`GameObject NewPointer = GunData.NewPointer;`
`872`	`872`
`873`		`- if (rightTrigger > 0.5f \|\| Mouse.current.leftButton.isPressed)`
	`873`	`+ if (GetGunInput(true))`
`874`	`874`	`{`
`875`	`875`	`VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();`
`876`	`876`	`if (possibly && possibly != GorillaTagger.Instance.offlineVRRig)`
`@@ -921,13 +921,13 @@ public static void BattleKillAll()`
`921`	`921`
`922`	`922`	`public static void BattleReviveGun()`
`923`	`923`	`{`
`924`		`- if (rightGrab \|\| Mouse.current.rightButton.isPressed)`
	`924`	`+ if (GetGunInput(false))`
`925`	`925`	`{`
`926`	`926`	`var GunData = RenderGun();`
`927`	`927`	`RaycastHit Ray = GunData.Ray;`
`928`	`928`	`GameObject NewPointer = GunData.NewPointer;`
`929`	`929`
`930`		`- if (rightTrigger > 0.5f \|\| Mouse.current.leftButton.isPressed)`
	`930`	`+ if (GetGunInput(true))`
`931`	`931`	`{`
`932`	`932`	`VRRig possibly = Ray.collider.GetComponentInParent<VRRig>();`
`933`	`933`	`if (possibly && possibly != GorillaTagger.Instance.offlineVRRig)`