diff --git a/res/cardsfolder/battering_sliver.txt b/res/cardsfolder/battering_sliver.txt index 6a53b97dc95..6e4cf579070 100644 --- a/res/cardsfolder/battering_sliver.txt +++ b/res/cardsfolder/battering_sliver.txt @@ -1,8 +1,9 @@ Name:Battering Sliver ManaCost:5 R Types:Creature Sliver -Text:All Sliver creatures have trample. +Text:no text PT:4/4 +K:stPumpAll:Creature.Sliver:0/0/Trample:No Condiion:All Sliver creatures have trample. SVar:PlayMain1:TRUE SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/battering_sliver.jpg diff --git a/res/cardsfolder/kobold_overlord.txt b/res/cardsfolder/kobold_overlord.txt index ea4a89aa7e7..2985fe5b934 100644 --- a/res/cardsfolder/kobold_overlord.txt +++ b/res/cardsfolder/kobold_overlord.txt @@ -1,8 +1,10 @@ Name:Kobold Overlord ManaCost:1 R Types:Creature Kobold -Text:Kobold creatures you control have first strike. +Text:no text PT:1/2 +K:First Strike +K:stPumpAll:Creature.Kobold+Other+YouCtrl:0/0/First Strike:No Condiion:Other Kobold creatures you control have first strike. SVar:PlayMain1:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kobold_overlord.jpg diff --git a/res/cardsfolder/kobold_taskmaster.txt b/res/cardsfolder/kobold_taskmaster.txt index 9b831a18845..e45442be5b3 100644 --- a/res/cardsfolder/kobold_taskmaster.txt +++ b/res/cardsfolder/kobold_taskmaster.txt @@ -3,7 +3,7 @@ ManaCost:1 R Types:Creature Kobold Text:no text PT:1/2 -K:stPumpOther:Creature.Kobold+YouCtrl:1/0:No Condiion:Other Kobold creatures you control get +1/+0. +K:stPumpAll:Creature.Kobold+Other+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 diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index a04aea1167f..8fb37990139 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -6921,10 +6921,8 @@ public class GameActionUtil { list = list.getName("Winnower Patrol"); // final Ability ability; - for(int i = 0; i < list.size(); i++) { - if(library.size() <= 0) { - return; - } + if(library.size() > 0) { + for(int i = 0; i < list.size(); i++) { // System.out.println("top of deck: " + library.get(i).getName()); String creatureType = library.get(0).getType().toString(); String cardName = library.get(0).getName(); @@ -6971,7 +6969,8 @@ public class GameActionUtil { + "."); AllZone.Stack.add(ability); - }// for + }// for + }//library.size()>0 }// upkeep_Winnower_Patrol() private static void upkeep_Nightshade_Schemers() { @@ -10073,7 +10072,8 @@ public class GameActionUtil { }// for outer }// execute() }; //Rolling Stones - + + /* public static Command Kobold_Overlord = new Command() { private static final long serialVersionUID = 4620370378774187573L; @@ -10108,6 +10108,7 @@ public class GameActionUtil { }// for outer }// execute() }; + */ public static Command Mul_Daya_Channelers = new Command() { private static final long serialVersionUID = -2543659953307485051L; @@ -10254,7 +10255,8 @@ public class GameActionUtil { }// for outer }// execute() }; // Muscles_Sliver - + + /* public static Command Battering_Sliver = new Command() { private static final long serialVersionUID = -2214824705109236342L; @@ -10291,7 +10293,8 @@ public class GameActionUtil { }// for outer }// execute() }; // Blade Sliver - + */ + public static Command Marrow_Gnawer = new Command() { private static final long serialVersionUID = -2500490393763095527L; @@ -13481,6 +13484,7 @@ public class GameActionUtil { old = current; }// execute() }; // essence warden + public static Command Soul_Warden = new Command() { private static final long serialVersionUID = 5099736949744748496L; @@ -21159,7 +21163,7 @@ public class GameActionUtil { commands.put("Sun_Quan", Sun_Quan); commands.put("Rolling_Stones", Rolling_Stones); - commands.put("Kobold_Overlord", Kobold_Overlord); + //commands.put("Kobold_Overlord", Kobold_Overlord); commands.put("Kinsbaile_Cavalier", Kinsbaile_Cavalier); commands.put("Wrens_Run_Packmaster", Wrens_Run_Packmaster); @@ -21187,7 +21191,7 @@ public class GameActionUtil { commands.put("Gemhide_Sliver", Gemhide_Sliver); commands.put("Blade_Sliver", Blade_Sliver); - commands.put("Battering_Sliver", Battering_Sliver); + //commands.put("Battering_Sliver", Battering_Sliver); commands.put("Marrow_Gnawer", Marrow_Gnawer); diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java index 2a62ecc1768..2f4a8133985 100644 --- a/src/forge/StaticEffects.java +++ b/src/forge/StaticEffects.java @@ -200,7 +200,7 @@ public class StaticEffects cardToEffectsList.put("Madrush Cyclops", new String[] {"Madrush_Cyclops"}); cardToEffectsList.put("Rolling Stones", new String[] {"Rolling_Stones"}); cardToEffectsList.put("Sun Quan, Lord of Wu", new String[] {"Sun_Quan"}); - cardToEffectsList.put("Kobold Overlord", new String[] {"Kobold_Overlord"}); + //cardToEffectsList.put("Kobold Overlord", new String[] {"Kobold_Overlord"}); cardToEffectsList.put("Kinsbaile Cavalier", new String[] {"Kinsbaile_Cavalier"}); cardToEffectsList.put("Wren's Run Packmaster", new String[] {"Wrens_Run_Packmaster"}); cardToEffectsList.put("Sliver Legion", new String[] {"Sliver_Legion"}); @@ -223,7 +223,7 @@ public class StaticEffects cardToEffectsList.put("Reflex Sliver", new String[] {"Reflex_Sliver"}); cardToEffectsList.put("Gemhide Sliver", new String[] {"Gemhide_Sliver"}); cardToEffectsList.put("Blade Sliver", new String[] {"Blade_Sliver"}); - cardToEffectsList.put("Battering Sliver", new String[] {"Battering_Sliver"}); + //cardToEffectsList.put("Battering Sliver", new String[] {"Battering_Sliver"}); cardToEffectsList.put("Marrow-Gnawer", new String[] {"Marrow_Gnawer"}); cardToEffectsList.put("Mul Daya Channelers", new String[] {"Mul_Daya_Channelers"}); cardToEffectsList.put("Joiner Adept", new String[] {"Joiner_Adept"});