External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes to menace & Lure interaction

Browse source
This commit is contained in:
L_J 2018-05-19 08:24:42 +00:00 • committed by GitHub
parent 1be4379cbd
commit a7d662d73e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -970,7 +970,7 @@ public class Combat implements Serializable, Copyable<Combat> {
// check if creatures are forced to block but do not block at all or block creatures they are not forced to block // check if creatures are forced to block but do not block at all or block creatures they are not forced to block
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (Map.Entry<UUID, Set<UUID>> entry : creatureMustBlockAttackers.entrySet()) { for (Map.Entry<UUID, Set<UUID>> entry : creatureMustBlockAttackers.entrySet()) {
boolean blockIsValid; boolean blockIsValid = true;
Permanent creatureForcedToBlock = game.getPermanent(entry.getKey()); Permanent creatureForcedToBlock = game.getPermanent(entry.getKey());
if (creatureForcedToBlock == null) { if (creatureForcedToBlock == null) {
break; break;
@ -980,29 +980,6 @@ public class Combat implements Serializable, Copyable<Combat> {
continue; continue;
} }
// Check if blocker is really able to block one or more attackers (maybe not if the attacker has menace) - if not continue with the next forced blocker
// TODO: Probably there is some potential to abuse the check if forced blockers are assigned to differnt attackers with e.g. menace.
// While if assigned all to one the block is possible
// if (creatureForcedToBlock.getBlocking() = 0) {
// boolean validBlockPossible = false;
// for (UUID possibleAttackerId : entry.getValue()) {
// CombatGroup attackersGroup = findGroup(possibleAttackerId);
// if (attackersGroup.getBlockers().contains(creatureForcedToBlock.getId())) {
// // forcedBlocker blocks a valid blocker, so no problem break check if valid block option exists
// validBlockPossible = true;
// break;
// }
// Permanent attackingCreature = game.getPermanent(possibleAttackerId);
// if (attackingCreature.getMinBlockedBy() > 1) { // e.g. Menace
// if (attackersGroup.getBlockers().size() + 1 >= attackingCreature.getMinBlockedBy()) {
// validBlockPossible = true;
// }
// }
// }
// if (!validBlockPossible) {
// continue;
// }
// }
// // check if creature has to pay a cost to block so it's not mandatory to block // // check if creature has to pay a cost to block so it's not mandatory to block
// boolean removedAttacker = false; // boolean removedAttacker = false;
@ -1019,8 +996,24 @@ public class Combat implements Serializable, Copyable<Combat> {
// continue; // continue;
// } // }
// creature does not block -> not allowed // creature does not block -> not allowed
// Check if blocker is really able to block one or more attackers (maybe not if the attacker has menace) - if not continue with the next forced blocker
// TODO: Probably there is some potential to abuse the check if forced blockers are assigned to differnt attackers with e.g. menace.
// While if assigned all to one the block is possible
if (creatureForcedToBlock.getBlocking() == 0) { if (creatureForcedToBlock.getBlocking() == 0) {
blockIsValid = false; blockIsValid = entry.getValue().isEmpty();
for (UUID possibleAttackerId : entry.getValue()) {
CombatGroup attackersGroup = game.getCombat().findGroup(possibleAttackerId);
Permanent attackingCreature = game.getPermanent(possibleAttackerId);
if (attackersGroup == null || attackingCreature == null) {
continue;
}
if (attackingCreature.getMinBlockedBy() > 1) { // e.g. Menace
if (attackersGroup.getBlockers().size() + 1 < attackingCreature.getMinBlockedBy()) {
blockIsValid = true;
}
}
}
} else { } else {
blockIsValid = false; blockIsValid = false;
// which attacker is he blocking // which attacker is he blocking