Improve assault calculation (Card-Forge#9368)

Author: tool4ever

docs/Card-scripting-API/Targeting.md

@@ -90,8 +90,7 @@ Examples:
 For the full list of all available properties see the classes [CardProperty](https://github.com/Card-Forge/forge/blob/master/forge-game/src/main/java/forge/game/card/CardProperty.java) or respectively [PlayerProperty](https://github.com/Card-Forge/forge/blob/master/forge-game/src/main/java/forge/game/player/PlayerProperty.java).
 
 ## TgtZone$ {ZoneType}
-
-Redundant for AF where the specified zone already matches with a `Origin$` parameter.
+Redundant for AF that can only target the Stack or where the specified zone already matches with a `Origin$` parameter.
 
 ## TargetType
 

forge-ai/src/main/java/forge/ai/AiAttackController.java

@@ -3161,11 +3161,12 @@ public static boolean shouldSacrificeThreatenedCard(Player ai, Card c, SpellAbil
         }
         Combat combat = ai.getGame().getCombat();
         boolean isThreatened = (c.isCreature() && ComputerUtil.predictCreatureWillDieThisTurn(ai, c, sa, false)
-                && (!ComputerUtilCombat.willOpposingCreatureDieInCombat(ai, c, combat) && !ComputerUtilCombat.isDangerousToSacInCombat(ai, c, combat)))
+                && !ComputerUtilCombat.willOpposingCreatureDieInCombat(ai, c, combat) && !ComputerUtilCombat.isDangerousToSacInCombat(ai, c, combat))
                 || (!c.isCreature() && ComputerUtil.predictThreatenedObjects(ai, sa).contains(c));
         return isThreatened;
     }
 
