From 6c98ed686fcf5cc34e9e951331a271265c4a0ba3 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 05:14:57 +0000 Subject: [PATCH] Added Pyretic Ritual and included it as one of the list of cards which will not show up when the computer generates a random 2 color or multi color deck. --- res/card-pictures.txt | 1 + res/cards.txt | 5 +++ src/forge/CardFactory.java | 36 ++++++++++++++++++- src/forge/GenerateConstructedDeck.java | 1 + .../GenerateConstructedMultiColorDeck.java | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index bd67a3d7c7a..3b80deada9e 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,6 +38,7 @@ snow_covered_mountain.jpg http://www.wizards.com/global/images/magic/gene snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg +pyretic_ritual.jpg http://www.wizards.com/global/images/magic/general/pyretic_ritual.jpg angelic_chorus.jpg http://www.wizards.com/global/images/magic/general/angelic_chorus.jpg ajanis_pridemate.jpg http://www.wizards.com/global/images/magic/general/ajanis_pridemate.jpg ageless_entity.jpg http://www.wizards.com/global/images/magic/general/ageless_entity.jpg diff --git a/res/cards.txt b/res/cards.txt index c2eb141437f..b03a469751f 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,8 @@ +Pyretic Ritual +1 R +Instant +Add R R R to your mana pool. + Angelic Chorus 3 W W Enchantment diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index b9f8ed53f27..9c6ab8ea277 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -16475,8 +16475,42 @@ public class CardFactory implements NewConstants { return false; } }; + StringBuffer sb = new StringBuffer(); + sb.append(card.getName()).append(" adds B B B to your mana pool"); + spell.setStackDescription(sb.toString()); - spell.setStackDescription(cardName + " adds B B B to your mana pool"); + // spell.setStackDescription(cardName + " adds B B B to your mana pool"); + card.clearSpellAbility(); + card.addSpellAbility(spell); + + return card; + }//*************** END ************ END ************************** + + //*************** START *********** START ************************** + else if (cardName.equals("Pyretic Ritual")) { + final SpellAbility spell = new Spell(card) { + private static final long serialVersionUID = -5473428583650237774L; + + @Override + public void resolve() { + /*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards()); + list = list.getName("Mana Pool");*/ + Card mp = AllZone.ManaPool;//list.getCard(0); + mp.addExtrinsicKeyword("ManaPool:R"); + mp.addExtrinsicKeyword("ManaPool:R"); + mp.addExtrinsicKeyword("ManaPool:R"); + } + + @Override + public boolean canPlayAI() { + return false; + } + }; + StringBuffer sb = new StringBuffer(); + sb.append(card.getName()).append(" adds R R R to your mana pool"); + spell.setStackDescription(sb.toString()); + + // spell.setStackDescription(cardName + " adds R R R to your mana pool"); card.clearSpellAbility(); card.addSpellAbility(spell); diff --git a/src/forge/GenerateConstructedDeck.java b/src/forge/GenerateConstructedDeck.java index 19abbab1dc7..d708853999d 100644 --- a/src/forge/GenerateConstructedDeck.java +++ b/src/forge/GenerateConstructedDeck.java @@ -284,6 +284,7 @@ public class GenerateConstructedDeck remove.add("Eye of Ramos"); remove.add("Forbidden Orchard"); remove.add("Everflowing Chalice"); + remove.add("Pyretic Ritual"); final ArrayList goodLand = new ArrayList(); diff --git a/src/forge/GenerateConstructedMultiColorDeck.java b/src/forge/GenerateConstructedMultiColorDeck.java index e03f234cd1d..45c3a5a4aff 100644 --- a/src/forge/GenerateConstructedMultiColorDeck.java +++ b/src/forge/GenerateConstructedMultiColorDeck.java @@ -498,6 +498,7 @@ public class GenerateConstructedMultiColorDeck remove.add("Eye of Ramos"); remove.add("Forbidden Orchard"); remove.add("Everflowing Chalice"); + remove.add("Pyretic Ritual"); final ArrayList goodLand = new ArrayList();