Merge branch 'master' into 'master'

AI improvements for Liliana, Death Mage and Vivien, Monsters' Advocate

See merge request core-developers/forge!3961

forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java

@@ -43,6 +43,8 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
             return SpecialCardAi.GideonBlackblade.consider(ai, sa);
         } else if ("SoulEcho".equals(aiLogic)) {
             return doTriggerAINoCost(ai, sa, true);
+        } else if ("Always".equals(aiLogic)) {
+            return true;
         }
         return false;
     }

forge-ai/src/main/java/forge/ai/ability/EffectAi.java

@@ -1,11 +1,8 @@
 package forge.ai.ability;
 
-import java.util.List;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
-
 import forge.ai.*;
 import forge.game.Game;
 import forge.game.ability.ApiType;
@@ -21,6 +18,8 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
+import java.util.List;
+
 public class EffectAi extends SpellAbilityAi {
     @Override
     protected boolean canPlayAI(final Player ai,final SpellAbility sa) {
@@ -107,6 +106,10 @@ public class EffectAi extends SpellAbilityAi {
                     return false;
                 }
                 randomReturn = true;
+            } else if (logic.equals("WillCastCreature") && ai.isAI()) {
+                AiController aic = ((PlayerControllerAi)ai.getController()).getAi();
+                SpellAbility saCreature = aic.predictSpellToCastInMain2(ApiType.PermanentCreature);
+                randomReturn = saCreature != null && ComputerUtilMana.canPayManaCost(saCreature, ai, 0);
             } else if (logic.equals("Always")) {
                 randomReturn = true;
             } else if (logic.equals("Main1")) {

forge-ai/src/main/java/forge/ai/ability/LifeLoseAi.java

@@ -101,6 +101,12 @@ public class LifeLoseAi extends SpellAbilityAi {
         final String amountStr = sa.getParam("LifeAmount");
         int amount = 0;
 
+        if (sa.usesTargeting()) {
+            if (!doTgt(ai, sa, false)) {
+                return false;
+            }
+        }
+
         if (amountStr.equals("X") && sa.getSVar(amountStr).equals("Count$xPaid")) {
             // Set PayX here to maximum value.
             amount = ComputerUtilCost.getMaxXValue(sa, ai);
@@ -117,11 +123,6 @@ public class LifeLoseAi extends SpellAbilityAi {
             return false;
         }
 
-        if (sa.usesTargeting()) {
-            if (!doTgt(ai, sa, false)) {
-                return false;
-            }
-        }
         final PlayerCollection tgtPlayers = getPlayers(ai, sa);
 
         if (ComputerUtil.playImmediately(ai, sa)) {

forge-gui/res/cardsfolder/v/vivien_monsters_advocate.txt

@@ -6,12 +6,12 @@ S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library |
 S:Mode$ Continuous | Affected$ Creature.TopLibrary+YouCtrl | MayPlay$ True | AffectedZone$ Library | Description$ You may cast creature spells from the top of your library.
 SVar:NonStackingEffect:True
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ g_3_3_beast | TokenOwner$ You | LegacyImage$ g 3 3 beast iko | RememberTokens$ True | SubAbility$ DBGenericChoice | SpellDescription$ Create a 3/3 green Beast creature token. Put your choice of a vigilance counter, a reach counter, or a trample counter on it.
-SVar:DBGenericChoice:DB$ GenericChoice | Defined$ You | Choices$ Vigilance,Reach,Trample
+SVar:DBGenericChoice:DB$ GenericChoice | Defined$ You | Choices$ Vigilance,Reach,Trample | AILogic$ Always
 SVar:Reach:DB$ PutCounter | Choices$ Card.IsRemembered | ChoiceTitle$ Choose a token to put a reach counter on | CounterType$ Reach | CounterNum$ 1 | SubAbility$ DBCleanup | SpellDescription$ Reach
 SVar:Trample:DB$ PutCounter | Choices$ Card.IsRemembered | ChoiceTitle$ Choose a token to put a trample counter on | CounterType$ Trample | CounterNum$ 1 | SubAbility$ DBCleanup | SpellDescription$ Trample
 SVar:Vigilance:DB$ PutCounter | Choices$ Card.IsRemembered | ChoiceTitle$ Choose a token to put a vigilance counter on | CounterType$ Vigilance | CounterNum$ 1 | SubAbility$ DBCleanup | SpellDescription$ Vigilance
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ Effect | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Ultimate$ True | Triggers$ TrigSearch | SVars$ DBSearch,X | SpellDescription$ When you cast your next creature spell this turn, search your library for a creature card with lesser converted mana cost, put it onto the battlefield, then shuffle your library.
+A:AB$ Effect | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Ultimate$ True | Triggers$ TrigSearch | SVars$ DBSearch,X | AILogic$ WillCastCreature | SpellDescription$ When you cast your next creature spell this turn, search your library for a creature card with lesser converted mana cost, put it onto the battlefield, then shuffle your library.
 SVar:TrigSearch:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | OneOff$ True | TriggerZones$ Command | Execute$ DBSearch | TriggerDescription$ When you cast your next creature spell this turn, search your library for a creature card with lesser converted mana cost, put it onto the battlefield, then shuffle your library.
 SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcLTX | References$ X | ChangeNum$ 1
 SVar:X:TriggerCount$CastSACMC