External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 20:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/magefree/mage.git

Browse source
This commit is contained in:
LevelX2 2013-07-22 18:48:44 +02:00
commit 8af9e334e0
39 changed files with 530 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/mage/abilities/condition/common/FixedCondition.java → Mage/src/mage/abilities/condition/FixedCondition.java
View file

@ -26,10 +26,9 @@
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.condition.common;
package mage.abilities.condition;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
/**

15
Mage/src/mage/abilities/condition/common/InvertCondition.java → Mage/src/mage/abilities/condition/InvertCondition.java
View file

@ -25,26 +25,23 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.condition.common;
package mage.abilities.condition;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
/**
* A simple {@link mage.abilities.condition.Condition} to invert a decorated conditions
* {@link mage.abilities.condition.Condition#apply(mage.game.Game, mage.abilities.Ability) apply(mage.game.Game, mage.abilities.Ability)}
* A simple {@link Condition} to invert a decorated conditions
* {@link Condition#apply(mage.game.Game, mage.abilities.Ability) apply(mage.game.Game, mage.abilities.Ability)}
* method invocation.
*
* The copy for {@link UnlessCondition}.
*
* @author noxx
*
* @author maurer.it_at_gmail.com
*/
public class InvertCondition implements Condition {
private Condition condition;
public InvertCondition(Condition condition) {
public InvertCondition ( Condition condition ) {
this.condition = condition;
}

118
Mage/src/mage/abilities/condition/common/UnlessCondition.java → Mage/src/mage/abilities/condition/LockedInCondition.java
View file

@ -1,57 +1,61 @@
/*
* 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 mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
/**
* A simple {@link Condition} to invert a decorated conditions
* {@link Condition#apply(mage.game.Game, mage.abilities.Ability) apply(mage.game.Game, mage.abilities.Ability)}
* method invocation.
*
* @author maurer.it_at_gmail.com
*/
public class UnlessCondition implements Condition {
private Condition condition;
public UnlessCondition ( Condition condition ) {
this.condition = condition;
}
/*
* {@inheritDoc}
*/
@Override
public boolean apply(Game game, Ability source) {
return !condition.apply(game, source);
}
}
/*
* 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;
/**
* A simple {@link Condition} to check the condition only one time at the start (result locked in).
* All subsequent checks return the first result.
*
* @author LevelX2
*/
public class LockedInCondition implements Condition {
private boolean conditionChecked = false;
private boolean result;
private Condition condition;
public LockedInCondition ( Condition condition ) {
this.condition = condition;
}
/*
* {@inheritDoc}
*/
@Override
public boolean apply(Game game, Ability source) {
if(!conditionChecked) {
result = !condition.apply(game, source);
conditionChecked = true;
}
return result;
}
}

2
Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
View file

@ -3,7 +3,7 @@ package mage.abilities.decorator;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.FixedCondition;
import mage.abilities.condition.FixedCondition;
import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.constants.Duration;

48
Mage/src/mage/abilities/effects/common/counter/AddCountersTargetEffect.java
View file

@ -38,6 +38,9 @@ import mage.players.Player;
import java.util.UUID;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.util.CardUtil;
/**
*
@ -46,19 +49,32 @@ import mage.abilities.Mode;
public class AddCountersTargetEffect extends OneShotEffect<AddCountersTargetEffect> {
private Counter counter;
private DynamicValue amount;
public AddCountersTargetEffect(Counter counter) {
this(counter, Outcome.Benefit);
}
}
public AddCountersTargetEffect(Counter counter, Outcome outcome) {
public AddCountersTargetEffect(Counter counter, DynamicValue amount) {
this(counter, amount, Outcome.Benefit);
}
public AddCountersTargetEffect(Counter counter, Outcome outcome) {
this(counter, new StaticValue(0), outcome);
}
public AddCountersTargetEffect(Counter counter, DynamicValue amount, Outcome outcome) {
super(outcome);
this.counter = counter;
}
this.amount = amount;
}
public AddCountersTargetEffect(final AddCountersTargetEffect effect) {
super(effect);
this.counter = effect.counter.copy();
if (effect.counter != null) {
this.counter = effect.counter.copy();
}
this.amount = effect.amount;
}
@Override
@ -68,13 +84,17 @@ public class AddCountersTargetEffect extends OneShotEffect<AddCountersTargetEffe
Permanent permanent = game.getPermanent(uuid);
if (permanent != null) {
if (counter != null) {
permanent.addCounters(counter.copy(), game);
Counter newCounter = counter.copy();
newCounter.add(amount.calculate(game, source));
permanent.addCounters(newCounter, game);
affectedTargets ++;
}
} else {
Player player = game.getPlayer(uuid);
if (player != null) {
player.addCounters(counter.copy(), game);
Counter newCounter = counter.copy();
newCounter.add(amount.calculate(game, source));
player.addCounters(newCounter, game);
affectedTargets ++;
}
}
@ -87,14 +107,18 @@ public class AddCountersTargetEffect extends OneShotEffect<AddCountersTargetEffe
StringBuilder sb = new StringBuilder();
sb.append("put ");
if (counter.getCount() > 1) {
sb.append(Integer.toString(counter.getCount())).append(" ").append(counter.getName()).append(" counters on target ");
sb.append(CardUtil.numberToText(counter.getCount())).append(" ");
} else {
sb.append("a ");
}
else {
sb.append("a ").append(counter.getName()).append(" counter on target ");
}
// TODO add normal text infrastructure for target pointers
if (mode.getTargets().size() > 0)
sb.append(counter.getName().toLowerCase()).append(" counter on target ");
// TODO: add normal text infrastructure for target pointers
if (mode.getTargets().size() > 0) {
sb.append(mode.getTargets().get(0).getTargetName());
}
if (amount.getMessage().length() > 0) {
sb.append(" for each ").append(amount.getMessage());
}
return sb.toString();
}