From ea6795df35607701f11cc4bd21bdb8a37ce373dd Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Sat, 7 Sep 2013 08:11:35 +0000
Subject: [PATCH] *Made Commander casting a spell instead of an ability. Fixes
 interaction with SpellCast triggers but currently breaks Commander cost
 increase.

---
 src/main/java/forge/card/cardfactory/CardFactory.java     | 4 ++--
 src/main/java/forge/card/cardfactory/CardFactoryUtil.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/forge/card/cardfactory/CardFactory.java b/src/main/java/forge/card/cardfactory/CardFactory.java
index e9b12a40334..2fd4ab2c34a 100644
--- a/src/main/java/forge/card/cardfactory/CardFactory.java
+++ b/src/main/java/forge/card/cardfactory/CardFactory.java
@@ -143,9 +143,9 @@ public class CardFactory {
         out.setCommander(in.isCommander());
         if(out.isCommander())
         {
-            out.addStaticAbility("Mode$ RaiseCost | Amount$ CommanderCostRaise | Type$ Ability | Affected$ Card.Self | EffectZone$ Command | AffectedZone$ Command");
+            out.addStaticAbility("Mode$ RaiseCost | Amount$ CommanderCostRaise | Type$ Spell | Affected$ Card.Self | EffectZone$ Command | AffectedZone$ Command");
             SpellAbility sa = AbilityFactory.getAbility(
-                    "AB$ PermanentCreature | ActivationZone$ Command | SubAbility$ DBCommanderIncCast | Cost$ " + out.getManaCost().toString(),
+                    "SP$ PermanentCreature | SorcerySpeed$ True | ActivationZone$ Command | SubAbility$ DBCommanderIncCast | Cost$ " + out.getManaCost().toString(),
                     out);
             
             out.addSpellAbility(sa);
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 29c5c115879..994ec7c51e9 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -2052,11 +2052,11 @@ public class CardFactoryUtil {
         String cmdManaCost = cmd.getManaCost().toString();
         cmd.setSVar("CommanderMoveReplacement", "DB$ ChangeZone | Origin$ Battlefield,Graveyard,Exile,Library | Destination$ Command | Defined$ ReplacedCard");
         cmd.setSVar("DBCommanderIncCast", "DB$ StoreSVar | SVar$ CommanderCostRaise | Type$ CountSVar | Expression$ CommanderCostRaise/Plus.2");
-        SpellAbility sa = AbilityFactory.getAbility("AB$ PermanentCreature | ActivationZone$ Command | SubAbility$ DBCommanderIncCast | Cost$ " + cmdManaCost, cmd);
+        SpellAbility sa = AbilityFactory.getAbility("SP$ PermanentCreature | SorcerySpeed$ True | ActivationZone$ Command | SubAbility$ DBCommanderIncCast | Cost$ " + cmdManaCost, cmd);
         cmd.addSpellAbility(sa);
 
-        cmd.addIntrinsicAbility("AB$ PermanentCreature | SorcerySpeed$ True | ActivationZone$ Command | SubAbility$ DBCommanderIncCast | Cost$ " + cmdManaCost);
-        cmd.addStaticAbility("Mode$ RaiseCost | Amount$ CommanderCostRaise | Type$ Ability | Affected$ Card.Self | EffectZone$ Command | AffectedZone$ Command");
+        cmd.addIntrinsicAbility("SP$ PermanentCreature | SorcerySpeed$ True | ActivationZone$ Command | SubAbility$ DBCommanderIncCast | Cost$ " + cmdManaCost);
+        cmd.addStaticAbility("Mode$ RaiseCost | Amount$ CommanderCostRaise | Type$ Spell | Affected$ Card.Self | EffectZone$ Command | AffectedZone$ Command");
     }
 
     /**