From 41cbb7580a8dddf6e1f82e1c2d4e787ccac37b62 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 1 Jul 2021 21:16:03 -0400 Subject: [PATCH] [AFR] Implemented Djinni Windseeker --- .../src/mage/cards/d/DjinniWindseeker.java | 52 ++++++++ .../sets/AdventuresInTheForgottenRealms.java | 1 + .../common/RollDieWithResultTableEffect.java | 122 ++++++++++++++++++ Utils/gen-card.pl | 1 + 4 files changed, 176 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/d/DjinniWindseeker.java create mode 100644 Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java diff --git a/Mage.Sets/src/mage/cards/d/DjinniWindseeker.java b/Mage.Sets/src/mage/cards/d/DjinniWindseeker.java new file mode 100644 index 00000000000..bcc0023c6e0 --- /dev/null +++ b/Mage.Sets/src/mage/cards/d/DjinniWindseeker.java @@ -0,0 +1,52 @@ +package mage.cards.d; + +import mage.MageInt; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.RollDieWithResultTableEffect; +import mage.abilities.effects.keyword.ScryEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class DjinniWindseeker extends CardImpl { + + public DjinniWindseeker(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); + + this.subtype.add(SubType.DJINN); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // When Djinni Windseeker enters the battlefield, roll a d20. + RollDieWithResultTableEffect effect = new RollDieWithResultTableEffect(); + this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); + + // 1-9 | Scry 1. + effect.addTableEntry(1, 9, new ScryEffect(1, false)); + + // 10-19 | Scry 2. + effect.addTableEntry(10, 19, new ScryEffect(2, false)); + + // 20 | Scry 3. + effect.addTableEntry(20, 20, new ScryEffect(3, false)); + } + + private DjinniWindseeker(final DjinniWindseeker card) { + super(card); + } + + @Override + public DjinniWindseeker copy() { + return new DjinniWindseeker(this); + } +} diff --git a/Mage.Sets/src/mage/sets/AdventuresInTheForgottenRealms.java b/Mage.Sets/src/mage/sets/AdventuresInTheForgottenRealms.java index dd47d45bd54..aeecbabbe05 100644 --- a/Mage.Sets/src/mage/sets/AdventuresInTheForgottenRealms.java +++ b/Mage.Sets/src/mage/sets/AdventuresInTheForgottenRealms.java @@ -47,6 +47,7 @@ public final class AdventuresInTheForgottenRealms extends ExpansionSet { cards.add(new SetCardInfo("Den of the Bugbear", 254, Rarity.RARE, mage.cards.d.DenOfTheBugbear.class)); cards.add(new SetCardInfo("Devoted Paladin", 11, Rarity.COMMON, mage.cards.d.DevotedPaladin.class)); cards.add(new SetCardInfo("Displacer Beast", 54, Rarity.UNCOMMON, mage.cards.d.DisplacerBeast.class)); + cards.add(new SetCardInfo("Djinni Windseeker", 55, Rarity.COMMON, mage.cards.d.DjinniWindseeker.class)); cards.add(new SetCardInfo("Dragon Turtle", 56, Rarity.RARE, mage.cards.d.DragonTurtle.class)); cards.add(new SetCardInfo("Drizzt Do'Urden", 220, Rarity.RARE, mage.cards.d.DrizztDoUrden.class)); cards.add(new SetCardInfo("Dueling Rapier", 140, Rarity.COMMON, mage.cards.d.DuelingRapier.class)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java new file mode 100644 index 00000000000..ae3beb3c54c --- /dev/null +++ b/Mage/src/main/java/mage/abilities/effects/common/RollDieWithResultTableEffect.java @@ -0,0 +1,122 @@ +package mage.abilities.effects.common; + +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.effects.ContinuousEffect; +import mage.abilities.effects.Effect; +import mage.abilities.effects.Effects; +import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; +import mage.game.Game; +import mage.players.Player; +import mage.util.CardUtil; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author TheElk801 + */ +public class RollDieWithResultTableEffect extends OneShotEffect { + + private final int sides; + private final List resultsTable = new ArrayList<>(); + + public RollDieWithResultTableEffect() { + this(20); + } + + public RollDieWithResultTableEffect(int sides) { + super(Outcome.Benefit); + this.sides = sides; + } + + private RollDieWithResultTableEffect(final RollDieWithResultTableEffect effect) { + super(effect); + this.sides = effect.sides; + for (TableEntry tableEntry : effect.resultsTable) { + this.resultsTable.add(tableEntry.copy()); + } + } + + @Override + public RollDieWithResultTableEffect copy() { + return new RollDieWithResultTableEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(source.getControllerId()); + if (player == null) { + return false; + } + int result = player.rollDice(source, game, sides); + for (TableEntry tableEntry : this.resultsTable) { + if (tableEntry.matches(result)) { + tableEntry.apply(game, source); + return true; + } + } + return true; + } + + @Override + public String getText(Mode mode) { + StringBuilder sb = new StringBuilder("roll a d").append(sides).append('.'); + for (TableEntry tableEntry : this.resultsTable) { + sb.append("
"); + if (tableEntry.min == tableEntry.max) { + sb.append(tableEntry.max); + sb.append(' '); + } else { + sb.append(tableEntry.min); + sb.append('-'); + sb.append(tableEntry.max); + sb.append(" | "); + } + sb.append(CardUtil.getTextWithFirstCharUpperCase(tableEntry.effects.getText(mode))); + } + return sb.toString(); + } + + private static final class TableEntry { + private final int min; + private final int max; + private final Effects effects; + + private TableEntry(int min, int max, Effect... effects) { + this.min = min; + this.max = max; + this.effects = new Effects(effects); + } + + private TableEntry(final TableEntry tableEntry) { + this.min = tableEntry.min; + this.max = tableEntry.max; + this.effects = tableEntry.effects.copy(); + } + + private TableEntry copy() { + return new TableEntry(this); + } + + private boolean matches(int result) { + return result >= min && result <= max; + } + + private void apply(Game game, Ability source) { + for (Effect effect : effects) { + if (effect instanceof OneShotEffect) { + effect.apply(game, source); + } else if (effect instanceof ContinuousEffect) { + game.addEffect(((ContinuousEffect) effect), source); + } + } + } + } + + public void addTableEntry(int min, int max, Effect... effects) { + this.resultsTable.add(new TableEntry(min, max, effects)); + } +} + diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index 4a16b843837..739b0b0fe9e 100755 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -218,6 +218,7 @@ my $strong = ""; $cardAbilities =~ s/$strong/$empty/g; $strong = ""; $cardAbilities =~ s/$strong/$empty/g; +$cardAbilities =~ s/\&/\|/g; my @abilities = split('\$', $cardAbilities); foreach my $ability (@abilities) {