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

Merge branch 'explo' into 'master'

Browse Source 
Fix Explosive Singularity not being castable when no untapped creature

See merge request core-developers/forge!6370
This commit is contained in:
Michael Kamensky
2022-03-08 11:16:29 +00:00
parent 39c456c204 fda2b9ef7d
commit 1c68fcb7c4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
View File

@@ -94,12 +94,12 @@ public class CreatureEvaluator implements Function<Card, Integer> {
if (c.hasKeyword(Keyword.VIGILANCE)) { if (c.hasKeyword(Keyword.VIGILANCE)) {
value += addValue((power * 5) + (toughness * 5), "vigilance"); value += addValue((power * 5) + (toughness * 5), "vigilance");
} }
if (c.hasKeyword(Keyword.WITHER)) {
value += addValue(power * 10, "Wither");
}
if (c.hasKeyword(Keyword.INFECT)) { if (c.hasKeyword(Keyword.INFECT)) {
value += addValue(power * 15, "infect"); value += addValue(power * 15, "infect");
} }
else if (c.hasKeyword(Keyword.WITHER)) {
value += addValue(power * 10, "Wither");
}
value += addValue(c.getKeywordMagnitude(Keyword.RAMPAGE), "rampage"); value += addValue(c.getKeywordMagnitude(Keyword.RAMPAGE), "rampage");
value += addValue(c.getKeywordMagnitude(Keyword.AFFLICT) * 5, "afflict"); value += addValue(c.getKeywordMagnitude(Keyword.AFFLICT) * 5, "afflict");
} }

2
forge-game/src/main/java/forge/game/cost/CostTapType.java
View File

@@ -184,7 +184,7 @@ public class CostTapType extends CostPartWithList {
} }
final int amount = this.getAbilityAmount(ability); final int amount = this.getAbilityAmount(ability);
return typeList.size() != 0 && typeList.size() >= amount; return typeList.size() >= amount;
} }
/* (non-Javadoc) /* (non-Javadoc)