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

Merge pull request #118 from MarcinSc/master

Browse Source 
Fixed issue with cards creating assignments during fierce skirmish
This commit is contained in:
Christian McCarty
2024-10-18 07:33:05 -05:00
committed by GitHub
parent 6dda33292b f4ce01fc12
commit 4ae761e0ad
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,7 +366,7 @@ public class Filters {
new Filter() {
@Override
public boolean accepts(LotroGame game, PhysicalCard physicalCard) {
return (!game.getGameState().isFierceSkirmishes()) || game.getModifiersQuerying().hasKeyword(game, physicalCard, Keyword.FIERCE);
return (game.getGameState().getCurrentPhase() != Phase.ASSIGNMENT || !game.getGameState().isFierceSkirmishes()) || game.getModifiersQuerying().hasKeyword(game, physicalCard, Keyword.FIERCE);
}
}));

5
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_224_Tests.java
View File

@@ -106,9 +106,8 @@ public class Card_01_224_Tests
//Can't quite get the rest
//assertEquals(2, scn.GetShadowCardChoiceCount()); // both enquea and TWK
//scn.ShadowChooseCard(enquea);
//We should now be asking freeps to choose the next skirmish to resolve and in a skirmish phase
assertEquals(2, scn.GetShadowCardChoiceCount()); // both enquea and TWK
scn.ShadowChooseCard(enquea);
}