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

Merge branch 'master' into 'master'

Browse Source 
Check NetCombatDamage instead of NetPower when testing for possible Trample attack

See merge request core-developers/forge!2989
This commit is contained in:
Michael Kamensky
2020-07-10 12:26:28 +00:00
parent 16f5ce62f8 faf5ac7728
commit c72d575ebc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/AiAttackController.java
View File

@@ -1166,7 +1166,7 @@ public class AiAttackController {
} }
}); });
boolean canTrampleOverDefenders = attacker.hasKeyword(Keyword.TRAMPLE) && attacker.getNetPower() > Aggregates.sum(validBlockers, CardPredicates.Accessors.fnGetNetToughness); boolean canTrampleOverDefenders = attacker.hasKeyword(Keyword.TRAMPLE) && attacker.getNetCombatDamage() > Aggregates.sum(validBlockers, CardPredicates.Accessors.fnGetNetToughness);
// used to check that CanKillAllDangerous check makes sense in context where creatures with dangerous abilities are present // used to check that CanKillAllDangerous check makes sense in context where creatures with dangerous abilities are present
boolean dangerousBlockersPresent = !CardLists.filter(validBlockers, Predicates.or( boolean dangerousBlockersPresent = !CardLists.filter(validBlockers, Predicates.or(