fix: run speed modifiers stack as the client's do

LWOControllablePhysComponent::msgAddRunspeedModifier (0x00be0af0) and
msgRemoveRunSpeedModifier (0x00be0720): a modifier over 1000 or of exactly
500 counts for nothing, any slow (under 500) wins with the lowest one, and
otherwise the highest boost is the speed. Before, the last one applied won,
so a small boost cast after a big one, or a boost cast while slowed,
replaced it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 14:50:33 -06:00
parent 55a6d0babc
commit 9265ab0e10
3 changed files with 66 additions and 9 deletions

View File

@@ -333,8 +333,7 @@ void ControllablePhysicsComponent::RemovePickupRadiusScale(float value) {
void ControllablePhysicsComponent::AddSpeedboost(float value) {
m_ActiveSpeedBoosts.push_back(value);
m_SpeedBoost = value;
SetSpeedMultiplier(value / 500.0f); // 500 being the base speed
UpdateSpeedBoost();
}
void ControllablePhysicsComponent::RemoveSpeedboost(float value) {
@@ -346,16 +345,35 @@ void ControllablePhysicsComponent::RemoveSpeedboost(float value) {
return;
}
// Recalculate speedboost since we removed one
m_SpeedBoost = 500.0f; // Entities without level progression (enemies, pets) go back to the normal multiplier of 1
if (m_ActiveSpeedBoosts.empty()) { // no active speed boosts left, so return to base speed
UpdateSpeedBoost();
Game::entityManager->SerializeEntity(m_Parent);
}
void ControllablePhysicsComponent::UpdateSpeedBoost() {
// The client's rule (LWOControllablePhysComponent::msgAddRunspeedModifier 0x00be0af0, msgRemoveRunSpeedModifier
// 0x00be0720): a modifier over 1000 or of exactly the base 500 counts for nothing; with any slow (under 500) the
// lowest one is the speed, otherwise the highest boost is
constexpr float baseSpeed = 500.0f;
constexpr float maxModifier = 1000.0f;
float lowestSlow = baseSpeed;
float highestBoost = baseSpeed;
for (const auto boost : m_ActiveSpeedBoosts) {
if (boost > maxModifier) continue;
if (boost < lowestSlow) lowestSlow = boost;
if (boost > highestBoost) highestBoost = boost;
}
if (lowestSlow < baseSpeed) {
m_SpeedBoost = lowestSlow;
} else if (highestBoost > baseSpeed) {
m_SpeedBoost = highestBoost;
} else {
// No modifier counts: entities without level progression (enemies, pets) go back to the normal multiplier of 1
m_SpeedBoost = baseSpeed;
auto* levelProgressionComponent = m_Parent->GetComponent<LevelProgressionComponent>();
if (levelProgressionComponent) m_SpeedBoost = levelProgressionComponent->GetSpeedBase();
} else { // Used the last applied speedboost
m_SpeedBoost = m_ActiveSpeedBoosts.back();
}
SetSpeedMultiplier(m_SpeedBoost / 500.0f); // 500 being the base speed
Game::entityManager->SerializeEntity(m_Parent);
SetSpeedMultiplier(m_SpeedBoost / baseSpeed);
}
void ControllablePhysicsComponent::ActivateBubbleBuff(eBubbleType bubbleType, bool specialAnims) {