external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dargo' into 'master'

Browse Source 
CMR: Dargo and support

See merge request core-developers/forge!3323
This commit is contained in:
Michael Kamensky
2020-11-09 14:49:02 +00:00
parent 644403834f cd46705791
commit 1069b60b2a
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -871,10 +871,12 @@ public class CardFactoryUtil {
if (l[0].startsWith("SacrificedThisTurn")) {
CardCollectionView list = cc.getSacrificedThisTurn();
if (l[0].contains(" ")) {
final String[] components = l[0].split(" ", 2);
list = CardLists.getValidCards(list, components[1], cc, c);
String[] lparts = l[0].split(" ", 2);
String restrictions = TextUtil.fastReplace(l[0], TextUtil.addSuffix(lparts[0]," "), "");
final String[] rest = restrictions.split(",");
list = CardLists.getValidCards(list, rest, cc, c, null);
}
return list.size();
return doXMath(list.size(), m, c);
}
final String[] sq;