From 0b61dd7c5dbac0d3b1dd9eadc3bae32ff4628505 Mon Sep 17 00:00:00 2001 From: swordshine Date: Tue, 7 May 2013 10:55:52 +0000 Subject: [PATCH] - Added Leonin Shikari --- .gitattributes | 1 + res/cardsfolder/l/leonin_shikari.txt | 8 ++++++++ src/main/java/forge/game/GameActionUtil.java | 11 +++++++++++ 3 files changed, 20 insertions(+) create mode 100644 res/cardsfolder/l/leonin_shikari.txt diff --git a/.gitattributes b/.gitattributes index 6a168c4b1e8..5de3e88413c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6097,6 +6097,7 @@ res/cardsfolder/l/leonin_den_guard.txt svneol=native#text/plain res/cardsfolder/l/leonin_elder.txt svneol=native#text/plain res/cardsfolder/l/leonin_relic_warder.txt svneol=native#text/plain res/cardsfolder/l/leonin_scimitar.txt svneol=native#text/plain +res/cardsfolder/l/leonin_shikari.txt -text res/cardsfolder/l/leonin_skyhunter.txt svneol=native#text/plain res/cardsfolder/l/leonin_squire.txt svneol=native#text/plain res/cardsfolder/l/leonin_sun_standard.txt svneol=native#text/plain diff --git a/res/cardsfolder/l/leonin_shikari.txt b/res/cardsfolder/l/leonin_shikari.txt new file mode 100644 index 00000000000..3be07ef2720 --- /dev/null +++ b/res/cardsfolder/l/leonin_shikari.txt @@ -0,0 +1,8 @@ +Name:Leonin Shikari +ManaCost:1 W +Types:Creature Cat Soldier +PT:2/2 +S:Mode$ Continuous | AddHiddenKeyword$ EquipInstantSpeed | Affected$ Card.withEquip+YouCtrl | Description$ You may activate equip abilities any time you could cast an instant. +SVar:Picture:http://www.wizards.com/global/images/magic/general/leonin_shikari.jpg +Oracle:You may activate equip abilities any time you could cast an instant. +SetInfo:DST Rare \ No newline at end of file diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java index c0a85cac129..b81a7d3035c 100644 --- a/src/main/java/forge/game/GameActionUtil.java +++ b/src/main/java/forge/game/GameActionUtil.java @@ -60,6 +60,7 @@ import forge.card.cost.CostTapType; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostBeingPaid; import forge.card.spellability.Ability; +import forge.card.spellability.AbilityActivated; import forge.card.spellability.AbilityManaPart; import forge.card.spellability.AbilitySub; import forge.card.spellability.OptionalCost; @@ -1239,6 +1240,16 @@ public final class GameActionUtil { newSA.setDescription(sa.getDescription() + " (by paying " + actualcost.toSimpleString() + " instead of its mana cost)"); alternatives.add(newSA); } + if (sa.hasParam("Equip") && sa instanceof AbilityActivated && keyword.equals("EquipInstantSpeed")) { + final SpellAbility newSA = ((AbilityActivated) sa).getCopy(); + SpellAbilityRestriction sar = new SpellAbilityRestriction(); + sar.setVariables(sa.getRestrictions()); + sar.setSorcerySpeed(false); + sar.setInstantSpeed(true); + newSA.setRestrictions(sar); + newSA.setDescription(sa.getDescription() + " (you may activate any time you could cast an instant )"); + alternatives.add(newSA); + } } return alternatives; }