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

v0.8.0: tweaked when enemy sprites show zap vfx. Now shows if either enemy or target is visible

Browse Source
This commit is contained in:
Evan Debenham 2019-11-09 12:20:26 -05:00
parent b666231e7f
commit 94078bd9b9
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM100.java
View File

@ -86,7 +86,7 @@ public class DM100 extends Mob implements Callback {
} else { } else {
if (sprite != null && sprite.visible) { if (sprite != null && (sprite.visible || enemy.sprite.visible)) {
sprite.zap( enemy.pos ); sprite.zap( enemy.pos );
} }

13
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
View File

@ -462,17 +462,16 @@ public abstract class Mob extends Char {
protected boolean doAttack( Char enemy ) { protected boolean doAttack( Char enemy ) {
boolean visible = Dungeon.level.heroFOV[pos]; if (sprite != null && (sprite.visible || enemy.sprite.visible)) {
if (visible) {
sprite.attack( enemy.pos ); sprite.attack( enemy.pos );
spend( attackDelay() );
return false;
} else { } else {
attack( enemy ); attack( enemy );
}
spend( attackDelay() ); spend( attackDelay() );
return true;
return !visible; }
} }
@Override @Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java
View File

@ -93,7 +93,7 @@ public abstract class Shaman extends Mob {
} else { } else {
if (sprite != null && sprite.visible) { if (sprite != null && (sprite.visible || enemy.sprite.visible)) {
sprite.zap( enemy.pos ); sprite.zap( enemy.pos );
return false; return false;
} else { } else {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java
View File

@ -84,7 +84,7 @@ public class Warlock extends Mob implements Callback {
} else { } else {
if (sprite != null && sprite.visible) { if (sprite != null && (sprite.visible || enemy.sprite.visible)) {
sprite.zap( enemy.pos ); sprite.zap( enemy.pos );
return false; return false;
} else { } else {