diff --git a/.gitattributes b/.gitattributes index a2d664be4c6..bdc3671daee 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1489,6 +1489,7 @@ res/cardsfolder/c/carnival_hellsteed.txt -text res/cardsfolder/c/carnival_of_souls.txt svneol=native#text/plain res/cardsfolder/c/carnivorous_plant.txt svneol=native#text/plain res/cardsfolder/c/carnophage.txt svneol=native#text/plain +res/cardsfolder/c/carpet_of_flowers.txt -text res/cardsfolder/c/carrier_pigeons.txt svneol=native#text/plain res/cardsfolder/c/carrion.txt svneol=native#text/plain res/cardsfolder/c/carrion_ants.txt svneol=native#text/plain @@ -2387,6 +2388,7 @@ res/cardsfolder/d/deadwood_treefolk.txt svneol=native#text/plain res/cardsfolder/d/dearly_departed.txt -text res/cardsfolder/d/death_baron.txt svneol=native#text/plain res/cardsfolder/d/death_bomb.txt svneol=native#text/plain +res/cardsfolder/d/death_by_dragons.txt -text res/cardsfolder/d/death_charmer.txt svneol=native#text/plain res/cardsfolder/d/death_cloud.txt svneol=native#text/plain res/cardsfolder/d/death_cultist.txt svneol=native#text/plain diff --git a/res/cardsfolder/c/carpet_of_flowers.txt b/res/cardsfolder/c/carpet_of_flowers.txt new file mode 100644 index 00000000000..c5f865847d9 --- /dev/null +++ b/res/cardsfolder/c/carpet_of_flowers.txt @@ -0,0 +1,18 @@ +Name:Carpet of Flowers +ManaCost:G +Types:Enchantment +T:Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | CheckSVar$ CarpetX | SVarCompare$ EQ0 | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each of your main phases, if you haven't added mana to your mana pool with this ability this turn, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls. +SVar:TrigMana:AB$ Pump | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent, you may add X mana, where X is the number of Islands target opponent controls | RememberObjects$ Targeted | SubAbility$ ChooseNumber +SVar:ChooseNumber:DB$ ChooseNumber | Min$ 0 | Max$ NumManaMax | References$ NumManaMax | ListTitle$ Choose the amount of mana | SubAbility$ DBMana +SVar:DBMana:DB$ Mana | Amount$ X | Produced$ Any | SubAbility$ CheckPlus +SVar:CheckPlus:DB$ StoreSVar | SVar$ CarpetX | Type$ Number | Expression$ 1 | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +T:Mode$ Phase | Phase$ End of Turn | Execute$ TrigReset | Static$ True +SVar:TrigReset:AB$ StoreSVar | Cost$ 0 | SVar$ CarpetX | Type$ Number | Expression$ 0 +SVar:X:Count$ChosenNumber +SVar:NumManaMax:Count$Valid Island.RememberedPlayerCtrl +SVar:CarpetX:Number$0 +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/carpet_of_flowers.jpg +SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/240.jpg +Oracle:At the beginning of each of your main phases, if you haven't added mana to your mana pool with this ability this turn, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls. diff --git a/res/cardsfolder/d/death_by_dragons.txt b/res/cardsfolder/d/death_by_dragons.txt new file mode 100644 index 00000000000..938370d0f49 --- /dev/null +++ b/res/cardsfolder/d/death_by_dragons.txt @@ -0,0 +1,8 @@ +Name:Death by Dragons +ManaCost:4 R R +Types:Sorcery +A:SP$ Token | Cost$ 4 R R | ValidTgts$ Player | TgtPrompt$ Select target player who would not get a token | AITgts$ Opponent | RememberTargets$ True | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ Player.IsNotRemembered | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | StackDescription$ SpellDescription | SubAbility$ DBCleanup | SpellDescription$ Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield. +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:Picture:http://www.wizards.com/global/images/magic/general/death_by_dragons.jpg +SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/118.jpg +Oracle:Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield. diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 5888ad491ae..b279ff9bcbf 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -6876,10 +6876,6 @@ public class Card extends GameEntity implements Comparable { for (final Object rem : source.getRemembered()) { if (rem instanceof Card) { final Card card = (Card) rem; - System.out.println(this + " vs " + card); - System.out.println(this.getOwner().equals(card.getOwner())); - System.out.println(this.getOwner()); - System.out.println(card.getOwner()); if (!this.getOwner().equals(card.getOwner())) { return false; } diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 48f6eab88a4..d2d3d7d9688 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -2522,6 +2522,10 @@ public abstract class Player extends GameEntity implements Comparable { if (!source.getRemembered().contains(this)) { return false; } + } else if (property.equals("IsNotRemembered")) { + if (source.getRemembered().contains(this)) { + return false; + } } else if (property.startsWith("EnchantedBy")) { if (!this.getEnchantedBy().contains(source)) { return false;