From 4ad9187a563fa4dee4e2b1e52dec8f4ec9200e3a Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 21 Nov 2011 16:46:44 +0000 Subject: [PATCH] Stored objects for cards are removed at the end of each turn. --- .../gempukku/lotro/cards/set1/sauron/Card1_266.java | 2 -- .../com/gempukku/lotro/cards/set1/site/Card1_338.java | 3 --- .../com/gempukku/lotro/cards/set1/site/Card1_342.java | 4 +--- .../com/gempukku/lotro/cards/set1/site/Card1_348.java | 10 ---------- .../com/gempukku/lotro/cards/set1/site/Card1_350.java | 3 --- .../com/gempukku/lotro/cards/set4/site/Card4_347.java | 3 --- .../com/gempukku/lotro/cards/set4/site/Card4_359.java | 3 --- .../gempukku/lotro/cards/set5/sauron/Card5_102.java | 3 --- 8 files changed, 1 insertion(+), 30 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_266.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_266.java index 57717deda..96261e4a8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_266.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_266.java @@ -53,8 +53,6 @@ public class Card1_266 extends AbstractMinion { return Collections.singletonList(action); } } - if (effectResult.getType() == EffectResult.Type.END_OF_TURN) - self.removeData(); return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java index dbc4874d9..3231fc636 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java @@ -50,9 +50,6 @@ public class Card1_338 extends AbstractSite { if (TriggerConditions.played(game, effectResult, Race.NAZGUL) && game.getGameState().getCurrentSite() == self) self.storeData(new Object()); - if (effectResult.getType() == EffectResult.Type.END_OF_TURN - && self.getData() != null) - self.removeData(); return null; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java index 499b2e232..6909ad1a9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java @@ -28,9 +28,7 @@ public class Card1_342 extends AbstractSite { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (effectResult.getType() == EffectResult.Type.END_OF_TURN) - self.removeData(); - else if (game.getGameState().getCurrentSite() == self + if (game.getGameState().getCurrentSite() == self && self.getData() == null && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Keyword.RANGER)) { self.storeData(new Object()); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_348.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_348.java index 1f2236bcb..b390c639e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_348.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_348.java @@ -8,9 +8,7 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; -import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.timing.Action; -import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; import java.util.List; @@ -41,12 +39,4 @@ public class Card1_348 extends AbstractSite { } return null; } - - @Override - public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (effectResult.getType() == EffectResult.Type.END_OF_TURN - && self.getData() != null) - self.removeData(); - return null; - } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java index 0029e5260..7f109e077 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java @@ -49,9 +49,6 @@ public class Card1_350 extends AbstractSite { public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.played(game, effectResult, Filters.and(Culture.MORIA, Race.ORC))) self.storeData(new Object()); - if (effectResult.getType() == EffectResult.Type.END_OF_TURN - && self.getData() != null) - self.removeData(); return null; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java index b7f60b365..3ab9571ad 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java @@ -50,9 +50,6 @@ public class Card4_347 extends AbstractSite { if (TriggerConditions.played(game, effectResult, Race.URUK_HAI) && game.getGameState().getCurrentSite() == self) self.storeData(new Object()); - if (effectResult.getType() == EffectResult.Type.END_OF_TURN - && self.getData() != null) - self.removeData(); return null; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_359.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_359.java index 9fc2139af..dbe780a5f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_359.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_359.java @@ -39,9 +39,6 @@ public class Card4_359 extends AbstractSite { && game.getGameState().getCurrentPhase() == Phase.SHADOW) { self.storeData(new Object()); } - if (effectResult.getType() == EffectResult.Type.END_OF_TURN) { - self.removeData(); - } return null; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_102.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_102.java index c28f8625c..65d6a62b0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_102.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_102.java @@ -58,9 +58,6 @@ public class Card5_102 extends AbstractPermanent { if (TriggerConditions.played(game, effectResult, Culture.SAURON, Race.ORC) && Filters.and(Filters.siteNumber(4), Filters.siteBlock(Block.TWO_TOWERS)).accepts(game.getGameState(), game.getModifiersQuerying(), game.getGameState().getCurrentSite())) self.storeData(new Object()); - if (effectResult.getType() == EffectResult.Type.END_OF_TURN - && self.getData() != null) - self.removeData(); return null; }