diff --git a/src/engine/gameManager/MovementManager.java b/src/engine/gameManager/MovementManager.java index 45dbfc77..9ef9eab8 100644 --- a/src/engine/gameManager/MovementManager.java +++ b/src/engine/gameManager/MovementManager.java @@ -67,8 +67,10 @@ public enum MovementManager { return; if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) { - if (((PlayerCharacter) toMove).isCasting()) - ((PlayerCharacter) toMove).update(false); + if (((PlayerCharacter) toMove).isCasting()) { + ((PlayerCharacter) toMove).updateLocation(); + ((PlayerCharacter) toMove).updateMovementState(); + } } @@ -408,7 +410,9 @@ public enum MovementManager { if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None)) continue; - member.update(false); + //member.update(false); + member.updateLocation(); + member.updateMovementState(); // All checks passed, let's move the player diff --git a/src/engine/objects/PlayerCombatStats.java b/src/engine/objects/PlayerCombatStats.java index 2c1b7e34..1cb70274 100644 --- a/src/engine/objects/PlayerCombatStats.java +++ b/src/engine/objects/PlayerCombatStats.java @@ -216,12 +216,17 @@ public class PlayerCombatStats { atr += prefixValues; atr *= preciseRune; atr += atrEnchants; - //atr *= 1 + (this.owner.bonuses.getFloatPercentAll(Enum.ModType.OCV, Enum.SourceType.Buff) - this.owner.bonuses.getFloatPercentAll(Enum.ModType.OCV, Enum.SourceType.DeBuff)); + atr *= 1.0f + stanceValue; if(this.owner.bonuses != null) { float positivePercentBonuses = this.owner.bonuses.getFloatPercentPositive(Enum.ModType.OCV, Enum.SourceType.None); float negativePercentBonuses = this.owner.bonuses.getFloatPercentNegative(Enum.ModType.OCV, Enum.SourceType.None); - float modifier = 1 + (positivePercentBonuses + negativePercentBonuses - (preciseRune - 1.0f) - (stanceValue - 1.0f)); + float modifier = 1 + (positivePercentBonuses + negativePercentBonuses); + if(preciseRune > 1.0f) + modifier -= 0.05f; + if(stanceValue > 1.0f){ + modifier -= (stanceValue - 1.0f); + } atr *= modifier; } atr = (float) Math.round(atr);