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

v2.0.0: fixed fly swarms never splitting on ascent

Browse Source
This commit is contained in:
Evan Debenham
2023-02-13 16:36:52 -05:00
parent 09e042879f
commit 3e63023f5b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java
+6 -2
View File
@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AllyBuff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AllyBuff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AscensionChallenge;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ChampionEnemy; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ChampionEnemy;
@@ -83,7 +84,10 @@ public class Swarm extends Mob {
@Override @Override
public int defenseProc( Char enemy, int damage ) { public int defenseProc( Char enemy, int damage ) {
if (HP >= damage + 2) { //accounting for reduced damage on ascension
int effectiveDmg = (int)Math.ceil(damage / AscensionChallenge.statModifier(this));
if (HP >= effectiveDmg + 2) {
ArrayList<Integer> candidates = new ArrayList<>(); ArrayList<Integer> candidates = new ArrayList<>();
int[] neighbours = {pos + 1, pos - 1, pos + Dungeon.level.width(), pos - Dungeon.level.width()}; int[] neighbours = {pos + 1, pos - 1, pos + Dungeon.level.width(), pos - Dungeon.level.width()};
@@ -99,7 +103,7 @@ public class Swarm extends Mob {
if (candidates.size() > 0) { if (candidates.size() > 0) {
Swarm clone = split(); Swarm clone = split();
clone.HP = (HP - damage) / 2; clone.HP = (HP - effectiveDmg) / 2;
clone.pos = Random.element( candidates ); clone.pos = Random.element( candidates );
clone.state = clone.HUNTING; clone.state = clone.HUNTING;