From cbd2e38719b28a2b60ab75f560e5dbb0aea132b2 Mon Sep 17 00:00:00 2001 From: moomarc Date: Fri, 31 Aug 2012 08:42:32 +0000 Subject: [PATCH] - Small tweaks to Diseased Vermin - Pump RememberObjects will not remember objects already remembered --- res/cardsfolder/d/diseased_vermin.txt | 6 ++++-- .../java/forge/card/abilityfactory/AbilityFactoryPump.java | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/d/diseased_vermin.txt b/res/cardsfolder/d/diseased_vermin.txt index e09153a5757..0e24885a425 100644 --- a/res/cardsfolder/d/diseased_vermin.txt +++ b/res/cardsfolder/d/diseased_vermin.txt @@ -7,10 +7,12 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ INFECTION | CounterNum$ 1 | SubAbility$ DBRemember SVar:DBRemember:DB$ Pump | RememberObjects$ Opponent | StackDescription$ None T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBDisease | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, Diseased Vermin deals X damage to target opponent previously dealt damage by it, where X is the number of infection counters on it. -SVar:DBDisease:DB$ DealDamage| ValidTgts$ Opponent.IsRemembered | NumDmg$ X +SVar:DBDisease:DB$ DealDamage| ValidTgts$ Opponent.IsRemembered | NumDmg$ X | References$ X SVar:X:Count$CardCounters.INFECTION +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Self | Execute$ DBCleanup | Static$ True +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Rarity:Uncommon -SVar:Picture:http://www.wizards.com/global/images/magic/general/arcbound_slith.jpg +SVar:Picture:http://www.wizards.com/global/images/magic/general/diseased_vermin.jpg SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/5.jpg Oracle:Whenever Diseased Vermin deals combat damage to a player, put an infection counter on it.\nAt the beginning of your upkeep, Diseased Vermin deals X damage to target opponent previously dealt damage by it, where X is the number of infection counters on it. End \ No newline at end of file diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java index 74aa08b9bda..2d164de00b4 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java @@ -1330,7 +1330,9 @@ public class AbilityFactoryPump { if (pumpRemembered != null) { for (final Object o : AbilityFactory.getDefinedObjects(sa.getSourceCard(), pumpRemembered, sa)) { - sa.getSourceCard().addRemembered(o); + if (!sa.getSourceCard().getRemembered().contains(o)) { + sa.getSourceCard().addRemembered(o); + } } }