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

v2.0.1: fixed necromancers not properly handling particle refs

Browse Source
This commit is contained in:
Evan Debenham
2023-03-21 13:52:58 -04:00
parent 70af94f30b
commit 4f1b50de25
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/NecromancerSprite.java
View File

@@ -83,6 +83,7 @@ public class NecromancerSprite extends MobSprite {
super.die();
if (summoningBones != null){
summoningBones.on = false;
summoningBones = null;
}
}
@@ -90,13 +91,15 @@ public class NecromancerSprite extends MobSprite {
public void kill() {
super.kill();
if (summoningBones != null){
summoningBones.killAndErase();
summoningBones.on = false;
summoningBones = null;
}
}
public void cancelSummoning(){
if (summoningBones != null){
summoningBones.on = false;
summoningBones = null;
}
}
@@ -107,6 +110,7 @@ public class NecromancerSprite extends MobSprite {
} else {
summoningBones.on = false;
}
summoningBones = null;
idle();
}

40
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpectralNecromancerSprite.java
View File

@@ -34,7 +34,7 @@ import com.watabou.noosa.particles.Emitter;
public class SpectralNecromancerSprite extends MobSprite {
private Animation charging;
private Emitter summoningBones;
private Emitter summoningParticles;
public SpectralNecromancerSprite(){
super();
@@ -75,40 +75,44 @@ public class SpectralNecromancerSprite extends MobSprite {
@Override
public void update() {
super.update();
if (summoningBones != null && ((Necromancer) ch).summoningPos != -1){
summoningBones.visible = Dungeon.level.heroFOV[((Necromancer) ch).summoningPos];
if (summoningParticles != null && ((Necromancer) ch).summoningPos != -1){
summoningParticles.visible = Dungeon.level.heroFOV[((Necromancer) ch).summoningPos];
}
}
@Override
public void die() {
super.die();
if (summoningBones != null){
summoningBones.on = false;
if (summoningParticles != null){
summoningParticles.on = false;
summoningParticles = null;
}
}
@Override
public void kill() {
super.kill();
if (summoningBones != null){
summoningBones.killAndErase();
if (summoningParticles != null){
summoningParticles.on = false;
summoningParticles = null;
}
}
public void cancelSummoning(){
if (summoningBones != null){
summoningBones.on = false;
if (summoningParticles != null){
summoningParticles.on = false;
summoningParticles = null;
}
}
public void finishSummoning(){
if (summoningBones.visible) {
if (summoningParticles.visible) {
Sample.INSTANCE.play(Assets.Sounds.CURSED);
summoningBones.burst(ShadowParticle.CURSE, 5);
summoningParticles.burst(ShadowParticle.CURSE, 5);
} else {
summoningBones.on = false;
summoningParticles.on = false;
}
summoningParticles = null;
idle();
}
@@ -120,13 +124,13 @@ public class SpectralNecromancerSprite extends MobSprite {
public void zap(int cell) {
super.zap(cell);
if (ch instanceof Necromancer && ((Necromancer) ch).summoning){
if (summoningBones != null){
summoningBones.on = false;
if (summoningParticles != null){
summoningParticles.on = false;
}
summoningBones = CellEmitter.get(((Necromancer) ch).summoningPos);
summoningBones.pour(ShadowParticle.MISSILE, 0.1f);
summoningBones.visible = Dungeon.level.heroFOV[((Necromancer) ch).summoningPos];
if (visible || summoningBones.visible ) Sample.INSTANCE.play( Assets.Sounds.CHARGEUP, 1f, 0.8f );
summoningParticles = CellEmitter.get(((Necromancer) ch).summoningPos);
summoningParticles.pour(ShadowParticle.MISSILE, 0.1f);
summoningParticles.visible = Dungeon.level.heroFOV[((Necromancer) ch).summoningPos];
if (visible || summoningParticles.visible ) Sample.INSTANCE.play( Assets.Sounds.CHARGEUP, 1f, 0.8f );
}
}