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

Couple of bug fixes

Browse Source
This commit is contained in:
marcin.sciesinski
2019-09-09 08:41:16 -07:00
parent 422e64b0e7
commit 71016b88b2
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-async/src/main/web/cards/set14.json
View File

@@ -237,7 +237,8 @@
"amount": {
"type": "printedStrengthFromMemory",
"memory": "discardedCard"
}
},
"until": "start(regroup)"
}
}
]

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseARace.java
View File

@@ -13,8 +13,8 @@ import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
import com.gempukku.lotro.logic.timing.Effect;
import org.json.simple.JSONObject;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
public class ChooseARace implements EffectAppenderProducer {
@Override
@@ -26,7 +26,7 @@ public class ChooseARace implements EffectAppenderProducer {
return new DelayedAppender() {
@Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
final Set<String> possibleRaces = new LinkedHashSet<String>();
final Set<String> possibleRaces = new TreeSet<>();
for (Race race : Race.values()) {
possibleRaces.add(race.getHumanReadable());
}

12
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java
View File

@@ -265,8 +265,16 @@ public class FilterFactory {
return new FilterableSource() {
@Override
public Filterable getFilterable(ActionContext actionContext) {
final String value = (String) actionContext.getSource().getWhileInZoneData();
return Race.valueOf(value);
return new Filter() {
@Override
public boolean accepts(LotroGame game, PhysicalCard physicalCard) {
final String value = (String) actionContext.getSource().getWhileInZoneData();
if (value == null)
return false;
else
return Race.valueOf(value) == physicalCard.getBlueprint().getRace();
}
};
}
};
}

21
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/NewCardsAtTest.java
View File

@@ -518,4 +518,25 @@ public class NewCardsAtTest extends AbstractAtTest {
assertEquals(Zone.DISCARD, blackBreath.getZone());
assertEquals(Zone.ATTACHED, blackBreath2.getZone());
}
@Test
public void strengthBonus() throws DecisionResultInvalidException, CardNotFoundException {
initializeSimplestGame();
final PhysicalCardImpl grimbeorn = createCard(P1, "14_6");
final PhysicalCardImpl nazgulInHand = createCard(P1, "40_211");
final PhysicalCardImpl nazgul = createCard(P2, "40_211");
_game.getGameState().addCardToZone(_game, grimbeorn, Zone.FREE_CHARACTERS);
_game.getGameState().addCardToZone(_game, nazgul, Zone.SHADOW_CHARACTERS);
_game.getGameState().addCardToZone(_game, nazgulInHand, Zone.HAND);
skipMulligans();
playerDecided(P1, "");
playerDecided(P2, "");
playerDecided(P1, "0");
playerDecided(P1, "");
}
}