From f40ca331cb18e546fe7ec6e36bc1b0b5932fd7b3 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:18:42 +0000 Subject: [PATCH] Doubling Season is completely handled in CardFactoryUtil.makeToken --- src/forge/CardFactory.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index c625ef30814..8962216b9fe 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -5735,16 +5735,10 @@ public class CardFactory implements NewConstants { @Override public void resolve() { String controller = (controllerString.equals("Controller") ? card.getController() : AllZone.GameAction.getOpponent(card.getController())); + if(keywords[0].equals("None")) keywords[0] = ""; - int multiplier = 1; - int doublingSeasons = AllZoneUtil.getPlayerCardsInPlay("Doubling Season", card.getController()).size(); - if(doublingSeasons > 0) multiplier = (int) Math.pow(2, doublingSeasons); - int num = xString ? CardFactoryUtil.xCount(card, numString) : Integer.valueOf(numString); - num = num*multiplier; - - for(int i = 0; i < num; i ++ ){ - if(keywords[0].equals("None")) keywords[0] = ""; + for(int i = 0; i < num; i ++ ){ CardFactoryUtil.makeToken(name, imageName, controller, manaCost, types, attack, defense, keywords); } }