From 6b4336a00ae65680a38cbea2613882a98a6cd655 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 24 Aug 2020 22:45:54 +0200 Subject: [PATCH] * Fixed some tooltip rule texts. --- Mage.Sets/src/mage/cards/a/Archaeomancer.java | 5 +++-- .../mage/cards/h/HondenOfInfiniteRage.java | 22 ++++++++----------- .../src/mage/cards/h/HondenOfNightsReach.java | 10 +++------ Mage.Sets/src/mage/cards/k/KhalniGarden.java | 8 ++++--- Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java | 8 +++---- .../src/mage/cards/t/TaigamOjutaiMaster.java | 5 ++--- .../mage/game/permanent/token/PlantToken.java | 4 +--- 7 files changed, 27 insertions(+), 35 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/Archaeomancer.java b/Mage.Sets/src/mage/cards/a/Archaeomancer.java index fa7d8fd621d..6aed540eaf1 100644 --- a/Mage.Sets/src/mage/cards/a/Archaeomancer.java +++ b/Mage.Sets/src/mage/cards/a/Archaeomancer.java @@ -1,4 +1,3 @@ - package mage.cards.a; import java.util.UUID; @@ -30,7 +29,9 @@ public final class Archaeomancer extends CardImpl { this.toughness = new MageInt(2); // When Archaeomancer enters the battlefield, return target instant or sorcery card from your graveyard to your hand. - EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); + EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility( + new ReturnToHandTargetEffect() + .setText("return target instant or sorcery card from your graveyard to your hand"), false); Target target = new TargetCardInYourGraveyard(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java index 02c8df2535e..2dc9fdaa864 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java @@ -1,7 +1,6 @@ - - package mage.cards.h; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -15,33 +14,30 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetAnyTarget; -import java.util.UUID; - /** * * @author Loki */ public final class HondenOfInfiniteRage extends CardImpl { - static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine you control"); - static { - filter.add(SubType.SHRINE.getPredicate()); - } + static { + filter.add(SubType.SHRINE.getPredicate()); + } - public HondenOfInfiniteRage (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); + public HondenOfInfiniteRage(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.SHRINE); - - // At the beginning of your upkeep, Honden of Infinite Rage deals damage to any target equal to the number of Shrines you control. + // At the beginning of your upkeep, Honden of Infinite Rage deals damage to any target equal to the number of Shrines you control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } - public HondenOfInfiniteRage (final HondenOfInfiniteRage card) { + public HondenOfInfiniteRage(final HondenOfInfiniteRage card) { super(card); } diff --git a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java index 5d96df43be2..8e482bd58e8 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java @@ -1,7 +1,6 @@ - - package mage.cards.h; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -15,25 +14,22 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetOpponent; -import java.util.UUID; - /** * @author Loki */ public final class HondenOfNightsReach extends CardImpl { - static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); + static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine you control"); static { filter.add(SubType.SHRINE.getPredicate()); } public HondenOfNightsReach(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.SHRINE); - // At the beginning of your upkeep, target opponent discards a card for each Shrine you control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/k/KhalniGarden.java b/Mage.Sets/src/mage/cards/k/KhalniGarden.java index cd686244272..5f30520a85b 100644 --- a/Mage.Sets/src/mage/cards/k/KhalniGarden.java +++ b/Mage.Sets/src/mage/cards/k/KhalniGarden.java @@ -1,5 +1,3 @@ - - package mage.cards.k; import java.util.UUID; @@ -19,9 +17,13 @@ import mage.game.permanent.token.PlantToken; public final class KhalniGarden extends CardImpl { public KhalniGarden(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},null); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); + + // Khalni Garden enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); + // When Khalni Garden enters the battlefield, create a 0/1 green Plant creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PlantToken()), false)); + // {T}: Add {G}. this.addAbility(new GreenManaAbility()); } diff --git a/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java b/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java index d9cdf289b94..95145497291 100644 --- a/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java +++ b/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java @@ -1,5 +1,6 @@ package mage.cards.k; +import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -14,8 +15,6 @@ import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.GoblinToken; -import java.util.UUID; - /** * @author North */ @@ -34,9 +33,10 @@ public final class KrenkoMobBoss extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // {tap}: create X 1/1 red Goblin creature tokens, where X is the number of Goblins you control. + // {T}: Create X 1/1 red Goblin creature tokens, where X is the number of Goblins you control. this.addAbility(new SimpleActivatedAbility( - new CreateTokenEffect(new GoblinToken(), xValue), new TapSourceCost() + new CreateTokenEffect(new GoblinToken(), xValue).setText("create X 1/1 red Goblin creature tokens, where X is the number of Goblins you control"), + new TapSourceCost() )); } diff --git a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java index 236ce4ff01d..032ffaa7296 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java +++ b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterSpell; -import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; import mage.game.Game; import mage.game.events.GameEvent; @@ -31,7 +30,7 @@ import mage.watchers.common.AttackedThisTurnWatcher; public final class TaigamOjutaiMaster extends CardImpl { private static final String effectText = "Whenever you cast an instant or sorcery spell from your hand, if {this} attacked this turn, that spell gains rebound."; - private static final FilterSpell filter = new FilterSpell("Instant, Sorcery, and Dragon spells"); + private static final FilterSpell filter = new FilterSpell("Instant, Sorcery, and Dragon spells you control"); static { filter.add( @@ -52,7 +51,7 @@ public final class TaigamOjutaiMaster extends CardImpl { this.toughness = new MageInt(4); // Instant, sorcery, and Dragon spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filter, StaticFilters.FILTER_SPELL_OR_ABILITY, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filter, null, Duration.WhileOnBattlefield))); // Whenever you cast an instant or sorcery spell from your hand, if Taigam, Ojutai Master attacked this turn, that spell gains rebound. Ability ability = new ConditionalInterveningIfTriggeredAbility(new TaigamOjutaiMasterTriggeredAbility(), diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java index 962b0c657ae..5bd4e17ca83 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -1,5 +1,3 @@ - - package mage.game.permanent.token; import java.util.ArrayList; @@ -18,7 +16,7 @@ public final class PlantToken extends TokenImpl { } public PlantToken() { - super("Plant", "0/1 green Plant creature"); + super("Plant", "0/1 green Plant creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.PLANT);