Fixed Alpha Authority and combat to handle a defined maximum of blockers.

This commit is contained in:
LevelX2 2013-05-29 17:41:30 +02:00
parent 9c18425b46
commit 7bb6fabfef
6 changed files with 62 additions and 10 deletions

View file

@ -121,7 +121,7 @@ class CantBeBlockedByMoreThanOneAttachedEffect extends ContinuousEffectImpl<Cant
if (attachment != null && attachment.getAttachedTo() != null) {
Permanent perm = game.getPermanent(attachment.getAttachedTo());
if (perm != null) {
perm.setMaxBlocks(amount);
perm.setMaxBlockedBy(amount);
return true;
}
}

View file

@ -154,8 +154,8 @@ class OdricMasterTacticianEffect extends ReplacementEffectImpl<OdricMasterTactic
if (game.isPaused() || game.isGameOver()) {
return true;
}
game.getCombat().checkBlockRestrictions(game.getPlayer(defenderId), game);
choose = !game.getCombat().checkBlockRequirementsAfter(game.getPlayer(defenderId), player, game);
choose = game.getCombat().checkBlockRestrictions(game.getPlayer(defenderId), game);
choose |= !game.getCombat().checkBlockRequirementsAfter(game.getPlayer(defenderId), player, game);
}
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_BLOCKERS, defenderId, defenderId));
}