As part of the cantrip to draw a card keyword change, I found 7 cards which had the draw a card hard coded. The 7 cards are Brainbite, Dismiss, Exclude, Opt, Remand, Repulse, Reviving Dose. I commented out the "AllZone.GameAction.drawCard(card.getController());" code for these 7 cards and moved the "Draw a card." from the text line to the keyword line.

res/cards.txt

@@ -4700,7 +4700,8 @@ This card can't be countered.
 Dismiss
 2 U U 
 Instant
-Counter target spell. Draw a card.
+Counter target spell.
+Draw a card.
 
 Bog Tatters
 4 B
@@ -7431,7 +7432,8 @@ When Monk Realist comes into play, destroy target enchantment.
 Brainbite
 2 U B
 Sorcery
-Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Draw a card.
+Target opponent reveals his or her hand. You choose a card from it. That player discards that card.
+Draw a card.
 
 Fable of Wolf and Owl
 3 GU GU GU
@@ -14523,7 +14525,8 @@ Look at the top four cards of your library. Put one of them into your hand and t
 Repulse
 2 U
 Instant
-Return target creature to its owner's hand. Draw a card.
+Return target creature to its owner's hand.
+Draw a card.
 
 Echoing Truth
 1 U
@@ -15190,7 +15193,8 @@ Search target opponent's library for a creature card and put that card into play
 Remand
 1 U
 Instant
-Counter target spell. If that spell is countered this way, put it into its owner's hand instead of into that player's graveyard. Draw a card.
+Counter target spell. If that spell is countered this way, put it into its owner's hand instead of into that player's graveyard.
+Draw a card.
 
 Counterspell
 U U
@@ -15205,7 +15209,8 @@ Return target permanent to its owner's hand.
 Opt
 U
 Instant
-Look at the top card of your library. You may put that card on the bottom of your library. Draw a card.
+Look at the top card of your library. You may put that card on the bottom of your library.
+Draw a card.
 
 Remove Soul
 1 U
@@ -15448,7 +15453,8 @@ Tap all nonwhite creatures.
 Reviving Dose
 2 W
 Instant
-You gain 3 life. Draw a card.
+You gain 3 life.
+Draw a card.
 
 Angelic Blessing
 2 W
@@ -16342,7 +16348,8 @@ Search your library for a creature card, reveal that card, and put it into your
 Exclude
 2 U
 Instant
-Counter target creature spell. Draw a Card.
+Counter target creature spell.
+Draw a card.
 
 Gerrard's Verdict
 W B

res/main.properties

@@ -1,6 +1,6 @@
 program/mail=mtgerror@yahoo.com
 program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
-program/version=Forge -- official beta: 10/01/17, SVN revision: 284
+program/version=Forge -- official beta: 10/01/17, SVN revision: 285
 
 tokens--file=AllTokens.txt
 

src/forge/CardFactory.java

@@ -5764,7 +5764,7 @@ public class CardFactory implements NewConstants {
           PlayerLife life = AllZone.GameAction.getPlayerLife(card.getController());
           life.addLife(3);
 
-          AllZone.GameAction.drawCard(card.getController());
+          // AllZone.GameAction.drawCard(card.getController());
         }
       };
       card.clearSpellAbility();
@@ -7783,7 +7783,7 @@ public class CardFactory implements NewConstants {
           Card[] handChoices = removeLand(hand.getCards());
 
           if(handChoices.length == 0){
-        	  AllZone.GameAction.drawCard(card.getController());
+        	  // AllZone.GameAction.drawCard(card.getController());
         	  return;
           }
             
@@ -9647,7 +9647,7 @@ public class CardFactory implements NewConstants {
           AllZone.GameAction.moveTo(hand, sa.getSourceCard());
 
           //draw card
-          AllZone.GameAction.drawCard(card.getController());
+          // AllZone.GameAction.drawCard(card.getController());
         }
         public boolean canPlay()
         {
@@ -9822,7 +9822,7 @@ public class CardFactory implements NewConstants {
               PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, getTargetCard().getOwner());
               AllZone.GameAction.moveTo(hand, getTargetCard());
             }
-            AllZone.GameAction.drawCard(card.getController());
+            // AllZone.GameAction.drawCard(card.getController());
           }//if
         }//resolve()
       };//SpellAbility
@@ -10264,7 +10264,7 @@ public class CardFactory implements NewConstants {
               AllZone.Computer_Library.add(top);
             }
           }
-          AllZone.GameAction.drawCard(card.getController());
+          // AllZone.GameAction.drawCard(card.getController());
         }//computerResolve()
         public void humanResolve()
         {
@@ -10285,7 +10285,7 @@ public class CardFactory implements NewConstants {
               library.add(top);
             }
           }//if
-          AllZone.GameAction.drawCard(card.getController());
+          // AllZone.GameAction.drawCard(card.getController());
         }//resolve()
       };
       card.clearSpellAbility();
@@ -11907,7 +11907,7 @@ public class CardFactory implements NewConstants {
         {
           SpellAbility sa = AllZone.Stack.pop();
           AllZone.GameAction.moveToGraveyard(sa.getSourceCard());
-		  AllZone.GameAction.drawCard(card.getController());
+		  // AllZone.GameAction.drawCard(card.getController());
         }
         public boolean canPlay()
         {
@@ -12003,7 +12003,7 @@ public class CardFactory implements NewConstants {
           SpellAbility sa = AllZone.Stack.pop();
           AllZone.GameAction.moveToGraveyard(sa.getSourceCard());
 
-          AllZone.GameAction.drawCard(card.getController());
+          // AllZone.GameAction.drawCard(card.getController());
 
         }
         public boolean canPlay()