Merge pull request #3184 from HanClinto/CMH-GuiltyConscienceAndBackfire

Implementing Guilty Conscience and Backfire

Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java

@@ -66,12 +66,18 @@ public class DealsDamageToAPlayerAttachedTriggeredAbility extends TriggeredAbili
                 return false;
             }
         }
+        if (targetController == TargetController.YOU) {
+            if (!this.getControllerId().equals(event.getPlayerId())) {
+                return false;
+            }
+        }
         DamagedPlayerEvent damageEvent = (DamagedPlayerEvent) event;
         Permanent p = game.getPermanent(event.getSourceId());
         if ((!onlyCombat || damageEvent.isCombatDamage())
                 && p != null && p.getAttachments().contains(this.getSourceId())) {
             if (setFixedTargetPointer) {
                 for (Effect effect : this.getEffects()) {
+                    effect.setValue("damage", event.getAmount());
                     effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
                 }
             }
@@ -92,6 +98,9 @@ public class DealsDamageToAPlayerAttachedTriggeredAbility extends TriggeredAbili
             case OPPONENT:
                 sb.append("an opponent, ");
                 break;
+            case YOU:
+                sb.append("you, ");
+                break;
             case ANY:
                 sb.append("a player, ");
                 break;

Mage/src/main/java/mage/abilities/effects/common/DamageAttachedEffect.java

@@ -0,0 +1,93 @@
+/*
+ *  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 mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.StaticValue;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author LoneFox
+ */
+public class DamageAttachedEffect extends OneShotEffect {
+
+    protected DynamicValue amount;
+
+    public DamageAttachedEffect(int amount) {
+        super(Outcome.Damage);
+        this.amount = new StaticValue(amount);
+    }
+    
+    public DamageAttachedEffect(DynamicValue amount) {
+        super(Outcome.Damage);
+        this.amount = amount;
+    }
+
+    public DamageAttachedEffect(final DamageAttachedEffect effect) {
+        super(effect);
+        this.amount = effect.amount;
+    }
+
+    @Override
+    public DamageAttachedEffect copy() {
+        return new DamageAttachedEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent enchantment = game.getPermanentOrLKIBattlefield(source.getSourceId());
+        if(enchantment == null) {
+            return false;
+        }
+        Permanent enchanted = game.getPermanentOrLKIBattlefield(enchantment.getAttachedTo());
+        if(enchanted == null) {
+            return false;
+        }
+        enchanted.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true);
+        return true;
+    }
+
+    @Override
+    public String getText(Mode mode) {
+        if (staticText != null && !staticText.isEmpty()) {
+            return staticText;
+        }
+        if ("equal to".equals(amount.toString())) {
+            return "{this} deals damage " + amount + " that creatures toughness to that creature";
+        }
+         return "{this} deals " + amount + " damage to that creature";
+    }
+}