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

v0.8.1: fixed cleave not triggering if enemy was corrupted

Browse Source
This commit is contained in:
Evan Debenham 2020-06-08 19:06:24 -04:00
parent 671f4fba69
commit d76e81d27e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
View File

@ -264,6 +264,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
} }
dmg = target.attackProc(enemy, dmg); dmg = target.attackProc(enemy, dmg);
boolean wasAlly = enemy.alignment == target.alignment;
enemy.damage( dmg, this ); enemy.damage( dmg, this );
//special effects //special effects
@ -323,8 +324,9 @@ public class Combo extends Buff implements ActionIndicator.Action {
//Post-attack behaviour //Post-attack behaviour
switch(type){ switch(type){
case CLEAVE: case CLEAVE:
if (!enemy.isAlive()) {
//combo isn't reset, but rather increments with a cleave kill, and grants more time. //combo isn't reset, but rather increments with a cleave kill, and grants more time.
//this includes corrupting kills (which is why we check alignment
if (!enemy.isAlive() || (!wasAlly && enemy.alignment == target.alignment)) {
hit( enemy ); hit( enemy );
comboTime = 12f; comboTime = 12f;
} else { } else {