LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.2.3: gladiator's combo now works while unarmed

Browse Source
This commit is contained in:
Evan Debenham 2014-12-18 12:56:50 -05:00
parent e4951449f4
commit b62090ae33
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -858,38 +858,37 @@ public class Hero extends Char {
@Override @Override
public int attackProc( Char enemy, int damage ) { public int attackProc( Char enemy, int damage ) {
KindOfWeapon wep = rangedWeapon != null ? rangedWeapon : belongings.weapon; 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) { switch (subClass) {
case GLADIATOR: case GLADIATOR:
if (wep instanceof MeleeWeapon) { if (wep instanceof MeleeWeapon || wep == null) {
damage += Buff.affect( this, Combo.class ).hit( enemy, damage ); damage += Buff.affect( this, Combo.class ).hit( enemy, damage );
}
break;
case BATTLEMAGE:
if (wep instanceof Wand) {
Wand wand = (Wand)wep;
if (wand.curCharges < wand.maxCharges && damage > 0) {
wand.curCharges++;
if (Dungeon.quickslot == wand) {
QuickSlot.refresh();
}
ScrollOfRecharging.charge( this );
}
damage += wand.curCharges;
}
case SNIPER:
if (rangedWeapon != null) {
Buff.prolong( enemy, SnipersMark.class, attackDelay() * 1.1f );
}
break;
default:
} }
break;
case BATTLEMAGE:
if (wep instanceof Wand) {
Wand wand = (Wand)wep;
if (wand.curCharges < wand.maxCharges && damage > 0) {
wand.curCharges++;
if (Dungeon.quickslot == wand) {
QuickSlot.refresh();
}
ScrollOfRecharging.charge( this );
}
damage += wand.curCharges;
}
case SNIPER:
if (rangedWeapon != null) {
Buff.prolong( enemy, SnipersMark.class, attackDelay() * 1.1f );
}
break;
default:
} }
return damage; return damage;
} }