Merge branch 'cheaterrats' into 'master'

psi29a · psi29a · commit 9f90349a0990 · 2025-01-04T18:27:59.000Z
Don't stagger creatures in the middle of an attack (#8275)

Closes #8275

See merge request OpenMW/openmw!4499
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
@@ -403,6 +403,12 @@ namespace MWMechanics
             resetCurrentIdleState();
         }
 
+        if (!mPtr.getClass().isNpc() && mUpperBodyState > UpperBodyState::WeaponEquipped)
+        {
+            recovery = false;
+            stats.setHitRecovery(false);
+        }
+
         if (mHitState != CharState_None)
         {
             if (!mAnimation->isPlaying(mCurrentHit))

Original file line number	Diff line number	Diff line change
`@@ -403,6 +403,12 @@ namespace MWMechanics`
`403`	`403`	`resetCurrentIdleState();`
`404`	`404`	`}`
`405`	`405`
	`406`	`+ if (!mPtr.getClass().isNpc() && mUpperBodyState > UpperBodyState::WeaponEquipped)`
	`407`	`+ {`
	`408`	`+ recovery = false;`
	`409`	`+ stats.setHitRecovery(false);`
	`410`	`+ }`
	`411`	`+`
`406`	`412`	`if (mHitState != CharState_None)`
`407`	`413`	`{`
`408`	`414`	`if (!mAnimation->isPlaying(mCurrentHit))`