Remove SetCardColorSourceEffect and use BecomesColorSourceEffect instead

Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java

@@ -38,8 +38,8 @@ import mage.abilities.condition.common.CardsInControllerGraveCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.abilities.effects.common.continuous.BecomesColorSourceEffect;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
-import mage.abilities.effects.common.continuous.SetCardColorSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
@@ -77,7 +77,7 @@ public class RepentantVampire extends CardImpl {
         this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false));
         // Threshold - As long as seven or more cards are in your graveyard, Repentant Vampire is white and has "{tap}: Destroy target black creature."
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
-                new SetCardColorSourceEffect(ObjectColor.WHITE, Duration.WhileOnBattlefield),
+                new BecomesColorSourceEffect(ObjectColor.WHITE, Duration.WhileOnBattlefield),
                 new CardsInControllerGraveCondition(7),
                 "<i>Threshold</i> - As long as seven or more cards are in your graveyard, {this} is white"));
         Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());

Mage.Sets/src/mage/sets/odyssey/WaywardAngel.java

@@ -36,9 +36,9 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.CardsInControllerGraveCondition;
 import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.effects.common.SacrificeControllerEffect;
+import mage.abilities.effects.common.continuous.BecomesColorSourceEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
-import mage.abilities.effects.common.continuous.SetCardColorSourceEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.TrampleAbility;
 import mage.abilities.keyword.VigilanceAbility;
@@ -75,21 +75,21 @@ public class WaywardAngel extends CardImpl {
                 new CardsInControllerGraveCondition(7),
                 "<i>Threshold</i> - As long as seven or more cards are in your graveyard, {this} gets +3/+3,"));
         ability.addEffect(new ConditionalContinuousEffect(
-                new SetCardColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield),
+                new BecomesColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield),
                 new CardsInControllerGraveCondition(7),
                 " is black,"));
         ability.addEffect(new ConditionalContinuousEffect(
                 new GainAbilitySourceEffect(TrampleAbility.getInstance()),
                 new CardsInControllerGraveCondition(7),
                 " has trample,"));
-        
+
         Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(new FilterControlledCreaturePermanent(), 1, ""), TargetController.YOU, false);
-        
+
         ability.addEffect(new ConditionalContinuousEffect(
                 new GainAbilitySourceEffect(gainedAbility),
                 new CardsInControllerGraveCondition(7),
                 " and has \"At the beginning of your upkeep, sacrifice a creature.\" "));
-        
+
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/timespiral/BlazingBladeAskari.java

@@ -29,16 +29,16 @@ package mage.sets.timespiral;
 
 import java.util.UUID;
 
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.MageInt;
 import mage.ObjectColor;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.common.continuous.SetCardColorSourceEffect;
+import mage.abilities.effects.common.continuous.BecomesColorSourceEffect;
 import mage.abilities.keyword.FlankingAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.Rarity;
 import mage.constants.Zone;
 
 /**
@@ -59,7 +59,7 @@ public class BlazingBladeAskari extends CardImpl {
         // Flanking
         this.addAbility(new FlankingAbility());
         // {2}: Blazing Blade Askari becomes colorless until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetCardColorSourceEffect(new ObjectColor(""), Duration.EndOfTurn), new ManaCostsImpl("{2}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(new ObjectColor(), Duration.EndOfTurn), new ManaCostsImpl("{2}")));
     }
 
     public BlazingBladeAskari(final BlazingBladeAskari card) {

Mage/src/mage/abilities/effects/common/continuous/SetCardColorSourceEffect.java

@@ -1,101 +0,0 @@
-/*
- *  
- * 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.continuous;
-
-import mage.MageObject;
-import mage.ObjectColor;
-import mage.abilities.Ability;
-import mage.abilities.Mode;
-import mage.abilities.effects.ContinuousEffectImpl;
-import mage.constants.Duration;
-import mage.constants.Layer;
-import mage.constants.Outcome;
-import mage.constants.SubLayer;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-import mage.game.stack.StackObject;
-
-
-/**
- *
- * @author nicolas.perrenou
- */
-
-
-public class SetCardColorSourceEffect extends ContinuousEffectImpl {
-
-    private ObjectColor setColor;
-
-    public SetCardColorSourceEffect(ObjectColor setColor, Duration duration, String text) {
-        super(duration, Layer.ColorChangingEffects_5, SubLayer.NA, Outcome.Benefit);
-        this.setColor = setColor;
-        staticText = text;
-    }
-
-    public SetCardColorSourceEffect(ObjectColor setColor, Duration duration) {
-        super(duration, Layer.ColorChangingEffects_5, SubLayer.NA, Outcome.Benefit);
-        this.setColor = setColor;
-    }
-
-    public SetCardColorSourceEffect(final SetCardColorSourceEffect effect) {
-        super(effect);
-        this.setColor = effect.setColor;
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        MageObject o = game.getObject(source.getSourceId());
-        if (o != null) {
-            if (o instanceof Permanent || o instanceof StackObject) {
-                o.getColor(game).setColor(setColor);
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public SetCardColorSourceEffect copy() {
-        return new SetCardColorSourceEffect(this);
-    }
-
-    @Override
-    public String getText(Mode mode) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("{this} ");
-        if (mode.getTargets().size() > 0) {
-            sb.append(mode.getTargets().get(0).getTargetName());
-        }
-        sb.append(" becomes ").append(setColor.getDescription());
-        sb.append(" ").append(duration.toString());
-        return sb.toString();
-    }
-}