github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unneeded code from MulticoloredPredicate (leftover from pre-Amonkhet split card rules)

Browse source
This commit is contained in:
Alex W. Jackson 2022-09-23 12:46:41 -04:00
parent c8e1cec846
commit 4b15df3bae
2 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage.Sets/src/mage/cards/t/ThreefoldSignal.java
View file

@ -34,7 +34,7 @@ public class ThreefoldSignal extends CardImpl {
// When Threefold Signal enters the battlefield, scry 3.
this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(3)));
// Each spell you cast that’s exactly three colors has replicate {3}.
// Each spell you cast that's exactly three colors has replicate {3}.
// (When you cast it, copy it for each time you paid its replicate cost.
// You may choose new targets for the copies.
// A copy of a permanent spell becomes a token.)
@ -59,23 +59,11 @@ enum ThreeColorPredicate implements Predicate<MageObject> {
@Override
public boolean apply(MageObject input, Game game) {
// 708.3. Each split card that consists of two halves with different colored mana symbols in their mana costs
// is a multicolored card while it's not a spell on the stack. While it's a spell on the stack, it's only the
// color or colors of the half or halves being cast. #
if (input instanceof SplitCardHalf
&& game.getState().getZone(input.getId()) != Zone.STACK) {
return 3 == ((SplitCardHalf) input).getMainCard().getColor(game).getColorCount();
} else if (input instanceof ModalDoubleFacesCardHalf
&& (game.getState().getZone(input.getId()) != Zone.STACK && game.getState().getZone(input.getId()) != Zone.BATTLEFIELD)) {
// While a double-faced card isn’t on the stack or battlefield, consider only the characteristics of its front face.
return 3 == ((ModalDoubleFacesCardHalf) input).getMainCard().getColor(game).getColorCount();
} else {
return 3 == input.getColor(game).getColorCount();
}
return 3 == input.getColor(game).getColorCount();
}
@Override
public String toString() {
return "Multicolored";
}
}
}

14
Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java
View file

@ -15,19 +15,7 @@ public enum MulticoloredPredicate implements Predicate<MageObject> {
@Override
public boolean apply(MageObject input, Game game) {
// 708.3. Each split card that consists of two halves with different colored mana symbols in their mana costs
// is a multicolored card while it's not a spell on the stack. While it's a spell on the stack, it's only the
// color or colors of the half or halves being cast. #
if (input instanceof SplitCardHalf
&& game.getState().getZone(input.getId()) != Zone.STACK) {
return 1 < ((SplitCardHalf) input).getMainCard().getColor(game).getColorCount();
} else if (input instanceof ModalDoubleFacesCardHalf
&& (game.getState().getZone(input.getId()) != Zone.STACK && game.getState().getZone(input.getId()) != Zone.BATTLEFIELD)) {
// While a double-faced card isn’t on the stack or battlefield, consider only the characteristics of its front face.
return 1 < ((ModalDoubleFacesCardHalf) input).getMainCard().getColor(game).getColorCount();
} else {
return 1 < input.getColor(game).getColorCount();
}
return 1 < input.getColor(game).getColorCount();
}
@Override