diff --git a/.gitattributes b/.gitattributes index 10143528b23..41d36233b70 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16848,6 +16848,7 @@ forge-gui/res/cardsfolder/upcoming/naga_oracle.txt -text forge-gui/res/cardsfolder/upcoming/naga_vitalist.txt -text forge-gui/res/cardsfolder/upcoming/nef_crop_entangler.txt -text forge-gui/res/cardsfolder/upcoming/neheb_the_worthy.txt -text +forge-gui/res/cardsfolder/upcoming/nest_of_scarabs.txt -text forge-gui/res/cardsfolder/upcoming/never_return.txt -text forge-gui/res/cardsfolder/upcoming/nimble_blade_khenra.txt -text forge-gui/res/cardsfolder/upcoming/nissa_steward_of_elements.txt -text diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 67a5c011b34..07e1b2cbe48 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -1053,6 +1053,7 @@ public class Card extends GameEntity implements Comparable { getGame().getTriggerHandler().runTrigger(TriggerType.CounterAdded, runParams, false); } if (addAmount > 0) { + runParams.put("CounterAmount", addAmount); getGame().getTriggerHandler().runTrigger(TriggerType.CounterAddedOnce, runParams, false); } } else { diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java index 3c5feaf1d36..528e9987df0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java @@ -92,6 +92,7 @@ public class TriggerCounterAddedOnce extends Trigger { sa.setTriggeringObject("Card", this.getRunParams().get("Card")); if (this.getRunParams().containsKey("Player")) sa.setTriggeringObject("Player", this.getRunParams().get("Player")); + sa.setTriggeringObject("Amount", this.getRunParams().get("CounterAmount")); } @Override @@ -102,6 +103,8 @@ public class TriggerCounterAddedOnce extends Trigger { sb.append(sa.getTriggeringObject("Card")); if (sa.hasTriggeringObject("Player")) sb.append(sa.getTriggeringObject("Player")); + + sb.append(" Amount: ").append(sa.getTriggeringObject("Amount")); return sb.toString(); } } diff --git a/forge-gui/res/cardsfolder/upcoming/nest_of_scarabs.txt b/forge-gui/res/cardsfolder/upcoming/nest_of_scarabs.txt new file mode 100644 index 00000000000..8bcef5da581 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/nest_of_scarabs.txt @@ -0,0 +1,7 @@ +Name:Nest of Scarabs +ManaCost:2 B +Types:Enchantment +T:Mode$ CounterAddedOnce | ValidCard$ Creature | CounterType$ M1M1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you put one or more -1/-1 counters on a creature, create that many 1/1 black Insect creature tokens. +SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 +SVar:X:TriggerCount$Amount +Oracle:Whenever you put one or more -1/-1 counters on a creature, create that many 1/1 black Insect creature tokens. \ No newline at end of file