diff --git a/CHANGELOG.md b/CHANGELOG.md index adb07c0..f45a473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Fix: large relic images have to be in images/largeRelics * Fix: Poison Weapons did not exhaust (#3) * Changed Infinite Journal to be rare +* Changed Infernal Berry to be a skill ### v1.4.0 * Added cards: 1 curse diff --git a/src/main/java/conspire/Conspire.java b/src/main/java/conspire/Conspire.java index 1cbc10d..9a6a964 100644 --- a/src/main/java/conspire/Conspire.java +++ b/src/main/java/conspire/Conspire.java @@ -49,6 +49,7 @@ import conspire.cards.colorless.Banana; import conspire.cards.colorless.GhostlyDefend; import conspire.cards.colorless.GhostlyStrike; +import conspire.cards.colorless.InfernalBerry; import conspire.cards.colorless.SpireCoStock; import conspire.cards.curse.Blindness; import conspire.cards.curse.NecroticWound; @@ -58,7 +59,6 @@ import conspire.cards.red.ExplosiveBarrier; import conspire.cards.red.HitWhereItHurts; import conspire.cards.red.Purge; -import conspire.cards.status.InfernalBerry; import conspire.cards.status.PyramidRune; import conspire.cards.status.Treasure; import conspire.events.Investor; diff --git a/src/main/java/conspire/cards/status/InfernalBerry.java b/src/main/java/conspire/cards/colorless/InfernalBerry.java similarity index 59% rename from src/main/java/conspire/cards/status/InfernalBerry.java rename to src/main/java/conspire/cards/colorless/InfernalBerry.java index f60a978..cdbe770 100644 --- a/src/main/java/conspire/cards/status/InfernalBerry.java +++ b/src/main/java/conspire/cards/colorless/InfernalBerry.java @@ -1,4 +1,4 @@ -package conspire.cards.status; +package conspire.cards.colorless; import com.megacrit.cardcrawl.actions.common.DrawCardAction; import com.megacrit.cardcrawl.cards.AbstractCard; @@ -22,37 +22,15 @@ public class InfernalBerry extends CustomCard { private static final int COST = 1; public InfernalBerry() { - super(ID, NAME, Conspire.cardImage(ID), COST, DESCRIPTION, CardType.STATUS, CardColor.COLORLESS, CardRarity.COMMON, CardTarget.ENEMY); + super(ID, NAME, Conspire.cardImage(ID), COST, DESCRIPTION, CardType.SKILL, CardColor.COLORLESS, CardRarity.SPECIAL, CardTarget.ENEMY); this.exhaust = true; } @Override public void use(AbstractPlayer p, AbstractMonster m) { - if (p.hasRelic("Medical Kit")) { - this.useMedicalKit(p); - } AbstractDungeon.actionManager.addToBottom(new ReduceHolyAction(m, 1)); } - @Override - public boolean canUse(AbstractPlayer p, AbstractMonster m) { - if (AbstractDungeon.player.hasRelic("Medical Kit")) { - return true; - } - if (this.cardPlayable(m) && this.hasEnoughEnergy()) { - return true; - } - return false; - } - - @Override - public void triggerWhenDrawn() { - if (AbstractDungeon.player.hasPower(EvolvePower.POWER_ID) && !AbstractDungeon.player.hasPower(NoDrawPower.POWER_ID)) { - AbstractDungeon.player.getPower(EvolvePower.POWER_ID).flash(); - AbstractDungeon.actionManager.addToBottom(new DrawCardAction(AbstractDungeon.player, AbstractDungeon.player.getPower(EvolvePower.POWER_ID).amount)); - } - } - @Override public AbstractCard makeCopy() { return new InfernalBerry(); diff --git a/src/main/java/conspire/monsters/HollyBat.java b/src/main/java/conspire/monsters/HollyBat.java index 3381439..481ac0b 100644 --- a/src/main/java/conspire/monsters/HollyBat.java +++ b/src/main/java/conspire/monsters/HollyBat.java @@ -19,7 +19,7 @@ import com.megacrit.cardcrawl.powers.StrengthPower; import com.megacrit.cardcrawl.powers.WeakPower; -import conspire.cards.status.InfernalBerry; +import conspire.cards.colorless.InfernalBerry; import conspire.helpers.AscensionHelper; import conspire.helpers.MovePicker; import conspire.powers.HolyPower;