mirror of
https://github.com/magefree/mage.git
synced 2025-12-21 02:52:02 -08:00
Refactor cards and token images code (#10139):
- removed outdated token store format (example: BIRD.W.BIRD.CREATURE.1.1.full.jpg) - removed duplicated cache images code; - removed duplicated set code fields; - removed outdated auto-generated thumb files (also all *.thumb.zip files will be deleted on startup);
This commit is contained in:
parent
d93e533c75
commit
66d0ef4b35
25 changed files with 333 additions and 634 deletions
|
|
@ -49,11 +49,6 @@ public interface Card extends MageObject {
|
|||
List<String> getRules(Game game); // gets card rules + in game modifications
|
||||
|
||||
String getExpansionSetCode();
|
||||
|
||||
String getTokenSetCode();
|
||||
|
||||
String getTokenDescriptor();
|
||||
|
||||
void checkForCountersToAdd(Permanent permanent, Ability source, Game game);
|
||||
|
||||
void setFaceDown(boolean value, Game game);
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
|
|||
protected UUID ownerId;
|
||||
protected String cardNumber;
|
||||
protected String expansionSetCode;
|
||||
protected String tokenSetCode;
|
||||
protected String tokenDescriptor;
|
||||
protected Rarity rarity;
|
||||
protected Class<? extends Card> secondSideCardClazz;
|
||||
protected Class<? extends Card> meldsWithClazz;
|
||||
|
|
@ -121,8 +119,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
|
|||
ownerId = card.ownerId;
|
||||
cardNumber = card.cardNumber;
|
||||
expansionSetCode = card.expansionSetCode;
|
||||
tokenSetCode = card.tokenSetCode;
|
||||
tokenDescriptor = card.tokenDescriptor;
|
||||
rarity = card.rarity;
|
||||
|
||||
secondSideCardClazz = card.secondSideCardClazz;
|
||||
|
|
@ -378,16 +374,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
|
|||
return expansionSetCode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTokenSetCode() {
|
||||
return tokenSetCode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTokenDescriptor() {
|
||||
return tokenDescriptor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Mana> getMana() {
|
||||
List<Mana> mana = new ArrayList<>();
|
||||
|
|
|
|||
|
|
@ -87,7 +87,6 @@ public class PermanentToken extends PermanentImpl {
|
|||
this.supertype.clear();
|
||||
this.supertype.addAll(token.getSuperType());
|
||||
this.subtype.copyFrom(token.getSubtype(game));
|
||||
this.tokenDescriptor = token.getTokenDescriptor();
|
||||
this.startingLoyalty = token.getStartingLoyalty();
|
||||
// workaround for entersTheBattlefield replacement effects
|
||||
if (this.abilities.containsClass(ChangelingAbility.class)) {
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ public interface Token extends MageObject {
|
|||
@Override
|
||||
Token copy();
|
||||
|
||||
String getTokenDescriptor();
|
||||
|
||||
String getDescription();
|
||||
|
||||
List<UUID> getLastAddedTokenIds();
|
||||
|
|
|
|||
|
|
@ -85,12 +85,6 @@ public abstract class TokenImpl extends MageObjectImpl implements Token {
|
|||
this.tokenDescriptor = tokenDescriptor();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTokenDescriptor() {
|
||||
this.tokenDescriptor = tokenDescriptor();
|
||||
return tokenDescriptor;
|
||||
}
|
||||
|
||||
private String tokenDescriptor() {
|
||||
String strName = this.name.replaceAll("[^a-zA-Z0-9]", "");
|
||||
String strColor = this.color.toString().replaceAll("[^a-zA-Z0-9]", "");
|
||||
|
|
|
|||
|
|
@ -697,16 +697,6 @@ public class Spell extends StackObjectImpl implements Card {
|
|||
return card.getExpansionSetCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTokenSetCode() {
|
||||
return card.getTokenSetCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTokenDescriptor() {
|
||||
return card.getTokenDescriptor();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFaceDown(boolean value, Game game) {
|
||||
faceDown = value;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue