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 'moraug' into 'master'

Browse Source 
ZNR: Moraug, Fury of Akoum and support

Closes #1571

See merge request core-developers/forge!3163
This commit is contained in:
Michael Kamensky
2020-09-21 05:48:44 +00:00
parent 8efe4f8118 1439069492
commit 49e8ffae13
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1295,6 +1295,9 @@ public class CardFactoryUtil {
if (sq[0].contains("CardNumColors")) {
return doXMath(CardUtil.getColors(c).countColors(), m, c);
}
if (sq[0].contains("CardNumAttacksThisTurn")) {
return doXMath(c.getDamageHistory().getCreatureAttacksThisTurn(), m, c);
}
if (sq[0].contains("ChosenNumber")) {
Integer i = c.getChosenNumber();
return doXMath(i == null ? 0 : i, m, c);