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

weapon range bonus works again

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-08-12 19:58:27 -05:00
parent a278f8bc79
commit 58fe2d93b7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+3 -2
View File
@@ -736,7 +736,7 @@ public enum CombatManager {
if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && !mainHand) { if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && !mainHand) {
dpj = ((PlayerCharacter) ac).getWeaponPower(); dpj = ((PlayerCharacter) ac).getWeaponPower();
if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) { if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
float attackRange = getWeaponRange(wb,null); float attackRange = getWeaponRange(wb,bonuses);
dpj.attack(target, attackRange); dpj.attack(target, attackRange);
} }
} }
@@ -1216,7 +1216,8 @@ public enum CombatManager {
return 0f; return 0f;
float rangeMod = 1.0f; float rangeMod = 1.0f;
if (bonus != null) { if (bonus != null) {
rangeMod += bonus.getFloat(ModType.WeaponRange, SourceType.None); //rangeMod += bonus.getFloat(ModType.WeaponRange, SourceType.None);
rangeMod += bonus.getFloatPercentAll(ModType.WeaponRange, SourceType.None);
} }
return weapon.getRange() * rangeMod; return weapon.getRange() * rangeMod;
} }