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

small cleanups to make Eclipse happy

Browse Source
This commit is contained in:
jendave
2011-08-10 20:33:26 +00:00
parent f51a55a2e6
commit c8b43ff84f
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -162,8 +162,7 @@
<plugin> <plugin>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.2.1</version> <version>2.2.1</version><!--$NO-MVN-MAN-VER$-->
<!--$NO-MVN-MAN-VER$ -->
<configuration> <configuration>
<allowTimestampedSnapshots>true</allowTimestampedSnapshots> <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
</configuration> </configuration>
@@ -205,8 +204,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version> <version>2.2.1</version><!--$NO-MVN-MAN-VER$-->
<!--$NO-MVN-MAN-VER$ -->
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>

14
src/main/java/forge/Card.java
View File

@@ -1,7 +1,17 @@
package forge; 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 com.esotericsoftware.minlog.Log;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.card.spellability.Ability_Mana; import forge.card.spellability.Ability_Mana;
@@ -11,10 +21,6 @@ import forge.card.spellability.Spell_Permanent;
import forge.card.staticAbility.StaticAbility; import forge.card.staticAbility.StaticAbility;
import forge.card.trigger.Trigger; import forge.card.trigger.Trigger;
import java.security.acl.Owner;
import java.util.*;
import java.util.Map.Entry;
/** /**
* <p>Card class.</p> * <p>Card class.</p>
* *

7
src/main/java/forge/ComputerUtil_Attack2.java
View File

@@ -356,7 +356,7 @@ public class ComputerUtil_Attack2 {
// examine the potential forces // examine the potential forces
CardList nextTurnAttackers = new CardList(); CardList nextTurnAttackers = new CardList();
int candidateCounterAttackDamage = 0; int candidateCounterAttackDamage = 0;
int candidateTotalBlockDamage = 0; //int candidateTotalBlockDamage = 0;
for (Card pCard : playerCreatures) { for (Card pCard : playerCreatures) {
// if the creature can attack next turn add it to counter attackers list // if the creature can attack next turn add it to counter attackers list
@@ -364,7 +364,7 @@ public class ComputerUtil_Attack2 {
nextTurnAttackers.add(pCard); nextTurnAttackers.add(pCard);
if (pCard.getNetCombatDamage() > 0) { if (pCard.getNetCombatDamage() > 0) {
candidateCounterAttackDamage += pCard.getNetCombatDamage(); candidateCounterAttackDamage += pCard.getNetCombatDamage();
candidateTotalBlockDamage += pCard.getNetCombatDamage(); //candidateTotalBlockDamage += pCard.getNetCombatDamage();
playerForces += 1; // player forces they might use to attack 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 // find the potential counter attacking damage compared to AI life total
double aiLifeToPlayerDamageRatio = 1000000; double aiLifeToPlayerDamageRatio = 1000000;
if (candidateCounterAttackDamage > 0) if (candidateCounterAttackDamage > 0) {
aiLifeToPlayerDamageRatio = (double) AllZone.getComputerPlayer().life / candidateCounterAttackDamage; aiLifeToPlayerDamageRatio = (double) AllZone.getComputerPlayer().life / candidateCounterAttackDamage;
}
// get the potential damage and strength of the AI forces // get the potential damage and strength of the AI forces
CardList candidateAttackers = new CardList(); CardList candidateAttackers = new CardList();