Merge branch 'y22_hw' into 'master'

Y22: Hollowhenge Wrangler and support

See merge request core-developers/forge!5978
This commit is contained in:
Michael Kamensky
2021-12-28 04:12:56 +00:00
2 changed files with 13 additions and 0 deletions

View File

@@ -234,6 +234,11 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
if (cardZone != null && cardZone.is(ZoneType.Command) && sa.hasParam("HiddenAgenda")) { if (cardZone != null && cardZone.is(ZoneType.Command) && sa.hasParam("HiddenAgenda")) {
return true; return true;
} }
if (sa.hasParam("AdditionalActivationZone")) {
if (cardZone != null && cardZone.is(ZoneType.valueOf(sa.getParam("AdditionalActivationZone")))) {
return true;
}
}
// Not a Spell, or on Battlefield, return false // Not a Spell, or on Battlefield, return false
if (!sa.isSpell() || (cardZone != null && ZoneType.Battlefield.equals(cardZone.getZoneType())) if (!sa.isSpell() || (cardZone != null && ZoneType.Battlefield.equals(cardZone.getZoneType()))
|| (this.getZone() != null && !this.getZone().equals(ZoneType.Hand))) { || (this.getZone() != null && !this.getZone().equals(ZoneType.Hand))) {

View File

@@ -0,0 +1,8 @@
Name:Hollowhenge Wrangler
ManaCost:3 G G
Types:Creature Elemental
PT:6/6
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSeek | TriggerDescription$ When CARDNAME enters the battlefield, seek a land card.
SVar:TrigSeek:DB$ ChangeZone | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeType$ Land | ChangeNum$ 1
A:AB$ MakeCard | Cost$ Discard<1/Land/land> | Name$ Hollowhenge Beast | Zone$ Hand | AdditionalActivationZone$ Graveyard | StackDescription$ Conjure a card named Hollowhenge Beast into your hand. | SpellDescription$ Conjure a card named Hollowhenge Beast into your hand. You may also activate this ability while CARDNAME is in your graveyard.
Oracle:When Hollowhenge Wrangler enters the battlefield, seek a land card.\nDiscard a land card: Conjure a card named Hollowhenge Beast into your hand. You may also activate this ability while Hollowhenge Wrangler is in your graveyard.