From 4454c64ae32b2caa93e8cde06bdfb6cbab546a51 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 08:57:16 +0000
Subject: [PATCH] - Fixing merge issues for AbilityFactory

---
 src/forge/AbilityFactory.java | 43 +++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/forge/AbilityFactory.java b/src/forge/AbilityFactory.java
index 1c700f0a374..a6ade28c43c 100644
--- a/src/forge/AbilityFactory.java
+++ b/src/forge/AbilityFactory.java
@@ -56,6 +56,11 @@ public class AbilityFactory {
 	{
 		return abTgt;
 	}
+	
+	private boolean isCurse = false;
+	public boolean isCurse(){
+		return isCurse;
+	}
 
 	private boolean hasSubAb = false;
 	
@@ -123,9 +128,6 @@ public class AbilityFactory {
 		{
 			hasValid = true;
 			isTargeted = true;
-			abTgt = new Target("TgtV");
-			abTgt.setValidTgts(mapParams.get("ValidTgts").split(","));
-			abTgt.setVTSelection(mapParams.get("TgtPrompt"));
 		}
 		
 		if (mapParams.containsKey("ValidCards"))
@@ -134,9 +136,17 @@ public class AbilityFactory {
 		if (mapParams.containsKey("Tgt"))
 		{
 			isTargeted = true;
-			abTgt = new Target(mapParams.get("Tgt"));
 		}
 		
+		if (isTargeted)
+		{
+			if (hasValid)
+				abTgt = new Target("TgtV", mapParams.get("TgtPrompt"), mapParams.get("ValidTgts").split(","));
+			else
+				abTgt = new Target(mapParams.get("Tgt"));
+		}
+		
+		isCurse = mapParams.containsKey("IsCurse");	
 		
 		hasSubAb = mapParams.containsKey("SubAbility");
 		
@@ -170,19 +180,24 @@ public class AbilityFactory {
 		}
 		
 		// additional API keywords here
-
+		if (API.equals("PutCounter")){
+			if (isAb)
+				SA = AbilityFactory_Counters.createAbilityPutCounters(this);
+			if (isSp){
+				// todo: createSpellPutCounters
+			}
+		}
 
 		// *********************************************
 		// set universal properties of the SpellAbility
-        if (isTargeted)
-        {
-        	//if (isAb)
-        		SA.setTarget(abTgt);   
-        	
-        }
-        
-        //if (isAb)
-        	SA.setPayCosts(abCost);
+		if (isSp){	
+			// Ability_Activated sets abTgt and abCost in the constructor so this only needs to be set for Spells
+			// Once Spell constructors set Tgt and abCost this block should be removed
+	        if (isTargeted)
+	        	SA.setTarget(abTgt);
+	        
+	        SA.setPayCosts(abCost);
+		}
         
         if (hasSpDesc)
         {