v0.2.3: gladiator's combo now works while unarmed
This commit is contained in:
@@ -858,13 +858,12 @@ public class Hero extends Char {
|
||||
@Override
|
||||
public int attackProc( Char enemy, int damage ) {
|
||||
KindOfWeapon wep = rangedWeapon != null ? rangedWeapon : belongings.weapon;
|
||||
if (wep != null) {
|
||||
|
||||
wep.proc( this, enemy, damage );
|
||||
if (wep != null) wep.proc( this, enemy, damage );
|
||||
|
||||
switch (subClass) {
|
||||
case GLADIATOR:
|
||||
if (wep instanceof MeleeWeapon) {
|
||||
if (wep instanceof MeleeWeapon || wep == null) {
|
||||
damage += Buff.affect( this, Combo.class ).hit( enemy, damage );
|
||||
}
|
||||
break;
|
||||
@@ -889,7 +888,7 @@ public class Hero extends Char {
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return damage;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user