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

Merge branch 'manifest' into 'master'

Browse Source 
Fix ManifestAi

See merge request core-developers/forge!5519
This commit is contained in:
Michael Kamensky
2021-10-08 03:35:54 +00:00
parent 35ee2aa80b 34b19c0207
commit 88c29ce2a3
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
View File

@@ -106,7 +106,7 @@ public class ManifestAi extends SpellAbilityAi {
return false;
}
if (card.mayPlayerLook(ai)) {
if (card.getView().canBeShownTo(ai.getView())) {
// try to avoid manifest a non Permanent
if (!card.isPermanent())
return false;
@@ -115,7 +115,7 @@ public class ManifestAi extends SpellAbilityAi {
if (card.getManaCost().countX() > 0)
return false;
// try to avoid manifesting a creature with zero or less thoughness
// try to avoid manifesting a creature with zero or less toughness
if (card.isCreature() && card.getNetToughness() <= 0)
return false;
@@ -177,14 +177,13 @@ public class ManifestAi extends SpellAbilityAi {
return MyRandom.getRandom().nextFloat() < .8;
}
protected Card chooseSingleCard(final Player ai, final SpellAbility sa, Iterable<Card> options, boolean isOptional, Player targetedPlayer) {
if (Iterables.size(options) <= 1) {
return Iterables.getFirst(options, null);
}
@Override
protected Card chooseSingleCard(final Player ai, final SpellAbility sa, Iterable<Card> options, boolean isOptional, Player targetedPlayer, Map<String, Object> params) {
if (Iterables.size(options) > 1 || isOptional) {
CardCollection filtered = CardLists.filter(options, new Predicate<Card>() {
@Override
public boolean apply(Card input) {
return !shouldManyfest(input, ai, sa);
return shouldManyfest(input, ai, sa);
}
});
if (!filtered.isEmpty()) {
@@ -193,6 +192,7 @@ public class ManifestAi extends SpellAbilityAi {
if (isOptional) {
return null;
}
}
return Iterables.getFirst(options, null);
}
}

12
forge-ai/src/main/java/forge/ai/ability/PumpAi.java
View File

@@ -526,16 +526,16 @@ public class PumpAi extends PumpAiBase {
}
list = getCurseCreatures(ai, sa, defense, attack, keywords);
} else {
if (!tgt.canTgtCreature()) {
ZoneType zone = tgt.getZone().get(0);
list = new CardCollection(game.getCardsIn(zone));
} else {
list = getPumpCreatures(ai, sa, defense, attack, keywords, immediately);
}
if (sa.canTarget(ai)) {
sa.getTargets().add(ai);
return true;
}
if (tgt.canTgtCreature()) {
list = getPumpCreatures(ai, sa, defense, attack, keywords, immediately);
} else {
ZoneType zone = tgt.getZone().get(0);
list = new CardCollection(game.getCardsIn(zone));
}
}
list = CardLists.getValidCards(list, tgt.getValidTgts(), ai, source, sa);

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

@@ -1069,7 +1069,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
public final Card getEncodingCard() {
return encoding;
}
public final void setEncodingCard(final Card e) {
encoding = e;
}

2
forge-game/src/main/java/forge/game/card/CardView.java
View File

@@ -486,7 +486,7 @@ public class CardView extends GameEntityView {
});
}
private boolean canBeShownTo(final PlayerView viewer) {
public boolean canBeShownTo(final PlayerView viewer) {
if (viewer == null) { return false; }
ZoneType zone = getZone();

1
forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
View File

@@ -426,6 +426,7 @@ public class TargetRestrictions {
*/
public final boolean canTgtCreature() {
for (final String s : this.validTgts) {
// TODO check IsCommander when in that variant
if ((s.contains("Creature") || s.startsWith("Permanent"))
&& !s.contains("nonCreature")) {
return true;