merged cardfactory into forge.game.card package

.gitattributes

@@ -14810,10 +14810,6 @@ forge-gui/src/main/java/forge/card/CardCharacteristics.java -text
 forge-gui/src/main/java/forge/card/CardEditionPredicates.java -text
 forge-gui/src/main/java/forge/card/MetaSet.java -text
 forge-gui/src/main/java/forge/card/UnOpenedMeta.java -text
-forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/cardfactory/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/control/ChatArea.java -text
 forge-gui/src/main/java/forge/control/FControl.java -text
@@ -14974,6 +14970,8 @@ forge-gui/src/main/java/forge/game/ability/package-info.java svneol=native#text/
 forge-gui/src/main/java/forge/game/card/Card.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/card/CardDamageHistory.java -text
+forge-gui/src/main/java/forge/game/card/CardFactory.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/card/CardKeywords.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/card/CardLists.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/card/CardPowerToughness.java svneol=native#text/plain
@@ -15629,7 +15627,6 @@ forge-gui/src/main/java/forge/util/maps/EnumMapToAmount.java -text
 forge-gui/src/main/java/forge/util/maps/HashMapOfLists.java -text
 forge-gui/src/main/java/forge/util/maps/MapOfLists.java -text
 forge-gui/src/main/java/forge/util/maps/MapToAmount.java -text
-forge-gui/src/main/java/forge/util/maps/TreeMapToAmount.java -text
 forge-gui/src/main/java/forge/util/maps/package-info.java -text
 forge-gui/src/main/java/forge/util/package-info.java -text
 forge-gui/src/main/java/forge/util/storage/StorageImmediatelySerialized.java svneol=native#text/plain

forge-gui/src/main/java/forge/ai/AiController.java

@@ -30,13 +30,13 @@ import com.google.common.collect.Iterables;
 
 import forge.card.CardType;
 import forge.card.MagicColor;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.GameActionUtil;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.ApiType;
 import forge.game.ai.AiProps;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CardPredicates.Presets;

forge-gui/src/main/java/forge/ai/ComputerUtilCard.java

@@ -20,11 +20,11 @@ import com.google.common.collect.Iterables;
 import forge.card.CardType;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CardUtil;

forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java

@@ -24,7 +24,6 @@ import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.GlobalRuleChange;
@@ -33,6 +32,7 @@ import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;
 import forge.game.combat.Combat;

forge-gui/src/main/java/forge/ai/ability/AttachAi.java

@@ -15,12 +15,12 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CardUtil;

forge-gui/src/main/java/forge/ai/ability/CounterAi.java

@@ -2,11 +2,11 @@ package forge.ai.ability;
 
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.cost.Cost;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java

