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

- A couple minor tweaks in AttachAi.

Browse Source
This commit is contained in:
Agetian
2018-11-23 07:33:44 +03:00
parent becc8380e3
commit b021e13d86
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-ai/src/main/java/forge/ai/ability/AttachAi.java
View File

@@ -159,7 +159,7 @@ public class AttachAi extends SpellAbilityAi {
boolean isBuffAura = !sa.isCurse() && (power > 0 || toughness > 0 || !keywords.isEmpty()); boolean isBuffAura = !sa.isCurse() && (power > 0 || toughness > 0 || !keywords.isEmpty());
if (!isBuffAura) { if (!isBuffAura) {
// Currently only works with buff auras, otherwise returns for instant speed use. To be improved later. // Currently only works with buff auras, otherwise returns true for instant speed use. To be improved later.
return true; return true;
} }
@@ -184,7 +184,8 @@ public class AttachAi extends SpellAbilityAi {
int t = AbilityUtils.calculateAmount(peekSa.getHostCard(), peekSa.getParam("NumDef"), peekSa); int t = AbilityUtils.calculateAmount(peekSa.getHostCard(), peekSa.getParam("NumDef"), peekSa);
if (t < 0 && toughness > 0 && attachTarget.getNetToughness() + t + toughness > 0) { if (t < 0 && toughness > 0 && attachTarget.getNetToughness() + t + toughness > 0) {
canRespondToStack = true; canRespondToStack = true;
} else if (p < 0 && power > 0 && attachTarget.getNetToughness() + t + toughness > 0) { } else if (p < 0 && power > 0 && attachTarget.getNetPower() + p + power > 0
&& attachTarget.getNetToughness() + t + toughness > 0) {
// Yep, still need to ensure that the net toughness will be positive here even if buffing for power // Yep, still need to ensure that the net toughness will be positive here even if buffing for power
canRespondToStack = true; canRespondToStack = true;
} }
@@ -210,7 +211,7 @@ public class AttachAi extends SpellAbilityAi {
} }
} }
if (!canSurviveCombat) { if (!canSurviveCombat || (attachTarget.isCreature() && ComputerUtilCard.isUselessCreature(ai, attachTarget))) {
// don't buff anything that will die or get seriously crippled in combat, it's pointless anyway // don't buff anything that will die or get seriously crippled in combat, it's pointless anyway
return false; return false;
} }