[KLD] Added 15 artifacts.

Aetherflux Reservoir, Aetherworks Marvel, Animation Module, Cogworker's Puzzleknot, Decoction Module, Demolition Stomper, Fabrication Module, Fireforger's Puzzleknot, Fleetwheel Cruiser, Ghirapur Orrery, Glassblower's Puzzleknot, Inventor's Goggles, Metalspinner's Puzzleknot, Ovalchase Dragster and Skysovereign, Consul Flagship.

Mage/src/main/java/mage/abilities/costs/common/PayEnergyCost.java

@@ -0,0 +1,85 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.abilities.costs.common;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.CostImpl;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.players.Player;
+
+/**
+ *
+ * @author emerald000
+ */
+public class PayEnergyCost extends CostImpl {
+
+    private final int amount;
+
+    public PayEnergyCost(int amount) {
+        this.amount = amount;
+        setText();
+    }
+
+    public PayEnergyCost(PayEnergyCost cost) {
+        super(cost);
+        this.amount = cost.amount;
+    }
+
+    @Override
+    public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
+        Player player = game.getPlayer(controllerId);
+        return player != null && player.getCounters().getCount(CounterType.ENERGY) >= amount;
+    }
+
+    @Override
+    public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) {
+        Player player = game.getPlayer(controllerId);
+        if (player != null) {
+            player.getCounters().removeCounter(CounterType.ENERGY, amount);
+            paid = true;
+        }
+        return paid;
+    }
+
+    @Override
+    public PayEnergyCost copy() {
+        return new PayEnergyCost(this);
+    }
+
+    private void setText() {
+        StringBuilder sb = new StringBuilder("Pay ");
+        for (int i = 0; i < amount; i++) {
+            sb.append("{E}");
+        }
+        this.text = sb.toString();
+    }
+}

Mage/src/main/java/mage/abilities/effects/Effects.java

@@ -65,12 +65,12 @@ public class Effects extends ArrayList<Effect> {
         StringBuilder sbText = new StringBuilder();
         String lastRule = null;
         for (Effect effect: this) {
-            String endString = "";            
+            String endString = "";
             String nextRule = effect.getText(mode);
             if (nextRule != null) {
                 if (nextRule.startsWith("and ") || nextRule.startsWith("with ")) {
                     endString = " ";
-                } else if (nextRule.startsWith(",")) {
+                } else if (nextRule.startsWith(",") || nextRule.startsWith(" ")) {
                     endString = "";
                 } else if (lastRule != null && lastRule.length()> 3) {
                     if (!lastRule.endsWith(".") && !lastRule.endsWith("<br>")) {
@@ -84,7 +84,7 @@ public class Effects extends ArrayList<Effect> {
             }
             lastRule = nextRule;
         }
-        if (lastRule != null && lastRule.length()> 3 && 
+        if (lastRule != null && lastRule.length()> 3 &&
                 !lastRule.endsWith(".") &&
                 !lastRule.endsWith("\"") &&
                 !lastRule.startsWith("<b>Level ") &&

Mage/src/main/java/mage/abilities/keyword/FabricateAbility.java

@@ -27,17 +27,15 @@
  */
 package mage.abilities.keyword;
 
-import mage.MageInt;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
-import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.counters.CounterType;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.ServoToken;
 import mage.players.Player;
 import mage.util.CardUtil;
 
@@ -105,15 +103,3 @@ class FabricateEffect extends OneShotEffect {
         return false;
     }
 }
-
-class ServoToken extends Token {
-
-    ServoToken() {
-        super("Servo", "1/1 colorless Servo artifact creature token");
-        cardType.add(CardType.ARTIFACT);
-        cardType.add(CardType.CREATURE);
-        subtype.add("Servo");
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-    }
-}