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

- Little updates in CombatUtil.

Browse Source
This commit is contained in:
Sloth
2011-08-25 11:01:10 +00:00
parent 196863ca9f
commit 3ef7b21654
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/forge/CombatUtil.java
View File

@@ -309,18 +309,6 @@ public class CombatUtil {
if (!attacker.hasKeyword("All creatures able to block CARDNAME do so.") if (!attacker.hasKeyword("All creatures able to block CARDNAME do so.")
&& canBlockAnAttackerWithLure(blocker, combat)) return false; && canBlockAnAttackerWithLure(blocker, combat)) return false;
if (blocker.hasStartOfKeyword("CARDNAME can't block ")) {
for (String kw : blocker.getKeyword()) {
if (kw.startsWith("CARDNAME can't block ")) {
String unblockableCard = kw.substring(21);
int ID = Integer.parseInt(unblockableCard.substring(unblockableCard.lastIndexOf("(") + 1, unblockableCard.length() - 1));
if (attacker.getUniqueNumber() == ID) {
return false;
}
}
}
}
return canBlock(attacker, blocker); return canBlock(attacker, blocker);
} }
@@ -342,6 +330,18 @@ public class CombatUtil {
if (CardFactoryUtil.hasProtectionFrom(blocker, attacker)) return false; if (CardFactoryUtil.hasProtectionFrom(blocker, attacker)) return false;
if (blocker.hasStartOfKeyword("CARDNAME can't block ")) {
for (String kw : blocker.getKeyword()) {
if (kw.startsWith("CARDNAME can't block ")) {
String unblockableCard = kw.substring(21);
int ID = Integer.parseInt(unblockableCard.substring(unblockableCard.lastIndexOf("(") + 1, unblockableCard.length() - 1));
if (attacker.getUniqueNumber() == ID) {
return false;
}
}
}
}
//rare case: //rare case:
if (blocker.hasKeyword("Shadow") if (blocker.hasKeyword("Shadow")
&& blocker.hasKeyword( && blocker.hasKeyword(
@@ -1225,7 +1225,9 @@ public class CombatUtil {
public static int predictToughnessBonusOfAttacker(Card attacker, Card defender, Combat combat) { public static int predictToughnessBonusOfAttacker(Card attacker, Card defender, Combat combat) {
int toughness = 0; int toughness = 0;
toughness += attacker.getKeywordMagnitude("Bushido"); if (defender != null) {
toughness += attacker.getKeywordMagnitude("Bushido");
}
ArrayList<Trigger> registeredTriggers = AllZone.getTriggerHandler().getRegisteredTriggers(); ArrayList<Trigger> registeredTriggers = AllZone.getTriggerHandler().getRegisteredTriggers();
for (Trigger trigger : registeredTriggers) { for (Trigger trigger : registeredTriggers) {