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

- Hopefully finally fixed the damned copying sites Allies...

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-27 23:03:40 +00:00
parent 7b21e19de5
commit 36671770e8
5 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlaySiteEffect.java
View File

@@ -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);
}

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

@@ -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<OptionalTriggerAction> 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);

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

@@ -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<OptionalTriggerAction> 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);

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

@@ -75,6 +75,9 @@ public class Card1_295 extends AbstractAlly {
@Override
public List<OptionalTriggerAction> 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);

1
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -2,6 +2,7 @@
<b>27 Oct. 2011</b>
- "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...
<b>26 Oct. 2011</b>
- Added card overlay to active characters showing their current strength.