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

v2.4.1: fixed locked floor not always checking for immune or invuln

Browse Source
This commit is contained in:
Evan Debenham
2024-05-16 15:19:30 -04:00
parent 2f5531339b
commit 9027f5888c
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java
+1 -1
View File
@@ -476,7 +476,7 @@ public class DM300 extends Mob {
int dmgTaken = preHP - HP; int dmgTaken = preHP - HP;
if (dmgTaken > 0) { if (dmgTaken > 0) {
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
if (lock != null && !isImmune(src.getClass())){ if (lock != null && !isImmune(src.getClass()) && !isInvulnerable(src.getClass())){
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmgTaken/2f); if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmgTaken/2f);
else lock.addTime(dmgTaken); else lock.addTime(dmgTaken);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java
+1 -1
View File
@@ -476,7 +476,7 @@ public class DwarfKing extends Mob {
super.damage(dmg, src); super.damage(dmg, src);
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
if (lock != null && !isImmune(src.getClass())){ if (lock != null && !isImmune(src.getClass()) && !isInvulnerable(src.getClass())){
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmg/5f); if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmg/5f);
else lock.addTime(dmg/3f); else lock.addTime(dmg/3f);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
+1 -1
View File
@@ -273,7 +273,7 @@ public class Goo extends Mob {
yell(Messages.get(this, "gluuurp")); yell(Messages.get(this, "gluuurp"));
} }
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
if (lock != null){ if (lock != null && !isImmune(src.getClass()) && !isInvulnerable(src.getClass())){
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmg); if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmg);
else lock.addTime(dmg*1.5f); else lock.addTime(dmg*1.5f);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java
+1 -1
View File
@@ -203,7 +203,7 @@ public class Pylon extends Mob {
} }
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
if (lock != null && !isImmune(src.getClass())){ if (lock != null && !isImmune(src.getClass()) && !isInvulnerable(src.getClass())){
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmg/2f); if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmg/2f);
else lock.addTime(dmg); else lock.addTime(dmg);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java
+1 -1
View File
@@ -153,7 +153,7 @@ public class Tengu extends Mob {
dmg = beforeHitHP - HP; dmg = beforeHitHP - HP;
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
if (lock != null) { if (lock != null && !isImmune(src.getClass()) && !isInvulnerable(src.getClass())){
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(2*dmg/3f); if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(2*dmg/3f);
else lock.addTime(dmg); else lock.addTime(dmg);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java
+1 -1
View File
@@ -422,7 +422,7 @@ public class YogDzewa extends Mob {
} }
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
if (lock != null){ if (lock != null && !isImmune(src.getClass()) && !isInvulnerable(src.getClass())){
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmgTaken/3f); if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmgTaken/3f);
else lock.addTime(dmgTaken/2f); else lock.addTime(dmgTaken/2f);
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java
+1 -1
View File
@@ -152,7 +152,7 @@ public abstract class YogFist extends Mob {
int dmgTaken = preHP - HP; int dmgTaken = preHP - HP;
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
if (dmgTaken > 0 && lock != null){ if (dmgTaken > 0 && lock != null && !isImmune(src.getClass()) && !isInvulnerable(src.getClass())){
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmgTaken/4f); if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) lock.addTime(dmgTaken/4f);
else lock.addTime(dmgTaken/2f); else lock.addTime(dmgTaken/2f);
} }