From fd289b023cb961f959c91c4125db1006b342e5c9 Mon Sep 17 00:00:00 2001
From: Michael Simons <rystan@gmail.com>
Date: Mon, 14 May 2018 22:57:59 -0400
Subject: [PATCH] Update Electryte.java

Electryte damage is now done by OneShotEffect derived "ElectryteEffect" so that damage is calculated at time of effect triggering.

Thanks @JayDi85
---
 Mage.Sets/src/mage/cards/e/Electryte.java | 68 +++++++++++++----------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/e/Electryte.java b/Mage.Sets/src/mage/cards/e/Electryte.java
index 9ce5a9d5e2..b7a29b10df 100644
--- a/Mage.Sets/src/mage/cards/e/Electryte.java
+++ b/Mage.Sets/src/mage/cards/e/Electryte.java
@@ -1,42 +1,24 @@
 /*
- *  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.
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
  */
 package mage.cards.e;
 
+import java.util.List;
 import java.util.UUID;
 import mage.MageInt;
+import mage.abilities.Ability;
 import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
-import mage.abilities.effects.common.DamageAllEffect;
+import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.filter.common.FilterBlockingCreature;
-import mage.filter.predicate.permanent.BlockingPredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
 
 /**
  *
@@ -53,7 +35,7 @@ public class Electryte extends CardImpl {
 
         // Whenever Electryte successfully deals combat damage to defending player, 
         // Electryte deals damage equal to its power to each blocking creature.
-        this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DamageAllEffect(this.power.getValue(), new FilterBlockingCreature()), false));
+        this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ElectryteEffect(), false));
     }
 
     public Electryte(final Electryte card) {
@@ -65,3 +47,33 @@ public class Electryte extends CardImpl {
         return new Electryte(this);
     }
 }
+
+class ElectryteEffect extends OneShotEffect {
+    
+    static private FilterBlockingCreature filter = new FilterBlockingCreature();
+    
+    public ElectryteEffect() {
+        super(Outcome.Damage);
+        staticText = "it deals damage equal to its power to each blocking creature";        
+    }
+    
+    public ElectryteEffect(final ElectryteEffect effect) {
+        super(effect);
+    }
+    
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent thisCreature = game.getPermanent(source.getSourceId());
+        int amount = thisCreature.getPower().getValue();
+        List<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
+        for (Permanent permanent : permanents) {
+            permanent.damage(amount, source.getSourceId(), game, false, true);
+        }
+        return true;
+    }
+    
+    @Override
+    public ElectryteEffect copy () {
+        return new ElectryteEffect(this);
+    }
+}