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

v2.0.0: chasm warning can now also appear when levitation is ending

Browse Source
This commit is contained in:
Evan Debenham
2023-02-01 13:21:48 -05:00
parent 3ce45921ab
commit f0bff6ce3f
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+15 -12
View File
@@ -50,6 +50,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Foresight;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.HoldFast; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.HoldFast;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Levitation;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LostInventory; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LostInventory;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MindVision; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MindVision;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Momentum; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Momentum;
@@ -1473,15 +1474,6 @@ public class Hero extends Char {
path = null; path = null;
if (Actor.findChar( target ) == null) { if (Actor.findChar( target ) == null) {
if (Dungeon.level.pit[target] && !flying && !Dungeon.level.solid[target]) {
if (!Chasm.jumpConfirmed){
Chasm.heroJump(this);
interrupt();
} else {
Chasm.heroFall(target);
}
return false;
}
if (Dungeon.level.passable[target] || Dungeon.level.avoid[target]) { if (Dungeon.level.passable[target] || Dungeon.level.avoid[target]) {
step = target; step = target;
} }
@@ -1531,16 +1523,27 @@ public class Hero extends Char {
if (step != -1) { if (step != -1) {
float delay = 1 / speed();
if (Dungeon.level.pit[step] && !Dungeon.level.solid[step]
&& (!flying || buff(Levitation.class) != null && buff(Levitation.class).cooldown() < delay)){
if (!Chasm.jumpConfirmed){
Chasm.heroJump(this);
interrupt();
} else {
Chasm.heroFall(target);
}
return false;
}
if (subClass == HeroSubClass.FREERUNNER){ if (subClass == HeroSubClass.FREERUNNER){
Buff.affect(this, Momentum.class).gainStack(); Buff.affect(this, Momentum.class).gainStack();
} }
float speed = speed();
sprite.move(pos, step); sprite.move(pos, step);
move(step); move(step);
spend( 1 / speed ); spend( delay );
justMoved = true; justMoved = true;
search(false); search(false);