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

- The AI will no longer pump combatants to kill creatures like Rukh Egg.

Browse Source
This commit is contained in:
Sloth
2015-07-19 09:29:04 +00:00
parent 51997090e7
commit 6cc38f04ce
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
View File

@@ -1085,7 +1085,8 @@ public class ComputerUtilCard {
} }
if (survivor) { if (survivor) {
for (Card o : opposing) { for (Card o : opposing) {
if (!ComputerUtilCombat.combatantWouldBeDestroyed(opp, o, combat)) { if (!ComputerUtilCombat.combatantWouldBeDestroyed(opp, o, combat)
&& !(o.hasSVar("SacMe") && Integer.parseInt(o.getSVar("SacMe")) > 2)) {
if (isAttacking) { if (isAttacking) {
if (ComputerUtilCombat.blockerWouldBeDestroyed(opp, o, pumpedCombat)) { if (ComputerUtilCombat.blockerWouldBeDestroyed(opp, o, pumpedCombat)) {
return true; return true;

6
forge-ai/src/main/java/forge/ai/ability/PumpAi.java
View File

@@ -153,15 +153,13 @@ public class PumpAi extends PumpAiBase {
attack = AbilityUtils.calculateAmount(sa.getHostCard(), numAttack, sa); attack = AbilityUtils.calculateAmount(sa.getHostCard(), numAttack, sa);
} }
if ((numDefense.contains("X") && defense == 0) if ((numDefense.contains("X") && defense == 0) || (numAttack.contains("X") && attack == 0)) {
|| (numAttack.contains("X") && attack == 0)) {
return false; return false;
} }
//Untargeted //Untargeted
if ((sa.getTargetRestrictions() == null) || !sa.getTargetRestrictions().doesTarget()) { if ((sa.getTargetRestrictions() == null) || !sa.getTargetRestrictions().doesTarget()) {
final List<Card> cards = AbilityUtils.getDefinedCards(sa.getHostCard(), final List<Card> cards = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa);
sa.getParam("Defined"), sa);
if (cards.isEmpty()) { if (cards.isEmpty()) {
return false; return false;