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

- Fixed Circle of Protection AI.

Browse Source
This commit is contained in:
Sloth
2013-05-07 16:57:10 +00:00
parent 1979e83edb
commit 3f037efabd
2 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/main/java/forge/card/ability/effects/ChooseSourceEffect.java
View File

@@ -144,38 +144,14 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
if (sa.hasParam("AILogic") && sa.getParam("AILogic").equals("NeedsPrevention")) { if (sa.hasParam("AILogic") && sa.getParam("AILogic").equals("NeedsPrevention")) {
final Player ai = sa.getActivatingPlayer(); final Player ai = sa.getActivatingPlayer();
if (!game.getStack().isEmpty()) { if (!game.getStack().isEmpty()) {
final SpellAbility topStack = game.getStack().peekAbility(); Card choseCard = ChooseCardOnStack(sa, ai, game);
if (sa.hasParam("Choices") && !topStack.getSourceCard().isValid(sa.getParam("Choices"), ai, host)) { if (choseCard != null) {
break; chosen.add(ChooseCardOnStack(sa, ai, game));
} }
final ApiType threatApi = topStack.getApi();
if (threatApi != ApiType.DealDamage && threatApi != ApiType.DamageAll) {
break;
} }
final Card source = topStack.getSourceCard(); if (chosen.isEmpty()) {
ArrayList<Object> objects = new ArrayList<Object>(); permanentSources = CardLists.filter(permanentSources, new Predicate<Card>() {
final Target threatTgt = topStack.getTarget();
if (threatTgt == null) {
if (topStack.hasParam("Defined")) {
objects = AbilityUtils.getDefinedObjects(source, topStack.getParam("Defined"), topStack);
} else if (topStack.hasParam("ValidPlayers")) {
objects.addAll(AbilityUtils.getDefinedPlayers(source, topStack.getParam("ValidPlayers"), topStack));
}
} else {
objects.addAll(threatTgt.getTargetPlayers());
}
if (!objects.contains(ai) || topStack.hasParam("NoPrevention")) {
break;
}
int dmg = AbilityUtils.calculateAmount(source, topStack.getParam("NumDmg"), topStack);
if (ComputerUtilCombat.predictDamageTo(ai, dmg, source, false) <= 0) {
break;
}
chosen.add(topStack.getSourceCard());
} else {
sourcesToChooseFrom = CardLists.filter(sourcesToChooseFrom, new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
if (!c.isAttacking(ai) || !game.getCombat().isUnblocked(c)) { if (!c.isAttacking(ai) || !game.getCombat().isUnblocked(c)) {
@@ -184,7 +160,7 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
return ComputerUtilCombat.damageIfUnblocked(c, ai, game.getCombat()) > 0; return ComputerUtilCombat.damageIfUnblocked(c, ai, game.getCombat()) > 0;
} }
}); });
chosen.add(ComputerUtilCard.getBestCreatureAI(sourcesToChooseFrom)); chosen.add(ComputerUtilCard.getBestCreatureAI(permanentSources));
} }
} else { } else {
chosen.add(ComputerUtilCard.getBestAI(sourcesToChooseFrom)); chosen.add(ComputerUtilCard.getBestAI(sourcesToChooseFrom));
@@ -201,4 +177,40 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
} }
} }
private Card ChooseCardOnStack(SpellAbility sa, Player ai, GameState game) {
int size = game.getStack().size();
for (int i = 0; i < size; i++) {
final SpellAbility topStack = game.getStack().peekAbility(i);
if (sa.hasParam("Choices") && !topStack.getSourceCard().isValid(sa.getParam("Choices"), ai, sa.getSourceCard())) {
continue;
}
final ApiType threatApi = topStack.getApi();
if (threatApi != ApiType.DealDamage && threatApi != ApiType.DamageAll) {
continue;
}
final Card source = topStack.getSourceCard();
ArrayList<Object> objects = new ArrayList<Object>();
final Target threatTgt = topStack.getTarget();
if (threatTgt == null) {
if (topStack.hasParam("Defined")) {
objects = AbilityUtils.getDefinedObjects(source, topStack.getParam("Defined"), topStack);
} else if (topStack.hasParam("ValidPlayers")) {
objects.addAll(AbilityUtils.getDefinedPlayers(source, topStack.getParam("ValidPlayers"), topStack));
}
} else {
objects.addAll(threatTgt.getTargetPlayers());
}
if (!objects.contains(ai) || topStack.hasParam("NoPrevention")) {
continue;
}
int dmg = AbilityUtils.calculateAmount(source, topStack.getParam("NumDmg"), topStack);
if (ComputerUtilCombat.predictDamageTo(ai, dmg, source, false) <= 0) {
continue;
}
return source;
}
return null;
}
} }

2
src/main/java/forge/game/ai/ComputerUtilCombat.java
View File

@@ -1838,7 +1838,7 @@ public class ComputerUtilCombat {
restDamage = target.staticReplaceDamage(restDamage, source, isCombat); restDamage = target.staticReplaceDamage(restDamage, source, isCombat);
// Predict replacement effects // Predict replacement effects
for (final Card ca : game.getCardsIn(ZoneType.Battlefield)) { for (final Card ca : game.getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) {
for (final ReplacementEffect re : ca.getReplacementEffects()) { for (final ReplacementEffect re : ca.getReplacementEffects()) {
Map<String, String> params = re.getMapParams(); Map<String, String> params = re.getMapParams();
if (!"DamageDone".equals(params.get("Event")) || !params.containsKey("PreventionEffect")) { if (!"DamageDone".equals(params.get("Event")) || !params.containsKey("PreventionEffect")) {