From 6932ee3ac9d94e6ecd2a303afde360b457192efc Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:00:44 +0000 Subject: [PATCH] 1) add Knight of Cliffhaven from Rise of the Eldrazi 2) add Ikiral Outrider from Rise of the Eldrazi 3) clean up a blank comment from Caravan Escort --- res/card-pictures.txt | 2 + res/cards.txt | 16 ++++++++ src/forge/GameActionUtil.java | 74 +++++++++++++++++++++++++++++++++-- src/forge/StaticEffects.java | 3 ++ 4 files changed, 92 insertions(+), 3 deletions(-) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 455fb790dbb..26cc323bb10 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,6 +38,8 @@ snow_covered_mountain.jpg http://www.wizards.com/global/images/magic/gene snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg +knight_of_cliffhaven.jpg http://www.wizards.com/global/images/magic/general/knight_of_cliffhaven.jpg +ikiral_outrider.jpg http://www.wizards.com/global/images/magic/general/ikiral_outrider.jpg caravan_escort.jpg http://www.wizards.com/global/images/magic/general/caravan_escort.jpg soulsurge_elemental.jpg http://www.wizards.com/global/images/magic/general/soulsurge_elemental.jpg hellion_eruption.jpg http://www.wizards.com/global/images/magic/general/hellion_eruption.jpg diff --git a/res/cards.txt b/res/cards.txt index 51adac82ed3..ec36921fc4a 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,19 @@ +Knight of Cliffhaven +1 W +Creature Kor Knight +LEVEL 1-3 2/3 Flying LEVEL 4+ 2/4 Flying Vigilance +2/2 +Level up:3 +maxLevel:4 + +Ikiral Outrider +1 W +Creature Human Soldier +LEVEL 1-3 3/6 LEVEL 4+ 3/10 First Strike +1/2 +Level up:4 +maxLevel:4 + Caravan Escort W Creature Human Knight diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 8a7eb20fbfe..a5e97655dfa 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -9925,9 +9925,6 @@ public class GameActionUtil { }; public static Command Caravan_Escort = new Command() { - /** - * - */ private static final long serialVersionUID = -6996623102170747897L; public void execute() @@ -9960,6 +9957,75 @@ public class GameActionUtil { } }; + public static Command Ikiral_Outrider = new Command() { + private static final long serialVersionUID = 7835884582225439851L; + + public void execute() + { + CardList list = new CardList(); + list.addAll(AllZone.Human_Play.getCards()); + list.addAll(AllZone.Computer_Play.getCards()); + list = list.getName("Ikiral Outrider"); + + for (Card c:list) + { + int lcs = c.getCounters(Counters.LEVEL); + if ( lcs < 1) + { + c.setBaseAttack(1); + c.setBaseDefense(2); + } + else if ( lcs >=1 && lcs < 3 ) + { + c.setBaseAttack(3); + c.setBaseDefense(6); + c.addNonStackingIntrinsicKeyword("Vigilance"); + } + else + { + c.setBaseAttack(5); + c.setBaseDefense(5); + c.addNonStackingIntrinsicKeyword("Vigilance"); + } + } + } + }; + + public static Command Knight_of_Cliffhaven = new Command() { + private static final long serialVersionUID = 3624165284236103054L; + + public void execute() + { + CardList list = new CardList(); + list.addAll(AllZone.Human_Play.getCards()); + list.addAll(AllZone.Computer_Play.getCards()); + list = list.getName("Knight of Cliffhaven"); + + for (Card c:list) + { + int lcs = c.getCounters(Counters.LEVEL); + if ( lcs < 1) + { + c.setBaseAttack(2); + c.setBaseDefense(2); + } + else if ( lcs >=1 && lcs < 3 ) + { + c.setBaseAttack(2); + c.setBaseDefense(3); + c.addNonStackingIntrinsicKeyword("Flying"); + } + else + { + c.setBaseAttack(5); + c.setBaseDefense(5); + c.addNonStackingIntrinsicKeyword("Flying"); + c.addNonStackingIntrinsicKeyword("Vigilance"); + } + } + } + }; + public static Command Student_of_Warfare = new Command() { private static final long serialVersionUID = 2627513737024865169L; @@ -15375,6 +15441,8 @@ public class GameActionUtil { commands.put("Lighthouse_Chronologist", Lighthouse_Chronologist); commands.put("Skywatcher_Adept", Skywatcher_Adept); commands.put("Caravan_Escort", Caravan_Escort); + commands.put("Ikiral_Outrider", Ikiral_Outrider); + commands.put("Knight_of_Cliffhaven", Knight_of_Cliffhaven); commands.put("Soulsurge_Elemental", Soulsurge_Elemental); commands.put("Dauntless_Dourbark", Dauntless_Dourbark); diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java index 26cd36acb73..f3041c0b2dd 100644 --- a/src/forge/StaticEffects.java +++ b/src/forge/StaticEffects.java @@ -59,6 +59,9 @@ public class StaticEffects cardToEffectsList.put("Lighthouse Chronologist", new String[] {"Lighthouse_Chronologist"}); cardToEffectsList.put("Skywatcher Adept", new String[] {"Skywatcher_Adept"}); cardToEffectsList.put("Caravan Escort", new String[] {"Caravan_Escort"}); + cardToEffectsList.put("Ikiral Outrider", new String[] {"Ikiral_Outrider"}); + cardToEffectsList.put("Knight of Cliffhaven", new String[] {"Knight_of_Cliffhaven"}); + cardToEffectsList.put("Soulsurge Elemental", new String[] {"Soulsurge_Elemental"}); cardToEffectsList.put("Dauntless Dourbark", new String[] {"Dauntless_Dourbark"}); cardToEffectsList.put("Gaea's Avenger", new String[] {"Gaeas_Avenger"});