ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stored objects for cards are removed at the end of each turn.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-21 16:46:44 +00:00
parent 019274f0d7
commit 4ad9187a56
8 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_266.java
View File

@@ -53,8 +53,6 @@ public class Card1_266 extends AbstractMinion {
return Collections.singletonList(action); return Collections.singletonList(action);
} }
} }
if (effectResult.getType() == EffectResult.Type.END_OF_TURN)
self.removeData();
return null; return null;
} }

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_338.java
View File

@@ -50,9 +50,6 @@ public class Card1_338 extends AbstractSite {
if (TriggerConditions.played(game, effectResult, Race.NAZGUL) if (TriggerConditions.played(game, effectResult, Race.NAZGUL)
&& game.getGameState().getCurrentSite() == self) && game.getGameState().getCurrentSite() == self)
self.storeData(new Object()); self.storeData(new Object());
if (effectResult.getType() == EffectResult.Type.END_OF_TURN
&& self.getData() != null)
self.removeData();
return null; return null;
} }
} }

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_342.java
View File

@@ -28,9 +28,7 @@ public class Card1_342 extends AbstractSite {
@Override @Override
public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (effectResult.getType() == EffectResult.Type.END_OF_TURN) if (game.getGameState().getCurrentSite() == self
self.removeData();
else if (game.getGameState().getCurrentSite() == self
&& self.getData() == null && self.getData() == null
&& Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Keyword.RANGER)) { && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Keyword.RANGER)) {
self.storeData(new Object()); self.storeData(new Object());

10
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_348.java
View File

@@ -8,9 +8,7 @@ import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.ActivateCardAction; 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.Action;
import com.gempukku.lotro.logic.timing.EffectResult;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -41,12 +39,4 @@ public class Card1_348 extends AbstractSite {
} }
return null; return null;
} }
@Override
public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (effectResult.getType() == EffectResult.Type.END_OF_TURN
&& self.getData() != null)
self.removeData();
return null;
}
} }

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_350.java
View File

@@ -49,9 +49,6 @@ public class Card1_350 extends AbstractSite {
public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (TriggerConditions.played(game, effectResult, Filters.and(Culture.MORIA, Race.ORC))) if (TriggerConditions.played(game, effectResult, Filters.and(Culture.MORIA, Race.ORC)))
self.storeData(new Object()); self.storeData(new Object());
if (effectResult.getType() == EffectResult.Type.END_OF_TURN
&& self.getData() != null)
self.removeData();
return null; return null;
} }
} }

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_347.java
View File

@@ -50,9 +50,6 @@ public class Card4_347 extends AbstractSite {
if (TriggerConditions.played(game, effectResult, Race.URUK_HAI) if (TriggerConditions.played(game, effectResult, Race.URUK_HAI)
&& game.getGameState().getCurrentSite() == self) && game.getGameState().getCurrentSite() == self)
self.storeData(new Object()); self.storeData(new Object());
if (effectResult.getType() == EffectResult.Type.END_OF_TURN
&& self.getData() != null)
self.removeData();
return null; return null;
} }
} }

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/site/Card4_359.java
View File

@@ -39,9 +39,6 @@ public class Card4_359 extends AbstractSite {
&& game.getGameState().getCurrentPhase() == Phase.SHADOW) { && game.getGameState().getCurrentPhase() == Phase.SHADOW) {
self.storeData(new Object()); self.storeData(new Object());
} }
if (effectResult.getType() == EffectResult.Type.END_OF_TURN) {
self.removeData();
}
return null; return null;
} }
} }

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_102.java
View File

@@ -58,9 +58,6 @@ public class Card5_102 extends AbstractPermanent {
if (TriggerConditions.played(game, effectResult, Culture.SAURON, Race.ORC) 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())) && Filters.and(Filters.siteNumber(4), Filters.siteBlock(Block.TWO_TOWERS)).accepts(game.getGameState(), game.getModifiersQuerying(), game.getGameState().getCurrentSite()))
self.storeData(new Object()); self.storeData(new Object());
if (effectResult.getType() == EffectResult.Type.END_OF_TURN
&& self.getData() != null)
self.removeData();
return null; return null;
} }