external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Don't add Unmanifest ability to noncreatures

Browse Source
This commit is contained in:
Sol
2015-01-23 14:14:00 +00:00
parent 70caf4fda6
commit 0320e8b9cb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -37,9 +37,7 @@ import forge.game.*;
import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityFactory;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
import forge.game.ability.ApiType; import forge.game.ability.ApiType;
import forge.game.card.CardCollectionView;
import forge.game.card.CardPredicates.Presets; import forge.game.card.CardPredicates.Presets;
import forge.game.card.CardView;
import forge.game.combat.AttackingBand; import forge.game.combat.AttackingBand;
import forge.game.combat.Combat; import forge.game.combat.Combat;
import forge.game.cost.Cost; import forge.game.cost.Cost;
@@ -431,8 +429,10 @@ public class Card extends GameEntity implements Comparable<Card> {
// Mark this card as "manifested" // Mark this card as "manifested"
c.setManifested(true); c.setManifested(true);
// Add manifest demorph static ability for creatures? // Add manifest demorph static ability for creatures
c.addSpellAbility(CardFactoryUtil.abilityManifestFaceUp(c, cost, isCreature)); if (isCreature) {
c.addSpellAbility(CardFactoryUtil.abilityManifestFaceUp(c, cost));
}
return c; return c;
} }

4
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -166,7 +166,7 @@ public class CardFactoryUtil {
return morphUp; return morphUp;
} }
public static AbilityStatic abilityManifestFaceUp(final Card sourceCard, final ManaCost manaCost, final boolean canFlip) { public static AbilityStatic abilityManifestFaceUp(final Card sourceCard, final ManaCost manaCost) {
final Cost cost = new Cost(manaCost, false); final Cost cost = new Cost(manaCost, false);
final AbilityStatic manifestUp = new AbilityStatic(sourceCard, cost, null) { final AbilityStatic manifestUp = new AbilityStatic(sourceCard, cost, null) {
@@ -183,7 +183,7 @@ public class CardFactoryUtil {
@Override @Override
public boolean canPlay() { public boolean canPlay() {
return sourceCard.getController().equals(this.getActivatingPlayer()) && sourceCard.isFaceDown() return sourceCard.getController().equals(this.getActivatingPlayer()) && sourceCard.isFaceDown()
&& sourceCard.isInPlay() && sourceCard.isManifested() && canFlip; && sourceCard.isInPlay() && sourceCard.isManifested();
} }
}; // manifest_up }; // manifest_up