Refactoring RegenerateEquippedEffect to RegenerateAttachedEffect for using with enchantments and equipments

Mage.Sets/src/mage/sets/magic2013/RingOfXathrid.java

@@ -38,7 +38,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.EquippedMatchesFilterCondition;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.decorator.ConditionalTriggeredAbility;
-import mage.abilities.effects.common.RegenerateEquippedEffect;
+import mage.abilities.effects.common.RegenerateAttachedEffect;
 import mage.abilities.effects.common.counter.AddPlusOneCountersAttachedEffect;
 import mage.abilities.keyword.EquipAbility;
 import mage.cards.CardImpl;
@@ -63,7 +63,7 @@ public class RingOfXathrid extends CardImpl<RingOfXathrid> {
         this.subtype.add("Equipment");
 
         // {2}: Regenerate equipped creature.
-        this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateEquippedEffect(), new GenericManaCost(2)));
+        this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateAttachedEffect(Constants.AttachmentType.EQUIPMENT), new GenericManaCost(2)));
         
         // At the beginning of your upkeep, put a +1/+1 counter on equipped creature if it's black.
         TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(Constants.Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1), Constants.TargetController.YOU, false);

Mage/src/mage/abilities/effects/common/RegenerateAttachedEffect.java

@@ -0,0 +1,107 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ * 
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ * 
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ * 
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ * 
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.abilities.effects.common;
+
+import java.util.UUID;
+import mage.Constants;
+import mage.Constants.AttachmentType;
+import mage.Constants.Duration;
+import mage.Constants.Outcome;
+import mage.abilities.Ability;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author jeff
+ */
+public class RegenerateAttachedEffect extends ReplacementEffectImpl<RegenerateAttachedEffect> {
+
+    protected AttachmentType attachmentType;
+
+    public RegenerateAttachedEffect(AttachmentType attachmentType) {
+        super(Duration.EndOfTurn, Outcome.Regenerate);
+        this.attachmentType = attachmentType;
+        this.setText();
+    }
+
+    public RegenerateAttachedEffect(final RegenerateAttachedEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        //20110204 - 701.11
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        Permanent equipped = game.getPermanent(permanent.getAttachedTo());
+        if (permanent != null && equipped.regenerate(this.getId(), game)) {
+            this.used = true;
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public RegenerateAttachedEffect copy() {
+        return new RegenerateAttachedEffect(this);
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        return apply(game, source);
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        //20110204 - 701.11c - event.getAmount() is used to signal if regeneration is allowed
+        Permanent equipment = game.getPermanent(source.getSourceId());
+        if (equipment != null) {
+            Permanent equipped = game.getPermanent(equipment.getAttachedTo());
+            if (equipped != null) {
+                UUID equippedID = equipped.getId();
+                if (event.getType() == EventType.DESTROY_PERMANENT && event.getAmount() == 0 && event.getTargetId().equals(equippedID) && !this.used) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    private void setText() {
+        StringBuilder sb = new StringBuilder();
+        if (attachmentType == Constants.AttachmentType.AURA) {
+            sb.append("Regenerate enchanted creature");
+        } else if (attachmentType == Constants.AttachmentType.EQUIPMENT) {
+            sb.append("Regenerate equipped creature");
+        }
+        staticText = sb.toString();
+    }
+}