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

Minor formatting.

Browse source
This commit is contained in:
LevelX2 2014-04-20 23:47:48 +02:00
parent 4023a359a0
commit 9f2570bf66
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java
View file

@ -54,7 +54,7 @@ public class HumblerOfMortals extends CardImpl<HumblerOfMortals> {
this.toughness = new MageInt(5); this.toughness = new MageInt(5);
// Constellation - Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn. // Constellation - Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn.
this.addAbility(new ConstellationAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent()))); this.addAbility(new ConstellationAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures"))));
} }
public HumblerOfMortals(final HumblerOfMortals card) { public HumblerOfMortals(final HumblerOfMortals card) {

23
Mage/src/mage/cards/ExpansionSet.java
View file

@ -28,17 +28,16 @@
package mage.cards; package mage.cards;
import mage.constants.Rarity;
import mage.constants.SetType;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.constants.Rarity;
import mage.constants.SetType;
/** /**
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
@ -113,13 +112,9 @@ public abstract class ExpansionSet implements Serializable {
return booster; return booster;
} }
CardCriteria criteria = new CardCriteria();
criteria.setCodes(!hasBasicLands && parentSet != null ? parentSet.code : this.code).rarities(Rarity.LAND).doubleFaced(false);
List<CardInfo> basicLand = CardRepository.instance.findCards(criteria);
List<CardInfo> common = getCommon(); List<CardInfo> common = getCommon();
criteria = new CardCriteria(); CardCriteria criteria = new CardCriteria();
criteria.setCodes(this.code).rarities(Rarity.UNCOMMON).doubleFaced(false); criteria.setCodes(this.code).rarities(Rarity.UNCOMMON).doubleFaced(false);
List<CardInfo> uncommon = CardRepository.instance.findCards(criteria); List<CardInfo> uncommon = CardRepository.instance.findCards(criteria);
@ -131,9 +126,15 @@ public abstract class ExpansionSet implements Serializable {
criteria.setCodes(this.code).rarities(Rarity.MYTHIC).doubleFaced(false); criteria.setCodes(this.code).rarities(Rarity.MYTHIC).doubleFaced(false);
List<CardInfo> mythic = CardRepository.instance.findCards(criteria); List<CardInfo> mythic = CardRepository.instance.findCards(criteria);
if (numBoosterLands > 0) {
criteria = new CardCriteria();
criteria.setCodes(!hasBasicLands && parentSet != null ? parentSet.code : this.code).rarities(Rarity.LAND).doubleFaced(false);
List<CardInfo> basicLand = CardRepository.instance.findCards(criteria);
for (int i = 0; i < numBoosterLands; i++) { for (int i = 0; i < numBoosterLands; i++) {
addToBooster(booster, basicLand); addToBooster(booster, basicLand);
} }
}
for (int i = 0; i < numBoosterCommon; i++) { for (int i = 0; i < numBoosterCommon; i++) {
addToBooster(booster, common); addToBooster(booster, common);
} }