From 36671770e86bf99fde49371d9990c729e984c93b Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 27 Oct 2011 23:03:40 +0000 Subject: [PATCH] - Hopefully finally fixed the damned copying sites Allies... --- .../java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java | 3 ++- .../java/com/gempukku/lotro/cards/set1/elven/Card1_060.java | 4 ++++ .../java/com/gempukku/lotro/cards/set1/elven/Card1_067.java | 4 ++++ .../java/com/gempukku/lotro/cards/set1/shire/Card1_295.java | 3 +++ .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java index 1cc07ca50..dd22a8bfc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java @@ -9,6 +9,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.timing.AbstractEffect; import com.gempukku.lotro.logic.timing.Effect; +import com.gempukku.lotro.logic.timing.results.PlayCardResult; import java.util.Collection; import java.util.Collections; @@ -86,7 +87,7 @@ public class PlaySiteEffect extends AbstractEffect { } sitePlayedCallback(newSite); - return new FullEffectResult(null, true, true); + return new FullEffectResult(Collections.singleton(new PlayCardResult(newSite, null)), true, true); } return new FullEffectResult(null, false, false); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java index d03babf08..cb2a5ba5f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractAlly; +import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.common.Block; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; @@ -72,6 +73,9 @@ public class Card1_060 extends AbstractAlly { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (PlayConditions.played(game, effectResult, Filters.siteNumber(3))) + game.getGameState().reapplyAffectingForCard(game, self); + LotroCardBlueprint copied = getCopied(game, self); if (copied != null) return copied.getOptionalAfterTriggers(playerId, game, effectResult, self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java index b6f154ed3..fc927952e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.set1.elven; import com.gempukku.lotro.cards.AbstractAlly; +import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.common.Block; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; @@ -72,6 +73,9 @@ public class Card1_067 extends AbstractAlly { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (PlayConditions.played(game, effectResult, Filters.siteNumber(6))) + game.getGameState().reapplyAffectingForCard(game, self); + LotroCardBlueprint copied = getCopied(game, self); if (copied != null) return copied.getOptionalAfterTriggers(playerId, game, effectResult, self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java index 8e2ad83e7..c5372de97 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java @@ -75,6 +75,9 @@ public class Card1_295 extends AbstractAlly { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (PlayConditions.played(game, effectResult, Filters.siteNumber(1))) + game.getGameState().reapplyAffectingForCard(game, self); + LotroCardBlueprint copied = getCopied(game, self); if (copied != null) return copied.getOptionalAfterTriggers(playerId, game, effectResult, self); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 7cc4b7d6f..2a6e107c1 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -2,6 +2,7 @@ 27 Oct. 2011 - "Wizard Staff" is no longer considered an artifact by the game, it's just a mere possession. - Fixed display of minions when they are removed from skirmish (for example by Merry or Pippin effect). +- Hopefully finally fixed the damned copying sites Allies... 26 Oct. 2011 - Added card overlay to active characters showing their current strength.