projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-01-16 23:04:20 -05:00
Code Issues Projects Releases Wiki Activity

187: Less nesting in CombatCommandAttack#isAttackDevastating()

Browse Source
This commit is contained in:
Ziggy
2019-10-13 14:44:58 +02:00
parent 609565f699
commit 0f12026df0
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandAttack.java
View File

@@ -288,16 +288,15 @@ enum CombatCommandAttack implements CombatCommandHitType {
WeaponObject weapon = source.getEquippedWeapon();
WeaponType type = weapon.getType();
// Only AoE and CoE heavy weapons can qualify for a devastation roll
switch (type) {
case HEAVY_WEAPON:
case DIRECTIONAL_TARGET_WEAPON:
double devastationChance = source.getSkillModValue("expertise_devastation_bonus") / 10;
double roll = ThreadLocalRandom.current().nextDouble(100); // Generate number between 0 and 100
return roll <= devastationChance; // If devastation chance is 20%, then the roll should be between 0 and 20 (both inclusive)
default: return false;
if (!WeaponType.HEAVY_WEAPON.equals(type) && !WeaponType.DIRECTIONAL_TARGET_WEAPON.equals(type)) {
// If the weapon type isn't a heavy weapon and isn't a flamethrower, then the weapon cannot roll a devastation
return false;
}
double devastationChance = source.getSkillModValue("expertise_devastation_bonus") / 10;
double roll = ThreadLocalRandom.current().nextDouble(100); // Generate number between 0 and 100
return roll <= devastationChance; // If devastation chance is 20%, then the roll should be between 0 and 20 (both inclusive)
}
}