From 390ce204585ce72c243b1dc9426488744fb14fee Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 22 Dec 2012 20:07:31 +0100 Subject: [PATCH] new BeginnOfEndStepTrigger, new OpponentLostLifeCondition, some minor changes. --- .../BeginningOfEndStepTriggeredAbility.java | 155 ++++++++++++++++++ .../condition/IntCompareCondition.java | 76 +++++++++ .../common/ControlsPermanentCondition.java | 5 + .../common/OpponentLostLifeCondition.java | 79 +++++++++ .../counter/AddCountersSourceEffect.java | 6 +- Mage/src/mage/counters/Counter.java | 9 +- 6 files changed, 324 insertions(+), 6 deletions(-) create mode 100644 Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java create mode 100644 Mage/src/mage/abilities/condition/IntCompareCondition.java create mode 100644 Mage/src/mage/abilities/condition/common/OpponentLostLifeCondition.java diff --git a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java new file mode 100644 index 0000000000..20ae723bd6 --- /dev/null +++ b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -0,0 +1,155 @@ +/* + * 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.common; + +import mage.Constants; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.condition.Condition; +import mage.abilities.effects.Effect; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.target.targetpointer.FixedTarget; + +public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { + private Constants.TargetController targetController; + private Condition interveningIfClauseCondition; + + public BeginningOfEndStepTriggeredAbility(Effect effect, Constants.TargetController targetController, boolean isOptional) { + this(Constants.Zone.BATTLEFIELD, effect, targetController, null, isOptional); + } + + public BeginningOfEndStepTriggeredAbility(Constants.Zone zone, Effect effect, Constants.TargetController targetController, Condition interveningIfClauseCondition, boolean isOptional) { + super(zone, effect, isOptional); + this.targetController = targetController; + this.interveningIfClauseCondition = interveningIfClauseCondition; + } + + public BeginningOfEndStepTriggeredAbility(final BeginningOfEndStepTriggeredAbility ability) { + super(ability); + this.targetController = ability.targetController; + this.interveningIfClauseCondition = ability.interveningIfClauseCondition; + } + + @Override + public BeginningOfEndStepTriggeredAbility copy() { + return new BeginningOfEndStepTriggeredAbility(this); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.END_TURN_STEP_PRE) { + switch (targetController) { + case YOU: + boolean yours = event.getPlayerId().equals(this.controllerId); + if (yours) { + if (getTargets().size() == 0) { + for (Effect effect : this.getEffects()) { + effect.setTargetPointer(new FixedTarget(event.getPlayerId())); + } + } + } + return yours; + case OPPONENT: + if (game.getOpponents(this.controllerId).contains(event.getPlayerId())) { + if (getTargets().size() == 0) { + for (Effect effect : this.getEffects()) { + effect.setTargetPointer(new FixedTarget(event.getPlayerId())); + } + } + return true; + } + break; + case ANY: + if (getTargets().size() == 0) { + for (Effect effect : this.getEffects()) { + effect.setTargetPointer(new FixedTarget(event.getPlayerId())); + } + } + return true; + case CONTROLLER_ATTACHED_TO: + Permanent attachment = game.getPermanent(sourceId); + if (attachment != null && attachment.getAttachedTo() != null) { + Permanent attachedTo = game.getPermanent(attachment.getAttachedTo()); + if (attachedTo != null && attachedTo.getControllerId().equals(event.getPlayerId())) { + if (getTargets().size() == 0) { + for (Effect effect : this.getEffects()) { + effect.setTargetPointer(new FixedTarget(event.getPlayerId())); + } + } + return true; + } + } + } + } + return false; + } + + @Override + public boolean checkInterveningIfClause(Game game) { + if (interveningIfClauseCondition != null) { + return interveningIfClauseCondition.apply(game, this); + } + return true; + } + + @Override + public String getRule() { + StringBuilder sb = new StringBuilder(getEffects().getText(modes.getMode())); + if (this.optional) { + if (sb.substring(0, 6).toLowerCase().equals("target")){ + sb.insert(0, "you may have "); + } else if (!sb.substring(0, 4).toLowerCase().equals("you ")){ + sb.insert(0, "you may "); + } + } + switch (targetController) { + case YOU: + return sb.insert(0, generateConditionString()).insert(0, "At the beginning of your end step, ").toString(); + case OPPONENT: + return sb.insert(0, generateConditionString()).insert(0, "At the beginning of each opponent's end step, ").toString(); + case ANY: + return sb.insert(0, generateConditionString()).insert(0, "At the beginning of each end step, ").toString(); + case CONTROLLER_ATTACHED_TO: + return sb.insert(0, generateConditionString()).insert(0, "At the beginning of the end step of enchanted creature's controller, ").toString(); + } + return ""; + } + + private String generateConditionString() { + if (interveningIfClauseCondition != null) { + return new StringBuilder(interveningIfClauseCondition.toString()).append(", ").toString(); + } + switch (getZone()) { + case GRAVEYARD: + return "if {this} is in your graveyard, "; + } + return ""; + } +} diff --git a/Mage/src/mage/abilities/condition/IntCompareCondition.java b/Mage/src/mage/abilities/condition/IntCompareCondition.java new file mode 100644 index 0000000000..ebadab1dc4 --- /dev/null +++ b/Mage/src/mage/abilities/condition/IntCompareCondition.java @@ -0,0 +1,76 @@ +/* + * 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.condition; + +import mage.abilities.Ability; +import mage.game.Game; + +/** + * + * @author LevelX2 + */ +public abstract class IntCompareCondition implements Condition { + + protected final Condition.ComparisonType type; + protected final int value; + + public IntCompareCondition(Condition.ComparisonType type, int value) { + this.type = type; + this.value = value; + } + + protected abstract int getInputValue(Game game, Ability source); + + @Override + public final boolean apply(Game game, Ability source) { + int inputValue = getInputValue(game, source); + switch (type) { + case Equal: + if (inputValue != value) { + return false; + } + break; + case GreaterThan: + if (inputValue <= value) { + return false; + } + break; + case LessThan: + if (inputValue >= value) { + return false; + } + break; + } + return true; + } + + @Override + public String toString() { + return type.toString() + value; + } +} diff --git a/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java b/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java index 4b6901234b..c25bf3f00c 100644 --- a/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java +++ b/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java @@ -114,4 +114,9 @@ public class ControlsPermanentCondition implements Condition { return conditionApplies; } + + @Override + public String toString() { + return filter.getMessage(); + } } diff --git a/Mage/src/mage/abilities/condition/common/OpponentLostLifeCondition.java b/Mage/src/mage/abilities/condition/common/OpponentLostLifeCondition.java new file mode 100644 index 0000000000..a0ebf1b5f8 --- /dev/null +++ b/Mage/src/mage/abilities/condition/common/OpponentLostLifeCondition.java @@ -0,0 +1,79 @@ +/* + * 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.condition.common; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.condition.Condition; +import mage.abilities.condition.IntCompareCondition; +import mage.game.Game; +import mage.watchers.common.PlayerLostLifeWatcher; + +/** + * Describes condition when an opponent has lost an amount of life + * + * @author LevelX2 + */ +public class OpponentLostLifeCondition extends IntCompareCondition { + + public OpponentLostLifeCondition(Condition.ComparisonType type, int value) { + super(type, value); + } + + @Override + protected int getInputValue(Game game, Ability source) { + int maxLostLive = 0; + PlayerLostLifeWatcher watcher = (PlayerLostLifeWatcher) game.getState().getWatchers().get("PlayerLostLifeWatcher"); + if (watcher != null) { + for (UUID opponentId: game.getOpponents(source.getControllerId())) { + int lostLive = watcher.getLiveLost(opponentId); + if (lostLive > maxLostLive) { + maxLostLive = lostLive; + } + } + } + return maxLostLive; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("if an opponent lost "); + switch(type) { + case GreaterThan: + sb.append(value+1).append(" or more life this turn "); + break; + case Equal: + sb.append(value).append(" life this turn "); + break; + case LessThan: + sb.append(" less than ").append(value).append(" life this turn "); + break; + } + return sb.toString(); + } +} diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java b/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java index d0cf6ff5a5..e9744b5d04 100644 --- a/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java @@ -89,7 +89,7 @@ public class AddCountersSourceEffect extends OneShotEffect 1) { - StringBuilder sb = new StringBuilder(); sb.append("put ").append(Integer.toString(counter.getCount())).append(" ").append(counter.getName()).append(" counters on {this}"); staticText = sb.toString(); } else { - staticText = "put a " + counter.getName() + " counter on {this}"; + staticText = sb.append("put a ").append(counter.getName().toLowerCase()).append(" counter on {this}").toString(); } } diff --git a/Mage/src/mage/counters/Counter.java b/Mage/src/mage/counters/Counter.java index fe61f93eac..098a3dd933 100644 --- a/Mage/src/mage/counters/Counter.java +++ b/Mage/src/mage/counters/Counter.java @@ -63,15 +63,18 @@ public class Counter> implements Serializable { } public void remove() { - if (count > 0) + if (count > 0) { count--; + } } public void remove(int amount) { - if (count > amount) + if (count > amount) { count -= amount; - else + } + else { count = 0; + } } public String getName() {