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

v3.2.2: fixed explosive cursed pickaxe explosion not awarding mick badge

Browse Source
This commit is contained in:
Evan Debenham
2025-08-25 12:01:39 -04:00
parent df56fa1a25
commit e1a8744748
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
View File

@@ -34,6 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.Pickaxe; import com.shatteredpixel.shatteredpixeldungeon.items.quest.Pickaxe;
import com.shatteredpixel.shatteredpixeldungeon.items.remains.RemainsItem; import com.shatteredpixel.shatteredpixeldungeon.items.remains.RemainsItem;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Explosive;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
import com.shatteredpixel.shatteredpixeldungeon.journal.Bestiary; import com.shatteredpixel.shatteredpixeldungeon.journal.Bestiary;
import com.shatteredpixel.shatteredpixeldungeon.journal.Catalog; import com.shatteredpixel.shatteredpixeldungeon.journal.Catalog;
@@ -1036,8 +1037,8 @@ public class Badges {
} }
public static void validateTakingTheMick(Object cause){ public static void validateTakingTheMick(Object cause){
if (cause == Dungeon.hero && if ((cause == Dungeon.hero || cause instanceof Explosive.ExplosiveCurseBomb)
Dungeon.hero.belongings.attackingWeapon() instanceof Pickaxe && Dungeon.hero.belongings.attackingWeapon() instanceof Pickaxe
&& Dungeon.hero.belongings.attackingWeapon().level() >= 20){ && Dungeon.hero.belongings.attackingWeapon().level() >= 20){
local.add( Badge.TAKING_THE_MICK ); local.add( Badge.TAKING_THE_MICK );
displayBadge(Badge.TAKING_THE_MICK); displayBadge(Badge.TAKING_THE_MICK);

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java
View File

@@ -77,7 +77,7 @@ public class Explosive extends Weapon.Enchantment {
explosionPos = defender.pos; explosionPos = defender.pos;
} }
new Bomb.ConjuredBomb().explode(explosionPos); new ExplosiveCurseBomb().explode(explosionPos);
durability = 100; durability = 100;
Item.updateQuickslot(); Item.updateQuickslot();
@@ -147,4 +147,6 @@ public class Explosive extends Weapon.Enchantment {
bundle.put(DURABILITY, durability); bundle.put(DURABILITY, durability);
} }
public static class ExplosiveCurseBomb extends Bomb.ConjuredBomb {}
} }