- Added Death by Dragons and Carpet of Flowers

This commit is contained in:
swordshine
2013-03-04 00:37:00 +00:00
parent c912f2d28b
commit 7e83d92cd9
5 changed files with 32 additions and 4 deletions

2
.gitattributes vendored
View File

@@ -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/carnival_of_souls.txt svneol=native#text/plain
res/cardsfolder/c/carnivorous_plant.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/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/carrier_pigeons.txt svneol=native#text/plain
res/cardsfolder/c/carrion.txt svneol=native#text/plain res/cardsfolder/c/carrion.txt svneol=native#text/plain
res/cardsfolder/c/carrion_ants.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/dearly_departed.txt -text
res/cardsfolder/d/death_baron.txt svneol=native#text/plain res/cardsfolder/d/death_baron.txt svneol=native#text/plain
res/cardsfolder/d/death_bomb.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_charmer.txt svneol=native#text/plain
res/cardsfolder/d/death_cloud.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 res/cardsfolder/d/death_cultist.txt svneol=native#text/plain

View File

@@ -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.

View File

@@ -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.

View File

@@ -6876,10 +6876,6 @@ public class Card extends GameEntity implements Comparable<Card> {
for (final Object rem : source.getRemembered()) { for (final Object rem : source.getRemembered()) {
if (rem instanceof Card) { if (rem instanceof Card) {
final Card card = (Card) rem; 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())) { if (!this.getOwner().equals(card.getOwner())) {
return false; return false;
} }

View File

@@ -2522,6 +2522,10 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
if (!source.getRemembered().contains(this)) { if (!source.getRemembered().contains(this)) {
return false; return false;
} }
} else if (property.equals("IsNotRemembered")) {
if (source.getRemembered().contains(this)) {
return false;
}
} else if (property.startsWith("EnchantedBy")) { } else if (property.startsWith("EnchantedBy")) {
if (!this.getEnchantedBy().contains(source)) { if (!this.getEnchantedBy().contains(source)) {
return false; return false;