diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java index 27a388c2160..55cd031279b 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java @@ -45,7 +45,7 @@ public class ReplaceAddCounter extends ReplacementEffect { if (!(o instanceof Card)) { return false; } - if (!matchesValid(o, getParam("ValidCard").split(","), this.getHostCard())) { + if (!matchesValid(o, getParam("ValidCard").split(","), getHostCard())) { return false; } } else if (hasParam("ValidPlayer")) { @@ -53,7 +53,17 @@ public class ReplaceAddCounter extends ReplacementEffect { if (!(o instanceof Player)) { return false; } - if (!matchesValid(o, getParam("ValidPlayer").split(","), this.getHostCard())) { + if (!matchesValid(o, getParam("ValidPlayer").split(","), getHostCard())) { + return false; + } + } else if (hasParam("ValidObject")) { + if (!matchesValid(runParams.get(AbilityKey.Affected), getParam("ValidObject").split(","), getHostCard())) { + return false; + } + } + + if (hasParam("ValidSource")) { + if (!matchesValid(runParams.get(AbilityKey.Source), getParam("ValidSource").split(","), getHostCard())) { return false; } } @@ -81,6 +91,7 @@ public class ReplaceAddCounter extends ReplacementEffect { } else if (o instanceof Player) { sa.setReplacingObject(AbilityKey.Player, o); } + sa.setReplacingObject(AbilityKey.Object, o); } } diff --git a/forge-gui/res/cardsfolder/upcoming/vorinclex_monstrous_raider.txt b/forge-gui/res/cardsfolder/upcoming/vorinclex_monstrous_raider.txt new file mode 100644 index 00000000000..2bdb56cc448 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/vorinclex_monstrous_raider.txt @@ -0,0 +1,14 @@ +Name:Vorinclex, Monstrous Raider +ManaCost:4 G G +Types:Legendary Creature Phyrexian Praetor +PT:6/6 +K:Trample +K:Haste +R:Event$ AddCounter | ActiveZones$ Battlefield | ValidSource$ You | ValidObject$ Permanent.inZoneBattlefield,Player | ReplaceWith$ DoubleCounters | Description$ If you would put one or more counters on a permanent or player, put twice that many of each of those kinds of counters on that permanent or player instead. +SVar:DoubleCounters:DB$ ReplaceEffect | VarName$ CounterNum | VarValue$ X | References$ X +SVar:X:ReplaceCount$CounterNum/Twice +R:Event$ AddCounter | ActiveZones$ Battlefield | ValidSource$ Opponent | ValidObject$ Permanent.inZoneBattlefield,Player | ReplaceWith$ HalfCounters | Description$ If an opponent would put one or more counters on a permanent or player, they put half that many of each of those kinds of counters on that permanent or player instead, rounded down. +SVar:HalfCounters:DB$ ReplaceEffect | VarName$ CounterNum | VarValue$ Y | References$ Y +SVar:Y:ReplaceCount$CounterNum/HalfDown +Oracle:Trample, haste\nIf you would put one or more counters on a permanent or player, put twice that many of each of those kinds of counters on that permanent or player instead.\nIf an opponent would put one or more counters on a permanent or player, they put half that many of each of those kinds of counters on that permanent or player instead, rounded down. +