mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
Improved Scuttlemutt and deleted now unnecessary BecomeColorOrColorsTargetEffect
This commit is contained in:
parent
ea69376943
commit
81b2124302
2 changed files with 10 additions and 136 deletions
|
@ -27,8 +27,6 @@
|
|||
*/
|
||||
package mage.sets.shadowmoor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import mage.MageInt;
|
||||
import mage.ObjectColor;
|
||||
|
@ -42,7 +40,7 @@ import mage.constants.Zone;
|
|||
import mage.abilities.costs.common.TapSourceCost;
|
||||
import mage.abilities.effects.ContinuousEffect;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.abilities.effects.common.continious.BecomesColorOrColorsTargetEffect;
|
||||
import mage.abilities.effects.common.continious.BecomesColorTargetEffect;
|
||||
import mage.choices.ChoiceColor;
|
||||
import mage.constants.Duration;
|
||||
import mage.constants.Outcome;
|
||||
|
@ -94,7 +92,7 @@ class ChangeColorsTargetEffect extends OneShotEffect {
|
|||
public boolean apply(Game game, Ability source) {
|
||||
Player you = game.getPlayer(source.getControllerId());
|
||||
Permanent target = game.getPermanent(source.getFirstTarget());
|
||||
List<ObjectColor> chosenColors = new ArrayList<>();
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
if (you != null && target != null) {
|
||||
for (int i = 0; i < 5; i++) {
|
||||
|
@ -108,20 +106,22 @@ class ChangeColorsTargetEffect extends OneShotEffect {
|
|||
}
|
||||
game.informPlayers(target.getName() + ": " + you.getName() + " has chosen " + choiceColor.getChoice());
|
||||
if (choiceColor.getColor().isBlack()) {
|
||||
chosenColors.add(ObjectColor.BLACK);
|
||||
sb.append("B");
|
||||
} else if (choiceColor.getColor().isBlue()) {
|
||||
chosenColors.add(ObjectColor.BLUE);
|
||||
sb.append("U");
|
||||
} else if (choiceColor.getColor().isRed()) {
|
||||
chosenColors.add(ObjectColor.RED);
|
||||
sb.append("R");
|
||||
} else if (choiceColor.getColor().isGreen()) {
|
||||
chosenColors.add(ObjectColor.GREEN);
|
||||
sb.append("G");
|
||||
} else if (choiceColor.getColor().isWhite()) {
|
||||
chosenColors.add(ObjectColor.WHITE);
|
||||
sb.append("W");
|
||||
}
|
||||
}
|
||||
String colors = new String(sb);
|
||||
ObjectColor chosenColors = new ObjectColor(colors);
|
||||
|
||||
|
||||
ContinuousEffect effect = new BecomesColorOrColorsTargetEffect(chosenColors, Duration.EndOfTurn);
|
||||
ContinuousEffect effect = new BecomesColorTargetEffect(chosenColors, Duration.EndOfTurn);
|
||||
effect.setTargetPointer(new FixedTarget(source.getFirstTarget()));
|
||||
game.addEffect(effect, source);
|
||||
|
||||
|
|
|
@ -1,126 +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.continious;
|
||||
|
||||
import java.util.UUID;
|
||||
import mage.MageObject;
|
||||
import mage.abilities.Ability;
|
||||
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;
|
||||
import mage.players.Player;
|
||||
import java.util.List;
|
||||
import mage.ObjectColor;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author philvt101
|
||||
*/
|
||||
|
||||
public class BecomesColorOrColorsTargetEffect extends ContinuousEffectImpl {
|
||||
|
||||
private final List<ObjectColor> colors;
|
||||
|
||||
/**
|
||||
* Set the color or colors of a spell or permanent
|
||||
*
|
||||
* @param duration
|
||||
* @param colors
|
||||
*/
|
||||
|
||||
public BecomesColorOrColorsTargetEffect(List<ObjectColor> colors, Duration duration) {
|
||||
super(duration, Layer.ColorChangingEffects_5, SubLayer.NA, Outcome.Benefit);
|
||||
this.colors=colors;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source){
|
||||
Player controller = game.getPlayer(source.getControllerId());
|
||||
if (controller == null) {
|
||||
return false;
|
||||
}
|
||||
boolean result = false;
|
||||
|
||||
for (UUID targetId :targetPointer.getTargets(game, source)) {
|
||||
MageObject o = game.getObject(targetId);
|
||||
if(o != null){
|
||||
if(o instanceof Permanent || o instanceof StackObject);{
|
||||
if(!colors.isEmpty()){
|
||||
/**As target may become a single color other than its original color,
|
||||
* all colors must be initialized to false before applying chosen color/colors
|
||||
*/
|
||||
o.getColor().setWhite(false);
|
||||
o.getColor().setBlue(false);
|
||||
o.getColor().setBlack(false);
|
||||
o.getColor().setRed(false);
|
||||
o.getColor().setGreen(false);
|
||||
|
||||
for (ObjectColor color : colors) {
|
||||
if (color.isWhite()) {
|
||||
o.getColor().setWhite(true);
|
||||
} else if (color.isBlue()) {
|
||||
o.getColor().setBlue(true);
|
||||
} else if (color.isBlack()) {
|
||||
o.getColor().setBlack(true);
|
||||
} else if (color.isRed()) {
|
||||
o.getColor().setRed(true);
|
||||
} else if (color.isGreen()) {
|
||||
o.getColor().setGreen(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!result) {
|
||||
if (this.getDuration().equals(Duration.Custom)) {
|
||||
this.discard();
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public BecomesColorOrColorsTargetEffect(final BecomesColorOrColorsTargetEffect effect) {
|
||||
super(effect);
|
||||
this.colors = effect.colors;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BecomesColorOrColorsTargetEffect copy() {
|
||||
return new BecomesColorOrColorsTargetEffect(this);
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in a new issue