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

- JOU: Added Sightless Brawler

Browse Source
This commit is contained in:
swordshine
2014-04-22 11:25:51 +00:00
parent e165b64199
commit 7cec807a31
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,7 +670,8 @@ public class CombatUtil {
// Handles removing cards like Mogg Flunkies from combat if group attack // Handles removing cards like Mogg Flunkies from combat if group attack
// didn't occur // didn't occur
for (Card c1 : combat.getAttackers()) { for (Card c1 : combat.getAttackers()) {
if (c1.hasKeyword("CARDNAME can't attack or block alone.")) { if (c1.hasKeyword("CARDNAME can't attack or block alone.")
|| c1.hasKeyword("CARDNAME can't attack alone.")) {
if (combat.getAttackers().size() < 2) { if (combat.getAttackers().size() < 2) {
combat.removeFromCombat(c1); combat.removeFromCombat(c1);
} }
@@ -701,7 +702,8 @@ public class CombatUtil {
if (CombatUtil.canAttack(c)) { if (CombatUtil.canAttack(c)) {
for (Player def : defenders) { for (Player def : defenders) {
if (CombatUtil.canAttackNextTurn(c, def)) { if (CombatUtil.canAttackNextTurn(c, def)) {
if (c.hasKeyword("CARDNAME can't attack or block alone.")) { if (c.hasKeyword("CARDNAME can't attack or block alone.")
|| c.hasKeyword("CARDNAME can't attack alone.")) {
//ensure another possible attacker is found //ensure another possible attacker is found
//if the first one found can't attack alone //if the first one found can't attack alone
if (!foundCreatureThatCantAttackAlone) { if (!foundCreatureThatCantAttackAlone) {
@@ -760,8 +762,8 @@ public class CombatUtil {
} }
} }
if (c.hasKeyword("CARDNAME can't attack or block alone.") && if ((c.hasKeyword("CARDNAME can't attack or block alone.") || c.hasKeyword("CARDNAME can't attack alone."))
c.getController().getCreaturesInPlay().size() < 2) { && c.getController().getCreaturesInPlay().size() < 2) {
return false; return false;
} }