diff --git a/res/cardsfolder/b/break_open.txt b/res/cardsfolder/b/break_open.txt index 0d33ceed262..46279ba7c9d 100644 --- a/res/cardsfolder/b/break_open.txt +++ b/res/cardsfolder/b/break_open.txt @@ -3,7 +3,8 @@ ManaCost:1 R Types:Instant Text:no text A:SP$ SetState | Cost$ 1 R | ValidTgts$ Creature.faceDown+YouDontCtrl | TgtPrompt$ Select target facedown creature you don't control. | Mode$ TurnFace | SpellDescription$ Turn target face-down creature an opponent controls face up. -SVar:Rarity:Rare +SVar:RemRandomDeck:True +SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/break_open.jpg SetInfo:ONS|Common|http://magiccards.info/scans/en/on/190.jpg Oracle:Turn target face-down creature an opponent controls face up. diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index e00c80d0fbc..51742017a38 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -2152,7 +2152,7 @@ public class Card extends GameEntity implements Comparable { || keyword.get(i).startsWith("Echo") || keyword.get(i).startsWith("Fading") || keyword.get(i).startsWith("Ripple") || keyword.get(i).startsWith("Unearth") || keyword.get(i).startsWith("Vanishing") || keyword.get(i).startsWith("Madness") - || keyword.get(i).startsWith("Devour")) { + || keyword.get(i).startsWith("Devour") || keyword.get(i).startsWith("Morph")) { String k = keyword.get(i); k = k.replace(":", " "); sbLong.append(k).append("\r\n"); diff --git a/src/main/java/forge/ComputerAIGeneral.java b/src/main/java/forge/ComputerAIGeneral.java index c43ecfc763d..7c71c5b3849 100644 --- a/src/main/java/forge/ComputerAIGeneral.java +++ b/src/main/java/forge/ComputerAIGeneral.java @@ -73,7 +73,7 @@ public class ComputerAIGeneral implements Computer { private void playCards(final String phase) { final SpellAbility[] sp = phase.equals(Constant.Phase.MAIN1) ? this.getMain1() : this.getMain2(); - final boolean nextPhase = ComputerUtil.playAbilities(sp); + final boolean nextPhase = ComputerUtil.playSpellAbilities(sp); if (nextPhase) { AllZone.getPhase().passPriority(); @@ -519,7 +519,7 @@ public class ComputerAIGeneral implements Computer { boolean pass = (sas.length == 0) || AllZone.getPhase().is(Constant.Phase.END_OF_TURN, AllZone.getComputerPlayer()); if (!pass) { // Each AF should check the phase individually - pass = ComputerUtil.playAbilities(sas); + pass = ComputerUtil.playSpellAbilities(sas); } if (pass) { @@ -556,7 +556,7 @@ public class ComputerAIGeneral implements Computer { if (sas.length > 0) { // Spell not Countered - if (!ComputerUtil.playAbilities(sas)) { + if (!ComputerUtil.playSpellAbilities(sas)) { return; } } diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java index 0d129157e45..a53cc7c2ccf 100644 --- a/src/main/java/forge/ComputerUtil.java +++ b/src/main/java/forge/ComputerUtil.java @@ -39,7 +39,7 @@ public class ComputerUtil { * objects. * @return a boolean. */ - public static boolean playAbilities(final SpellAbility[] all) { + public static boolean playSpellAbilities(final SpellAbility[] all) { // not sure "playing biggest spell" matters? ComputerUtil.sortSpellAbilityByCost(all); // MyRandom.shuffle(all); @@ -102,7 +102,7 @@ public class ComputerUtil { for (int i = 0; i < sas.length; i++) { sas[i] = all.get(i); } - return ComputerUtil.playAbilities(sas); + return ComputerUtil.playSpellAbilities(sas); } // playCards() /** diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 3bf09f00576..621e2d8f218 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -5050,7 +5050,6 @@ public class CardFactoryUtil { card.setPrevType(card.getType()); final String parse = card.getKeyword().get(n).toString(); - card.removeIntrinsicKeyword(parse); card.setCanMorph(true); final String[] k = parse.split(":");