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

v1.4.0: fixed various visual errors with stacking barrier buffs

Browse Source
This commit is contained in:
Evan Debenham
2022-09-20 13:35:26 -04:00
parent aa3a56c083
commit 7f9ef66525
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barrier.java
+6 -2
View File
@@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blocking;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
@@ -68,8 +69,11 @@ public class Barrier extends ShieldBuff {
@Override @Override
public void fx(boolean on) { public void fx(boolean on) {
if (on) target.sprite.add(CharSprite.State.SHIELDED); if (on) {
else target.sprite.remove(CharSprite.State.SHIELDED); target.sprite.add(CharSprite.State.SHIELDED);
} else if (target.buff(Blocking.BlockBuff.class) == null) {
target.sprite.remove(CharSprite.State.SHIELDED);
}
} }
@Override @Override
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+4 -1
View File
@@ -401,7 +401,10 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
healing.pour(Speck.factory(Speck.HEALING), 0.5f); healing.pour(Speck.factory(Speck.HEALING), 0.5f);
break; break;
case SHIELDED: case SHIELDED:
GameScene.effect( shield = new ShieldHalo( this )); if (shield != null) {
shield.killAndErase();
}
GameScene.effect(shield = new ShieldHalo(this));
break; break;
case HEARTS: case HEARTS:
hearts = emitter(); hearts = emitter();