diff --git a/res/cardsfolder/cold_eyed_selkie.txt b/res/cardsfolder/cold_eyed_selkie.txt index 0456dd1fa02..783411a5fe0 100644 --- a/res/cardsfolder/cold_eyed_selkie.txt +++ b/res/cardsfolder/cold_eyed_selkie.txt @@ -1,9 +1,12 @@ Name:Cold-Eyed Selkie ManaCost:1 GU GU Types:Creature Merfolk Rogue -Text:Whenever Cold-Eyed Selkie deals combat damage to a player, you may draw that many cards. +Text:no text PT:1/1 K:Islandwalk +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw that many cards. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X +SVar:X:Count$TriggeredDamageAmount SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/cold_eyed_selkie.jpg SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/149.jpg diff --git a/res/cardsfolder/glint_eye_nephilim.txt b/res/cardsfolder/glint_eye_nephilim.txt index 69de5635eff..dd58d29794a 100644 --- a/res/cardsfolder/glint_eye_nephilim.txt +++ b/res/cardsfolder/glint_eye_nephilim.txt @@ -1,8 +1,11 @@ Name:Glint-Eye Nephilim ManaCost:U B R G Types:Creature Nephilim -Text:Whenever Glint-Eye Nephilim deals combat damage to a player, draw that many cards. +Text:no text PT:2/2 +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, draw that many cards. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X +SVar:X:Count$TriggeredDamageAmount A:AB$Pump | Cost$ 1 Discard<1/Card> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/glint_eye_nephilim.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 2edd965ecf3..dd18bea689c 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -3129,7 +3129,6 @@ public class GameActionUtil { else if(c.getName().equals("Scalpelexis")) playerCombatDamage_Scalpelexis(c); else if(c.getName().equals("Augury Adept")) playerCombatDamage_Augury_Adept(c); else if(c.getName().equals("Spawnwrithe")) playerCombatDamage_Spawnwrithe(c); - else if(c.getName().equals("Glint-Eye Nephilim") || c.getName().equals("Cold-Eyed Selkie")) playerCombatDamage_Glint_Eye_Nephilim(c); else if(c.getName().equals("Rootwater Thief")) playerCombatDamage_Rootwater_Thief(c); else if(c.getName().equals("Treva, the Renewer")) playerCombatDamage_Treva(c); else if(c.getName().equals("Rith, the Awakener")) playerCombatDamage_Rith(c); @@ -3411,28 +3410,6 @@ public class GameActionUtil { } } - private static void playerCombatDamage_Glint_Eye_Nephilim(Card c) { - final Player player = c.getController(); - final int power = c.getNetAttack(); - - if(power > 0) { - Ability ability2 = new Ability(c, "0") { - @Override - public void resolve() { - player.drawCards(power); - } - };// ability2 - - StringBuilder sb = new StringBuilder(); - sb.append(c.getName()).append(" - ").append(player); - sb.append(" draws ").append(power).append(" card(s)."); - ability2.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability2); - } // if - - } - private static void playerCombatDamage_Spawnwrithe(Card c) { final Player player = c.getController(); final Card crd = c;