mirror of
https://github.com/correl/mage.git
synced 2024-12-24 11:50:45 +00:00
* Fixed Identity Thief copying creature with +1/+1 counter gets P/T boost from it, but not counter (fixes #2131).
This commit is contained in:
parent
d1c25b0662
commit
d0db2d51ed
33 changed files with 407 additions and 385 deletions
|
@ -158,8 +158,8 @@ class MarathWillOfTheWildCreateTokenEffect extends OneShotEffect {
|
|||
if (player != null) {
|
||||
int amount = new ManacostVariableValue().calculate(game, source, this);
|
||||
Token token = new MarathWillOfTheWildElementalToken();
|
||||
token.getPower().initValue(amount);
|
||||
token.getToughness().initValue(amount);
|
||||
token.getPower().modifyBaseValue(amount);
|
||||
token.getToughness().modifyBaseValue(amount);
|
||||
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -113,8 +113,8 @@ class WireflyToken extends Token {
|
|||
WireflyToken() {
|
||||
super("Wirefly", "2/2 colorless Insect artifact creature token named Wirefly");
|
||||
this.setOriginalExpansionSetCode("DST");
|
||||
this.getPower().initValue(2);
|
||||
this.getToughness().initValue(2);
|
||||
this.getPower().modifyBaseValue(2);
|
||||
this.getToughness().modifyBaseValue(2);
|
||||
this.getSubtype().add("Insect");
|
||||
this.getCardType().add(CardType.ARTIFACT);
|
||||
this.getCardType().add(CardType.CREATURE);
|
||||
|
|
|
@ -106,10 +106,7 @@ class IdentityThiefAbility extends TriggeredAbilityImpl {
|
|||
|
||||
@Override
|
||||
public boolean checkTrigger(GameEvent event, Game game) {
|
||||
if (event.getSourceId().equals(this.getSourceId())) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return event.getSourceId().equals(this.getSourceId());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -141,7 +138,11 @@ class IdentityThiefEffect extends OneShotEffect {
|
|||
Player controller = game.getPlayer(source.getControllerId());
|
||||
Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
|
||||
if (controller != null && permanent != null && sourcePermanent != null) {
|
||||
CopyEffect copyEffect = new CopyEffect(Duration.EndOfTurn, permanent, source.getSourceId());
|
||||
Permanent permanentReset = permanent.copy();
|
||||
permanentReset.getCounters().clear();
|
||||
permanentReset.getPower().resetToBaseValue();
|
||||
permanentReset.getToughness().resetToBaseValue();
|
||||
CopyEffect copyEffect = new CopyEffect(Duration.EndOfTurn, permanentReset, source.getSourceId());
|
||||
if (controller.moveCardToExileWithInfo(permanent, source.getSourceId(), sourcePermanent.getIdName(), source.getSourceId(), game, Zone.BATTLEFIELD, true)) {
|
||||
// Copy exiled permanent
|
||||
game.addEffect(copyEffect, source);
|
||||
|
|
|
@ -33,14 +33,11 @@ import mage.abilities.Ability;
|
|||
import mage.abilities.common.SimpleActivatedAbility;
|
||||
import mage.abilities.costs.common.TapSourceCost;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
|
||||
import mage.abilities.keyword.DefenderAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Duration;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SubLayer;
|
||||
import mage.constants.Zone;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
@ -108,7 +105,9 @@ class TreeOfPerditionEffect extends OneShotEffect {
|
|||
return false;
|
||||
}
|
||||
opponent.setLife(amount, game);
|
||||
game.addEffect(new SetPowerToughnessSourceEffect(Integer.MIN_VALUE, life, Duration.Custom, SubLayer.SetPT_7b), source);
|
||||
perm.getPower().modifyBaseValue(life);
|
||||
perm.getToughness().modifyBaseValue(life);
|
||||
// game.addEffect(new SetPowerToughnessSourceEffect(Integer.MIN_VALUE, life, Duration.Custom, SubLayer.SetPT_7b), source);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,8 +82,8 @@ class CamaridToken extends Token {
|
|||
CamaridToken() {
|
||||
super("Camarid", "1/1 blue Camarid creature tokens");
|
||||
this.setOriginalExpansionSetCode("FEM");
|
||||
this.getPower().initValue(1);
|
||||
this.getToughness().initValue(1);
|
||||
this.getPower().modifyBaseValue(1);
|
||||
this.getToughness().modifyBaseValue(1);
|
||||
this.color.setBlue(true);
|
||||
this.getSubtype().add("Camarid");
|
||||
this.getCardType().add(CardType.CREATURE);
|
||||
|
|
|
@ -33,7 +33,6 @@ import mage.abilities.Ability;
|
|||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.effects.ReplacementEffectImpl;
|
||||
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
|
||||
import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
|
||||
import mage.abilities.keyword.DefenderAbility;
|
||||
import mage.abilities.keyword.FlyingAbility;
|
||||
import mage.cards.CardImpl;
|
||||
|
@ -43,7 +42,6 @@ import mage.constants.CardType;
|
|||
import mage.constants.Duration;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SubLayer;
|
||||
import mage.constants.Zone;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.EntersTheBattlefieldEvent;
|
||||
|
@ -152,7 +150,9 @@ class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl {
|
|||
game.addEffect(new GainAbilitySourceEffect(DefenderAbility.getInstance(), Duration.Custom), source);
|
||||
break;
|
||||
}
|
||||
game.addEffect(new SetPowerToughnessSourceEffect(power, toughness, Duration.Custom, SubLayer.SetPT_7b), source);
|
||||
permanent.getPower().modifyBaseValue(power);
|
||||
permanent.getToughness().modifyBaseValue(toughness);
|
||||
// game.addEffect(new SetPowerToughnessSourceEffect(power, toughness, Duration.Custom, SubLayer.SetPT_7b), source);
|
||||
}
|
||||
return false;
|
||||
|
||||
|
|
|
@ -95,8 +95,8 @@ class MimingSlimeEffect extends OneShotEffect {
|
|||
}
|
||||
}
|
||||
OozeToken oozeToken = new OozeToken();
|
||||
oozeToken.getPower().initValue(amount);
|
||||
oozeToken.getToughness().initValue(amount);
|
||||
oozeToken.getPower().modifyBaseValue(amount);
|
||||
oozeToken.getToughness().modifyBaseValue(amount);
|
||||
oozeToken.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -101,8 +101,8 @@ class OozeFluxCreateTokenEffect extends OneShotEffect {
|
|||
}
|
||||
Token tokenCopy = token.copy();
|
||||
tokenCopy.getAbilities().newId();
|
||||
tokenCopy.getPower().initValue(xValue);
|
||||
tokenCopy.getToughness().initValue(xValue);
|
||||
tokenCopy.getPower().modifyBaseValue(xValue);
|
||||
tokenCopy.getToughness().modifyBaseValue(xValue);
|
||||
tokenCopy.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -91,8 +91,8 @@ class SkeletonToken extends Token {
|
|||
SkeletonToken() {
|
||||
super("Skeleton", "1/1 black Skeleton creature token onto the battlefield. It has \"{B}: Regenerate this creature.\"");
|
||||
this.setOriginalExpansionSetCode("HML");
|
||||
this.getPower().initValue(1);
|
||||
this.getToughness().initValue(1);
|
||||
this.getPower().modifyBaseValue(1);
|
||||
this.getToughness().modifyBaseValue(1);
|
||||
this.color.setBlack(true);
|
||||
this.getSubtype().add("Skeleton");
|
||||
this.getCardType().add(CardType.CREATURE);
|
||||
|
|
|
@ -99,7 +99,11 @@ class EssenceOfTheWildEffect extends ReplacementEffectImpl {
|
|||
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
|
||||
Permanent sourceObject = game.getPermanentOrLKIBattlefield(source.getSourceId());
|
||||
if (sourceObject != null) {
|
||||
game.addEffect(new CopyEffect(Duration.Custom, sourceObject, event.getTargetId()), source);
|
||||
Permanent permanentReset = sourceObject.copy();
|
||||
permanentReset.getCounters().clear();
|
||||
permanentReset.getPower().resetToBaseValue();
|
||||
permanentReset.getToughness().resetToBaseValue();
|
||||
game.addEffect(new CopyEffect(Duration.Custom, permanentReset, event.getTargetId()), source);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -80,7 +80,6 @@ public class PharikaGodOfAffliction extends CardImpl {
|
|||
ability.addTarget(target);
|
||||
this.addAbility(ability);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public PharikaGodOfAffliction(final PharikaGodOfAffliction card) {
|
||||
|
@ -132,15 +131,13 @@ class PharikaExileEffect extends OneShotEffect {
|
|||
class PharikaSnakeToken extends Token {
|
||||
|
||||
public PharikaSnakeToken() {
|
||||
super("Snake", "1/1 black and green Snake enchantment creature token with deathtouch");
|
||||
super("Snake", "1/1 black and green Snake enchantment creature token with deathtouch", 1, 1);
|
||||
this.setOriginalExpansionSetCode("JOU");
|
||||
cardType.add(CardType.ENCHANTMENT);
|
||||
cardType.add(CardType.CREATURE);
|
||||
subtype.add("Snake");
|
||||
color.setBlack(true);
|
||||
color.setGreen(true);
|
||||
power.setValue(1);
|
||||
toughness.setValue(1);
|
||||
this.addAbility(DeathtouchAbility.getInstance());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -134,8 +134,8 @@ class NissaSageAnimistToken extends Token {
|
|||
super("Ashaya, the Awoken World", "legendary 4/4 green Elemental creature token named Ashaya, the Awoken World");
|
||||
this.setOriginalExpansionSetCode("ORI");
|
||||
this.getSupertype().add("Legendary");
|
||||
this.getPower().initValue(4);
|
||||
this.getToughness().initValue(4);
|
||||
this.getPower().modifyBaseValue(4);
|
||||
this.getToughness().modifyBaseValue(4);
|
||||
this.color.setGreen(true);
|
||||
this.getSubtype().add("Elemental");
|
||||
this.getCardType().add(CardType.CREATURE);
|
||||
|
|
|
@ -81,8 +81,8 @@ public class PhyrexianRebirth extends CardImpl {
|
|||
count += permanent.destroy(source.getSourceId(), game, false) ? 1 : 0;
|
||||
}
|
||||
HorrorToken horrorToken = new HorrorToken();
|
||||
horrorToken.getPower().initValue(count);
|
||||
horrorToken.getToughness().initValue(count);
|
||||
horrorToken.getPower().modifyBaseValue(count);
|
||||
horrorToken.getToughness().modifyBaseValue(count);
|
||||
horrorToken.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -74,8 +74,8 @@ class CatWarriorToken extends Token {
|
|||
CatWarriorToken() {
|
||||
super("Cat Warrior", "2/2 green Cat Warrior creature token with forestwalk");
|
||||
this.setOriginalExpansionSetCode("PLC");
|
||||
this.getPower().initValue(2);
|
||||
this.getToughness().initValue(2);
|
||||
this.getPower().modifyBaseValue(2);
|
||||
this.getToughness().modifyBaseValue(2);
|
||||
this.color.setGreen(true);
|
||||
this.getSubtype().add("Cat");
|
||||
this.getSubtype().add("Warrior");
|
||||
|
|
|
@ -33,7 +33,6 @@ import mage.abilities.Ability;
|
|||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.effects.ReplacementEffectImpl;
|
||||
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
|
||||
import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
|
||||
import mage.abilities.keyword.DefenderAbility;
|
||||
import mage.abilities.keyword.FlyingAbility;
|
||||
import mage.cards.CardImpl;
|
||||
|
@ -43,7 +42,6 @@ import mage.constants.CardType;
|
|||
import mage.constants.Duration;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SubLayer;
|
||||
import mage.constants.Zone;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.EntersTheBattlefieldEvent;
|
||||
|
@ -153,7 +151,9 @@ class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl {
|
|||
game.addEffect(new GainAbilitySourceEffect(DefenderAbility.getInstance(), Duration.Custom), source);
|
||||
break;
|
||||
}
|
||||
game.addEffect(new SetPowerToughnessSourceEffect(power, toughness, Duration.Custom, SubLayer.SetPT_7b), source);
|
||||
permanent.getPower().modifyBaseValue(power);
|
||||
permanent.getToughness().modifyBaseValue(toughness);
|
||||
// game.addEffect(new SetPowerToughnessSourceEffect(power, toughness, Duration.Custom, SubLayer.SetPT_7b), source);
|
||||
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -31,11 +31,8 @@ import java.util.UUID;
|
|||
import mage.MageInt;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.common.EntersBattlefieldAbility;
|
||||
import mage.abilities.dynamicvalue.common.StaticValue;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
|
||||
import mage.abilities.effects.common.continuous.SetPowerSourceEffect;
|
||||
import mage.abilities.effects.common.continuous.SetToughnessSourceEffect;
|
||||
import mage.abilities.keyword.DefenderAbility;
|
||||
import mage.abilities.keyword.HasteAbility;
|
||||
import mage.cards.CardImpl;
|
||||
|
@ -95,14 +92,14 @@ class MoltenSentryEffect extends OneShotEffect {
|
|||
if (controller != null && permanent != null) {
|
||||
if (controller.flipCoin(game)) {
|
||||
game.informPlayers("Heads: " + permanent.getLogName() + " enters the battlefield as a 5/2 creature with haste");
|
||||
game.addEffect(new SetPowerSourceEffect(new StaticValue(5), Duration.WhileOnBattlefield), source);
|
||||
game.addEffect(new SetToughnessSourceEffect(new StaticValue(2), Duration.WhileOnBattlefield), source);
|
||||
permanent.getPower().modifyBaseValue(5);
|
||||
permanent.getToughness().modifyBaseValue(2);
|
||||
game.addEffect(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), source);
|
||||
return true;
|
||||
} else {
|
||||
game.informPlayers("Tails: " + permanent.getLogName() + " enters the battlefield as a 2/5 creature with defender");
|
||||
game.addEffect(new SetPowerSourceEffect(new StaticValue(2), Duration.WhileOnBattlefield), source);
|
||||
game.addEffect(new SetToughnessSourceEffect(new StaticValue(5), Duration.WhileOnBattlefield), source);
|
||||
permanent.getPower().modifyBaseValue(2);
|
||||
permanent.getToughness().modifyBaseValue(5);
|
||||
game.addEffect(new GainAbilitySourceEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield), source);
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -80,8 +80,8 @@ class SlimeMoldingEffect extends OneShotEffect {
|
|||
int count = source.getManaCostsToPay().getX();
|
||||
|
||||
OozeToken oozeToken = new OozeToken();
|
||||
oozeToken.getPower().initValue(count);
|
||||
oozeToken.getToughness().initValue(count);
|
||||
oozeToken.getPower().modifyBaseValue(count);
|
||||
oozeToken.getToughness().modifyBaseValue(count);
|
||||
oozeToken.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -83,8 +83,8 @@ class DevastatingSummonsEffect extends OneShotEffect {
|
|||
public boolean apply(Game game, Ability source) {
|
||||
ElementalToken token = new ElementalToken();
|
||||
|
||||
token.getPower().initValue(new GetXValue().calculate(game, source, this));
|
||||
token.getToughness().initValue(new GetXValue().calculate(game, source, this));
|
||||
token.getPower().modifyBaseValue(new GetXValue().calculate(game, source, this));
|
||||
token.getToughness().modifyBaseValue(new GetXValue().calculate(game, source, this));
|
||||
|
||||
token.putOntoBattlefield(2, game, source.getSourceId(), source.getControllerId());
|
||||
|
||||
|
|
|
@ -80,8 +80,8 @@ class GelatinousGenesisEffect extends OneShotEffect {
|
|||
int count = source.getManaCostsToPay().getX();
|
||||
|
||||
OozeToken oozeToken = new OozeToken();
|
||||
oozeToken.getPower().initValue(count);
|
||||
oozeToken.getToughness().initValue(count);
|
||||
oozeToken.getPower().modifyBaseValue(count);
|
||||
oozeToken.getToughness().modifyBaseValue(count);
|
||||
oozeToken.putOntoBattlefield(count, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -72,15 +72,15 @@ class QuicksilverGargantuanApplyToPermanent extends ApplyToPermanent {
|
|||
|
||||
@Override
|
||||
public Boolean apply(Game game, Permanent permanent) {
|
||||
permanent.getPower().initValue(7);
|
||||
permanent.getToughness().initValue(7);
|
||||
permanent.getPower().modifyBaseValue(7);
|
||||
permanent.getToughness().modifyBaseValue(7);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean apply(Game game, MageObject mageObject) {
|
||||
mageObject.getPower().initValue(7);
|
||||
mageObject.getToughness().initValue(7);
|
||||
mageObject.getPower().modifyBaseValue(7);
|
||||
mageObject.getToughness().modifyBaseValue(7);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -80,8 +80,8 @@ class WurmcallingEffect extends OneShotEffect {
|
|||
public boolean apply(Game game, Ability source) {
|
||||
int count = source.getManaCostsToPay().getX();
|
||||
WurmToken token = new WurmToken();
|
||||
token.getPower().initValue(count);
|
||||
token.getToughness().initValue(count);
|
||||
token.getPower().modifyBaseValue(count);
|
||||
token.getToughness().modifyBaseValue(count);
|
||||
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -129,8 +129,8 @@ class PhyrexianProcessorCreateTokenEffect extends OneShotEffect {
|
|||
if(object != null && object instanceof Integer) {
|
||||
int lifePaid = (int) object;
|
||||
MinionToken token = new MinionToken();
|
||||
token.getPower().initValue(lifePaid);
|
||||
token.getToughness().initValue(lifePaid);
|
||||
token.getPower().modifyBaseValue(lifePaid);
|
||||
token.getToughness().modifyBaseValue(lifePaid);
|
||||
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -225,6 +225,8 @@ public class MorphTest extends CardTestPlayerBase {
|
|||
*/
|
||||
@Test
|
||||
public void testPineWalkerWithUnboostEffect() {
|
||||
// Morph {4}{G}
|
||||
// Whenever Pine Walker or another creature you control is turned face up, untap that creature.
|
||||
addCard(Zone.HAND, playerA, "Pine Walker");
|
||||
addCard(Zone.BATTLEFIELD, playerA, "Forest", 8);
|
||||
|
||||
|
@ -643,12 +645,13 @@ public class MorphTest extends CardTestPlayerBase {
|
|||
}
|
||||
|
||||
/**
|
||||
* Reflector Mage bouncing a creature that can be played as a morph should not prevent the card
|
||||
* from being replayed as a morph. Morph creatures are nameless.
|
||||
* Reflector Mage bouncing a creature that can be played as a morph should
|
||||
* not prevent the card from being replayed as a morph. Morph creatures are
|
||||
* nameless.
|
||||
*
|
||||
* Reported bug:
|
||||
* Face-up morph creatures that are bounced by Reflector Mage should be able to be replayed as morphs
|
||||
* without the "until the next turn" restriction."
|
||||
* Reported bug: Face-up morph creatures that are bounced by Reflector Mage
|
||||
* should be able to be replayed as morphs without the "until the next turn"
|
||||
* restriction."
|
||||
*/
|
||||
@Test
|
||||
public void testReflectorMageBouncesFaceupCreatureReplayAsMorph() {
|
||||
|
@ -684,12 +687,13 @@ public class MorphTest extends CardTestPlayerBase {
|
|||
}
|
||||
|
||||
/**
|
||||
* Reflector Mage bouncing a creature that can be played as a morph should not prevent the card
|
||||
* from being replayed as a morph. Morph creatures are nameless.
|
||||
* Reflector Mage bouncing a creature that can be played as a morph should
|
||||
* not prevent the card from being replayed as a morph. Morph creatures are
|
||||
* nameless.
|
||||
*
|
||||
* Reported bug:
|
||||
* Face-up morph creatures that are bounced by Reflector Mage should be able to be replayed as morphs
|
||||
* without the "until the next turn" restriction."
|
||||
* Reported bug: Face-up morph creatures that are bounced by Reflector Mage
|
||||
* should be able to be replayed as morphs without the "until the next turn"
|
||||
* restriction."
|
||||
*
|
||||
* Testing bouncing a face-down creature played next turn face-up.
|
||||
*/
|
||||
|
|
|
@ -381,7 +381,9 @@ public class TestPlayer implements Player {
|
|||
@Override
|
||||
public boolean priority(Game game) {
|
||||
int numberOfActions = actions.size();
|
||||
for (PlayerAction action : actions) {
|
||||
List<PlayerAction> tempActions = new ArrayList<>();
|
||||
tempActions.addAll(actions);
|
||||
for (PlayerAction action : tempActions) {
|
||||
if (action.getTurnNum() == game.getTurnNum() && action.getStep() == game.getStep().getType()) {
|
||||
|
||||
if (action.getAction().startsWith("activate:")) {
|
||||
|
@ -478,7 +480,7 @@ public class TestPlayer implements Player {
|
|||
int turns = Integer.parseUnsignedInt(groups[1].substring(6));
|
||||
game.rollbackTurns(turns);
|
||||
actions.remove(action);
|
||||
break;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,8 +24,7 @@
|
|||
* 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;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
@ -49,15 +48,28 @@ public class MageInt implements Serializable, Copyable<MageInt> {
|
|||
};
|
||||
|
||||
protected int baseValue;
|
||||
protected int baseValueModified;
|
||||
protected int boostedValue;
|
||||
protected String cardValue = "";
|
||||
|
||||
public MageInt(int value) {
|
||||
this.baseValue = value;
|
||||
this.baseValueModified = baseValue;
|
||||
this.boostedValue = baseValue;
|
||||
this.cardValue = Integer.toString(value);
|
||||
}
|
||||
|
||||
public MageInt(int baseValue, String cardValue) {
|
||||
this.baseValue = baseValue;
|
||||
this.baseValueModified = baseValue;
|
||||
this.boostedValue = baseValue;
|
||||
this.cardValue = cardValue;
|
||||
}
|
||||
|
||||
public MageInt(int baseValue, int baseValueModified, int boostedValue, String cardValue) {
|
||||
this.baseValue = baseValue;
|
||||
this.baseValueModified = baseValueModified;
|
||||
this.boostedValue = boostedValue;
|
||||
this.cardValue = cardValue;
|
||||
}
|
||||
|
||||
|
@ -66,24 +78,37 @@ public class MageInt implements Serializable, Copyable<MageInt> {
|
|||
if (this == EmptyMageInt) {
|
||||
return this;
|
||||
}
|
||||
return new MageInt(baseValue, cardValue);
|
||||
return new MageInt(baseValue, baseValueModified, boostedValue, cardValue);
|
||||
}
|
||||
|
||||
public int getValue() {
|
||||
public int getBaseValue() {
|
||||
return baseValue;
|
||||
}
|
||||
|
||||
public void initValue(int value) {
|
||||
this.baseValue = value;
|
||||
public int getBaseValueModified() {
|
||||
return baseValueModified;
|
||||
}
|
||||
|
||||
public int getValue() {
|
||||
return boostedValue;
|
||||
}
|
||||
|
||||
public void modifyBaseValue(int value) {
|
||||
this.baseValueModified = value;
|
||||
this.boostedValue = value;
|
||||
this.cardValue = Integer.toString(value);
|
||||
}
|
||||
|
||||
public void setValue(int value) {
|
||||
this.baseValue = value;
|
||||
this.boostedValue = value;
|
||||
}
|
||||
|
||||
public void boostValue(int amount) {
|
||||
this.baseValue += amount;
|
||||
this.boostedValue += amount;
|
||||
}
|
||||
|
||||
public void resetToBaseValue() {
|
||||
this.boostedValue = this.baseValueModified;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -47,13 +47,12 @@ import mage.game.Game;
|
|||
import mage.game.permanent.Permanent;
|
||||
|
||||
/**
|
||||
* This effect lets the card be a 2/2 face-down creature, with no text,
|
||||
* no name, no subtypes, and no mana cost, if it's face down on the battlefield.
|
||||
* And it adds the a TurnFaceUpAbility ability.
|
||||
* This effect lets the card be a 2/2 face-down creature, with no text, no name,
|
||||
* no subtypes, and no mana cost, if it's face down on the battlefield. And it
|
||||
* adds the a TurnFaceUpAbility ability.
|
||||
*
|
||||
* @author LevelX2
|
||||
*/
|
||||
|
||||
public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implements SourceEffect {
|
||||
|
||||
public enum FaceDownType {
|
||||
|
@ -65,15 +64,15 @@ public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implemen
|
|||
|
||||
protected int zoneChangeCounter;
|
||||
protected Ability turnFaceUpAbility = null;
|
||||
protected MageObjectReference objectReference= null;
|
||||
protected MageObjectReference objectReference = null;
|
||||
protected boolean foundPermanent;
|
||||
protected FaceDownType faceDownType;
|
||||
|
||||
public BecomesFaceDownCreatureEffect(Duration duration, FaceDownType faceDownType){
|
||||
public BecomesFaceDownCreatureEffect(Duration duration, FaceDownType faceDownType) {
|
||||
this(null, null, duration, faceDownType);
|
||||
}
|
||||
|
||||
public BecomesFaceDownCreatureEffect(Costs<Cost> turnFaceUpCosts, FaceDownType faceDownType){
|
||||
public BecomesFaceDownCreatureEffect(Costs<Cost> turnFaceUpCosts, FaceDownType faceDownType) {
|
||||
this(turnFaceUpCosts, null, faceDownType);
|
||||
}
|
||||
|
||||
|
@ -97,7 +96,6 @@ public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implemen
|
|||
this.faceDownType = faceDownType;
|
||||
}
|
||||
|
||||
|
||||
public BecomesFaceDownCreatureEffect(final BecomesFaceDownCreatureEffect effect) {
|
||||
super(effect);
|
||||
this.zoneChangeCounter = effect.zoneChangeCounter;
|
||||
|
@ -151,7 +149,7 @@ public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implemen
|
|||
if (permanent != null && permanent.isFaceDown(game)) {
|
||||
if (!foundPermanent) {
|
||||
foundPermanent = true;
|
||||
switch(faceDownType) {
|
||||
switch (faceDownType) {
|
||||
case MANIFESTED:
|
||||
case MANUAL: // sets manifested image
|
||||
permanent.setManifested(true);
|
||||
|
@ -184,13 +182,11 @@ public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implemen
|
|||
if (ability.getWorksFaceDown()) {
|
||||
ability.setRuleVisible(false);
|
||||
continue;
|
||||
} else {
|
||||
if (!ability.getRuleVisible() && !ability.getEffects().isEmpty()) {
|
||||
} else if (!ability.getRuleVisible() && !ability.getEffects().isEmpty()) {
|
||||
if (ability.getEffects().get(0) instanceof BecomesFaceDownCreatureEffect) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
abilitiesToRemove.add(ability);
|
||||
}
|
||||
permanent.getAbilities().removeAll(abilitiesToRemove);
|
||||
|
@ -200,15 +196,13 @@ public class BecomesFaceDownCreatureEffect extends ContinuousEffectImpl implemen
|
|||
break;
|
||||
case PTChangingEffects_7:
|
||||
if (sublayer == SubLayer.SetPT_7b) {
|
||||
permanent.getPower().setValue(2);
|
||||
permanent.getToughness().setValue(2);
|
||||
// permanent.getPower().setValue(2);
|
||||
// permanent.getToughness().setValue(2);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (duration.equals(Duration.Custom) && foundPermanent == true) {
|
||||
} else if (duration.equals(Duration.Custom) && foundPermanent == true) {
|
||||
discard();
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -115,7 +115,7 @@ public class BoostTargetEffect extends ContinuousEffectImpl {
|
|||
if (staticText != null && !staticText.isEmpty()) {
|
||||
return staticText;
|
||||
}
|
||||
if (mode == null || mode.getTargets().size() == 0) {
|
||||
if (mode == null || mode.getTargets().isEmpty()) {
|
||||
return "no target";
|
||||
}
|
||||
Target target = mode.getTargets().get(0);
|
||||
|
|
|
@ -208,7 +208,6 @@ class FlashbackEffect extends OneShotEffect {
|
|||
if (!game.isSimulation()) {
|
||||
game.informPlayers(controller.getLogName() + " flashbacks " + card.getLogName());
|
||||
}
|
||||
// spellAbility.setCostModificationActive(false); // prevents to apply cost modification twice for flashbacked spells
|
||||
if (controller.cast(spellAbility, game, false)) {
|
||||
ContinuousEffect effect = new FlashbackReplacementEffect();
|
||||
effect.setTargetPointer(new FixedTarget(source.getSourceId(), game.getState().getZoneChangeCounter(source.getSourceId())));
|
||||
|
|
|
@ -295,8 +295,8 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost
|
|||
}
|
||||
|
||||
public static void setPermanentToFaceDownCreature(MageObject mageObject) {
|
||||
mageObject.getPower().initValue(2);
|
||||
mageObject.getToughness().initValue(2);
|
||||
mageObject.getPower().modifyBaseValue(2);
|
||||
mageObject.getToughness().modifyBaseValue(2);
|
||||
mageObject.getAbilities().clear();
|
||||
mageObject.getColor(null).setColor(new ObjectColor());
|
||||
mageObject.setName("");
|
||||
|
|
|
@ -61,6 +61,8 @@ public class PermanentCard extends PermanentImpl {
|
|||
}
|
||||
|
||||
private void init(Card card, Game game) {
|
||||
power = card.getPower().copy();
|
||||
toughness = card.getToughness().copy();
|
||||
copyFromCard(card);
|
||||
// if temporary added abilities to the spell/card exist, you need to add it to the permanent derived from that card
|
||||
Abilities<Ability> otherAbilities = game.getState().getAllOtherAbilities(card.getId());
|
||||
|
@ -94,6 +96,8 @@ public class PermanentCard extends PermanentImpl {
|
|||
// when the permanent is reset, copy all original values from the card
|
||||
// must copy card each reset so that the original values don't get modified
|
||||
copyFromCard(card);
|
||||
power.resetToBaseValue();
|
||||
toughness.resetToBaseValue();
|
||||
super.reset(game);
|
||||
}
|
||||
|
||||
|
@ -115,8 +119,6 @@ public class PermanentCard extends PermanentImpl {
|
|||
this.cardType.addAll(card.getCardType());
|
||||
this.color = card.getColor(null).copy();
|
||||
this.manaCost = card.getManaCost().copy();
|
||||
this.power = card.getPower().copy();
|
||||
this.toughness = card.getToughness().copy();
|
||||
if (card instanceof PermanentCard) {
|
||||
this.maxLevelCounters = ((PermanentCard) card).maxLevelCounters;
|
||||
}
|
||||
|
@ -232,6 +234,8 @@ public class PermanentCard extends PermanentImpl {
|
|||
@Override
|
||||
public boolean turnFaceUp(Game game, UUID playerId) {
|
||||
if (super.turnFaceUp(game, playerId)) {
|
||||
power.modifyBaseValue(power.getBaseValue());
|
||||
toughness.modifyBaseValue(toughness.getBaseValue());
|
||||
setManifested(false);
|
||||
setMorphed(false);
|
||||
return true;
|
||||
|
@ -241,7 +245,7 @@ public class PermanentCard extends PermanentImpl {
|
|||
|
||||
@Override
|
||||
public void adjustTargets(Ability ability, Game game) {
|
||||
if (this.isTransformed()) {
|
||||
if (this.isTransformed() && card.getSecondCardFace() != null) {
|
||||
card.getSecondCardFace().adjustTargets(ability, game);
|
||||
} else {
|
||||
card.adjustTargets(ability, game);
|
||||
|
@ -250,7 +254,7 @@ public class PermanentCard extends PermanentImpl {
|
|||
|
||||
@Override
|
||||
public void adjustCosts(Ability ability, Game game) {
|
||||
if (this.isTransformed()) {
|
||||
if (this.isTransformed() && card.getSecondCardFace() != null) {
|
||||
card.getSecondCardFace().adjustCosts(ability, game);
|
||||
} else {
|
||||
card.adjustCosts(ability, game);
|
||||
|
|
|
@ -82,8 +82,8 @@ public class PermanentToken extends PermanentImpl {
|
|||
}
|
||||
this.cardType = token.getCardType();
|
||||
this.color = token.getColor(game).copy();
|
||||
this.power.initValue(token.getPower().getValue());
|
||||
this.toughness.initValue(token.getToughness().getValue());
|
||||
this.power.modifyBaseValue(token.getPower().getBaseValueModified());
|
||||
this.toughness.modifyBaseValue(token.getToughness().getBaseValueModified());
|
||||
this.supertype = token.getSupertype();
|
||||
this.subtype = token.getSubtype();
|
||||
}
|
||||
|
|
|
@ -84,8 +84,8 @@ public class Token extends MageObjectImpl {
|
|||
|
||||
public Token(String name, String description, int power, int toughness) {
|
||||
this(name, description);
|
||||
this.power.setValue(power);
|
||||
this.toughness.setValue(toughness);
|
||||
this.power.modifyBaseValue(power);
|
||||
this.toughness.modifyBaseValue(toughness);
|
||||
}
|
||||
|
||||
public Token(String name, String description, ObjectColor color, List<String> subtype, int power, int toughness, Abilities<Ability> abilities) {
|
||||
|
@ -93,8 +93,8 @@ public class Token extends MageObjectImpl {
|
|||
this.cardType.add(CardType.CREATURE);
|
||||
this.color = color.copy();
|
||||
this.subtype = subtype;
|
||||
this.power.setValue(power);
|
||||
this.toughness.setValue(toughness);
|
||||
this.power.modifyBaseValue(power);
|
||||
this.toughness.modifyBaseValue(toughness);
|
||||
if (abilities != null) {
|
||||
this.abilities = abilities.copy();
|
||||
}
|
||||
|
@ -264,19 +264,15 @@ public class Token extends MageObjectImpl {
|
|||
if (availableImageSetCodes.size() > 0) {
|
||||
if (availableImageSetCodes.contains(code)) {
|
||||
setOriginalExpansionSetCode(code);
|
||||
} else {
|
||||
// we should not set random set if appropriate set is already used
|
||||
} else // we should not set random set if appropriate set is already used
|
||||
if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()
|
||||
|| !availableImageSetCodes.contains(getOriginalExpansionSetCode())) {
|
||||
setOriginalExpansionSetCode(availableImageSetCodes.get(new Random().nextInt(availableImageSetCodes.size())));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()) {
|
||||
} else if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()) {
|
||||
setOriginalExpansionSetCode(code);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public boolean updateExpansionSetCode(String setCode) {
|
||||
if (setCode == null || setCode.isEmpty()) {
|
||||
|
|
|
@ -108,9 +108,9 @@ public class CopyTokenFunction implements Function<Token, Card> {
|
|||
ability.setSourceId(target.getId());
|
||||
target.addAbility(ability);
|
||||
}
|
||||
// Needed to do it this way because only the cardValue does not include the increased value from cards like "Intangible Virtue" will be copied.
|
||||
target.getPower().initValue(Integer.parseInt(sourceObj.getPower().toString()));
|
||||
target.getToughness().initValue(Integer.parseInt(sourceObj.getToughness().toString()));
|
||||
|
||||
target.getPower().modifyBaseValue(sourceObj.getPower().getBaseValueModified());
|
||||
target.getToughness().modifyBaseValue(sourceObj.getToughness().getBaseValueModified());
|
||||
|
||||
return target;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue