diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java index 57731ac55db..8a0cda09fd5 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java @@ -405,10 +405,10 @@ public abstract class DeckGeneratorBase { Predicate dualLandFilter = Predicates.compose(CardRulesPredicates.coreType(true, CardType.CoreType.Land), PaperCard.FN_GET_RULES); Predicate exceptBasicLand = Predicates.not(Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND, PaperCard.FN_GET_RULES)); Iterable landCards = pool.getAllCards(Predicates.and(dualLandFilter,exceptBasicLand)); - Iterable dualLandPatterns = Arrays.asList("Add \\{([WUBRG])\\} or \\{([WUBRG])\\} to your mana pool", - "Add \\{([WUBRG])\\}, \\{([WUBRG])\\}, or \\{([WUBRG])\\} to your mana pool", - "Add \\{([WUBRG])\\}\\{([WUBRG])\\} to your mana pool", - "Add \\{[WUBRG]\\}\\{[WUBRG]\\}, \\{([WUBRG])\\}\\{([WUBRG])\\}, or \\{[WUBRG]\\}\\{[WUBRG]\\} to your mana pool"); + Iterable dualLandPatterns = Arrays.asList("Add \\{([WUBRG])\\} or \\{([WUBRG])\\}", + "Add \\{([WUBRG])\\}, \\{([WUBRG])\\}, or \\{([WUBRG])\\}", + "Add \\{([WUBRG])\\}\\{([WUBRG])\\}", + "Add \\{[WUBRG]\\}\\{[WUBRG]\\}, \\{([WUBRG])\\}\\{([WUBRG])\\}, or \\{[WUBRG]\\}\\{[WUBRG]\\}"); for (String pattern:dualLandPatterns){ regexLandSearch(pattern, landCards); } diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java index d8817614237..6ffe2512a93 100644 --- a/forge-game/src/main/java/forge/game/GameActionUtil.java +++ b/forge-game/src/main/java/forge/game/GameActionUtil.java @@ -63,7 +63,7 @@ public final class GameActionUtil { for (int i = 0; i < MagicColor.WUBRG.length; i++ ) { String color = MagicColor.toShortString(MagicColor.WUBRG[i]); String abString = "AB$ Mana | Cost$ T | Produced$ " + color + - " | SpellDescription$ Add {" + color + "} to your mana pool."; + " | SpellDescription$ Add {" + color + "}."; Map mapParams = AbilityFactory.getMapParams(abString); BASIC_LAND_ABILITIES_PARAMS[i] = mapParams; BASIC_LAND_ABILITIES_TYPES[i] = AbilityRecordType.getRecordType(mapParams); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java index cac1e536288..5a1b9970375 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java @@ -36,7 +36,7 @@ public class ManaEffect extends SpellAbilityEffect { final boolean optional = sa.hasParam("Optional"); final Game game = sa.getActivatingPlayer().getGame(); - if (optional && !sa.getActivatingPlayer().getController().confirmAction(sa, null, "Do you want to add mana to your mana pool?")) { + if (optional && !sa.getActivatingPlayer().getController().confirmAction(sa, null, "Do you want to add mana?")) { return; } @@ -205,7 +205,7 @@ public class ManaEffect extends SpellAbilityEffect { final StringBuilder sb = new StringBuilder(); String mana = !sa.hasParam("Amount") || StringUtils.isNumeric(sa.getParam("Amount")) ? GameActionUtil.generatedMana(sa) : "mana"; - sb.append("Add ").append(mana).append(" to your mana pool."); + sb.append("Add ").append(mana).append("."); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/cost/CostAddMana.java b/forge-game/src/main/java/forge/game/cost/CostAddMana.java index 646e9c6c2ec..5213f4f6ae6 100644 --- a/forge-game/src/main/java/forge/game/cost/CostAddMana.java +++ b/forge-game/src/main/java/forge/game/cost/CostAddMana.java @@ -56,7 +56,7 @@ public class CostAddMana extends CostPart { public final String toString() { final StringBuilder sb = new StringBuilder(); final Integer i = this.convertAmount(); - sb.append("Add ").append(StringUtils.repeat("{" + this.getType() + "}", i)).append(" to your mana pool"); + sb.append("Add ").append(StringUtils.repeat("{" + this.getType() + "}", i)); return sb.toString(); } diff --git a/forge-gui/res/puzzle/PS_AER2.pzl b/forge-gui/res/puzzle/PS_AER2.pzl index b35f89a07ba..ccd512b0e52 100644 --- a/forge-gui/res/puzzle/PS_AER2.pzl +++ b/forge-gui/res/puzzle/PS_AER2.pzl @@ -14,4 +14,4 @@ humanhand=Savage Alliance;Hungry Flames;Confiscation Coup;Tezzeret's Touch;Yahen humanbattlefield=Island;Swamp;Swamp;Mountain;Electrostatic Pummeler;Tezzeret the Schemer|Counters:LOYALTY=7;t:Etherium Cell,P:0,T:0,Cost:no cost,Types:Artifact,Keywords:,Image:c_etherium_cell|Ability:Petal;t:Etherium Cell,P:0,T:0,Cost:no cost,Types:Artifact,Keywords:,Image:c_etherium_cell|Ability:Petal;t:Etherium Cell,P:0,T:0,Cost:no cost,Types:Artifact,Keywords:,Image:c_etherium_cell|Ability:Petal;t:Etherium Cell,P:0,T:0,Cost:no cost,Types:Artifact,Keywords:,Image:c_etherium_cell|Ability:Petal aihand=Island;Bound by Moonsilver;Plains;Plains;Emissary of the Sleepless;Nearheath Chaplain;Plains aibattlefield=Kessig Dire Swine;Brood Monitor;Consulate Skygate;t:Servo,P:1,T:1,Cost:no cost,Types:Artifact-Creature-Servo,Keywords:,Image:c_1_1_servo3;t:Servo,P:1,T:1,Cost:no cost,Types:Artifact-Creature-Servo,Keywords:,Image:c_1_1_servo3;t:Servo,P:1,T:1,Cost:no cost,Types:Artifact-Creature-Servo,Keywords:,Image:c_1_1_servo3;t:Servo,P:1,T:1,Cost:no cost,Types:Artifact-Creature-Servo,Keywords:,Image:c_1_1_servo3 -AbilityPetal=AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool. +AbilityPetal=AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color. diff --git a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java index 7003f2afbcd..d0877b739d0 100644 --- a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java +++ b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java @@ -152,7 +152,7 @@ public class CardReaderExperiments { //check for other key phrases that might be missing "{G}" formatting String[] phrases = new String[] { - "Add * to your mana pool", + "Add * to your mana pool", // TODO: "Add *" instead of "Add * to your mana pool"? Is that too lax? "CostDesc\\$ * \\|" }; for (String phrase : phrases) {