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

Merge pull request #39 from PhallenCassidy/Fixes-for-Dwarf-Race-Issues

Browse Source 
Even more fixes to The Hobbit
This commit is contained in:
Marcin Sciesinski
2017-11-14 10:07:56 -08:00
committed by GitHub
parent 2181588b55 b390d04bcc
commit 1cc8103769
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_004.java
View File

@@ -32,14 +32,14 @@ public class Card30_004 extends AbstractEvent {
@Override @Override
public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) { public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) {
return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile) return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile)
&& PlayConditions.canExert(self, game, Race.DWARF); && PlayConditions.canExert(self, game, Race.DWARF, Filters.character);
} }
@Override @Override
public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
final PlayEventAction action = new PlayEventAction(self); final PlayEventAction action = new PlayEventAction(self);
action.appendCost( action.appendCost(
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF)); new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF, Filters.character));
action.appendEffect( action.appendEffect(
new ChooseActiveCardsEffect(self, playerId, "Choose Orc(s) to wound", 1, 2, Race.ORC) { new ChooseActiveCardsEffect(self, playerId, "Choose Orc(s) to wound", 1, 2, Race.ORC) {
@Override @Override
@@ -56,4 +56,4 @@ public class Card30_004 extends AbstractEvent {
); );
return action; return action;
} }
} }

29
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java
View File

@@ -38,19 +38,20 @@ public class Card31_003 extends AbstractPermanent {
@Override @Override
protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) {
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) {
final ActivateCardAction action = new ActivateCardAction(self); final ActivateCardAction action = new ActivateCardAction(self);
action.appendCost( action.appendCost(
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF)); new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF));
action.appendEffect( action.appendEffect(
new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Race.MAN)); new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Race.MAN));
return Collections.singletonList(action); return Collections.singletonList(action);
} }
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
final ActivateCardAction action = new ActivateCardAction(self); && PlayConditions.canExert(self, game, Race.MAN)) {
action.appendCost( final ActivateCardAction action = new ActivateCardAction(self);
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.MAN)); action.appendCost(
action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.MAN));
new SelfDiscardEffect(self)); action.appendCost(
new SelfDiscardEffect(self));
List<Effect> possibleEffects = new LinkedList<Effect>(); List<Effect> possibleEffects = new LinkedList<Effect>();
possibleEffects.add( possibleEffects.add(
new ChooseAndPlayCardFromDeckEffect(playerId, Race.ELF) { new ChooseAndPlayCardFromDeckEffect(playerId, Race.ELF) {
@@ -70,8 +71,8 @@ public class Card31_003 extends AbstractPermanent {
} }
action.appendEffect( action.appendEffect(
new ChoiceEffect(action, playerId, possibleEffects)); new ChoiceEffect(action, playerId, possibleEffects));
return Collections.singletonList(action); return Collections.singletonList(action);
} }
return null; return null;
} }
} }

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_021.java
View File

@@ -27,14 +27,14 @@ import java.util.List;
* Set: The Short Rest * Set: The Short Rest
* Side: Shadow * Side: Shadow
* Culture: Gollum * Culture: Gollum
* Twilight Cost: 1 * Twilight Cost: 2
* Type: Event • Skirmish * Type: Event • Skirmish
* Game Text: You may exert Gollum twice to play this event from your discard pile. Make a minion strength +2. If * Game Text: You may exert Gollum twice to play this event from your discard pile. Make a minion strength +2. If
* that minion wins this skirmish, you may add a doubt. * that minion wins this skirmish, you may add a doubt.
*/ */
public class Card31_021 extends AbstractEvent { public class Card31_021 extends AbstractEvent {
public Card31_021() { public Card31_021() {
super(Side.SHADOW, 1, Culture.GOLLUM, "If He Loses", Phase.SKIRMISH); super(Side.SHADOW, 2, Culture.GOLLUM, "If He Loses", Phase.SKIRMISH);
} }
@Override @Override