Merge pull request #7 from DBmaoha/rewind-stuck-fix

Fix player stuck in places they can't stand up

mod.json

@@ -1,7 +1,7 @@
 {
   "Name": "Legonzaur.HoloShift",
   "Description": "Swap positions with your beloved decoy",
-  "Version": "1.0.7",
+  "Version": "1.0.8",
   "LoadPriority": 2,
   "Scripts": [
     {

mod/scripts/vscripts/holoshift_recharge.gnut

@@ -33,6 +33,7 @@ bool IsLaunched = false
                         if(!player.IsPhaseShifted()){
                             if(player in playerDecoyActiveFrom){
                                 float chargeCount = float(player.GetOffhandWeapon(1).GetWeaponPrimaryClipCountMax()) - ((Time() - playerDecoyActiveFrom[player])*rechargeMultiplier)
+                                chargeCount = max(chargeCount, 0.0) // can be negative in weird cases
                                 player.GetOffhandWeapon(1).SetWeaponPrimaryClipCount(int(chargeCount))
                             }
                         }

mod/scripts/vscripts/weapons/mp_ability_holopilot.nut

@@ -428,18 +428,36 @@ void function PlayerUsesHoloRewindThreaded( entity player, entity decoy )
 	entity mover = CreateScriptMover( player.GetOrigin(), player.GetAngles() )
 	player.SetParent( mover, "REF" )
 
-	OnThreadEnd( function() : ( player, mover, decoy )
+	table decoyData = {}
+	decoyData.forceCrouch <- TraceLine
+							 ( decoy.GetOrigin(), 
+							   decoy.GetOrigin() + < 0,0,80 >, // 40 is crouched pilot height! add additional 40 for better check
+							   [ decoy ], 
+							   TRACE_MASK_SHOT, 
+							   TRACE_COLLISION_GROUP_NONE 
+							 ).hitEnt != null // decoy will stuck, need to forceCrouch player
+
+	OnThreadEnd( function() : ( player, mover, decoy, decoyData )
 	{
-		player.SetOrigin(decoy.GetOrigin())
-		player.SetAngles(decoy.GetAngles())
-		player.SetVelocity(decoy.GetVelocity())
-		CancelPhaseShift( player )
-		player.DeployWeapon()
-		player.SetPredictionEnabled( true )
-		player.ClearParent()
-		ViewConeFree( player )
-		mover.Destroy()
-		CleanupExistingDecoy(decoy)
+		if ( IsValid( player ) )
+		{
+			player.SetOrigin(decoy.GetOrigin())
+			player.SetAngles(decoy.GetAngles())
+			player.SetVelocity(decoy.GetVelocity())
+			CancelPhaseShift( player )
+			player.DeployWeapon()
+			player.SetPredictionEnabled( true )
+			player.ClearParent()
+			ViewConeFree( player )
+			if( decoyData.forceCrouch )
+				thread HoloRewindForceCrouch( player ) // this will handle "UnforceCrouch()"
+		}
+
+		if ( IsValid( mover ) )
+			mover.Destroy()
+
+		if ( IsValid( decoy ) )
+			CleanupExistingDecoy(decoy)
 	})
 
 	vector initial_origin = player.GetOrigin()
@@ -449,6 +467,8 @@ void function PlayerUsesHoloRewindThreaded( entity player, entity decoy )
 	ViewConeZero( player )
 	player.HolsterWeapon()
 	player.SetPredictionEnabled( false )
+	if( decoyData.forceCrouch )
+		player.ForceCrouch() // avoid stucking!
 	PhaseShift( player, 0.0, 7 * PHASE_REWIND_PATH_SNAPSHOT_INTERVAL * 1.5 )
 
 	for ( float i = 7; i > 0; i-- )
@@ -464,4 +484,13 @@ void function PlayerUsesHoloRewindThreaded( entity player, entity decoy )
 	mover.NonPhysicsRotateTo( decoy.GetAngles(), PHASE_REWIND_PATH_SNAPSHOT_INTERVAL, 0, 0 )
 	player.SetVelocity( decoy.GetVelocity() )
 }
+
+void function HoloRewindForceCrouch( entity player )
+{
+	// make player crouch
+	player.ForceCrouch()
+	wait 0.2 // magic number, player must be completely crouched to avoid auto-stand
+	if( IsValid( player ) )
+		player.UnforceCrouch()
+}
 #endif