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

- Fixed a typo in the PLANESWALKERS card predicate preset.

Browse Source
This commit is contained in:
Agetian
2018-04-11 08:05:47 +03:00
parent 4d33823f28
commit 2db32d289f
12 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/AiAttackController.java
View File

@@ -421,7 +421,7 @@ public class AiAttackController {
CardCollectionView oppBattlefield = c.getController().getCardsIn(ZoneType.Battlefield); CardCollectionView oppBattlefield = c.getController().getCardsIn(ZoneType.Battlefield);
if (c.getName().equals("Heart of Kiran")) { if (c.getName().equals("Heart of Kiran")) {
if (!CardLists.filter(oppBattlefield, CardPredicates.Presets.PLANEWALKERS).isEmpty()) { if (!CardLists.filter(oppBattlefield, CardPredicates.Presets.PLANESWALKERS).isEmpty()) {
// can be activated by removing a loyalty counter instead of tapping a creature // can be activated by removing a loyalty counter instead of tapping a creature
continue; continue;
} }

4
forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
View File

@@ -96,7 +96,7 @@ public class ComputerUtilCard {
* @return best Planeswalker * @return best Planeswalker
*/ */
public static Card getBestPlaneswalkerAI(final List<Card> list) { public static Card getBestPlaneswalkerAI(final List<Card> list) {
List<Card> all = CardLists.filter(list, CardPredicates.Presets.PLANEWALKERS); List<Card> all = CardLists.filter(list, CardPredicates.Presets.PLANESWALKERS);
if (all.size() == 0) { if (all.size() == 0) {
return null; return null;
} }
@@ -110,7 +110,7 @@ public class ComputerUtilCard {
* @return best Planeswalker * @return best Planeswalker
*/ */
public static Card getWorstPlaneswalkerAI(final List<Card> list) { public static Card getWorstPlaneswalkerAI(final List<Card> list) {
List<Card> all = CardLists.filter(list, CardPredicates.Presets.PLANEWALKERS); List<Card> all = CardLists.filter(list, CardPredicates.Presets.PLANESWALKERS);
if (all.size() == 0) { if (all.size() == 0) {
return null; return null;
} }

2
forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java
View File

@@ -112,7 +112,7 @@ public class CountersPutOrRemoveAi extends SpellAbilityAi {
// with one touch // with one touch
CardCollection planeswalkerList = CardLists.filter( CardCollection planeswalkerList = CardLists.filter(
CardLists.filterControlledBy(countersList, ai.getOpponents()), CardLists.filterControlledBy(countersList, ai.getOpponents()),
CardPredicates.Presets.PLANEWALKERS, CardPredicates.Presets.PLANESWALKERS,
CardPredicates.hasLessCounter(CounterType.LOYALTY, amount)); CardPredicates.hasLessCounter(CounterType.LOYALTY, amount));
if (!planeswalkerList.isEmpty()) { if (!planeswalkerList.isEmpty()) {

4
forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java
View File

@@ -121,7 +121,7 @@ public class CountersRemoveAi extends SpellAbilityAi {
list = ai.getOpponents().getCardsIn(ZoneType.Battlefield); list = ai.getOpponents().getCardsIn(ZoneType.Battlefield);
list = CardLists.filter(list, CardPredicates.isTargetableBy(sa)); list = CardLists.filter(list, CardPredicates.isTargetableBy(sa));
CardCollection planeswalkerList = CardLists.filter(list, CardPredicates.Presets.PLANEWALKERS, CardCollection planeswalkerList = CardLists.filter(list, CardPredicates.Presets.PLANESWALKERS,
CardPredicates.hasCounter(CounterType.LOYALTY, 5)); CardPredicates.hasCounter(CounterType.LOYALTY, 5));
if (!planeswalkerList.isEmpty()) { if (!planeswalkerList.isEmpty()) {
@@ -169,7 +169,7 @@ public class CountersRemoveAi extends SpellAbilityAi {
list = CardLists.filter(list, CardPredicates.isTargetableBy(sa)); list = CardLists.filter(list, CardPredicates.isTargetableBy(sa));
CardCollection planeswalkerList = CardLists.filter(list, CardCollection planeswalkerList = CardLists.filter(list,
Predicates.and(CardPredicates.Presets.PLANEWALKERS, CardPredicates.isControlledByAnyOf(ai.getOpponents())), Predicates.and(CardPredicates.Presets.PLANESWALKERS, CardPredicates.isControlledByAnyOf(ai.getOpponents())),
CardPredicates.hasLessCounter(CounterType.LOYALTY, amount)); CardPredicates.hasLessCounter(CounterType.LOYALTY, amount));
if (!planeswalkerList.isEmpty()) { if (!planeswalkerList.isEmpty()) {

2
forge-ai/src/main/java/forge/ai/ability/DamageAiBase.java
View File

@@ -78,7 +78,7 @@ public abstract class DamageAiBase extends SpellAbilityAi {
} }
// burn Planeswalkers // burn Planeswalkers
if (Iterables.any(enemy.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS)) { if (Iterables.any(enemy.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS)) {
return true; return true;
} }

2
forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
View File

@@ -342,7 +342,7 @@ public class DamageDealAi extends DamageAiBase {
final Player activator = sa.getActivatingPlayer(); final Player activator = sa.getActivatingPlayer();
final Card source = sa.getHostCard(); final Card source = sa.getHostCard();
final Game game = source.getGame(); final Game game = source.getGame();
List<Card> hPlay = CardLists.filter(getTargetableCards(ai, sa, pl, tgt, activator, source, game), CardPredicates.Presets.PLANEWALKERS); List<Card> hPlay = CardLists.filter(getTargetableCards(ai, sa, pl, tgt, activator, source, game), CardPredicates.Presets.PLANESWALKERS);
List<Card> killables = CardLists.filter(hPlay, new Predicate<Card>() { List<Card> killables = CardLists.filter(hPlay, new Predicate<Card>() {
@Override @Override

2
forge-ai/src/main/java/forge/ai/ability/DrawAi.java
View File

@@ -180,7 +180,7 @@ public class DrawAi extends SpellAbilityAi {
int numHand = ai.getCardsIn(ZoneType.Hand).size(); int numHand = ai.getCardsIn(ZoneType.Hand).size();
if ("Jace, Vryn's Prodigy".equals(sourceName) && ai.getCardsIn(ZoneType.Graveyard).size() > 3) { if ("Jace, Vryn's Prodigy".equals(sourceName) && ai.getCardsIn(ZoneType.Graveyard).size() > 3) {
return CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS, return CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS,
CardPredicates.isType("Jace")).size() <= 0; CardPredicates.isType("Jace")).size() <= 0;
} }
if (source.isSpell() && ai.getCardsIn(ZoneType.Hand).contains(source)) { if (source.isSpell() && ai.getCardsIn(ZoneType.Hand).contains(source)) {

2
forge-ai/src/main/java/forge/ai/ability/PermanentAi.java
View File

@@ -69,7 +69,7 @@ public class PermanentAi extends SpellAbilityAi {
/* -- not used anymore after Ixalan (Planeswalkers are now legendary, not unique by subtype) -- /* -- not used anymore after Ixalan (Planeswalkers are now legendary, not unique by subtype) --
if (card.isPlaneswalker()) { if (card.isPlaneswalker()) {
CardCollection list = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), CardCollection list = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield),
CardPredicates.Presets.PLANEWALKERS); CardPredicates.Presets.PLANESWALKERS);
for (String type : card.getType().getSubtypes()) { // determine for (String type : card.getType().getSubtypes()) { // determine
// planewalker // planewalker
// subtype // subtype

2
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -1303,7 +1303,7 @@ public class GameAction {
private boolean handlePlaneswalkerRule(Player p) { private boolean handlePlaneswalkerRule(Player p) {
// get all Planeswalkers // get all Planeswalkers
final List<Card> list = CardLists.filter(p.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS); final List<Card> list = CardLists.filter(p.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS);
boolean recheck = false; boolean recheck = false;
//final Multimap<String, Card> uniqueWalkers = ArrayListMultimap.create(); // Not used as of Ixalan //final Multimap<String, Card> uniqueWalkers = ArrayListMultimap.create(); // Not used as of Ixalan

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

@@ -587,7 +587,7 @@ public final class CardPredicates {
return c.isLand() && c.isSnow(); return c.isLand() && c.isSnow();
} }
}; };
public static final Predicate<Card> PLANEWALKERS = new Predicate<Card>() { public static final Predicate<Card> PLANESWALKERS = new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
return c.isPlaneswalker(); return c.isPlaneswalker();

2
forge-game/src/main/java/forge/game/combat/AttackRequirement.java
View File

@@ -77,7 +77,7 @@ public class AttackRequirement {
if (c.hasKeyword("Each opponent must attack you or a planeswalker you control with at least one creature each combat if able.")) { if (c.hasKeyword("Each opponent must attack you or a planeswalker you control with at least one creature each combat if able.")) {
if (attacker.getController().isOpponentOf(c.getController()) && !defenderOrPWSpecific.containsKey(c.getController())) { if (attacker.getController().isOpponentOf(c.getController()) && !defenderOrPWSpecific.containsKey(c.getController())) {
defenderOrPWSpecific.put(c.getController(), 1); defenderOrPWSpecific.put(c.getController(), 1);
for (Card pw : CardLists.filter(c.getController().getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS)) { for (Card pw : CardLists.filter(c.getController().getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS)) {
// Add the attack alternatives that suffice (planeswalkers that can be attacked instead of the player) // Add the attack alternatives that suffice (planeswalkers that can be attacked instead of the player)
if (!defenderSpecificAlternatives.containsKey(c.getController())) { if (!defenderSpecificAlternatives.containsKey(c.getController())) {
defenderSpecificAlternatives.put(c.getController(), Lists.<GameEntity>newArrayList()); defenderSpecificAlternatives.put(c.getController(), Lists.<GameEntity>newArrayList());

2
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -62,7 +62,7 @@ public class CombatUtil {
final FCollection<GameEntity> defenders = new FCollection<GameEntity>(); final FCollection<GameEntity> defenders = new FCollection<GameEntity>();
for (final Player defender : playerWhoAttacks.getOpponents()) { for (final Player defender : playerWhoAttacks.getOpponents()) {
defenders.add(defender); defenders.add(defender);
final CardCollection planeswalkers = CardLists.filter(defender.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS); final CardCollection planeswalkers = CardLists.filter(defender.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS);
defenders.addAll(planeswalkers); defenders.addAll(planeswalkers);
} }
return defenders; return defenders;