FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request 'Fix for weaponspeed effect modifier.' (#19) from EffectModifierFix into master

Browse Source 
Reviewed-on: MagicBane/Server#19
This commit is contained in:
MagicBot
2022-12-30 13:13:15 +00:00
parent dfd6beb988 a35c5ef3cc
commit 5853dc802d
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCharacter.java
+1 -1
View File
@@ -3885,7 +3885,7 @@ public void dismissNecroPets() {
else
speed = 20f; //unarmed attack speed
if (weapon != null)
speed *= (1 + weapon.getBonusPercent(ModType.WeaponSpeed, SourceType.None));
speed *= (1 + this.bonuses.getFloatPercentAll(ModType.WeaponSpeed, SourceType.None));
speed *= (1 + this.bonuses.getFloatPercentAll(ModType.AttackDelay, SourceType.None));
if (speed < 10)
speed = 10;
src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java
+13 -1
View File
@@ -30,7 +30,19 @@ public class WeaponSpeedEffectModifier extends AbstractEffectModifier {
}
@Override
public void applyBonus(AbstractCharacter ac, int trains) {}
public void applyBonus(AbstractCharacter ac, int trains) {
Float amount = 0f;
if (this.useRampAdd)
amount = this.percentMod + (this.ramp * trains);
else
amount = this.percentMod * (1 + (this.ramp * trains));
amount = amount/100;
ac.getBonuses().addFloat(this, amount);
}
@Override
public void applyBonus(Item item, int trains) {