- Fixed YouCtrl in isValidCard (again).

- Added 3 stPump cards.
- Added Kiri-Onna with etbBounce.
- Fixed Beasts of Bogardan.
- Converted Kobold Taskmaster to stPump.

.gitattributes

@@ -1979,6 +1979,7 @@ res/cardsfolder/kingfisher.txt -text svneol=native#text/plain
 res/cardsfolder/kinsbaile_borderguard.txt -text svneol=native#text/plain
 res/cardsfolder/kinsbaile_cavalier.txt -text svneol=native#text/plain
 res/cardsfolder/kird_ape.txt -text svneol=native#text/plain
+res/cardsfolder/kiri_onna.txt -text svneol=native#text/plain
 res/cardsfolder/kirtars_desire.txt -text svneol=native#text/plain
 res/cardsfolder/kismet.txt -text svneol=native#text/plain
 res/cardsfolder/kiss_of_death.txt -text svneol=native#text/plain
@@ -3642,6 +3643,7 @@ res/cardsfolder/tectonic_edge.txt -text svneol=native#text/plain
 res/cardsfolder/tectonic_fiend.txt -text svneol=native#text/plain
 res/cardsfolder/teekas_dragon.txt -text svneol=native#text/plain
 res/cardsfolder/teferis_puzzle_box.txt -text svneol=native#text/plain
+res/cardsfolder/tek.txt -text svneol=native#text/plain
 res/cardsfolder/tel_jilad_archers.txt -text svneol=native#text/plain
 res/cardsfolder/tel_jilad_chosen.txt -text svneol=native#text/plain
 res/cardsfolder/tel_jilad_exile.txt -text svneol=native#text/plain
@@ -4102,6 +4104,7 @@ res/cardsfolder/watcher_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/watchwolf.txt -text svneol=native#text/plain
 res/cardsfolder/water_elemental.txt -text svneol=native#text/plain
 res/cardsfolder/water_servant.txt -text svneol=native#text/plain
+res/cardsfolder/water_wurm.txt -text svneol=native#text/plain
 res/cardsfolder/watery_grave.txt -text svneol=native#text/plain
 res/cardsfolder/waveskimmer_aven.txt -text svneol=native#text/plain
 res/cardsfolder/wayward_soul.txt -text svneol=native#text/plain
@@ -4225,6 +4228,7 @@ res/cardsfolder/wrecking_ball.txt -text svneol=native#text/plain
 res/cardsfolder/wrench_mind.txt -text svneol=native#text/plain
 res/cardsfolder/wrens_run_packmaster.txt -text svneol=native#text/plain
 res/cardsfolder/wretched_anurid.txt -text svneol=native#text/plain
+res/cardsfolder/wu_admiral.txt -text svneol=native#text/plain
 res/cardsfolder/wu_elite_cavalry.txt -text svneol=native#text/plain
 res/cardsfolder/wu_infantry.txt -text svneol=native#text/plain
 res/cardsfolder/wu_light_cavalry.txt -text svneol=native#text/plain

res/cardsfolder/beasts_of_bogardan.txt

@@ -4,7 +4,7 @@ Types:Creature Beast
 Text:no text
 PT:3/3
 K:Protection from red
-K:stPumpSelf:Creature:1/1:isPresent Creature.White+YouDontCtrl:Beasts of Bogardan gets +1/+1 as long as an opponent controls a white permanent.
+K:stPumpSelf:Creature:1/1:isPresent Permanent.White+YouDontCtrl:Beasts of Bogardan gets +1/+1 as long as an opponent controls a white permanent.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beasts_of_bogardan.jpg
 End

res/cardsfolder/kiri_onna.txt

@@ -0,0 +1,10 @@
+Name:Kiri-Onna
+ManaCost:4 U
+Types:Creature Spirit
+Text:When Kiri-Onna enters the battlefield, return target creature to its owner's hand.
+PT:2/2
+K:etbBounceTgt:Creature:Hand
+K:WheneverKeyword:CastSpell/Controller:OneTypeOfMany/Arcane/Spirit:Play:MoveFrom-Play-Hand:Self:ASAP:Yes_No:No Special Condition:Whenever you cast a Spirit or Arcane spell, you may return Kiri-Onna to its owner's hand.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kiri_onna.jpg
+End

res/cardsfolder/kobold_taskmaster.txt

@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Kobold
 Text:no text
 PT:1/2
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/0:Type.Creature!Type.Kobold!NotSelf:Other Kobold creatures you control get +1/+0.
+K:stPumpOther:Creature.Kobold+YouCtrl:1/0:No Condiion:Other Kobold creatures you control get +1/+0.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kobold_taskmaster.jpg

res/cardsfolder/tek.txt

@@ -0,0 +1,14 @@
+Name:Tek
+ManaCost:5
+Types:Artifact Creature Dragon
+Text:no text
+PT:2/2
+K:stPumpSelf:Creature:0/2:isPresent Plains.YouCtrl:Tek gets +0/+2 as long as you control a Plains,
+K:stPumpSelf:Creature:0/0/Flying:isPresent Island.YouCtrl:has flying as long as you control an Island,
+K:stPumpSelf:Creature:2/0:isPresent Swamp.YouCtrl:gets +2/+0 as long as you control a Swamp,
+K:stPumpSelf:Creature:0/0/First Strike:isPresent Mountain.YouCtrl:has first strike as long as you control a Mountain,
+K:stPumpSelf:Creature:0/0/Trample:isPresent Forest.YouCtrl:has trample as long as you control a Forest.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/tek.jpg
+End

res/cardsfolder/water_wurm.txt

@@ -0,0 +1,9 @@
+Name:Water Wurm
+ManaCost:U
+Types:Creature Wurm
+Text:no text
+PT:1/1
+K:stPumpSelf:Creature:0/1:isPresent Island.YouDontCtrl:Water Wurm gets +0/+1 as long as an opponent controls an Island.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/water_wurm.jpg
+End

res/cardsfolder/wu_admiral.txt

@@ -0,0 +1,9 @@
+Name:Wu Admiral
+ManaCost:4 U
+Types:Creature Human Soldier
+Text:no text
+PT:3/3
+K:stPumpSelf:Creature:1/1:isPresent Island.YouDontCtrl:Wu Admiral gets +1/+1 as long as an opponent controls an Island.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/wu_admiral.jpg
+End

src/forge/Card.java

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map.Entry;
+import forge.error.ErrorViewer;
 
 import com.esotericsoftware.minlog.Log;
 
@@ -2040,15 +2041,13 @@ public class Card extends MyObservable {
             {
                 if (!getController().equals(Controller))
                    return false;
-                Restrictions[i] = Restrictions[i].split("\\+YouCtrl")[0];
-                Restrictions[i].replaceAll(".YouCtrl", "");
+                Restrictions[i] = Restrictions[i].replaceAll(".YouCtrl", "");
             }
             else if (Restrictions[i].contains("YouDontCtrl"))
             {
                 if (getController().equals(Controller))
                    return false;
-                Restrictions[i] = Restrictions[i].split("\\+YouDontCtrl")[0];
-                Restrictions[i].replaceAll(".YouDontCtrl", "");
+                Restrictions[i] = Restrictions[i].replaceAll(".YouDontCtrl", "");
             }
         }
         return isValidCard(Restrictions);