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

CombatUtil: add MustBeBlockedBy for Slayer's Cleaver

Browse Source
This commit is contained in:
Hanmac
2016-07-17 20:12:40 +00:00
parent 0cfa184d62
commit 96d1c1c6db
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -755,6 +755,17 @@ public class CombatUtil {
|| (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.")
&& combat.getBlockers(attacker).isEmpty())) {
attackersWithLure.add(attacker);
} else {
for (String keyword : attacker.getKeywords()) {
// MustBeBlockedBy <valid>
if (keyword.startsWith("MustBeBlockedBy ")) {
final String valid = keyword.substring("MustBeBlockedBy ".length());
if (blocker.isValid(valid, null, null, null) &&
CardLists.getValidCardCount(combat.getBlockers(attacker), valid, null, null) == 0) {
attackersWithLure.add(attacker);
}
}
}
}
}
@@ -855,6 +866,19 @@ public class CombatUtil {
return false;
}
boolean mustBeBlockedBy = false;
for (String keyword : attacker.getKeywords()) {
// MustBeBlockedBy <valid>
if (keyword.startsWith("MustBeBlockedBy ")) {
final String valid = keyword.substring("MustBeBlockedBy ".length());
if (blocker.isValid(valid, null, null, null) &&
CardLists.getValidCardCount(combat.getBlockers(attacker), valid, null, null) == 0) {
mustBeBlockedBy = true;
break;
}
}
}
// if the attacker has no lure effect, but the blocker can block another
// attacker with lure, the blocker can't block the former
if (!attacker.hasKeyword("All creatures able to block CARDNAME do so.")
@@ -862,6 +886,7 @@ public class CombatUtil {
&& !(attacker.hasStartOfKeyword("All creatures with flying able to block CARDNAME do so.") && blocker.hasKeyword("Flying"))
&& !(attacker.hasKeyword("CARDNAME must be blocked if able.") && combat.getBlockers(attacker).isEmpty())
&& !(blocker.getMustBlockCards() != null && blocker.getMustBlockCards().contains(attacker))
&& !mustBeBlockedBy
&& CombatUtil.mustBlockAnAttacker(blocker, combat)) {
return false;
}