From c8b43ff84f4fda1720afdcda1c9569f3b213c0d1 Mon Sep 17 00:00:00 2001 From: jendave Date: Wed, 10 Aug 2011 20:33:26 +0000 Subject: [PATCH] small cleanups to make Eclipse happy --- pom.xml | 6 ++---- src/main/java/forge/Card.java | 14 ++++++++++---- src/main/java/forge/ComputerUtil_Attack2.java | 7 ++++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 8488a137876..6394cdc62d3 100644 --- a/pom.xml +++ b/pom.xml @@ -162,8 +162,7 @@ maven-release-plugin - 2.2.1 - + 2.2.1 true @@ -205,8 +204,7 @@ maven-assembly-plugin - 2.2.1 - + 2.2.1 jar-with-dependencies diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index aabdc46c98f..847bafbfc16 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1,7 +1,17 @@ package forge; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; +import java.util.TreeMap; + import com.esotericsoftware.minlog.Log; + import forge.card.cardFactory.CardFactoryUtil; import forge.card.mana.ManaCost; import forge.card.spellability.Ability_Mana; @@ -11,10 +21,6 @@ import forge.card.spellability.Spell_Permanent; import forge.card.staticAbility.StaticAbility; import forge.card.trigger.Trigger; -import java.security.acl.Owner; -import java.util.*; -import java.util.Map.Entry; - /** *

Card class.

* diff --git a/src/main/java/forge/ComputerUtil_Attack2.java b/src/main/java/forge/ComputerUtil_Attack2.java index fd906d13e3b..34d9f5a2128 100644 --- a/src/main/java/forge/ComputerUtil_Attack2.java +++ b/src/main/java/forge/ComputerUtil_Attack2.java @@ -356,7 +356,7 @@ public class ComputerUtil_Attack2 { // examine the potential forces CardList nextTurnAttackers = new CardList(); int candidateCounterAttackDamage = 0; - int candidateTotalBlockDamage = 0; + //int candidateTotalBlockDamage = 0; for (Card pCard : playerCreatures) { // if the creature can attack next turn add it to counter attackers list @@ -364,7 +364,7 @@ public class ComputerUtil_Attack2 { nextTurnAttackers.add(pCard); if (pCard.getNetCombatDamage() > 0) { candidateCounterAttackDamage += pCard.getNetCombatDamage(); - candidateTotalBlockDamage += pCard.getNetCombatDamage(); + //candidateTotalBlockDamage += pCard.getNetCombatDamage(); playerForces += 1; // player forces they might use to attack } } @@ -376,8 +376,9 @@ public class ComputerUtil_Attack2 { // find the potential counter attacking damage compared to AI life total double aiLifeToPlayerDamageRatio = 1000000; - if (candidateCounterAttackDamage > 0) + if (candidateCounterAttackDamage > 0) { aiLifeToPlayerDamageRatio = (double) AllZone.getComputerPlayer().life / candidateCounterAttackDamage; + } // get the potential damage and strength of the AI forces CardList candidateAttackers = new CardList();