From 90a44fbc91ffbad7e666d5f1dda9b271512ac013 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Fri, 7 Oct 2011 14:12:13 +0000
Subject: [PATCH] - Converted Singe-Mind Ogre to script.

---
 res/cardsfolder/m/merfolk_spy.txt             | 25 +++++++++----------
 res/cardsfolder/s/singe_mind_ogre.txt         |  9 +++++--
 .../cardFactory/CardFactory_Creatures.java    |  4 +--
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/res/cardsfolder/m/merfolk_spy.txt b/res/cardsfolder/m/merfolk_spy.txt
index a7acdd70c81..260a8d8829a 100644
--- a/res/cardsfolder/m/merfolk_spy.txt
+++ b/res/cardsfolder/m/merfolk_spy.txt
@@ -1,14 +1,13 @@
-Name:Merfolk Spy
-ManaCost:U
-Types:Creature Merfolk Rogue
-Text:no text
-PT:1/1
-K:Islandwalk
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReveal | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player reveals a card at random from his or her hand.
-SVar:TrigReveal:AB$ Reveal | Cost$ 0 | Random$ True | Defined$ TriggeredTarget
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/merfolk_spy.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/66.jpg
-Oracle:Islandwalk (This creature is unblockable as long as defending player controls an Island.)\nWhenever Merfolk Spy deals combat damage to a player, that player reveals a card at random from his or her hand.
+Name:Merfolk Spy
+ManaCost:U
+Types:Creature Merfolk Rogue
+Text:no text
+PT:1/1
+K:Islandwalk
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReveal | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player reveals a card at random from his or her hand.
+SVar:TrigReveal:AB$ Reveal | Cost$ 0 | Random$ True | Defined$ TriggeredTarget
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/merfolk_spy.jpg
+SetInfo:M11|Common|http://magiccards.info/scans/en/m11/66.jpg
+Oracle:Islandwalk (This creature is unblockable as long as defending player controls an Island.)\nWhenever Merfolk Spy deals combat damage to a player, that player reveals a card at random from his or her hand.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/singe_mind_ogre.txt b/res/cardsfolder/s/singe_mind_ogre.txt
index 86680b4991f..14eedc5221b 100644
--- a/res/cardsfolder/s/singe_mind_ogre.txt
+++ b/res/cardsfolder/s/singe_mind_ogre.txt
@@ -1,10 +1,15 @@
 Name:Singe-Mind Ogre
 ManaCost:2 B R
 Types:Creature Ogre Mutant
-Text:When CARDNAME enters the battlefield, target player reveals a card at random from his or her hand, then loses life equal to that card's converted mana cost.
+Text:no text
 PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters the battlefield, target player reveals a card at random from his or her hand, then loses life equal to that card's converted mana cost.
+SVar:TrigReveal:AB$ Reveal | Cost$ 0 | Random$ True | RememberRevealed$ True | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBLose
+SVar:DBLose:DB$LoseLife | LifeAmount$ X | Defined$ Targeted | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:X:Remembered$CardManaCost
 SVar:Rarity:Common
-SVar:Picture:http://magic.tcgplayer.com/db/cards/17138.jpg
+SVar:Picture:http://www.wizards.com/global/images/magic/general/singe_mind_ogre.jpg
 SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/45.jpg
 Oracle:When Singe-Mind Ogre enters the battlefield, target player reveals a card at random from his or her hand, then loses life equal to that card's converted mana cost.
 End
\ No newline at end of file
diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
index 867b12d07c4..3ec43b6bd44 100644
--- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
+++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
@@ -1568,7 +1568,7 @@ public class CardFactory_Creatures {
 
 
         //*************** START *********** START **************************
-        else if (cardName.equals("Singe-Mind Ogre")) {
+        /*else if (cardName.equals("Singe-Mind Ogre")) {
             final SpellAbility ability = new Ability(card, "0") {
                 @Override
                 public void resolve() {
@@ -1592,7 +1592,7 @@ public class CardFactory_Creatures {
                 }
             };
             card.addComesIntoPlayCommand(intoPlay);
-        }//*************** END ************ END **************************
+        }*///*************** END ************ END **************************
 
 
         //*************** START *********** START **************************