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

PlayerCombatStats weapon speed calculations complete

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-22 21:08:38 -06:00
parent 810812d06b
commit 0d9e03f848
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCombatStats.java
+16 -5
View File
@@ -207,6 +207,8 @@ public class PlayerCombatStats {
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.atrHandOne = 0.0f; this.atrHandOne = 0.0f;
}else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
this.atrHandTwo = 0.0f;
} }
} }
} //perfect DO NOT TOUCH } //perfect DO NOT TOUCH
@@ -267,6 +269,8 @@ public class PlayerCombatStats {
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.minDamageHandOne = 0; this.minDamageHandOne = 0;
}else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
this.minDamageHandTwo = 0;
} }
} }
} }
@@ -330,6 +334,8 @@ public class PlayerCombatStats {
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.maxDamageHandOne = 0; this.maxDamageHandOne = 0;
}else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
this.maxDamageHandTwo = 0;
} }
} }
} }
@@ -351,9 +357,10 @@ public class PlayerCombatStats {
for(Effect eff : weapon.effects.values()){ for(Effect eff : weapon.effects.values()){
for(AbstractEffectModifier mod : eff.getEffectModifiers()){ for(AbstractEffectModifier mod : eff.getEffectModifiers()){
if(mod.modType.equals(Enum.ModType.WeaponSpeed) || mod.modType.equals(Enum.ModType.AttackDelay)){ if(mod.modType.equals(Enum.ModType.WeaponSpeed) || mod.modType.equals(Enum.ModType.AttackDelay)){
float percent = mod.getPercentMod() * 0.01f; float percent = mod.getPercentMod();
speed *= 1 + (mod.getPercentMod() * 0.01f); int trains = eff.getTrains();
weaponSpecificValues += (mod.getPercentMod() * 0.01f); float modValue = percent + (trains * mod.getRamp());
weaponSpecificValues += modValue * 0.01f;
} }
} }
} }
@@ -376,8 +383,8 @@ public class PlayerCombatStats {
} }
float bonusValues = 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.AttackDelay,Enum.SourceType.None);//1.0f; float bonusValues = 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.AttackDelay,Enum.SourceType.None);//1.0f;
speed *= 1 + weaponSpecificValues;
bonusValues -= (stanceValue + weaponSpecificValues); // take away stance modifier from alac bonus values bonusValues -= stanceValue; // take away stance modifier from alac bonus values
speed *= 1 + stanceValue; // apply stance bonus speed *= 1 + stanceValue; // apply stance bonus
speed *= bonusValues; // apply alac bonuses without stance mod speed *= bonusValues; // apply alac bonuses without stance mod
@@ -391,6 +398,8 @@ public class PlayerCombatStats {
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.attackSpeedHandOne = 0.0f; this.attackSpeedHandOne = 0.0f;
}else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
this.attackSpeedHandTwo = 0.0f;
} }
} }
} }
@@ -419,6 +428,8 @@ public class PlayerCombatStats {
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.rangeHandOne = 0.0f; this.rangeHandOne = 0.0f;
}else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
this.rangeHandTwo = 0.0f;
} }
} }
} }