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

Some fixes (#5079)

Browse Source 
* Clean up CardTypes syntax

* Riku counting fix
This commit is contained in:
tool4ever
2024-04-20 15:40:43 +02:00
committed by GitHub
parent fd453dce07
commit 2efcace2b6
24 changed files with 34 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -599,21 +599,8 @@ public class AbilityUtils {
// All the following only work for SpellAbilities
else if (ability instanceof SpellAbility) {
final SpellAbility sa = (SpellAbility) ability;
if (calcX[0].startsWith("Modes")) {
int chosenModes = 0;
SpellAbility sub = sa;
while(sub != null) {
if (!sub.getSVar("CharmOrder").equals("")) {
chosenModes++;
}
sub = sub.getSubAbility();
}
// Count Math
final String m = CardFactoryUtil.extractOperators(calcX[1]);
val = doXMath(chosenModes, m, card, ability);
}
// Player attribute counting
else if (calcX[0].startsWith("TargetedPlayer")) {
if (calcX[0].startsWith("TargetedPlayer")) {
final List<Player> players = new ArrayList<>();
final SpellAbility saTargeting = sa.getSATargetingPlayer();
if (null != saTargeting) {
@@ -1739,14 +1726,11 @@ public class AbilityUtils {
}
// Count$NumTimesChoseMode
if (sq[0].startsWith("NumTimesChoseMode")) {
final SpellAbility root = sa.getRootAbility();
SpellAbility sub = sa.getRootAbility();
int amount = 0;
if (root != null) {
SpellAbility sub = root;
while(sub != null) {
if (!sub.getSVar("CharmOrder").equals("")) amount++;
sub = sub.getSubAbility();
}
while (sub != null) {
if (sub.getDirectSVars().containsKey("CharmOrder")) amount++;
sub = sub.getSubAbility();
}
return doXMath(amount, expr, c, ctb);
}
@@ -2037,9 +2021,6 @@ public class AbilityUtils {
return doXMath(c.getNetPower() + c.getNetToughness(), expr, c, ctb);
}
if (sq[0].equals("CardNumTypes")) {
return doXMath(getNumberOfTypes(c), expr, c, ctb);
}
if (sq[0].equals("CardNumNotedTypes")) {
return doXMath(c.getNumNotedTypes(), expr, c, ctb);
}
@@ -2653,21 +2634,6 @@ public class AbilityUtils {
return game.getPhaseHandler().getPlanarDiceSpecialActionThisTurn();
}
if (sq[0].contains("CardTypes")) {
return doXMath(getCardTypesFromList(getDefinedCards(c, sq[1], ctb), false), expr, c, ctb);
}
if (sq[0].contains("CardControllerTypes")) {
return doXMath(getCardTypesFromList(player.getCardsIn(ZoneType.listValueOf(sq[1])), false), expr, c, ctb);
}
if (sq[0].contains("CardControllerPermanentTypes")) {
return doXMath(getCardTypesFromList(player.getCardsIn(ZoneType.listValueOf(sq[1])), true), expr, c, ctb);
}
if (sq[0].startsWith("OppTypesInGrave")) {
final PlayerCollection opponents = player.getOpponents();
CardCollection oppCards = opponents.getCardsIn(ZoneType.Graveyard);
return doXMath(getCardTypesFromList(oppCards, false), expr, c, ctb);
}
if (sq[0].equals("TotalTurns")) {
return doXMath(game.getPhaseHandler().getTurn(), expr, c, ctb);
}
@@ -3680,6 +3646,10 @@ public class AbilityUtils {
return doXMath(num, splitString.length > 1 ? splitString[1] : null, source, ctb);
}
if (string.startsWith("CardTypes")) {
return doXMath(getCardTypesFromList(paidList, string.startsWith("CardTypesPermanent")), CardFactoryUtil.extractOperators(string), source, ctb);
}
String filteredString = string;
Iterable<Card> filteredList = paidList;
final String[] filter = filteredString.split("_");
@@ -3895,12 +3865,6 @@ public class AbilityUtils {
return list;
}
public static int getNumberOfTypes(final Card card) {
EnumSet<CardType.CoreType> types = EnumSet.noneOf(CardType.CoreType.class);
Iterables.addAll(types, card.getType().getCoreTypes());
return types.size();
}
public static int getCardTypesFromList(final Iterable<Card> list, boolean permanentTypes) {
EnumSet<CardType.CoreType> types = EnumSet.noneOf(CardType.CoreType.class);
for (Card c1 : list) {

2
forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
View File

@@ -368,7 +368,7 @@ public class PlayEffect extends SpellAbilityEffect {
continue;
}
boolean unpayableCost = tgtSA.getHostCard().getManaCost().isNoCost();
boolean unpayableCost = tgtSA.getPayCosts().getCostMana().getMana().isNoCost();
if (sa.hasParam("WithoutManaCost")) {
tgtSA = tgtSA.copyWithNoManaCost();
} else if (sa.hasParam("PlayCost")) {