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

- Simplified the code found in forge.Combat.

Browse Source
This commit is contained in:
jendave
2011-08-07 01:02:24 +00:00
parent 8ec61a824a
commit 35e38b7fab
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/forge/Combat.java
View File

@@ -176,7 +176,7 @@ public class Combat {
// sum unblocked attackers' power // sum unblocked attackers' power
for (int i = 0; i < att.size(); i++) { for (int i = 0; i < att.size(); i++) {
if (!isBlocked(att.get(i)) if (!isBlocked(att.get(i))
|| (getBlockers(att.get(i)).size() == 0 && att.get(i).getKeyword().contains("Trample"))) { || (getBlockers(att.get(i)).size() == 0 && att.get(i).hasKeyword("Trample"))) {
int damageDealt = att.get(i).getNetCombatDamage(); int damageDealt = att.get(i).getNetCombatDamage();
@@ -437,7 +437,7 @@ public class Combat {
else if (attacker.hasFirstStrike() || attacker.hasDoubleStrike()) { else if (attacker.hasFirstStrike() || attacker.hasDoubleStrike()) {
needFirstStrike = true; needFirstStrike = true;
if (getAttackingPlayer().isHuman()) {// human attacks if (getAttackingPlayer().isHuman()) {// human attacks
if (attacker.getKeyword().contains("Trample") || block.size() > 1) if (attacker.hasKeyword("Trample") || block.size() > 1)
AllZone.Display.assignDamage(attacker, block, damageDealt); AllZone.Display.assignDamage(attacker, block, damageDealt);
else block.get(0).addAssignedDamage(damageDealt, attacking.get(i)); else block.get(0).addAssignedDamage(damageDealt, attacking.get(i));
} }
@@ -465,11 +465,11 @@ public class Combat {
// if attacker has no trample, and there's damage left, assign the rest // if attacker has no trample, and there's damage left, assign the rest
// to a random blocker // to a random blocker
if (damage > 0 && !c.getKeyword().contains("Trample")) { if (damage > 0 && !c.hasKeyword("Trample")) {
int index = CardUtil.getRandomIndex(block); int index = CardUtil.getRandomIndex(block);
block.get(index).addAssignedDamage(damage, c); block.get(index).addAssignedDamage(damage, c);
damage = 0; damage = 0;
} else if (c.getKeyword().contains("Trample")) { } else if (c.hasKeyword("Trample")) {
this.addDefendingDamage(damage, c); this.addDefendingDamage(damage, c);
} }
}// setAssignedFirstStrikeDamage() }// setAssignedFirstStrikeDamage()
@@ -505,7 +505,7 @@ public class Combat {
if (getAttackingPlayer().isHuman()) {// human attacks if (getAttackingPlayer().isHuman()) {// human attacks
if (attacker.getKeyword().contains("Trample") || block.size() > 1) if (attacker.hasKeyword("Trample") || block.size() > 1)
AllZone.Display.assignDamage(attacker, block, damageDealt); AllZone.Display.assignDamage(attacker, block, damageDealt);
else block.get(0).addAssignedDamage(damageDealt, attacking.get(i)); else block.get(0).addAssignedDamage(damageDealt, attacking.get(i));
} }
@@ -527,7 +527,7 @@ public class Combat {
Card blocker = block.get(0); Card blocker = block.get(0);
// trample // trample
if (attacker.getKeyword().contains("Trample")) { if (attacker.hasKeyword("Trample")) {
int damageNeeded = 0; int damageNeeded = 0;
@@ -565,11 +565,14 @@ public class Combat {
// if attacker has no trample, and there's damage left, assign the rest // if attacker has no trample, and there's damage left, assign the rest
// to a random blocker // to a random blocker
if (damage > 0 && !(c.getKeyword().contains("Trample") && killsAllBlockers == true)) { if (damage > 0
&& !(c.hasKeyword("Trample")
&& killsAllBlockers == true)) {
int index = CardUtil.getRandomIndex(block); int index = CardUtil.getRandomIndex(block);
block.get(index).addAssignedDamage(damage, c); block.get(index).addAssignedDamage(damage, c);
damage = 0; damage = 0;
} else if (c.getKeyword().contains("Trample") && killsAllBlockers == true) { } else if (c.hasKeyword("Trample")
&& killsAllBlockers == true) {
this.addDefendingDamage(damage, c); this.addDefendingDamage(damage, c);
} }
} }