From d867c4dfe6488af73620c995f06efe31be8df018 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 3 Mar 2015 14:01:36 +0100 Subject: [PATCH] [DTK] Some fixes to Exploit. --- .../sets/dragonsoftarkir/SilumgarButcher.java | 8 +++---- ...a => ExploitCreatureTriggeredAbility.java} | 10 ++++----- ...xploidAbility.java => ExploitAbility.java} | 22 +++++++++---------- Utils/keywords.txt | 1 + 4 files changed, 21 insertions(+), 20 deletions(-) rename Mage/src/mage/abilities/common/{ExploidedCreatureTriggeredAbility.java => ExploitCreatureTriggeredAbility.java} (84%) rename Mage/src/mage/abilities/keyword/{ExploidAbility.java => ExploitAbility.java} (88%) diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarButcher.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarButcher.java index 7faa48990c..05d3d6631a 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarButcher.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarButcher.java @@ -30,9 +30,9 @@ package mage.sets.dragonsoftarkir; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.ExploidedCreatureTriggeredAbility; +import mage.abilities.common.ExploitCreatureTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; -import mage.abilities.keyword.ExploidAbility; +import mage.abilities.keyword.ExploitAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -54,10 +54,10 @@ public class SilumgarButcher extends CardImpl { this.toughness = new MageInt(3); // Exploit (When this creature enters the battlefield, you may sacrifice a creature.) - this.addAbility(new ExploidAbility()); + this.addAbility(new ExploitAbility()); // When Silumgar Butcher exploits a creature, target creature gets -3/-3 until end of turn. - Ability ability = new ExploidedCreatureTriggeredAbility(new BoostTargetEffect(-3,-3, Duration.EndOfTurn), false); + Ability ability = new ExploitCreatureTriggeredAbility(new BoostTargetEffect(-3,-3, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage/src/mage/abilities/common/ExploidedCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/ExploitCreatureTriggeredAbility.java similarity index 84% rename from Mage/src/mage/abilities/common/ExploidedCreatureTriggeredAbility.java rename to Mage/src/mage/abilities/common/ExploitCreatureTriggeredAbility.java index 13324c09ff..953789ca09 100644 --- a/Mage/src/mage/abilities/common/ExploidedCreatureTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/ExploitCreatureTriggeredAbility.java @@ -37,19 +37,19 @@ import mage.game.events.GameEvent; * * @author LevelX2 */ -public class ExploidedCreatureTriggeredAbility extends TriggeredAbilityImpl { +public class ExploitCreatureTriggeredAbility extends TriggeredAbilityImpl { - public ExploidedCreatureTriggeredAbility(Effect effect, boolean optional) { + public ExploitCreatureTriggeredAbility(Effect effect, boolean optional) { super(Zone.ALL, effect, optional); } - public ExploidedCreatureTriggeredAbility(final ExploidedCreatureTriggeredAbility ability) { + public ExploitCreatureTriggeredAbility(final ExploitCreatureTriggeredAbility ability) { super(ability); } @Override - public ExploidedCreatureTriggeredAbility copy() { - return new ExploidedCreatureTriggeredAbility(this); + public ExploitCreatureTriggeredAbility copy() { + return new ExploitCreatureTriggeredAbility(this); } @Override diff --git a/Mage/src/mage/abilities/keyword/ExploidAbility.java b/Mage/src/mage/abilities/keyword/ExploitAbility.java similarity index 88% rename from Mage/src/mage/abilities/keyword/ExploidAbility.java rename to Mage/src/mage/abilities/keyword/ExploitAbility.java index c165641a9c..02184aa92d 100644 --- a/Mage/src/mage/abilities/keyword/ExploidAbility.java +++ b/Mage/src/mage/abilities/keyword/ExploitAbility.java @@ -55,19 +55,19 @@ import mage.target.TargetPermanent; * * @author LevelX2 */ -public class ExploidAbility extends EntersBattlefieldTriggeredAbility { +public class ExploitAbility extends EntersBattlefieldTriggeredAbility { - public ExploidAbility() { - super(new ExploidEffect(), true); + public ExploitAbility() { + super(new ExploitEffect(), true); } - public ExploidAbility(final ExploidAbility ability) { + public ExploitAbility(final ExploitAbility ability) { super(ability); } @Override - public ExploidAbility copy() { - return new ExploidAbility(this); + public ExploitAbility copy() { + return new ExploitAbility(this); } @Override @@ -77,20 +77,20 @@ public class ExploidAbility extends EntersBattlefieldTriggeredAbility { } -class ExploidEffect extends OneShotEffect { +class ExploitEffect extends OneShotEffect { - public ExploidEffect() { + public ExploitEffect() { super(Outcome.Detriment); this.staticText = "you may sacrifice a creature"; } - public ExploidEffect(final ExploidEffect effect) { + public ExploitEffect(final ExploitEffect effect) { super(effect); } @Override - public ExploidEffect copy() { - return new ExploidEffect(this); + public ExploitEffect copy() { + return new ExploitEffect(this); } @Override diff --git a/Utils/keywords.txt b/Utils/keywords.txt index ad61bda496..7c0e7fe923 100644 --- a/Utils/keywords.txt +++ b/Utils/keywords.txt @@ -17,6 +17,7 @@ Dredge|number| Entwine|manaString| Evoke|card, manaString| Exalted|new| +Exploit|new| Extort|new| Fear|instance| First strike|instance|