konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed Crush AOE counting for DK challenge badge

Browse Source
This commit is contained in:
Evan Debenham
2023-01-16 16:05:41 -05:00
parent c9bb2421f5
commit 8c277eddda
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
+6
View File
@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DwarfKing;
import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal; import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave;
@@ -355,7 +356,12 @@ public class Combo extends Buff implements ActionIndicator.Action {
aoeHit /= 2; aoeHit /= 2;
aoeHit -= ch.drRoll(); aoeHit -= ch.drRoll();
if (ch.buff(Vulnerable.class) != null) aoeHit *= 1.33f; if (ch.buff(Vulnerable.class) != null) aoeHit *= 1.33f;
if (ch instanceof DwarfKing){
//change damage type for DK so that crush AOE doesn't count for DK's challenge badge
ch.damage(aoeHit, this);
} else {
ch.damage(aoeHit, target); ch.damage(aoeHit, target);
}
ch.sprite.bloodBurstA(target.sprite.center(), aoeHit); ch.sprite.bloodBurstA(target.sprite.center(), aoeHit);
ch.sprite.flash(); ch.sprite.flash();