From 8b493d3131cfebb53cd7f9601efd782a07b09428 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 11:00:35 +0000
Subject: [PATCH] convert Seasinger and Old Man of the Sea to AB$GainControl

---
 res/cardsfolder/old_man_of_the_sea.txt |  4 +++-
 res/cardsfolder/seasinger.txt          |  3 ++-
 src/forge/CardFactory_Creatures.java   | 14 ++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/res/cardsfolder/old_man_of_the_sea.txt b/res/cardsfolder/old_man_of_the_sea.txt
index d9cba83e5e7..b5c2c6f49e1 100644
--- a/res/cardsfolder/old_man_of_the_sea.txt
+++ b/res/cardsfolder/old_man_of_the_sea.txt
@@ -1,9 +1,11 @@
 Name:Old Man of the Sea
 ManaCost:1 U U
 Types:Creature Djinn
-Text:tap: Gain control of target creature with power less than or equal to Old Man of the Sea's power for as long as Old Man of the Sea remains tapped and that creature's power remains less than or equal to Old Man of the Sea's power.
+Text:no text
 PT:2/3
 K:You may choose not to untap CARDNAME during your untap step.
+A:AB$GainControl|Cost$T|ValidTgts$Creature.powerLEX|TgtPrompt$Select target creature with power less than or equal to Old Man's.|LoseControl$Untap,LeavesPlay,LoseControl|SpellDescription$Gain control of target creature with power less than or equal to Old Man of the Sea's power for as long as Old Man of the Sea remains tapped and that creature's power remains less than or equal to Old Man of the Sea's power.
+SVar:X:Count$CardPower
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/old_man_of_the_sea.jpg
 End
diff --git a/res/cardsfolder/seasinger.txt b/res/cardsfolder/seasinger.txt
index 4c8d8a56d5d..10c19c2c368 100644
--- a/res/cardsfolder/seasinger.txt
+++ b/res/cardsfolder/seasinger.txt
@@ -1,10 +1,11 @@
 Name:Seasinger
 ManaCost:1 U U
 Types:Creature Merfolk
-Text:Gain control of target creature whose controller controls an Island for as long as you control Seasinger and Seasinger remains tapped.
+Text:no text
 PT:0/1
 K:You may choose not to untap CARDNAME during your untap step.
 K:When you control no Islands, sacrifice CARDNAME.
+A:AB$GainControl|Cost$T|ValidTgts$Creature.ControllerControlsIsland|TgtPrompt$Select target creature whose controller controls an Island.|LoseControl$Untap,LeavesPlay,LoseControl|SpellDescription$Gain control of target creature whose controller controls an Island for as long as you control Seasinger and Seasinger remains tapped.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seasinger.jpg
 End
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 7bd7b0820bb..f1561c71707 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -19206,15 +19206,15 @@ public class CardFactory_Creatures {
             ability.setBeforePayMana(CardFactoryUtil.input_targetCreature(ability));
         }//*************** END ************ END **************************
         
-        
+        /*cardName.equals("Old Man of the Sea") || 
         //*************** START *********** START **************************
-        else if(cardName.equals("Old Man of the Sea") || cardName.equals("Seasinger")) {
+        else if(  cardName.equals("Seasinger")) {
         	/*
         	 * Tap: Gain control of target creature with power less than or
         	 * equal to Old Man of the Sea's power for as long as Old Man of
         	 * the Sea remains tapped and that creature's power remains less
         	 * than or equal to Old Man of the Sea's power.
-        	 */
+        	 *
         	//final Card movedCreature[] = new Card[1];
             final Ability_Tap ability = new Ability_Tap(card, "0") {
 				private static final long serialVersionUID = -7792654590884377028L;
@@ -19306,7 +19306,7 @@ public class CardFactory_Creatures {
             card.setOldManReleaseCommand(untapLeavesPlay);
             
             card.addSpellAbility(ability);
-            
+            /*
             //for Old Man of the Sea
             Input oldMan = new Input() {
 				private static final long serialVersionUID = -2079490830593191467L;
@@ -19324,6 +19324,7 @@ public class CardFactory_Creatures {
                 	 }
                  }
               };//input
+              *
               
               //for Seasinger
               Input seasinger = new Input() {
@@ -19343,14 +19344,15 @@ public class CardFactory_Creatures {
                   	 }
                    }
                 };//input
+            /*
             if(cardName.equals("Old Man of the Sea")) {
             	ability.setBeforePayMana(oldMan);
             }
-            else if( cardName.equals("Seasinger")) {
+            else * if( cardName.equals("Seasinger")) {
             	ability.setBeforePayMana(seasinger);
             }
         }//*************** END ************ END **************************
-        
+        */
         /*
         //*************** START *********** START **************************
         else if(cardName.equals("Time Elemental")) {