External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-27 05:52:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Disrupting Scepter - Fixed that it could only be activated as a Sorcery insteady correctly on your turn. (also for other cards) Replaced handling of the restriction as a cost to conditional ability.

Browse source
This commit is contained in:
LevelX2 2013-11-11 14:58:27 +01:00
parent e24ac705f6
commit efc2aae026
9 changed files with 36 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java
View file

@ -29,11 +29,11 @@
package mage.abilities.common;
import java.util.UUID;
import mage.constants.Zone;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.condition.Condition;
import mage.abilities.costs.Cost;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.game.Game;
/**
@ -80,7 +80,16 @@ public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl<Ac
@Override
public String getRule() {
return new StringBuilder(super.getRule()).append(" Activate this ability only if ").append(condition.toString()).append(".").toString() ;
StringBuilder sb = new StringBuilder(super.getRule()).append(" Activate this ability only ");
if (condition.toString() != null) {
if (!condition.toString().startsWith("during")) {
sb.append("if ");
}
sb.append(condition.toString()).append(".");
} else {
sb.append(" [Condition toSting() == null] ");
}
return sb.toString() ;
}
@Override

5
Mage/src/mage/abilities/condition/common/MyTurnCondition.java
View file

@ -42,4 +42,9 @@ public class MyTurnCondition implements Condition {
public boolean apply(Game game, Ability source) {
return game.getActivePlayerId().equals(source.getControllerId());
}
@Override
public String toString() {
return "during your turn";
}
}

66
Mage/src/mage/abilities/costs/common/OnlyDuringYourTurnCost.java
View file

@ -1,66 +0,0 @@
/*
* Copyright 2011 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.costs.common;
import mage.abilities.Ability;
import mage.abilities.costs.CostImpl;
import mage.game.Game;
import java.util.UUID;
/**
*
* @author nantuko
*/
public class OnlyDuringYourTurnCost extends CostImpl<OnlyDuringYourTurnCost> {
public OnlyDuringYourTurnCost() {
text = "Activate this ability only during your turn";
}
public OnlyDuringYourTurnCost(final OnlyDuringYourTurnCost cost) {
super(cost);
}
@Override
public OnlyDuringYourTurnCost copy() {
return new OnlyDuringYourTurnCost(this);
}
@Override
public boolean canPay(UUID sourceId, UUID controllerId, Game game) {
return game.getActivePlayerId().equals(controllerId);
}
@Override
public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) {
this.paid = true;
return paid;
}
}