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

Remove basic lands from boosters that are not supposed to have them. Implement the timeshifted slot of Time Spiral boosters.

Browse source 
TODO: Planar Chaos with its "planeshifted" card slots
This commit is contained in:
LoneFox 2015-07-20 21:06:51 +03:00
parent 764541d8ca
commit 2c3790b70e
27 changed files with 73 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java
View file

@ -15,8 +15,8 @@ public class ChampionsOfKamigawa extends ExpansionSet {
super("Champions of Kamigawa", "CHK", "mage.sets.championsofkamigawa", new GregorianCalendar(2004, 9, 1).getTime(), SetType.EXPANSION);
this.blockName = "Kamigawa";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/ClassicSixthEdition.java
View file

@ -47,8 +47,8 @@ public class ClassicSixthEdition extends ExpansionSet {
private ClassicSixthEdition() {
super("Classic Sixth Edition", "6ED", "mage.sets.classicsixthedition", new GregorianCalendar(1999, 3, 28).getTime(), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

6
Mage.Sets/src/mage/sets/FifthEdition.java
View file

@ -15,11 +15,11 @@ public class FifthEdition extends ExpansionSet {
private FifthEdition() {
super("Fifth Edition", "5ED", "mage.sets.fifthedition", new GregorianCalendar(1997, 3, 1).getTime(), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;
}
}
}

4
Mage.Sets/src/mage/sets/FourthEdition.java
View file

@ -47,8 +47,8 @@ public class FourthEdition extends ExpansionSet {
private FourthEdition() {
super("Fourth Edition", "4ED", "mage.sets.fourthedition", new GregorianCalendar(1995, 3, 1).getTime(), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/FutureSight.java
View file

@ -49,8 +49,8 @@ public class FutureSight extends ExpansionSet {
this.parentSet = TimeSpiral.getInstance();
this.hasBasicLands = false;
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/IceAge.java
View file

@ -48,8 +48,8 @@ public class IceAge extends ExpansionSet {
super("Ice Age", "ICE", "mage.sets.iceage", new GregorianCalendar(1995, 5, 1).getTime(), SetType.EXPANSION);
this.blockName = "Ice Age";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

6
Mage.Sets/src/mage/sets/Invasion.java
View file

@ -46,10 +46,10 @@ public class Invasion extends ExpansionSet {
super("Invasion", "INV", "mage.sets.invasion", new GregorianCalendar(2000, 9, 2).getTime(), SetType.EXPANSION);
this.blockName = "Invasion";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;
}
}
}

6
Mage.Sets/src/mage/sets/Judgment.java
View file

@ -49,10 +49,10 @@ public class Judgment extends ExpansionSet {
this.parentSet = Odyssey.getInstance();
this.hasBasicLands = false;
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;
}
}
}

4
Mage.Sets/src/mage/sets/Legends.java
View file

@ -48,8 +48,8 @@ public class Legends extends ExpansionSet {
super("Legends", "LEG", "mage.sets.legends", new GregorianCalendar(1994, 5, 1).getTime(), SetType.EXPANSION);
this.hasBasicLands = false;
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/LimitedEditionAlpha.java
View file

@ -20,8 +20,8 @@ public class LimitedEditionAlpha extends ExpansionSet {
private LimitedEditionAlpha() {
super("Limited Edition Alpha", "LEA", "mage.sets.limitedalpha", new GregorianCalendar(1993, 7, 1).getTime(), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/LimitedEditionBeta.java
View file

@ -20,8 +20,8 @@ public class LimitedEditionBeta extends ExpansionSet {
private LimitedEditionBeta() {
super("Limited Edition Beta", "LEB", "mage.sets.limitedbeta", new GregorianCalendar(1993, 9, 1).getTime(), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/Lorwyn.java
View file

@ -47,8 +47,8 @@ public class Lorwyn extends ExpansionSet {
super("Lorwyn", "LRW", "mage.sets.lorwyn", new GregorianCalendar(2007, 9, 12).getTime(), SetType.EXPANSION);
this.blockName = "Lorwyn";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/MercadianMasques.java
View file

@ -48,8 +48,8 @@ public class MercadianMasques extends ExpansionSet {
super("Mercadian Masques", "MMQ", "mage.sets.mercadianmasques", new GregorianCalendar(1999, 8, 25).getTime(), SetType.EXPANSION);
this.blockName = "Masques";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/Mirage.java
View file

@ -47,8 +47,8 @@ public class Mirage extends ExpansionSet {
super("Mirage", "MIR", "mage.sets.mirage", new GregorianCalendar(1996, 8, 21).getTime(), SetType.EXPANSION);
this.blockName = "Mirage";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/Mirrodin.java
View file

@ -16,8 +16,8 @@ public class Mirrodin extends ExpansionSet {
super("Mirrodin", "MRD", "mage.sets.mirrodin", new GregorianCalendar(2003, 9, 2).getTime(), SetType.EXPANSION);
this.blockName = "Mirrodin";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/Odyssey.java
View file

@ -47,8 +47,8 @@ public class Odyssey extends ExpansionSet {
super("Odyssey", "ODY", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), SetType.EXPANSION);
this.blockName = "Odyssey";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

6
Mage.Sets/src/mage/sets/Onslaught.java
View file

@ -16,10 +16,10 @@ public class Onslaught extends ExpansionSet {
super("Onslaught", "ONS", "mage.sets.onslaught", new GregorianCalendar(2002, 10, 7).getTime(), SetType.EXPANSION);
this.blockName = "Onslaught";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;
}
}
}

4
Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java
View file

@ -48,8 +48,8 @@ public class RavnicaCityOfGuilds extends ExpansionSet {
super("Ravnica: City of Guilds", "RAV", "mage.sets.ravnica", new GregorianCalendar(2005, 9, 24).getTime(), SetType.EXPANSION);
this.blockName = "Ravnica";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/RevisedEdition.java
View file

@ -20,8 +20,8 @@ public class RevisedEdition extends ExpansionSet {
private RevisedEdition() {
super("Revised Edition", "3ED", "mage.sets.revisededition", new GregorianCalendar(1994, 3, 1).getTime(), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/Shadowmoor.java
View file

@ -47,8 +47,8 @@ public class Shadowmoor extends ExpansionSet {
super("Shadowmoor", "SHM", "mage.sets.shadowmoor", new GregorianCalendar(2008, 4, 2).getTime(), SetType.EXPANSION);
this.blockName = "Shadowmoor";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/Tempest.java
View file

@ -16,8 +16,8 @@ public class Tempest extends ExpansionSet {
super("Tempest", "TMP", "mage.sets.tempest", new GregorianCalendar(1997, 9, 1).getTime(), SetType.EXPANSION);
this.blockName = "Tempest";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

23
Mage.Sets/src/mage/sets/TimeSpiral.java
View file

@ -1,9 +1,13 @@
package mage.sets;
import mage.cards.ExpansionSet;
import mage.constants.SetType;
import java.util.GregorianCalendar;
import java.util.List;
import mage.cards.Card;
import mage.cards.ExpansionSet;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardRepository;
import mage.constants.Rarity;
import mage.constants.SetType;
public class TimeSpiral extends ExpansionSet {
@ -17,10 +21,19 @@ public class TimeSpiral extends ExpansionSet {
super("Time Spiral", "TSP", "mage.sets.timespiral", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION);
this.blockName = "Time Spiral";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 11;
this.numBoosterLands = 0;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;
}
@Override
public List<Card> createBooster() {
List<Card> booster = super.createBooster();
CardCriteria criteria = new CardCriteria();
criteria.rarities(Rarity.SPECIAL).setCodes("TSB");
addToBooster(booster, CardRepository.instance.findCards(criteria));
return booster;
}
}

4
Mage.Sets/src/mage/sets/UrzasDestiny.java
View file

@ -49,8 +49,8 @@ public class UrzasDestiny extends ExpansionSet {
this.parentSet = UrzasSaga.getInstance();
this.hasBasicLands = false;
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/UrzasLegacy.java
View file

@ -51,8 +51,8 @@ public class UrzasLegacy extends ExpansionSet {
this.parentSet = UrzasSaga.getInstance();
this.hasBasicLands = false;
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/UrzasSaga.java
View file

@ -48,8 +48,8 @@ public class UrzasSaga extends ExpansionSet {
super("Urza's Saga", "USG", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION);
this.blockName = "Urza";
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

4
Mage.Sets/src/mage/sets/Weatherlight.java
View file

@ -51,8 +51,8 @@ public class Weatherlight extends ExpansionSet {
this.parentSet = Mirage.getInstance();
this.hasBasicLands = false;
this.hasBoosters = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;

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

@ -257,7 +257,7 @@ public abstract class ExpansionSet implements Serializable {
}
}
private void addToBooster(List<Card> booster, List<CardInfo> cards) {
protected void addToBooster(List<Card> booster, List<CardInfo> cards) {
if (!cards.isEmpty()) {
CardInfo cardInfo = cards.remove(rnd.nextInt(cards.size()));
if (cardInfo != null) {