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

Merge pull request #5 from MarcinSc/master

Browse Source 
Bringing fork up to date
This commit is contained in:
PhallenCassidy
2020-03-30 13:32:54 -04:00
committed by GitHub
parent 9efa204858 01bb7ca4c2
commit 75218e89ad
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json
View File

@@ -206,14 +206,26 @@
"memorize": "cardsInHand"
},
{
"type": "discardFromHand",
"hand": "shadowPlayer",
"player": "shadowPlayer",
"forced": true,
"count": {
"type": "forEachMatchingInMemory",
"memory": "cardsInHand",
"filter": "orc"
"type": "conditional",
"condition": {
"type": "isMore",
"firstNumber": {
"type": "forEachMatchingInMemory",
"memory": "cardsInHand",
"filter": "orc"
},
"secondNumber": 0
},
"effect": {
"type": "discardFromHand",
"hand": "shadowPlayer",
"player": "shadowPlayer",
"forced": true,
"count": {
"type": "forEachMatchingInMemory",
"memory": "cardsInHand",
"filter": "orc"
}
}
}
]

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

@@ -35,6 +35,7 @@ public class FilterFactory {
simpleFilters.put("unique", (actionContext) -> Filters.unique);
simpleFilters.put("bearer", (actionContext -> Filters.hasAttached(actionContext.getSource())));
simpleFilters.put("character", (actionContext) -> Filters.character);
simpleFilters.put("mounted", (actionContext) -> Filters.mounted);
simpleFilters.put("weapon", (actionContext) -> Filters.weapon);
simpleFilters.put("wounded", (actionContext) -> Filters.wounded);
simpleFilters.put("unwounded", (actionContext) -> Filters.unwounded);