1) make targeting for AF_DealDamage optional (though almost everything needs it; there's still a warning message displayed to console)

2) convert Stuffy Doll to AF_DealDamage (no target specified)
3) moved code from Filthy Cur, Jackal Pup, Shinka Gatekeeper and Stuffy Doll to the addDamage code in Card.java (previously, it was overriding the addDamage method and putting it on a new card in CardFactory_Creatures.java)

res/cardsfolder/stuffy_doll.txt

@@ -4,6 +4,7 @@ Types:Artifact Creature Construct
 Text:Whenever damage is dealt to Stuffy Doll, it deals that much damage to your opponent.
 PT:0/1
 K:Indestructible
+A:AB$DealDamage|Cost$T|NumDmg$1|SpellDescription$Stuffy Doll deals 1 damage to itself.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/tsp/en-us/card116724.jpg
 SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/264.jpg

src/forge/AbilityFactory_DealDamage.java

@@ -224,6 +224,10 @@ import java.util.Random;
 
           // TODO handle proper calculation of X values based on Cost
            
+           if(AF.getHostCard().equals("Stuffy Doll")) {
+        	   return true;
+           }
+           
             if (AF.isAbility())
             {
                Random r = new Random(); // prevent run-away activations
@@ -320,6 +324,10 @@ import java.util.Random;
         	   sb.append(name).append(" - ");
            
            sb.append("Deals ").append(dmg).append(" damage to ");
+           if(tgts == null || tgts.size() == 0) {
+        	   sb.append("itself");
+           }
+           else {
         	   for(int i = 0; i < tgts.size(); i++){
         		   if (i != 0)
         			   sb.append(" ");
@@ -333,6 +341,7 @@ import java.util.Random;
         		   }
 
         	   }
+           }
            sb.append(". ");
            
            if (hasSubAbAF){
@@ -375,10 +384,17 @@ import java.util.Random;
             boolean targeted = (AF.getAbTgt() != null) || TgtOpp;
 
             if (tgts == null || tgts.size() == 0){
-               System.out.println("No targets?");
+            	System.out.println("AF_DealDamage ("+AF.getHostCard()+") - No targets?  Ok.  Just making sure.");
-               return;
+            	//if no targets, damage goes to self (Card; i.e. Stuffy Doll)
+            	Card c = saMe.getSourceCard();
+            	if(AllZone.GameAction.isCardInPlay(c)) {
+    				if (noPrevention)
+    					c.addDamageWithoutPrevention(dmg, AF.getHostCard());
+    				else
+    					c.addDamage(dmg, AF.getHostCard());
     			}
-           
+            }
+            else {
             	for(Object o : tgts){
             		if (o instanceof Card){
             			Card c = (Card)o;
@@ -400,6 +416,7 @@ import java.util.Random;
             			}
             		}
             	}
+            }
    
            if (hasSubAbAF) {
         	   if (subAbAF.getParent() == null)

src/forge/Card.java

@@ -2851,7 +2851,39 @@ public class Card extends MyObservable {
         		}
         	};
         	StringBuilder sb = new StringBuilder();
-            sb.append("Stuffy Doll - causes ").append(stuffyDamage).append(" damage to ").append(opponent);
+            sb.append(this.getName()+" - Deals ").append(stuffyDamage).append(" damage to ").append(opponent);
+            ability.setStackDescription(sb.toString());
+            
+            AllZone.Stack.add(ability);
+        }
+        
+        if(this.getName().equals("Jackal Pup") || this.getName().equals("Shinka Gatekeeper")) {
+        	final Player player = this.getController();
+        	final int selfDamage = damageToAdd;
+        	SpellAbility ability = new Ability(this, "0") {
+        		@Override
+        		public void resolve() {
+        			player.addDamage(selfDamage, Card.this);
+        		}
+        	};
+        	StringBuilder sb = new StringBuilder();
+            sb.append(this.getName()+" - Deals ").append(selfDamage).append(" damage to ").append(player);
+            ability.setStackDescription(sb.toString());
+            
+            AllZone.Stack.add(ability);
+        }
+        
+        if(this.getName().equals("Filthy Cur")) {
+        	final Player player = this.getController();
+        	final int life = damageToAdd;
+        	SpellAbility ability = new Ability(this, "0") {
+        		@Override
+        		public void resolve() {
+        			player.loseLife(life, Card.this);
+        		}
+        	};
+        	StringBuilder sb = new StringBuilder();
+            sb.append(this.getName()+" - ").append(player).append(" loses ").append(life).append("life");
             ability.setStackDescription(sb.toString());
             
             AllZone.Stack.add(ability);

src/forge/CardFactory_Creatures.java

@@ -56,7 +56,7 @@ public class CardFactory_Creatures {
     
 
     public static Card getCard(final Card card, String cardName, Player owner, CardFactory cf) {
-        
+        /*
         //*************** START *********** START **************************
         if(cardName.equals("Filthy Cur")) {
             final Card newCard = new Card() {
@@ -94,9 +94,10 @@ public class CardFactory_Creatures {
             
             return newCard;
         }//*************** END ************ END **************************
+        */
         
         //*************** START *********** START **************************
-        else if(cardName.equals("Stone Giant")) {
+        if(cardName.equals("Stone Giant")) {
         	final ArrayList<Card> Tgt = new ArrayList<Card>();
         	
         	final Command untilEOT = new Command() {
@@ -243,7 +244,7 @@ public class CardFactory_Creatures {
             a1.setBeforePayMana(CardFactoryUtil.input_targetPlayer(a1));
         }//*************** END ************ END **************************
         
-        
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Shinka Gatekeeper")) {
             final Card newCard = new Card() {
@@ -327,7 +328,7 @@ public class CardFactory_Creatures {
         
         //*************** START *********** START **************************
         else if(cardName.equals("Stuffy Doll")) {
-        	/*
+        	/
             final Card newCard = new Card() {
                 Card c = this;
                 
@@ -365,7 +366,7 @@ public class CardFactory_Creatures {
             newCard.setBaseDefense(1);
             
             newCard.addIntrinsicKeyword("Indestructible");
-            */
+            *
             
 			Ability_Cost abilCost = new Ability_Cost("T", cardName, true);
 
@@ -394,9 +395,9 @@ public class CardFactory_Creatures {
             
             newCard.setSVars(card.getSVars());
             
-            return newCard;*/
+            return newCard;*
         }//*************** END ************ END **************************
-        
+        */
 
         //*************** START *********** START **************************
         else if(cardName.equals("Serra Avenger")) {