External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tokens rework:

Browse source 
- tests: added support of set code in custom ability (see addCustomCardWithAbility);
 - tests: added additional tests for token images (related to #10139, #10222);
 - fixed wrong token images for copied cards/tokens (#10222);
This commit is contained in:
Oleg Agafonov 2023-05-01 17:27:26 +04:00
parent 5c6de9815f
commit 94819ff91c
5 changed files with 149 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/game/permanent/token/TokenImpl.java
View file

@ -156,11 +156,22 @@ public abstract class TokenImpl extends MageObjectImpl implements Token {
// - use random set code
// - use default set code
// token from a card - must use card image instead (example: Embalm ability)
if (token.getOriginalCardNumber() != null) {
// token from a card, so must use card image instead (example: Embalm ability)
return new TokenInfo(TokenType.TOKEN, token.getName(), token.getOriginalExpansionSetCode(), 0);
}
// token from another token
if (token instanceof EmptyToken) {
if (token.getOriginalExpansionSetCode() == null) {
// possible reason: miss call of CardUtil.copySetAndCardNumber in copying method
throw new IllegalArgumentException("Wrong code usage: can't copy token without set code");
}
return new TokenInfo(TokenType.TOKEN, token.getName(), token.getOriginalExpansionSetCode(), token.getTokenType());
}
// token as is
// source
final String setCode;
Card sourceCard = game.getCard(sourceId);
@ -272,8 +283,8 @@ public abstract class TokenImpl extends MageObjectImpl implements Token {
List<Permanent> allowedTokens = new ArrayList<>();
// prepare tokens to enter
// must use same image for all tokens
for (int i = 0; i < amount; i++) {
// TODO: add random setTokenType here?
// use event.getPlayerId() as controller because it can be replaced by replacement effect
PermanentToken newPermanent = new PermanentToken(token, event.getPlayerId(), game);
game.getState().addCard(newPermanent);