MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

ATR completed

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-02-04 18:27:55 -06:00
parent 934c0a98f8
commit cc5aa4c140
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/MovementManager.java
+7 -3
View File
@@ -67,8 +67,10 @@ public enum MovementManager {
return; return;
if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) { if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
if (((PlayerCharacter) toMove).isCasting()) if (((PlayerCharacter) toMove).isCasting()) {
((PlayerCharacter) toMove).update(false); ((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)) if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
continue; continue;
member.update(false); //member.update(false);
member.updateLocation();
member.updateMovementState();
// All checks passed, let's move the player // All checks passed, let's move the player
src/engine/objects/PlayerCombatStats.java
+7 -2
View File
@@ -216,12 +216,17 @@ public class PlayerCombatStats {
atr += prefixValues; atr += prefixValues;
atr *= preciseRune; atr *= preciseRune;
atr += atrEnchants; 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; atr *= 1.0f + stanceValue;
if(this.owner.bonuses != null) { if(this.owner.bonuses != null) {
float positivePercentBonuses = this.owner.bonuses.getFloatPercentPositive(Enum.ModType.OCV, Enum.SourceType.None); 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 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 *= modifier;
} }
atr = (float) Math.round(atr); atr = (float) Math.round(atr);