+    // some AI checks can lead to loops depending on the boardstate
     public static <T> T protectRecursion(SpellAbility sa, Supplier<T> loopableMethod, T fallback) {
         boolean unskip = false;
         if (sa != null) {

forge-ai/src/main/java/forge/ai/ComputerUtil.java

@@ -75,8 +75,6 @@ public static void sortByEvaluateCreature(final CardCollection list) {
         list.sort(ComputerUtilCard.EvaluateCreatureComparator);
     }
 
-    // The AI doesn't really pick the best artifact, just the most expensive.
-
     /**
      * <p>
      * getBestArtifactAI.

forge-ai/src/main/java/forge/ai/ComputerUtilCard.java

@@ -206,18 +206,17 @@ public static int poisonIfUnblocked(final Card attacker, final Player attacked)
         if (!attacked.canReceiveCounters(CounterEnumType.POISON)) {
             return 0;
         }
-        int damage = attacker.getNetCombatDamage();
+        int damage = attacker.getNetCombatDamage() +
+                predictPowerBonusOfAttacker(attacker, null, null, false);
         int poison = 0;
-        damage += predictPowerBonusOfAttacker(attacker, null, null, false);
         if (attacker.isInfectDamage(attacked)) {
             int pd = predictDamageTo(attacked, damage, attacker, true);
             // opponent can always order it so that he gets 0
-            if (pd == 1 && attacker.getController().getOpponents().getCardsIn(ZoneType.Battlefield).anyMatch(CardPredicates.nameEquals("Vorinclex, Monstrous Raider"))) {
-                pd = 0;
-            }
-            poison += pd;
-            if (attacker.hasDoubleStrike()) {
-                poison += pd;
+            if (pd > 1 || !attacker.getController().getOpponents().getCardsIn(ZoneType.Battlefield).anyMatch(CardPredicates.nameEquals("Vorinclex, Monstrous Raider"))) {
+                poison = pd;
+                if (attacker.hasDoubleStrike()) {
+                    poison *= 2;
+                }
             }
         }
         if (damage > 0) {
@@ -346,7 +345,7 @@ public static int resultingPoison(final Player ai, final Combat combat) {
         for (final Card attacker : attackers) {
             final List<Card> blockers = combat.getBlockers(attacker);
 
-            if (blockers.size() == 0
+            if (blockers.isEmpty()
                     || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)) {
                 unblocked.add(attacker);
             } else if (attacker.hasKeyword(Keyword.TRAMPLE)) {
@@ -2501,20 +2500,18 @@ public static boolean willKillAtLeastOne(final Player ai, final Card c, final Co
     }
 
     public static int predictExtraPoisonWithDamage(Card attacker, Player attacked, int damage) {
-        int pd = 0, poison = 0;
+        int poison = 0;
         int damageAfterRepl = predictDamageTo(attacked, damage, attacker, true);
         if (damageAfterRepl > 0) {
-            CardCollectionView trigCards = attacker.getController().getCardsIn(ZoneType.Battlefield);
-            for (Card c : trigCards) {
+            for (Card c : attacker.getController().getCardsIn(ZoneType.Battlefield)) {
                 for (Trigger t : c.getTriggers()) {
                     if (t.getMode() == TriggerType.DamageDone && !"False".equals(t.getParam("CombatDamage")) && t.matchesValidParam("ValidSource", attacker)) {
                         SpellAbility ab = t.getOverridingAbility();
                         if (ab.getApi() == ApiType.Poison && "TriggeredTarget".equals(ab.getParam("Defined"))) {
-                            pd += AbilityUtils.calculateAmount(attacker, ab.getParam("Num"), ab);
+                            poison += AbilityUtils.calculateAmount(attacker, ab.getParam("Num"), ab);
                         }
                     }
                 }
-                poison += pd;
                 // TODO: Predict replacement effects for counters (doubled, reduced, additional counters, etc.)
             }
             // intern toxic effect

forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java

@@ -17,7 +17,6 @@
  */
 package forge.ai;
 
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import forge.ai.ability.AnimateAi;
 import forge.ai.ability.FightAi;
@@ -38,6 +37,7 @@
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.player.PlayerCollection;
 import forge.game.player.PlayerPredicates;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityPredicates;
@@ -405,24 +405,22 @@ public static AiAbilityDecision considerTargetingOpponent(final Player ai, final
                     ai.getCardsIn(ZoneType.Battlefield).threadSafeIterable(), CardPredicates.hasSVar("DonateMe")));
             if (donateTarget != null) {
                 // first filter for opponents which can be targeted by SA
-                final Iterable<Player> oppList = IterableUtil.filter(ai.getOpponents(),
-                        PlayerPredicates.isTargetableBy(sa));
+                PlayerCollection oppList = ai.getOpponents().filter(PlayerPredicates.isTargetableBy(sa));
 
                 // All opponents have hexproof or something like that
-                if (Iterables.isEmpty(oppList)) {
+                if (oppList.isEmpty()) {
                     return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
                 }
 
                 // filter for player who does not have donate target already
-                Iterable<Player> oppTarget = IterableUtil.filter(oppList,
-                        PlayerPredicates.isNotCardInPlay(donateTarget.getName()));
+                PlayerCollection oppTarget = oppList.filter(PlayerPredicates.isNotCardInPlay(donateTarget.getName()));
                 // fall back to previous list
-                if (Iterables.isEmpty(oppTarget)) {
+                if (oppTarget.isEmpty()) {
                     oppTarget = oppList;
                 }
 
                 // select player with less lands on the field (helpful for Illusions of Grandeur and probably Pacts too)
-                Player opp = Collections.min(Lists.newArrayList(oppTarget),
+                Player opp = Collections.min(oppTarget,
                         PlayerPredicates.compareByZoneSize(ZoneType.Battlefield, CardPredicates.LANDS));
 
                 if (opp != null) {

forge-ai/src/main/java/forge/ai/SpecialCardAi.java

@@ -794,7 +794,7 @@ private void parseLine(final String line, CardFace face) {
                         face.addTrigger(value);
                     } else if ("Types".equals(key)) {
                         face.setType(CardType.parse(value, false));
-                    } else if ("Text".equals(key) && !"no text".equals(value) && StringUtils.isNotBlank(value)) {
+                    } else if ("Text".equals(key) && StringUtils.isNotBlank(value)) {
                         face.setNonAbilityText(value);
                     }
                     break;

forge-core/src/main/java/forge/card/CardRules.java

@@ -368,16 +368,16 @@ private static void readCardFace(Card c, ICardFace face) {
             }
         }
 
+        // Set name for Sentry reports to be identifiable
+        c.setName(face.getName());
+
+        c.getCurrentState().setFlavorName(face.getFlavorName());
+
         // Negative card Id's are for view purposes only
         if (c.getId() >= 0) {
             // Build English oracle and translated oracle mapping
             CardTranslation.buildOracleMapping(face.getName(), face.getOracleText(), variantName);
-        }
-
-        // Set name for Sentry reports to be identifiable
-        c.setName(face.getName());
 
-        if (c.getId() >= 0) { // Set Triggers & Abilities if not for view
             for (Entry<String, String> v : face.getVariables())
                 c.setSVar(v.getKey(), v.getValue());
             for (String r : face.getReplacements())
@@ -397,13 +397,8 @@ private static void readCardFace(Card c, ICardFace face) {
         c.setManaCost(face.getManaCost());
         c.setText(face.getNonAbilityText());
 
-        c.getCurrentState().setBaseLoyalty(face.getInitialLoyalty());
-        c.getCurrentState().setBaseDefense(face.getDefense());
-
         c.getCurrentState().setOracleText(face.getOracleText());
 
-        c.getCurrentState().setFlavorName(face.getFlavorName());
-
         // Super and 'middle' types should use enums.
         c.setType(new CardType(face.getType()));
 
@@ -418,6 +413,9 @@ private static void readCardFace(Card c, ICardFace face) {
             c.setBaseToughnessString(face.getToughness());
         }
 
+        c.getCurrentState().setBaseLoyalty(face.getInitialLoyalty());
+        c.getCurrentState().setBaseDefense(face.getDefense());
+
         c.setAttractionLights(face.getAttractionLights());
 
         if (c.getId() > 0) // Set FactoryAbilities if not for view

forge-game/src/main/java/forge/game/card/CardFactory.java

@@ -526,8 +526,6 @@ public static List<String> getSharedKeywords(final Iterable<String> kw, final Ca
      *            the card
      */
     public static final void addAbilityFactoryAbilities(final Card card, final Iterable<String> abilities) {
-        // **************************************************
-        // AbilityFactory cards
         for (String rawAbility : abilities) {
             try {
                 final SpellAbility intrinsicAbility = AbilityFactory.getAbility(rawAbility, card);

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -3724,10 +3724,6 @@ public final boolean sameTeam(final Player other) {
         return this.teamNumber == other.getTeam();
     }
 
-    public final int countExaltedBonus() {
-        return CardLists.getAmountOfKeyword(this.getCardsIn(ZoneType.Battlefield), Keyword.EXALTED);
-    }
-
     public final boolean isCursed() {
         return CardLists.count(getAttachedCards(), Card::isCurse) > 0;
     }