update for U105E1

Maiq-The-Dude · Sep 11, 2022 · f30bc81 · f30bc81
1 parent 87683df
commit f30bc81
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/src/BetterHands/BetterHands.csproj b/src/BetterHands/BetterHands.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="H3VR.GameLibs" Version="0.104.0-r.0" />
+    <PackageReference Include="H3VR.GameLibs" Version="0.105.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
     <PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" PrivateAssets="all" />
     <PackageReference Include="Sodalite" Version="1.3.0" />

diff --git a/src/BetterHands/MagPalming/Functionality.cs b/src/BetterHands/MagPalming/Functionality.cs
@@ -1,6 +1,7 @@
 using BetterHands.Configs;
 using FistVR;
 using UnityEngine;
+using BepInEx.Logging;
 
 namespace BetterHands.MagPalming
 {
@@ -45,13 +46,26 @@ private void FVRFireArmReloadTriggerMag_OnTriggerEnter(On.FistVR.FVRFireArmReloa
 			{
 				var triggerWell = collider.GetComponent<FVRFireArmReloadTriggerWell>();
 				var firearm = triggerWell.FireArm;
-				if (mag.MagazineType == triggerWell.TypeOverride || (mag.MagazineType == firearm.MagazineType && (firearm.EjectDelay <= 0f || mag != firearm.LastEjectedMag) && firearm.Magazine == null))
-				{
+				var afirearm = triggerWell.AFireArm;
+				if (triggerWell.UsesSecondaryMagSlots && firearm != null && triggerWell.FireArm.SecondaryMagazineSlots[triggerWell.SecondaryMagSlotIndex].Magazine == null)
+                {
 					// Remove mag from qb, load, buzz loading hand, and unhide controller geo
+					mag.SetQuickBeltSlot(null);
+					mag.LoadIntoSecondary(firearm, triggerWell.SecondaryMagSlotIndex);
+					BuzzAndUpdateControllerDef(mag.QuickbeltSlot, mag.FireArm);
+				}
+				else if (firearm != null && (mag.MagazineType == triggerWell.TypeOverride || (mag.MagazineType == firearm.MagazineType && (firearm.EjectDelay <= 0f || mag != firearm.LastEjectedMag) && firearm.Magazine == null)))
+				{
 					mag.SetQuickBeltSlot(null);
 					mag.Load(firearm);
 					BuzzAndUpdateControllerDef(mag.QuickbeltSlot, mag.FireArm);
 				}
+				else if (afirearm != null && (mag.MagazineType == triggerWell.TypeOverride || mag.MagazineType == afirearm.MagazineType && (afirearm.EjectDelay <= 0f || mag != afirearm.LastEjectedMag) && afirearm.Magazine == null))
+                {
+					mag.SetQuickBeltSlot(null);
+					mag.Load(afirearm);
+					BuzzAndUpdateControllerDef();
+				}
 			}
 		}
 
@@ -100,6 +114,12 @@ private bool FirearmLoadCheck(FVRPhysicalObject obj, Collider col, string layer)
 			return false;
 		}
 
+		private void BuzzAndUpdateControllerDef()
+        {
+			GM.CurrentPlayerBody.LeftHand.GetComponent<FVRViveHand>().UpdateControllerDefinition();
+			GM.CurrentPlayerBody.RightHand.GetComponent<FVRViveHand>().UpdateControllerDefinition();
+		}
+
 		private void BuzzAndUpdateControllerDef(FVRQuickBeltSlot slot, FVRFireArm fireArm)
 		{
 			if (fireArm.IsHeld)

diff --git a/src/BetterHands/MagPalming/Input.cs b/src/BetterHands/MagPalming/Input.cs
@@ -21,14 +21,14 @@ public void Hook()
 		{
 			On.FistVR.FVRViveHand.Update += FVRViveHand_Update;
 			On.FistVR.FVRPhysicalObject.FVRUpdate += FVRPhysicalObject_FVRUpdate;
-			On.FistVR.FVRMovementManager.UpdateModeArmSwinger += FVRMovementManager_UpdateModeArmSwinger;
+            On.FistVR.FVRMovementManager.UpdateSmoothLocomotion += FVRMovementManager_UpdateSmoothLocomotion;
 		}
 
-		public void Unhook()
+        public void Unhook()
 		{
 			On.FistVR.FVRViveHand.Update -= FVRViveHand_Update;
 			On.FistVR.FVRPhysicalObject.FVRUpdate -= FVRPhysicalObject_FVRUpdate;
-			On.FistVR.FVRMovementManager.UpdateModeArmSwinger -= FVRMovementManager_UpdateModeArmSwinger;
+			On.FistVR.FVRMovementManager.UpdateSmoothLocomotion -= FVRMovementManager_UpdateSmoothLocomotion;
 		}
 
 		#region Input Hooks
@@ -120,7 +120,7 @@ private void FVRPhysicalObject_FVRUpdate(On.FistVR.FVRPhysicalObject.orig_FVRUpd
 					var moveMan = GM.CurrentMovementManager;
 					var isMovingFast = (moveMan.m_isTwinStickSmoothTurningClockwise || moveMan.m_isTwinStickSmoothTurningCounterClockwise ||
 						_isArmSwingerTurning ||
-						(moveMan.m_armSwingerVelocity + moveMan.m_twoAxisVelocity).magnitude >= _config.MagPalm.CollisionPreventionVelocity.Value);
+						moveMan.m_smoothLocoVelocity.magnitude >= _config.MagPalm.CollisionPreventionVelocity.Value);
 
 					var layer = isMovingFast ? "NoCol" : "Default";
 
@@ -137,7 +137,7 @@ private void FVRPhysicalObject_FVRUpdate(On.FistVR.FVRPhysicalObject.orig_FVRUpd
 		}
 
 		// Check if smooth turning on ArmSwinger loco
-		private void FVRMovementManager_UpdateModeArmSwinger(On.FistVR.FVRMovementManager.orig_UpdateModeArmSwinger orig, FVRMovementManager self)
+		private void FVRMovementManager_UpdateSmoothLocomotion(On.FistVR.FVRMovementManager.orig_UpdateSmoothLocomotion orig, FVRMovementManager self)
 		{
 			orig(self);
 

diff --git a/src/libs/MMHOOK_Assembly-CSharp.dll b/src/libs/MMHOOK_Assembly-CSharp.dll
diff --git a/thunderstore/manifest.json b/thunderstore/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "BetterHands",
-    "version_number": "1.6.0",
+    "version_number": "1.7.0",
     "dependencies": [
         "nrgill28-Sodalite-1.3.0"
     ],