mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-11 16:26:22 +00:00
Merge pull request #1672 from Northmoc/ravenous
Ravenous update for rules
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user