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

Clean up (#2893)

Browse Source
This commit is contained in:
tool4ever
2023-04-11 16:06:07 +02:00
committed by GitHub
parent eabe36c6ab
commit 69a723d451
101 changed files with 148 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -2150,24 +2150,15 @@ public class ComputerUtilCombat {
* a boolean.
* @return a int.
*/
public static final int getEnoughDamageToKill(final Card c, final int maxDamage, final Card source, final boolean isCombat,
final boolean noPrevention) {
final int killDamage = getDamageToKill(c, false);
public static final int getEnoughDamageToKill(final Card c, final int maxDamage, final Card source, final boolean isCombat, final boolean noPrevention) {
int killDamage = getDamageToKill(c, false);
if (c.hasKeyword(Keyword.INDESTRUCTIBLE) || c.getCounters(CounterEnumType.SHIELD) > 0 || (c.getShieldCount() > 0 && c.canBeShielded())) {
if (!(source.hasKeyword(Keyword.WITHER) || source.hasKeyword(Keyword.INFECT))) {
return maxDamage + 1;
}
} else if (source.hasKeyword(Keyword.DEATHTOUCH) && !c.isPlaneswalker()) {
for (int i = 1; i <= maxDamage; i++) {
if (noPrevention) {
if (c.staticReplaceDamage(i, source, isCombat) > 0) {
return i;
}
} else if (predictDamageTo(c, i, source, isCombat) > 0) {
return i;
}
}
} else if (source.hasKeyword(Keyword.DEATHTOUCH) && c.isCreature()) {
killDamage = 1;
}
for (int i = 1; i <= maxDamage; i++) {
@@ -2195,14 +2186,7 @@ public class ComputerUtilCombat {
*/
public final static int getDamageToKill(final Card c, boolean withShields) {
int damageShield = withShields ? c.getPreventNextDamageTotalShields() : 0;
int killDamage = 0;
if (c.isCreature()) {
killDamage = Math.max(0, c.getLethalDamage());
}
if (c.isPlaneswalker()) {
int killDamagePW = c.getCurrentLoyalty();
killDamage = c.isCreature() ? Math.min(killDamage, killDamagePW) : killDamagePW;
}
int killDamage = c.getExcessDamageValue(false);
if (killDamage > damageShield
&& c.hasSVar("DestroyWhenDamaged")) {

2
forge-ai/src/main/java/forge/ai/ability/DamageAllAi.java
View File

@@ -256,7 +256,7 @@ public class DamageAllAi extends SpellAbilityAi {
final Predicate<Card> filterKillable = new Predicate<Card>() {
@Override
public boolean apply(final Card c) {
return (ComputerUtilCombat.predictDamageTo(c, dmg, source, false) >= ComputerUtilCombat.getDamageToKill(c, false));
return ComputerUtilCombat.predictDamageTo(c, dmg, source, false) >= ComputerUtilCombat.getDamageToKill(c, false);
}
};