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

* Fixed viewer's error on tokens show up (Mirage and other); Fixed some tokens.

Browse source
This commit is contained in:
Oleg Agafonov 2018-05-02 15:16:39 +04:00
parent 4b4d7989cd
commit b6bad9ca96
6 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
View file

@ -581,7 +581,7 @@ public class MageBook extends JComponent {
}
int start = page * conf.CARDS_PER_PAGE;
int end = page * conf.CARDS_PER_PAGE + conf.CARDS_PER_PAGE;
int ttokens = getTotalNumTokens(set);
int ttokens = tokens.size();
int temblems = getTotalNumEmblems(set);
int tplanes = getTotalNumPlanes(set);
int numTokensEmblemsPlanes = ttokens + temblems + tplanes;

2
Mage.Sets/src/mage/sets/PrereleaseEvents.java
View file

@ -322,4 +322,4 @@ public class PrereleaseEvents extends ExpansionSet {
cards.add(new SetCardInfo("Zurgo Bellstriker", 197, Rarity.RARE, mage.cards.z.ZurgoBellstriker.class));
cards.add(new SetCardInfo("Zurgo Helmsmasher", 127, Rarity.SPECIAL, mage.cards.z.ZurgoHelmsmasher.class));
}
}
}

2
Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java
View file

@ -37,6 +37,8 @@ import mage.MageInt;
*/
public class ChainersTormentNightmareToken extends TokenImpl {
public ChainersTormentNightmareToken() { this(0); };
public ChainersTormentNightmareToken(int xValue) {
super("Nightmare", "X/X black Nightmare artifact creature token");
cardType.add(CardType.CREATURE);

2
Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java
View file

@ -6,6 +6,8 @@ import mage.constants.SubType;
public class GeminiEngineTwinToken extends TokenImpl {
public GeminiEngineTwinToken() { this(0, 0); }
public GeminiEngineTwinToken(int power, int toughness) {
super("Twin", "colorless Construct artifact creature token named Twin that's attacking. Its power is equal to Gemini Engine's power and its toughness is equal to Gemini Engine's toughness.");
cardType.add(CardType.ARTIFACT);

2
Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java
View file

@ -42,7 +42,7 @@ public class RiptideReplicatorToken extends TokenImpl {
this(null, null, 1);
}
public RiptideReplicatorToken(ObjectColor color, SubType type, int x) {
super(type != null ? type.getDescription() : "null", "X/X creature token of the chosen color and type");
super(type != null ? type.getDescription() : "", "X/X creature token of the chosen color and type");
cardType.add(CardType.CREATURE);
if (color != null) {
this.color.setColor(color);

2
Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java
View file

@ -42,7 +42,7 @@ public class VolrathsLaboratoryToken extends TokenImpl {
this(null, null);
}
public VolrathsLaboratoryToken(ObjectColor color, SubType type) {
super(type != null ? type.getDescription() : "null", "2/2 creature token of the chosen color and type");
super(type != null ? type.getDescription() : "", "2/2 creature token of the chosen color and type");
cardType.add(CardType.CREATURE);
if (color != null) {
this.color.setColor(color);