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

- "Crazy Cob" can now also play minions when Orcs are killed.

Browse Source
This commit is contained in:
marcin.sciesinski
2017-11-13 17:22:00 -08:00
parent c5f744d982
commit 203339ac64
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
- "Gwaihir" no longer crashed the game, when it is not attached to anything and has its Skirmish action activated.
- "Bolg, Servant of Sauron" can now only be used in Maneuver phase.
- "Burglar's Contract" can now be used in Skirmish.
- "Crazy Cob" can now also play minions when Orcs are killed.
<b>17 Dec. 2015</b>
- "Armor of Khazad" no longer allows to return itself from discard and can now be transferred.

54
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java
View File

@@ -40,24 +40,40 @@ public class Card31_057 extends AbstractMinion {
addKeyword(Keyword.FIERCE);
}
@Override
public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, Race.ORC)
&& !PlayConditions.isPhase(game, Phase.REGROUP)
&& PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) {
final OptionalTriggerAction action = new OptionalTriggerAction(self);
action.setTriggerIdentifier(self.getCardId()+"-"+((DiscardCardsFromPlayResult) effectResult).getDiscardedCard().getCardId());
action.appendEffect(
new ChooseAndPlayCardFromHandEffect(playerId, game, -2, Race.SPIDER) {
@Override
protected void afterCardPlayed(PhysicalCard cardPlayed) {
action.appendEffect(
new AddUntilStartOfPhaseModifierEffect(
new StrengthModifier(self, cardPlayed, 2), Phase.REGROUP));
}
});
return Collections.singletonList(action);
@Override
public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, Race.ORC)
&& !PlayConditions.isPhase(game, Phase.REGROUP)
&& PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) {
final OptionalTriggerAction action = new OptionalTriggerAction(self);
action.setTriggerIdentifier(self.getCardId() + "-" + ((DiscardCardsFromPlayResult) effectResult).getDiscardedCard().getCardId());
action.appendEffect(
new ChooseAndPlayCardFromHandEffect(playerId, game, -2, Race.SPIDER) {
@Override
protected void afterCardPlayed(PhysicalCard cardPlayed) {
action.appendEffect(
new AddUntilStartOfPhaseModifierEffect(
new StrengthModifier(self, cardPlayed, 2), Phase.REGROUP));
}
});
return Collections.singletonList(action);
}
if (TriggerConditions.forEachKilled(game, effectResult, Race.ORC)
&& !PlayConditions.isPhase(game, Phase.REGROUP)
&& PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) {
final OptionalTriggerAction action = new OptionalTriggerAction(self);
action.setTriggerIdentifier(self.getCardId() + "-" + ((DiscardCardsFromPlayResult) effectResult).getDiscardedCard().getCardId());
action.appendEffect(
new ChooseAndPlayCardFromHandEffect(playerId, game, -2, Race.SPIDER) {
@Override
protected void afterCardPlayed(PhysicalCard cardPlayed) {
action.appendEffect(
new AddUntilStartOfPhaseModifierEffect(
new StrengthModifier(self, cardPlayed, 2), Phase.REGROUP));
}
});
return Collections.singletonList(action);
}
return null;
}
return null;
}
}