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

v1.2.0: properly fixed bugs with giant succubi

Browse Source
This commit is contained in:
Evan Debenham 2022-02-23 13:43:28 -05:00
parent fe581e690f
commit 09f4644599
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java
View File

@ -68,7 +68,7 @@ public class Succubus extends Mob {
@Override @Override
public int damageRoll() { public int damageRoll() {
return Random.NormalIntRange( 25, 30 ); return Random.NormalIntRange( 2, 3 );
} }
@Override @Override
@ -104,9 +104,12 @@ public class Succubus extends Mob {
protected boolean getCloser( int target ) { protected boolean getCloser( int target ) {
if (fieldOfView[target] && Dungeon.level.distance( pos, target ) > 2 && blinkCooldown <= 0) { if (fieldOfView[target] && Dungeon.level.distance( pos, target ) > 2 && blinkCooldown <= 0) {
blink( target ); if (blink( target )) {
spend(-1 / speed()); spend(-1 / speed());
return true; return true;
} else {
return false;
}
} else { } else {
@ -116,7 +119,7 @@ public class Succubus extends Mob {
} }
} }
private void blink( int target ) { private boolean blink( int target ) {
Ballistica route = new Ballistica( pos, target, Ballistica.PROJECTILE); Ballistica route = new Ballistica( pos, target, Ballistica.PROJECTILE);
int cell = route.collisionPos; int cell = route.collisionPos;
@ -125,7 +128,7 @@ public class Succubus extends Mob {
if (Actor.findChar( cell ) != null && cell != this.pos) if (Actor.findChar( cell ) != null && cell != this.pos)
cell = route.path.get(route.dist-1); cell = route.path.get(route.dist-1);
if (Dungeon.level.avoid[ cell ] && (!properties().contains(Property.LARGE) || Dungeon.level.openSpace[cell])){ if (Dungeon.level.avoid[ cell ] || (properties().contains(Property.LARGE) && !Dungeon.level.openSpace[cell])){
ArrayList<Integer> candidates = new ArrayList<>(); ArrayList<Integer> candidates = new ArrayList<>();
for (int n : PathFinder.NEIGHBOURS8) { for (int n : PathFinder.NEIGHBOURS8) {
cell = route.collisionPos + n; cell = route.collisionPos + n;
@ -139,13 +142,14 @@ public class Succubus extends Mob {
cell = Random.element(candidates); cell = Random.element(candidates);
else { else {
blinkCooldown = Random.IntRange(4, 6); blinkCooldown = Random.IntRange(4, 6);
return; return false;
} }
} }
ScrollOfTeleportation.appear( this, cell ); ScrollOfTeleportation.appear( this, cell );
blinkCooldown = Random.IntRange(4, 6); blinkCooldown = Random.IntRange(4, 6);
return true;
} }
@Override @Override