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

- AI will no longer cast Bolster with no creatures on the BF

Browse Source 
- Manifest Ability can't be activated if the original card isn't a creature
This commit is contained in:
Sol
2015-01-18 17:00:03 +00:00
parent a87271f220
commit e576dbcf93
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
View File

@@ -6,10 +6,7 @@ import com.google.common.collect.Iterables;
import forge.ai.*;
import forge.game.ability.AbilityFactory;
import forge.game.ability.AbilityUtils;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardLists;
import forge.game.card.CounterType;
import forge.game.card.*;
import forge.game.combat.CombatUtil;
import forge.game.cost.Cost;
import forge.game.cost.CostPart;
@@ -88,7 +85,16 @@ public class CountersPutAi extends SpellAbilityAi {
}
}
}
if (sa.hasParam("Bolster")) {
CardCollection creatsYouCtrl = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.CREATURES);
CardCollection leastToughness = new CardCollection(Aggregates.listWithMin(creatsYouCtrl, CardPredicates.Accessors.fnGetDefense));
if (leastToughness.isEmpty()) {
return false;
}
// TODO If Creature that would be Bolstered for some reason is useless, also return False
}
if (sa.hasParam("Monstrosity") && source.isMonstrous()) {
return false;
}

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

@@ -416,6 +416,8 @@ public class Card extends GameEntity implements Comparable<Card> {
// Turn Face Down (even if it's DFC).
ManaCost cost = this.getManaCost();
boolean isCreature = this.isCreature();
// Sometimes cards are manifested while already being face down
if (!turnFaceDown(true) && currentStateName != CardStateName.FaceDown) {
return null;
@@ -430,7 +432,7 @@ public class Card extends GameEntity implements Comparable<Card> {
c.setManifested(true);
// Add manifest demorph static ability for creatures?
c.addSpellAbility(CardFactoryUtil.abilityManifestFaceUp(c, cost));
c.addSpellAbility(CardFactoryUtil.abilityManifestFaceUp(c, cost, isCreature));
return c;
}

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

@@ -166,7 +166,7 @@ public class CardFactoryUtil {
return morphUp;
}
public static AbilityStatic abilityManifestFaceUp(final Card sourceCard, final ManaCost manaCost) {
public static AbilityStatic abilityManifestFaceUp(final Card sourceCard, final ManaCost manaCost, final boolean canFlip) {
final Cost cost = new Cost(manaCost, false);
final AbilityStatic manifestUp = new AbilityStatic(sourceCard, cost, null) {
@@ -183,10 +183,10 @@ public class CardFactoryUtil {
@Override
public boolean canPlay() {
return sourceCard.getController().equals(this.getActivatingPlayer()) && sourceCard.isFaceDown()
&& sourceCard.isInPlay() && sourceCard.isManifested();
&& sourceCard.isInPlay() && sourceCard.isManifested() && canFlip;
}
}; // morph_up
}; // manifest_up
String costDesc = cost.toString();
// get rid of the ": " at the end