@@ -1,156 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package forge.card.cardfactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import forge.card.mana.ManaCost;
-import forge.game.card.Card;
-import forge.game.card.CounterType;
-import forge.game.cost.Cost;
-import forge.game.phase.PhaseType;
-import forge.game.player.Player;
-import forge.game.spellability.AbilityActivated;
-import forge.game.spellability.AbilityStatic;
-import forge.game.spellability.SpellAbility;
-import forge.game.zone.PlayerZone;
-import forge.game.zone.ZoneType;
-import forge.gui.GuiChoose;
-
-/**
- * <p>
- * CardFactory_Creatures class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
-public class CardFactoryCreatures {
-
-    private static void getCard_SphinxJwar(final Card card) {
-        final SpellAbility ability1 = new AbilityStatic(card, ManaCost.ZERO) {
-            @Override
-            public void resolve() {
-                final Player player = card.getController();
-                final PlayerZone lib = player.getZone(ZoneType.Library);
-
-                if (lib.size() < 1 || !this.getActivatingPlayer().equals(card.getController())) {
-                    return;
-                }
-
-                final List<Card> cl = new ArrayList<Card>();
-                cl.add(lib.get(0));
-
-                GuiChoose.oneOrNone("Top card", cl);
-            }
-
-            @Override
-            public boolean canPlayAI() {
-                return false;
-            }
-        }; // SpellAbility
-
-        final StringBuilder sb1 = new StringBuilder();
-        sb1.append(card.getName()).append(" - look at top card of library.");
-        ability1.setStackDescription(sb1.toString());
-
-        ability1.setDescription("You may look at the top card of your library.");
-        card.addSpellAbility(ability1);
-    }
-
-    public static void buildCard(final Card card, final String cardName) {
-
-        if (cardName.equals("Sphinx of Jwar Isle")) {
-            getCard_SphinxJwar(card);
-        }
-
-        // ***************************************************
-        // end of card specific code
-        // ***************************************************
-
-        final int iLvlUp = CardFactoryUtil.hasKeyword(card, "Level up");
-        final int iLvlMax = CardFactoryUtil.hasKeyword(card, "maxLevel");
-        
-        if (iLvlUp != -1 && iLvlMax != -1) {
-            final String parse = card.getKeyword().get(iLvlUp);
-            final String parseMax = card.getKeyword().get(iLvlMax);
-            card.addSpellAbility(makeLevellerAbility(card, parse, parseMax));
-            card.setLevelUp(true);
-        } // level up
-    }
-
-
-    private static SpellAbility makeLevellerAbility(final Card card, final String strLevelCost, final String strMaxLevel) {
-        card.removeIntrinsicKeyword(strLevelCost);
-        card.removeIntrinsicKeyword(strMaxLevel);
-
-        final String[] k = strLevelCost.split(":");
-        final String manacost = k[1];
-
-        final String[] l = strMaxLevel.split(":");
-        final int maxLevel = Integer.parseInt(l[1]);
-
-        class LevelUpAbility extends AbilityActivated {
-            public LevelUpAbility(final Card ca, final String s) {
-                super(ca, new Cost(manacost, true), null);
-            }
-
-            @Override
-            public AbilityActivated getCopy() {
-                AbilityActivated levelUp = new LevelUpAbility(getSourceCard(), getPayCosts().toString());
-                levelUp.getRestrictions().setSorcerySpeed(true);
-                return levelUp;
-            }
-
-            private static final long serialVersionUID = 3998280279949548652L;
-
-            @Override
-            public void resolve() {
-                card.addCounter(CounterType.LEVEL, 1, true);
-            }
-
-            @Override
-            public boolean canPlayAI() {
-                // creatures enchanted by curse auras have low priority
-                if (card.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)) {
-                    for (Card aura : card.getEnchantedBy()) {
-                        if (aura.getController().isOpponentOf(card.getController())) {
-                            return false;
-                        }
-                    }
-                }
-                return card.getCounters(CounterType.LEVEL) < maxLevel;
-            }
-
-            @Override
-            public String getDescription() {
-                final StringBuilder sbDesc = new StringBuilder();
-                sbDesc.append("Level up ").append(manacost).append(" (").append(manacost);
-                sbDesc.append(": Put a level counter on this. Level up only as a sorcery.)");
-                return sbDesc.toString();
-            }
-        }
-        final SpellAbility levelUp = new LevelUpAbility(card, manacost);
-        levelUp.getRestrictions().setSorcerySpeed(true);
-        final StringBuilder sbStack = new StringBuilder();
-        sbStack.append(card).append(" - put a level counter on this.");
-        levelUp.setStackDescription(sbStack.toString());
-        return levelUp;
-    }
-}

forge-gui/src/main/java/forge/card/cardfactory/package-info.java

@@ -1,3 +0,0 @@
-/** Forge Card Game. */
-package forge.card.cardfactory;
-

forge-gui/src/main/java/forge/game/GameAction.java

@@ -37,12 +37,12 @@ import forge.Command;
 import forge.FThreads;
 import forge.card.CardCharacteristicName;
 import forge.card.CardType;
-import forge.card.cardfactory.CardFactory;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.ApiType;
 import forge.game.ability.effects.AttachEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CardUtil;

forge-gui/src/main/java/forge/game/TriggerReplacementBase.java

@@ -6,9 +6,9 @@ import java.util.List;
 import java.util.Map;
 
 import forge.card.MagicColor;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardUtil;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java

@@ -2,12 +2,12 @@ package forge.game.ability;
 
 import java.util.Map;
 
