From 27642e1cd194d6c810e8edf56c5b188d4ed7aa27 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 12 Oct 2022 15:05:22 -0400 Subject: [PATCH] Ravenous update for rules --- .../java/forge/game/card/CardFactoryUtil.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 09b3f0ba3da..d9ad34ab36e 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1627,6 +1627,19 @@ public class CardFactoryUtil { sa.setSVar("Rampage" + n, "SVar$RampageCount/Times." + n); sa.setSVar("RampageCount", "TriggerCount$NumBlockers/Minus.1"); + sa.setIntrinsic(intrinsic); + trigger.setOverridingAbility(sa); + inst.addTrigger(trigger); + } else if (keyword.startsWith("Ravenous")) { + final String ravenousTrig = "Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | " + + "Destination$ Battlefield | CheckSVar$ Count$xPaid | SVarCompare$ GE5 | Secondary$ True | " + + "TriggerDescription$ If X is 5 or more, draw a card when it enters."; + + final String drawStr = "DB$ Draw"; + + final Trigger trigger = TriggerHandler.parseTrigger(ravenousTrig, card, intrinsic); + SpellAbility sa = AbilityFactory.getAbility(drawStr, card); + sa.setIntrinsic(intrinsic); trigger.setOverridingAbility(sa); inst.addTrigger(trigger); @@ -2349,19 +2362,6 @@ public class CardFactoryUtil { String counterStr = "DB$ PutCounter | CounterType$ P1P1 | ETB$ True | CounterNum$ X"; SpellAbility countersSA = AbilityFactory.getAbility(counterStr, card); - String delTrigStr = "DB$ DelayedTrigger | CheckSVar$ Count$xPaid | SVarCompare$ GE5 | " + - "Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | " + - "TriggerDescription$ If X is 5 or more, draw a card when it enters."; - AbilitySub delTrigSub = (AbilitySub) AbilityFactory.getAbility(delTrigStr, card); - - String drawStr = "DB$ Draw"; - - AbilitySub drawSub = (AbilitySub) AbilityFactory.getAbility(drawStr, card); - - countersSA.setSubAbility(delTrigSub); - - delTrigSub.setAdditionalAbility("Execute", drawSub); - if (!intrinsic) { countersSA.setIntrinsic(false); }