github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug of World Queller, changed rule order of Kazandu Refuge.

Browse source
This commit is contained in:
LevelX2 2012-12-24 15:21:52 +01:00
parent 4ab7766675
commit 895ee717dd
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/sets/zendikar/KazanduRefuge.java
View file

@ -47,10 +47,15 @@ public class KazanduRefuge extends CardImpl<KazanduRefuge> {
super(ownerId, 217, "Kazandu Refuge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); super(ownerId, 217, "Kazandu Refuge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
this.expansionSetCode = "ZEN"; this.expansionSetCode = "ZEN";
// Kazandu Refuge enters the battlefield tapped.
this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new EntersBattlefieldTappedAbility());
// When Kazandu Refuge enters the battlefield, you gain 1 life.
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(1)));
// {T}: Add {R} or {G} to your mana pool.
this.addAbility(new RedManaAbility()); this.addAbility(new RedManaAbility());
this.addAbility(new GreenManaAbility()); this.addAbility(new GreenManaAbility());
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(1)));
} }
public KazanduRefuge(final KazanduRefuge card) { public KazanduRefuge(final KazanduRefuge card) {

18
Mage.Sets/src/mage/sets/zendikar/WorldQueller.java
View file

@ -29,10 +29,12 @@ package mage.sets.zendikar;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Outcome;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.TargetController; import mage.Constants.TargetController;
import mage.MageInt; import mage.MageInt;
@ -44,6 +46,7 @@ import mage.cards.CardImpl;
import mage.choices.Choice; import mage.choices.Choice;
import mage.choices.ChoiceImpl; import mage.choices.ChoiceImpl;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -83,16 +86,16 @@ public class WorldQueller extends CardImpl<WorldQueller> {
class WorldQuellerEffect extends OneShotEffect<WorldQuellerEffect> { class WorldQuellerEffect extends OneShotEffect<WorldQuellerEffect> {
private static final HashSet<String> choice = new HashSet<String>(); private static final HashSet<String> choice = new LinkedHashSet<String>();
static { static {
choice.add(CardType.ARTIFACT.toString()); choice.add(CardType.ARTIFACT.toString());
choice.add(CardType.CREATURE.toString()); choice.add(CardType.CREATURE.toString());
choice.add(CardType.LAND.toString());
choice.add(CardType.ENCHANTMENT.toString()); choice.add(CardType.ENCHANTMENT.toString());
choice.add(CardType.INSTANT.toString()); choice.add(CardType.INSTANT.toString());
choice.add(CardType.SORCERY.toString()); choice.add(CardType.LAND.toString());
choice.add(CardType.PLANESWALKER.toString()); choice.add(CardType.PLANESWALKER.toString());
choice.add(CardType.SORCERY.toString());
choice.add(CardType.TRIBAL.toString()); choice.add(CardType.TRIBAL.toString());
} }
@ -114,10 +117,11 @@ class WorldQuellerEffect extends OneShotEffect<WorldQuellerEffect> {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
List<Card> chosen = new ArrayList<Card>(); List<Card> chosen = new ArrayList<Card>();
Player you = game.getPlayer(source.getControllerId()); Player you = game.getPlayer(source.getControllerId());
if (you != null) { Permanent sourceCreature = game.getPermanent(source.getSourceId());
if (you != null && sourceCreature != null) {
Choice choiceImpl = new ChoiceImpl(); Choice choiceImpl = new ChoiceImpl();
choiceImpl.setChoices(choice); choiceImpl.setChoices(choice);
while (!you.choose(outcome.Neutral, choiceImpl, game)); while (!you.choose(Outcome.Neutral, choiceImpl, game)) {};
CardType type = null; CardType type = null;
String choosenType = choiceImpl.getChoice(); String choosenType = choiceImpl.getChoice();
@ -139,11 +143,9 @@ class WorldQuellerEffect extends OneShotEffect<WorldQuellerEffect> {
type = CardType.TRIBAL; type = CardType.TRIBAL;
} }
FilterPermanent filter = new FilterPermanent(); FilterPermanent filter = new FilterControlledPermanent(new StringBuilder("permanent you control of type ").append(type.toString()).toString());
filter.add(new CardTypePredicate(type)); filter.add(new CardTypePredicate(type));
System.out.println("The type chosen is " + type.toString());
TargetPermanent target = new TargetControlledPermanent(1, 1, filter, false); TargetPermanent target = new TargetControlledPermanent(1, 1, filter, false);
target.setRequired(true); target.setRequired(true);
target.setNotTarget(true); target.setNotTarget(true);