fix Gideon Jura's Lure-like ability not working properly when the Human is low on life. (bAssault was taking over before the 'must attack entity' logic was being run.)

This commit is contained in:
slapshot5
2011-08-23 06:06:18 +00:00
parent 7ec3016fef
commit 31f0b0e84d
2 changed files with 7 additions and 8 deletions

View File

@@ -276,12 +276,7 @@ public class ComputerUtil_Attack2 {
// TODO: split attackers to different planeswalker/human // TODO: split attackers to different planeswalker/human
// AI will only attack one Defender per combat for now // AI will only attack one Defender per combat for now
ArrayList<Object> defs = c.getDefenders(); ArrayList<Object> defs = c.getDefenders();
if (defs.size() == 1 || bAssault) {
c.setCurrentDefender(0);
return;
}
// Randomly determine who EVERYONE is attacking // Randomly determine who EVERYONE is attacking
// would be better to determine more individually // would be better to determine more individually
int n = MyRandom.random.nextInt(defs.size()); int n = MyRandom.random.nextInt(defs.size());
@@ -292,13 +287,17 @@ public class ComputerUtil_Attack2 {
n = defenders.indexOf(entity); n = defenders.indexOf(entity);
if(-1 == n) { if(-1 == n) {
System.out.println("getMustAttackEntity() returned something not in defenders."); System.out.println("getMustAttackEntity() returned something not in defenders.");
c.setCurrentDefender(0);
} }
else { else {
c.setCurrentDefender(n); c.setCurrentDefender(n);
} }
} }
else { else {
c.setCurrentDefender(n); if (defs.size() == 1 || bAssault) {
c.setCurrentDefender(0);
}
else c.setCurrentDefender(n);
} }
return; return;

View File

@@ -435,7 +435,7 @@ public class AbilityFactory_Combat {
else { else {
entity = p.getOpponent(); entity = p.getOpponent();
} }
System.out.println("Setting mustAttackEntity to: "+entity); //System.out.println("Setting mustAttackEntity to: "+entity);
p.setMustAttackEntity(entity); p.setMustAttackEntity(entity);
} }
} }