-import forge.card.cardfactory.CardFactory;
 import forge.game.ability.effects.ChangeZoneAllEffect;
 import forge.game.ability.effects.ChangeZoneEffect;
 import forge.game.ability.effects.ManaEffect;
 import forge.game.ability.effects.ManaReflectedEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
 import forge.game.cost.Cost;
 import forge.game.player.Player;
 import forge.game.spellability.AbilityActivated;

forge-gui/src/main/java/forge/game/ability/AbilityUtils.java

@@ -12,10 +12,10 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Iterables;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardUtil;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java

@@ -7,7 +7,7 @@ import java.util.StringTokenizer;
 import org.apache.commons.lang3.StringUtils;
 
 
-import forge.card.cardfactory.CardFactoryUtil;
+import forge.game.card.CardFactoryUtil;
 import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java

@@ -6,10 +6,10 @@ import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.trigger.TriggerType;

forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java

@@ -6,10 +6,10 @@ import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.card.CardType;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java

@@ -5,9 +5,9 @@ import java.util.Random;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java

@@ -8,13 +8,13 @@ import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.combat.Combat;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java

@@ -8,12 +8,12 @@ import java.util.Map;
 import forge.Command;
 import forge.Singletons;
 import forge.card.CardCharacteristicName;
-import forge.card.cardfactory.CardFactory;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardUtil;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java

@@ -15,14 +15,14 @@ import forge.Command;
 import forge.Singletons;
 import forge.card.CardCharacteristicName;
 import forge.card.CardRulesPredicates;
-import forge.card.cardfactory.CardFactory;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCost;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.spellability.Ability;

forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java

@@ -6,11 +6,11 @@ import java.util.List;
 
 import com.google.common.collect.Iterables;
 
-import forge.card.cardfactory.CardFactory;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
 import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java

@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.replacement.ReplacementResult;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;

forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java

@@ -2,11 +2,11 @@ package forge.game.ability.effects;
 
 import java.util.List;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java

@@ -7,10 +7,10 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java

@@ -5,11 +5,11 @@ import java.util.Arrays;
 import java.util.List;
 
 import forge.Command;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.event.GameEventCardStatsChanged;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java

@@ -6,12 +6,12 @@ import java.util.List;
 
 import forge.Command;
 import forge.card.CardType;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardUtil;
 import forge.game.event.GameEventCardStatsChanged;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java

@@ -3,12 +3,12 @@ package forge.game.ability.effects;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.spellability.AbilitySub;

forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java

