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

Another bunch of fixes.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-08-30 21:22:51 +00:00
parent b2c073eb3b
commit cb17625d92
4 changed files with 8 additions and 2 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/elven/Card1_057.java
View File

@@ -31,7 +31,7 @@ import java.util.List;
*/
public class Card1_057 extends AbstractAlly {
public Card1_057() {
super(2, 6, 3, 3, Culture.ELVEN, "Rúmil", "1_56", true);
super(2, 6, 3, 3, Culture.ELVEN, "Rúmil", "1_57", true);
addKeyword(Keyword.ELF);
addKeyword(Keyword.ARCHER);
}

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

@@ -1,6 +1,7 @@
package com.gempukku.lotro.cards.set1.isengard;
import com.gempukku.lotro.cards.AbstractMinion;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
@@ -40,7 +41,7 @@ public class Card1_146 extends AbstractMinion {
appendPlayMinionAction(actions, lotroGame, self);
if (lotroGame.getGameState().getCurrentPhase() == Phase.MANEUVER
if (PlayConditions.canUseShadowCardDuringPhase(lotroGame.getGameState(), Phase.MANEUVER, self, 0)
&& Filters.countActive(lotroGame.getGameState(), lotroGame.getModifiersQuerying(), Filters.type(CardType.COMPANION)) >= 5) {
CostToEffectAction action = new CostToEffectAction(self, "Spot 5 companions to make this minion fierce until the regroup phase");

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -158,6 +158,9 @@ public class Filters {
return new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
if (physicalCard == null) {
System.out.println("Blah!");
}
return (physicalCard.getBlueprint().getCardType() == cardType);
}
};

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java
View File

@@ -142,6 +142,8 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
}
private boolean appliesStrengthModifier(GameState gameState, PhysicalCard modifierSource) {
if (modifierSource == null)
return true;
boolean result = true;
for (Modifier modifier : _modifiers) {
if (affectsCardWithSkipSet(gameState, modifierSource, modifier))