From 12bde72a8bf98f839631f1d7540d475427dc346a Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 4 Mar 2013 22:51:37 +0000 Subject: [PATCH 1/4] - Fixed AI not using AnyMana sources for Hybrid mana. --- src/main/java/forge/game/ai/ComputerUtilMana.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/game/ai/ComputerUtilMana.java b/src/main/java/forge/game/ai/ComputerUtilMana.java index c7f4542b3d1..cf8f1572d65 100644 --- a/src/main/java/forge/game/ai/ComputerUtilMana.java +++ b/src/main/java/forge/game/ai/ComputerUtilMana.java @@ -138,7 +138,7 @@ public class ComputerUtilMana { } else { m.setExpressChoice("0"); } - } + } // check if ability produces any color else if (m.isAnyMana()) { String colorChoice = costParts[nPart]; @@ -156,7 +156,7 @@ public class ComputerUtilMana { break; } } - } else if (costParts[nPart].contains("/")) { + } else if (costParts[nPart].contains("2/")) { colorChoice = costParts[nPart].replace("2/", ""); } else if (costParts[nPart].length() > 1) { colorChoice = costParts[nPart].substring(0, 1); From 35b4efec1b7107a4f1e867586733e40aaa94bfc7 Mon Sep 17 00:00:00 2001 From: swordshine Date: Tue, 5 Mar 2013 02:12:00 +0000 Subject: [PATCH 2/4] - Fixed Mirrorweave --- res/cardsfolder/m/mirrorweave.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/res/cardsfolder/m/mirrorweave.txt b/res/cardsfolder/m/mirrorweave.txt index 92346f74b7e..17a2b44e61e 100644 --- a/res/cardsfolder/m/mirrorweave.txt +++ b/res/cardsfolder/m/mirrorweave.txt @@ -4,6 +4,7 @@ Types:Instant A:SP$ Pump | Cost$ 2 WU WU | ValidTgts$ Creature.nonLegendary | TgtPrompt$ Choose target nonlegendary creature | AILogic$ Pump | RememberObjects$ Targeted | SubAbility$ MirrorweaveClone | StackDescription$ None | SpellDescription$ Each other creature becomes a copy of target nonlegendary creature until end of turn. SVar:MirrorweaveClone:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Creature.IsNotRemembered | RepeatSubAbility$ DBCopy | SubAbility$ DBCleanup SVar:DBCopy:DB$ Clone | Defined$ Remembered | CloneTarget$ Imprinted | Duration$ UntilEndOfTurn +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrorweave.jpg Oracle:Each other creature becomes a copy of target nonlegendary creature until end of turn. SetInfo:SHM Rare \ No newline at end of file From d3926810bbf6ecc9c40a0b53076ade97e39527cb Mon Sep 17 00:00:00 2001 From: swordshine Date: Tue, 5 Mar 2013 02:51:26 +0000 Subject: [PATCH 3/4] - Fixed "AllCreatureTypes" does not sharesCreatureTypeWith each other --- src/main/java/forge/Card.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index c1ff4e33cb9..ade141cff32 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -7523,7 +7523,8 @@ public class Card extends GameEntity implements Comparable { } for (final String type : this.getType()) { - if (type.equals("AllCreatureTypes") && c1.hasACreatureType()) { + if (type.equals("AllCreatureTypes") + && (c1.hasACreatureType() || c1.typeContains("AllCreatureTypes"))) { return true; } if (forge.card.CardType.isACreatureType(type) && c1.isType(type)) { From 7c1fb7966cca79b06912d9eee221e6ade46d1c96 Mon Sep 17 00:00:00 2001 From: Sol Date: Tue, 5 Mar 2013 03:01:15 +0000 Subject: [PATCH 4/4] - Added ThisTurnCast property for Cycle of Life --- src/main/java/forge/Card.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index ade141cff32..f7f3f997335 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -6891,6 +6891,13 @@ public class Card extends GameEntity implements Comparable { else if (list.get(1) != this) { return false; } + } else if (property.equals("ThisTurnCast")) { + for (final Card card : CardUtil.getThisTurnCast("Card", source)) { + if (this.equals(card)) { + return true; + } + } + return false; } else if (property.startsWith("sharesTypeWith")) { if (!this.sharesTypeWith(source)) { return false;