github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Issue 200

Browse source
This commit is contained in:
magenoxx 2011-08-10 13:50:49 +04:00
parent 9d3d0f43fb
commit 7b71fa29f5
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Mage/src/mage/game/combat/CombatGroup.java
View file

@ -134,6 +134,10 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
return perm.getAbilities().containsKey(FirstStrikeAbility.getInstance().getId()); return perm.getAbilities().containsKey(FirstStrikeAbility.getInstance().getId());
} }
private boolean hasDoubleStrike(Permanent perm) {
return perm.getAbilities().containsKey(DoubleStrikeAbility.getInstance().getId());
}
private boolean hasTrample(Permanent perm) { private boolean hasTrample(Permanent perm) {
return perm.getAbilities().containsKey(TrampleAbility.getInstance().getId()); return perm.getAbilities().containsKey(TrampleAbility.getInstance().getId());
} }
@ -163,8 +167,30 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
} }
} }
/**
* Determines if permanent can damage in current (First Strike or not) combat damage step
*
* @param perm Permanent to check
* @param first First strike or common combat damage step
* @return
*/
private boolean canDamage(Permanent perm, boolean first) { private boolean canDamage(Permanent perm, boolean first) {
return (first && hasFirstOrDoubleStrike(perm)) || (!first && !hasFirstStrike(perm)); // if now first strike combat damage step
if (first) {
// should have first strike or double strike
return hasFirstOrDoubleStrike(perm);
}
// if now not first strike combat
else {
if (hasFirstStrike(perm)) {
// if it has first strike in non FS combat damage step
// then it can damage only if it has ALSO double strike
// Fixes Issue 200
return hasDoubleStrike(perm);
}
// can damage otherwise
return true;
}
} }
private void unblockedDamage(boolean first, Game game) { private void unblockedDamage(boolean first, Game game) {