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

Change the abilities to layer 7b where they belong

Browse source
This commit is contained in:
xenohedron 2023-05-22 20:57:08 -04:00
parent 3dddfb46be
commit 9c20dd3bfc
3 changed files with 6 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java
View file

@ -3,9 +3,7 @@ package mage.abilities.effects.common.continuous;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.Effect;
import mage.constants.*;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -44,7 +42,6 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements
protected DynamicValue power = null;
protected DynamicValue toughness = null;
protected boolean durationRuleAtStart; // put duration rule at the start of the rules text rather than the end
protected boolean hasCDA; // used when becoming a creature with an ability that sets P/T in layer 7a
/**
* @param token Token as blueprint for creature to become
@ -56,7 +53,6 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements
this.token = token;
this.retainType = retainType;
this.durationRuleAtStart = (retainType == CardType.PLANESWALKER || retainType == CardType.CREATURE);
this.hasCDA = checkTokenCDA();
setText();
this.addDependencyType(DependencyType.BecomeCreature);
}
@ -74,7 +70,6 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements
this.toughness = effect.toughness.copy();
}
this.durationRuleAtStart = effect.durationRuleAtStart;
this.hasCDA = effect.hasCDA;
}
@Override
@ -138,7 +133,7 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements
break;
case PTChangingEffects_7:
if ((sublayer == SubLayer.SetPT_7b) && !hasCDA) {
if (sublayer == SubLayer.SetPT_7b) {
if (power != null) {
permanent.getPower().setModifiedBaseValue(power.calculate(game, source, this)); // check all other becomes to use calculate?
} else if (token.getPower() != null) {
@ -226,21 +221,4 @@ public class BecomesCreatureSourceEffect extends ContinuousEffectImpl implements
|| layer == Layer.TypeChangingEffects_4;
}
/**
* Check whether the token contains a characteristic-defining ability in layer 7a.
* If it does, then need to not overwrite P/T in layer 7b.
* (It might not really be a CDA, but applied as one for consistency with the effect type.)
* @return true if the token has an ability with an effect in layer 7a
*/
private boolean checkTokenCDA() {
for (Ability ability : token.getAbilities()) {
for (Effect effect : ability.getEffects()) {
if (effect instanceof ContinuousEffect && ((ContinuousEffect) effect).getSublayer() == SubLayer.CharacteristicDefining_7a) {
return true;
}
}
}
return false;
}
}