Skip to content

sync AugmentationFasterRegen up with retail #4413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gmriggs merged 1 commit into from
Mar 1, 2026
Merged

sync AugmentationFasterRegen up with retail #4413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Source/ACE.Server/WorldObjects/Creature_Vitals.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public bool VitalHeartBeat(CreatureVital vital)
var enchantmentMod = EnchantmentManager.GetRegenerationMod(vital);

var augMod = 1.0f;
if (this is Player player && player.AugmentationFasterRegen > 0)
if (this is Player player && player.AugmentationFasterRegen > 0 && ForwardCommand == MotionCommand.Sleeping)
augMod += player.AugmentationFasterRegen;

// cap rate?
Expand Down Expand Up @@ -200,6 +200,9 @@ public float GetAttributeMod(CreatureVital vital)
return attributeMod;
}

private MotionCommand ForwardCommand => CurrentMovementData.MovementType == MovementType.Invalid && CurrentMovementData.Invalid != null ?
CurrentMovementData.Invalid.State.ForwardCommand : MotionCommand.Invalid;

/// <summary>
/// Returns the vital regeneration modifier based on player stance
/// (combat, crouch, sitting, sleeping)
Expand All @@ -212,7 +215,7 @@ public float GetStanceMod(CreatureVital vital)
// does not apply for mana?
if (vital.Vital == PropertyAttribute2nd.MaxMana) return 1.0f;

var forwardCommand = CurrentMovementData.MovementType == MovementType.Invalid && CurrentMovementData.Invalid != null ? CurrentMovementData.Invalid.State.ForwardCommand : MotionCommand.Invalid;
var forwardCommand = ForwardCommand;

// combat mode / running
if (CombatMode != CombatMode.NonCombat || forwardCommand == MotionCommand.RunForward)
Expand Down