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

v2.0.1: improved noisemaker's not being collectable after trigger

Browse Source
This commit is contained in:
Evan Debenham
2023-03-28 16:52:46 -04:00
parent 7928f41ee3
commit 96f840932c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java
+10 -3
View File
@@ -58,16 +58,23 @@ public class Noisemaker extends Bomb {
@Override @Override
public ItemSprite.Glowing glowing() { public ItemSprite.Glowing glowing() {
if (Dungeon.hero.buff(Trigger.class) != null){ if (fuse == null){
for (Trigger trigger : Dungeon.hero.buffs(Trigger.class)){
Heap heap = Dungeon.level.heaps.get(trigger.cell);
if (heap != null && heap.items.contains(this)) {
return new ItemSprite.Glowing( 0xFF0000, 0.6f); return new ItemSprite.Glowing( 0xFF0000, 0.6f);
} }
}
}
return super.glowing(); return super.glowing();
} }
@Override @Override
public boolean doPickUp(Hero hero, int pos) { public boolean doPickUp(Hero hero, int pos) {
if (fuse == null && hero.buff(Trigger.class) != null){ if (fuse == null){
return false; for (Trigger trigger : hero.buffs(Trigger.class)){
if (trigger.cell == pos) return false;
}
} }
return super.doPickUp(hero, pos); return super.doPickUp(hero, pos);
} }