@@ -1,9 +1,9 @@
 package forge.game.ability.effects;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.spellability.SpellAbility;
 
 public class StoreSVarEffect extends SpellAbilityEffect {

forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java

@@ -21,13 +21,13 @@ import java.util.Arrays;
 import java.util.List;
 
 
-import forge.card.cardfactory.CardFactory;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
 import forge.game.combat.Combat;
 import forge.game.event.GameEventTokenCreated;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/card/Card.java

@@ -50,8 +50,6 @@ import forge.card.CardRarity;
 import forge.card.CardRules;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
-import forge.card.cardfactory.CardFactory;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostParser;
 import forge.game.Game;

forge-gui/src/main/java/forge/game/card/CardFactory.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.card.cardfactory;
+package forge.game.card;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,13 +33,12 @@ import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.ability.effects.CharmEffect;
-import forge.game.card.Card;
-import forge.game.card.CardColor;
-import forge.game.card.CardUtil;
 import forge.game.cost.Cost;
+import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.replacement.ReplacementHandler;
 import forge.game.spellability.AbilityActivated;
+import forge.game.spellability.AbilityStatic;
 import forge.game.spellability.AbilitySub;
 import forge.game.spellability.OptionalCost;
 import forge.game.spellability.SpellAbility;
@@ -48,6 +47,9 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerHandler;
 import forge.game.trigger.WrappedAbility;
+import forge.game.zone.PlayerZone;
+import forge.game.zone.ZoneType;
+import forge.gui.GuiChoose;
 import forge.item.PaperCard;
 import forge.item.IPaperCard;
 
@@ -339,7 +341,7 @@ public class CardFactory {
         // ************** Link to different CardFactories *******************
 
         if (card.isCreature()) {
-            CardFactoryCreatures.buildCard(card, cardName);
+            buildCard(card, cardName);
         } else if (card.isPlaneswalker()) {
             buildPlaneswalkerAbilities(card);
         } else if (card.isType("Plane")) {
@@ -660,4 +662,114 @@ public class CardFactory {
         return wrapperAbility;
     }
 
+    private static void getCard_SphinxJwar(final Card card) {
+        final SpellAbility ability1 = new AbilityStatic(card, ManaCost.ZERO) {
+            @Override
+            public void resolve() {
+                final Player player = card.getController();
+                final PlayerZone lib = player.getZone(ZoneType.Library);
+
+                if (lib.size() < 1 || !this.getActivatingPlayer().equals(card.getController())) {
+                    return;
+                }
+
+                final List<Card> cl = new ArrayList<Card>();
+                cl.add(lib.get(0));
+
+                GuiChoose.oneOrNone("Top card", cl);
+            }
+
+            @Override
+            public boolean canPlayAI() {
+                return false;
+            }
+        }; // SpellAbility
+
+        final StringBuilder sb1 = new StringBuilder();
+        sb1.append(card.getName()).append(" - look at top card of library.");
+        ability1.setStackDescription(sb1.toString());
+
+        ability1.setDescription("You may look at the top card of your library.");
+        card.addSpellAbility(ability1);
+    }
+
+    public static void buildCard(final Card card, final String cardName) {
+
+        if (cardName.equals("Sphinx of Jwar Isle")) {
+            getCard_SphinxJwar(card);
+        }
+
+        // ***************************************************
+        // end of card specific code
+        // ***************************************************
+
+        final int iLvlUp = CardFactoryUtil.hasKeyword(card, "Level up");
+        final int iLvlMax = CardFactoryUtil.hasKeyword(card, "maxLevel");
+        
+        if (iLvlUp != -1 && iLvlMax != -1) {
+            final String parse = card.getKeyword().get(iLvlUp);
+            final String parseMax = card.getKeyword().get(iLvlMax);
+            card.addSpellAbility(makeLevellerAbility(card, parse, parseMax));
+            card.setLevelUp(true);
+        } // level up
+    }
+
+
+    private static SpellAbility makeLevellerAbility(final Card card, final String strLevelCost, final String strMaxLevel) {
+        card.removeIntrinsicKeyword(strLevelCost);
+        card.removeIntrinsicKeyword(strMaxLevel);
+
+        final String[] k = strLevelCost.split(":");
+        final String manacost = k[1];
+
+        final String[] l = strMaxLevel.split(":");
+        final int maxLevel = Integer.parseInt(l[1]);
+
+        class LevelUpAbility extends AbilityActivated {
+            public LevelUpAbility(final Card ca, final String s) {
+                super(ca, new Cost(manacost, true), null);
+            }
+
+            @Override
+            public AbilityActivated getCopy() {
+                AbilityActivated levelUp = new LevelUpAbility(getSourceCard(), getPayCosts().toString());
+                levelUp.getRestrictions().setSorcerySpeed(true);
+                return levelUp;
+            }
+
+            private static final long serialVersionUID = 3998280279949548652L;
+
+            @Override
+            public void resolve() {
+                card.addCounter(CounterType.LEVEL, 1, true);
+            }
+
+            @Override
+            public boolean canPlayAI() {
+                // creatures enchanted by curse auras have low priority
+                if (card.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)) {
+                    for (Card aura : card.getEnchantedBy()) {
+                        if (aura.getController().isOpponentOf(card.getController())) {
+                            return false;
+                        }
+                    }
+                }
+                return card.getCounters(CounterType.LEVEL) < maxLevel;
+            }
+
+            @Override
+            public String getDescription() {
+                final StringBuilder sbDesc = new StringBuilder();
+                sbDesc.append("Level up ").append(manacost).append(" (").append(manacost);
+                sbDesc.append(": Put a level counter on this. Level up only as a sorcery.)");
+                return sbDesc.toString();
+            }
+        }
+        final SpellAbility levelUp = new LevelUpAbility(card, manacost);
+        levelUp.getRestrictions().setSorcerySpeed(true);
+        final StringBuilder sbStack = new StringBuilder();
+        sbStack.append(card).append(" - put a level counter on this.");
+        levelUp.setStackDescription(sbStack.toString());
+        return levelUp;
+    }    
 } // end class AbstractCardFactory

forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.card.cardfactory;
+package forge.game.card;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -42,11 +42,6 @@ import forge.game.GameLogEntryType;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.card.Card;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CardUtil;
-import forge.game.card.CounterType;
 import forge.game.card.CardPredicates.Presets;
 import forge.game.cost.Cost;
 import forge.game.event.GameEventCardStatsChanged;

forge-gui/src/main/java/forge/game/combat/CombatUtil.java

@@ -28,7 +28,6 @@ import com.google.common.collect.Lists;
 
 import forge.card.CardType;
 import forge.card.MagicColor;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCost;
 import forge.game.Game;
 import forge.game.GameEntity;
@@ -36,6 +35,7 @@ import forge.game.GlobalRuleChange;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/game/phase/PhaseHandler.java

@@ -29,7 +29,6 @@ import com.google.common.collect.Multimap;
 
 import forge.FThreads;
 import forge.Singletons;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCost;
 import forge.game.GameEntity;
 import forge.game.GameStage;
@@ -38,6 +37,7 @@ import forge.game.GameType;
 import forge.game.GlobalRuleChange;
 import forge.game.ability.AbilityFactory;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.Combat;

forge-gui/src/main/java/forge/game/phase/Upkeep.java

@@ -21,11 +21,11 @@ import java.util.HashMap;
 import java.util.List;
 import com.google.common.base.Predicate;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCost;
 import forge.game.Game;
 import forge.game.ability.AbilityFactory;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/game/player/HumanPlay.java

@@ -10,7 +10,6 @@ import com.google.common.base.Predicate;
 
 import forge.FThreads;
 import forge.Singletons;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCost;
 import forge.game.GameActionUtil;
 import forge.game.Game;
@@ -20,6 +19,7 @@ import forge.game.ability.ApiType;
 import forge.game.ability.effects.CharmEffect;
 import forge.game.ability.effects.FlipCoinEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java

@@ -19,8 +19,8 @@ package forge.game.replacement;
 
 import java.util.Map;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.spellability.SpellAbility;
 import forge.util.Expressions;
 

forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java

@@ -20,11 +20,11 @@ package forge.game.replacement;
 import java.util.List;
 import java.util.Map;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.TriggerReplacementBase;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/game/spellability/AbilitySub.java

@@ -19,7 +19,6 @@ package forge.game.spellability;
 
 import java.util.Map;
 
-import forge.card.cardfactory.CardFactory;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.ApiType;
 import forge.game.ability.SpellAbilityAi;
@@ -29,6 +28,7 @@ import forge.game.ability.effects.ChangeZoneEffect;
 import forge.game.ability.effects.ManaEffect;
 import forge.game.ability.effects.ManaReflectedEffect;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
 import forge.game.cost.Cost;
 import forge.game.player.Player;
 

forge-gui/src/main/java/forge/game/spellability/Spell.java

@@ -20,10 +20,10 @@ package forge.game.spellability;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.error.BugReporter;
 import forge.game.Game;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.cost.Cost;
 import forge.game.cost.CostPayment;

forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java

@@ -24,11 +24,11 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.card.MagicColor;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java

@@ -21,10 +21,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java

@@ -19,9 +19,9 @@ package forge.game.staticability;
 
 import java.util.HashMap;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.GameEntity;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.cost.Cost;
 
 /**

forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java

@@ -27,7 +27,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.common.collect.Lists;
 
 import forge.card.CardType;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.GlobalRuleChange;
 import forge.game.StaticEffect;
@@ -36,6 +35,7 @@ import forge.game.TriggerReplacementBase;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardUtil;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java

@@ -20,9 +20,9 @@ package forge.game.staticability;
 import java.util.HashMap;
 import java.util.List;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCostShard;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.mana.ManaCostBeingPaid;
 import forge.game.player.Player;
 import forge.game.spellability.AbilityActivated;

forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java

@@ -19,9 +19,9 @@ package forge.game.staticability;
 
 import java.util.HashMap;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.GameEntity;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 
 /**
  * The Class StaticAbility_PreventDamage.

forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java

@@ -19,9 +19,9 @@ package forge.game.trigger;
 
 import java.util.Map;
 
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.spellability.SpellAbility;
 import forge.util.Expressions;
 

forge-gui/src/main/java/forge/game/zone/MagicStack.java

@@ -35,8 +35,6 @@ import forge.FThreads;
 import forge.Singletons;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
-import forge.card.cardfactory.CardFactory;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.mana.ManaCost;
 import forge.game.Game;
 import forge.game.GameLogEntryType;
@@ -44,6 +42,8 @@ import forge.game.GameObject;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
+import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CardPredicates.Presets;

forge-gui/src/main/java/forge/gui/match/nonsingleton/ZoneAction.java

@@ -6,8 +6,8 @@ import java.util.List;
 
 import forge.Singletons;
 import forge.card.CardCharacteristicName;
-import forge.card.cardfactory.CardFactory;
 import forge.game.card.Card;
+import forge.game.card.CardFactory;
 import forge.game.zone.PlayerZone;
 import forge.gui.ForgeAction;
 import forge.gui.GuiChoose;

forge-gui/src/main/java/forge/gui/match/views/VPlayers.java

@@ -26,10 +26,10 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import net.miginfocom.swing.MigLayout;
 import forge.Singletons;
-import forge.card.cardfactory.CardFactoryUtil;
 import forge.game.Game;
 import forge.game.GameType;
 import forge.game.card.Card;
+import forge.game.card.CardFactoryUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.framework.DragCell;

forge-gui/src/main/java/forge/util/maps/TreeMapToAmount.java

@@ -1,85 +0,0 @@
-package forge.util.maps;
-
-import java.util.Comparator;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-public class TreeMapToAmount<T> extends TreeMap<T, Integer> implements MapToAmount<T> {
-    private static final long serialVersionUID = 5001205073403776022L;
-
-    public TreeMapToAmount() {
-        super();
-    }
-
-    public TreeMapToAmount(Comparator<? super T> comparator) {
-        super(comparator);
-    }
-
-    public TreeMapToAmount(Map<? extends T, ? extends Integer> m) {
-        super(m);
-    }
-
-    public TreeMapToAmount(SortedMap<T, ? extends Integer> m) {
-        super(m);
-    }
-
-
-    @Override
-    public void add(T item) {
-        add(item, 1);
-    }
-
-    @Override
-    public void add(T item, int amount) {
-        if (amount <= 0) return; // throw an exception maybe?
-        Integer cur = get(item);
-        int newVal = cur == null ? amount : amount + cur.intValue();
-        put(item, Integer.valueOf(newVal));
-    }
-
-    @Override
-    public void addAll(Iterable<T> item) {
-        for(T i : item) add(i, 1);
-    }
-
-    @Override
-    public boolean substract(T item) {
-        return substract(item, 1);
-    }
-
-
-    @Override
-    public boolean substract(T item, int amount) {
-        Integer cur = get(item);
-        if( cur == null ) return false;
-        int newVal = cur.intValue() - amount;
-        if(newVal > 0)
-            put(item, Integer.valueOf(newVal));
-        else
-            remove(item);
-        return true;
-    }
-
-
-    @Override
-    public void substractAll(Iterable<T> item) {
-        for(T i : item) substract(i);
-    }
-
-    @Override
-    public int countAll() {
-        int c = 0;
-        for(java.util.Map.Entry<T, Integer> kv : this.entrySet()) {
-            c += kv.getValue().intValue();
-        }
-        return c;
-    }
-
-
-    @Override
-    public int count(T item) {
-        Integer cur = get(item);
-        return cur == null ? 0 : cur.intValue();
-    }
-}