Merge remote-tracking branch 'upstream/master'

This commit is contained in:
daagar 2015-02-15 17:01:55 -06:00
commit 03ab6d3698
3 changed files with 15 additions and 5 deletions

View file

@ -3,5 +3,4 @@ XMage.info 1 (Europe/France) :176.31.186.181:17171
XMage.info 2 (Europe/France) :176.31.186.181:17000
IceMage (Europe/Netherlands) :ring0.cc:17171
Seedds Server (Asia) :115.29.203.80:17171
Felipejoys (South America/Brazil):felipejoys.no-ip.org:17171
localhost -> connect to your local server (must be started):localhost:17171

View file

@ -56,10 +56,8 @@ public class RunicRepetition extends CardImpl {
super(ownerId, 72, "Runic Repetition", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}");
this.expansionSetCode = "ISD";
this.color.setBlue(true);
// Return target exiled card with flashback you own to your hand.
TargetCardInExile target = new TargetCardInExile(filter, null);
TargetCardInExile target = new TargetCardInExile(filter);
this.getSpellAbility().addTarget(target);
this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
}

View file

@ -48,6 +48,15 @@ public class TargetCardInExile extends TargetCard {
private UUID zoneId;
private boolean allExileZones;
public TargetCardInExile(FilterCard filter) {
this(1, 1, filter, null);
}
/**
*
* @param filter
* @param zoneId - if null card can be in ever exile zone
*/
public TargetCardInExile(FilterCard filter, UUID zoneId) {
this(1, 1, filter, zoneId);
}
@ -59,7 +68,11 @@ public class TargetCardInExile extends TargetCard {
public TargetCardInExile(int minNumTargets, int maxNumTargets, FilterCard filter, UUID zoneId, boolean allExileZones) {
super(minNumTargets, maxNumTargets, Zone.EXILED, filter);
this.zoneId = zoneId;
this.allExileZones = allExileZones;
if (zoneId == null) {
this.allExileZones = true;
} else {
this.allExileZones = allExileZones;
}
this.targetName = filter.getMessage();
}