Merge branch 'tokenscript_pt' into 'master'

TokenInfo: add TokenPower & TokenToughness into token script

See merge request core-developers/forge!1462
This commit is contained in:
Sol
2019-03-16 18:26:47 +00:00

View File

@@ -9,6 +9,7 @@ import forge.StaticData;
import forge.card.CardType; import forge.card.CardType;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CardFactory; import forge.game.card.CardFactory;
import forge.game.card.CardFactoryUtil; import forge.game.card.CardFactoryUtil;
@@ -239,6 +240,18 @@ public class TokenInfo {
if (token != null) { if (token != null) {
final Card result = Card.fromPaperCard(token, null, game); final Card result = Card.fromPaperCard(token, null, game);
if (sa.hasParam("TokenPower")) {
String str = sa.getParam("TokenPower");
result.setBasePowerString(str);
result.setBasePower(AbilityUtils.calculateAmount(host, str, sa));
}
if (sa.hasParam("TokenToughness")) {
String str = sa.getParam("TokenToughness");
result.setBaseToughnessString(str);
result.setBaseToughness(AbilityUtils.calculateAmount(host, str, sa));
}
// update Token with CardTextChanges // update Token with CardTextChanges
Map<String, String> colorMap = sa.getChangedTextColors(); Map<String, String> colorMap = sa.getChangedTextColors();
Map<String, String> typeMap = sa.getChangedTextTypes(); Map<String, String> typeMap = sa.getChangedTextTypes();