External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tokens rework:

Browse source 
- added tokens database (now all tokens store in tokens-database.txt, related to #10139);
 - added sets/cards/tokens stats on app's start;
This commit is contained in:
Oleg Agafonov 2023-04-22 02:22:11 +04:00
parent 1dc7dcc94c
commit 24bd4315c6
8 changed files with 348 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,10 +5,7 @@ import mage.cards.CardDimensions;
import mage.cards.ExpansionSet;
import mage.cards.MageCard;
import mage.cards.Sets;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.cards.repository.ExpansionRepository;
import mage.cards.repository.*;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.client.components.HoverButton;
@ -30,7 +27,6 @@ import mage.game.permanent.token.Token;
import mage.view.*;
import org.apache.log4j.Logger;
import org.mage.card.arcane.ManaSymbols;
import org.mage.plugins.card.images.CardDownloadData;
import javax.imageio.ImageIO;
import javax.swing.*;
@ -46,7 +42,6 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static java.lang.Math.min;
import static org.mage.plugins.card.images.DownloadPicturesService.getTokenCardUrls;
/**
* Card viewer (mage book) with cards and page flipping
@ -236,20 +231,19 @@ public class MageBook extends JComponent {
List<Object> res = new ArrayList<>();
// tokens
List<CardDownloadData> allTokens = getTokenCardUrls().stream()
.filter(token -> token.getSet().equals(currentSet))
.filter(token -> token.getAffectedClassName().contains("Token"))
List<TokenInfo> allTokens = TokenRepository.instance.getByType(TokenType.TOKEN)
.stream()
.filter(token -> token.getSetCode().equals(currentSet))
.collect(Collectors.toList());
allTokens.forEach(token -> {
String fullClassName = "mage.game.permanent.token." + token.getAffectedClassName();
try {
Class<?> c = Class.forName(fullClassName);
Class<?> c = Class.forName(token.getFullClassFileName());
Constructor<?> cons = c.getConstructor();
Object newToken = cons.newInstance();
if (newToken instanceof Token) {
((Token) newToken).setOriginalExpansionSetCode(currentSet);
((Token) newToken).setExpansionSetCodeForImage(currentSet);
((Token) newToken).setTokenType(token.getType()); // must be called after set code, so it keep the type
((Token) newToken).setTokenType(token.getImageNumber()); // must be called after set code, so it keep the type
res.add(newToken);
}
} catch (Exception e) {
@ -258,14 +252,13 @@ public class MageBook extends JComponent {
});
// emblems
List<CardDownloadData> allEmblems = getTokenCardUrls().stream()
.filter(token -> token.getSet().equals(currentSet))
.filter(token -> token.getAffectedClassName().contains("Emblem"))
List<TokenInfo> allEmblems = TokenRepository.instance.getByType(TokenType.EMBLEM)
.stream()
.filter(token -> token.getSetCode().equals(currentSet))
.collect(Collectors.toList());
allEmblems.forEach(token -> {
String fullClassName = "mage.game.command.emblems." + token.getAffectedClassName();
try {
Class<?> c = Class.forName(fullClassName);
Class<?> c = Class.forName(token.getFullClassFileName());
Constructor<?> cons = c.getConstructor();
Object newEmblem = cons.newInstance();
if (newEmblem instanceof Emblem) {
@ -278,14 +271,13 @@ public class MageBook extends JComponent {
});
// planes
List<CardDownloadData> allPlanes = getTokenCardUrls().stream()
.filter(token -> token.getSet().equals(currentSet))
.filter(token -> token.getAffectedClassName().contains("Plane"))
List<TokenInfo> allPlanes = TokenRepository.instance.getByType(TokenType.PLANE)
.stream()
.filter(token -> token.getSetCode().equals(currentSet))
.collect(Collectors.toList());
allPlanes.forEach(token -> {
String fullClassName = "mage.game.command.planes." + token.getAffectedClassName();
try {
Class<?> c = Class.forName(fullClassName);
Class<?> c = Class.forName(token.getFullClassFileName());
Constructor<?> cons = c.getConstructor();
Object newPlane = cons.newInstance();
if (newPlane instanceof Plane) {
@ -298,14 +290,13 @@ public class MageBook extends JComponent {
});
// dungeons
List<CardDownloadData> allDungeons = getTokenCardUrls().stream()
.filter(token -> token.getSet().equals(currentSet))
.filter(token -> token.getAffectedClassName().contains("Dungeon"))
List<TokenInfo> allDungeons = TokenRepository.instance.getByType(TokenType.DUNGEON)
.stream()
.filter(token -> token.getSetCode().equals(currentSet))
.collect(Collectors.toList());
allDungeons.forEach(token -> {
String fullClassName = "mage.game.command.dungeons." + token.getAffectedClassName();
try {
Class<?> c = Class.forName(fullClassName);
Class<?> c = Class.forName(token.getFullClassFileName());
Constructor<?> cons = c.getConstructor();
Object newDungeon = cons.newInstance();
if (newDungeon instanceof Dungeon) {

15
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java
View file

@ -5,6 +5,7 @@ import mage.cards.Sets;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.cards.repository.TokenRepository;
import mage.client.MageFrame;
import mage.client.dialog.DownloadImagesDialog;
import mage.client.dialog.PreferencesDialog;
@ -536,7 +537,19 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
}
});
allCardsUrls.addAll(getTokenCardUrls());
// tokens
TokenRepository.instance.getAllTokens().forEach(token -> {
CardDownloadData card = new CardDownloadData(
token.getName(),
token.getSetCode(),
"0",
false,
token.getImageNumber(),
true,
token.getImageFileName()
);
allCardsUrls.add(card);
});
} catch (Exception e) {
logger.error(e);
}