From 5e18481c26fe352c6a0f6eb3b6507b8d7025e2c9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 30 Dec 2022 13:32:29 -0500 Subject: [PATCH] v2.0.0: several artifacts now cancel invisibility when used --- .../shatteredpixeldungeon/items/artifacts/DriedRose.java | 2 ++ .../shatteredpixeldungeon/items/artifacts/EtherealChains.java | 3 +++ .../shatteredpixeldungeon/items/artifacts/SandalsOfNature.java | 2 ++ .../items/artifacts/TalismanOfForesight.java | 2 ++ .../items/artifacts/TimekeepersHourglass.java | 1 + 5 files changed, 10 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 48a3629d2..8498e6a22 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -31,6 +31,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AllyBuff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AscensionChallenge; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; @@ -189,6 +190,7 @@ public class DriedRose extends Artifact { } } + Invisibility.dispel(hero); Talent.onArtifactUsed(hero); charge = 0; partialCharge = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java index 743e18a9b..bd06096d0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java @@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; @@ -174,6 +175,7 @@ public class EtherealChains extends Artifact { return; } else { charge -= chargeUse; + Invisibility.dispel(hero); Talent.onArtifactUsed(hero); updateQuickslot(); } @@ -237,6 +239,7 @@ public class EtherealChains extends Artifact { return; } else { charge -= chargeUse; + Invisibility.dispel(hero); Talent.onArtifactUsed(hero); updateQuickslot(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index db9f853eb..d4a25bc27 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.artifacts; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; @@ -324,6 +325,7 @@ public class SandalsOfNature extends Artifact { GLog.w(Messages.get(SandalsOfNature.class, "out_of_range")); } else { CellEmitter.get( cell ).burst( LeafParticle.GENERAL, 6 ); + Invisibility.dispel(curUser); Plant plant = ((Plant.Seed) Reflection.newInstance(curSeedEffect)).couch(cell, null); plant.activate(Actor.findChar(cell)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index 544b33dfc..eba1085e8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; @@ -219,6 +220,7 @@ public class TalismanOfForesight extends Artifact { charge++; partialCharge--; } + Invisibility.dispel(curUser); Talent.onArtifactUsed(Dungeon.hero); updateQuickslot(); Dungeon.observe(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 7452edceb..9203eb690 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -122,6 +122,7 @@ public class TimekeepersHourglass extends Artifact { GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.TELEPORT); + Invisibility.dispel(Dungeon.hero); activeBuff = new timeFreeze(); Talent.onArtifactUsed(Dungeon.hero); activeBuff.attachTo(Dungeon.hero);