Clean up some default amounts (Card-Forge#9345)

Author: tool4ever

docs/Card-scripting-API/Card-scripting-API.md

@@ -11,15 +11,15 @@ PT:2/2
 Oracle:
 ```
 
-* The name of this card is Vanilla Creature.  
-* It's casting cost is {2}{G}.  
-* It has the types Creature and Beast.  
-* It has a Power-Toughness of 2/2.  
-* It will not display any additional text in the card's template.  
+* The name of this card is Vanilla Creature.
+* It's casting cost is {2}{G}.
+* It has the types Creature and Beast.
+* It has a Power-Toughness of 2/2.
+* It will not display any additional text in the card's template.
 
-If a card has two faces, use AlternateMode:{CardStateName} in the front face and separate both by a new line with the text "ALTERNATE".
+If a card has two faces, use AlternateMode:{CardStateName} in the front face and separate both by a new line with the text `ALTERNATE`.
 
-There are a few other properties that will appear in many cards. These are
+There are a few other properties that will appear in many cards. These can all be used across different faces - with `AI` and related `Deck`-variants being the exception:
 
 | Property | Description
 | - | -

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

@@ -907,10 +907,9 @@ public AiPlayDecision canPlaySa(SpellAbility sa) {
         final Card card = sa.getHostCard();
 
         // Trying to play a card that has Buyback without a Buyback cost, look for possible additional considerations
-        if (getBoolProperty(AiProps.TRY_TO_PRESERVE_BUYBACK_SPELLS)) {
-            if (card.hasKeyword(Keyword.BUYBACK) && !sa.isBuyback() && !canPlaySpellWithoutBuyback(card, sa)) {
-                return AiPlayDecision.NeedsToPlayCriteriaNotMet;
-            }
+        if (getBoolProperty(AiProps.TRY_TO_PRESERVE_BUYBACK_SPELLS) && card.hasKeyword(Keyword.BUYBACK)
+                && !sa.isBuyback() && !canPlaySpellWithoutBuyback(card, sa)) {
+            return AiPlayDecision.NeedsToPlayCriteriaNotMet;
         }
 
         // TODO before suspending some spells try to predict if relevant targets can be expected

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

@@ -56,6 +56,7 @@ public final AiAbilityDecision canPlayWithSubs(final Player aiPlayer, final Spel
      * Handles the AI decision to play a "main" SpellAbility
      */
     protected AiAbilityDecision canPlay(final Player ai, final SpellAbility sa) {
+        // TODO this is redundant when reached from canPlayAndPayForFace
         if (sa.getRestrictions() != null && !sa.getRestrictions().canPlay(sa.getHostCard(), sa)) {
             return new AiAbilityDecision(0, AiPlayDecision.CantPlaySa);
         }

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

@@ -897,8 +897,7 @@ public boolean hasStartOfKeyword(final String k) {
     }
     public boolean hasStartOfKeyword(final String k, ICardFace cf) {
         for (final String inst : cf.getKeywords()) {
-            final String[] parts = inst.split(":");
-            if ((parts[0]).equalsIgnoreCase(k)) {
+            if (inst.startsWith(k)) {
                 return true;
             }
         }

forge-game/src/main/java/forge/game/GameActionUtil.java

@@ -405,7 +405,7 @@ public static List<OptionalCostValue> getOptionalCostValues(final SpellAbility s
         final Game game = source.getGame();
         boolean lkicheck = false;
 
-        Card newHost = ((Spell)sa).getAlternateHost(source);
+        Card newHost = sa.getAlternateHost(source);
         if (newHost != null) {
             source = newHost;
             lkicheck = true;

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

@@ -1457,7 +1457,7 @@ public static void addTriggerAbility(final KeywordInterface inst, final Card car
             sbTrig.append("Living Weapon (").append(inst.getReminderText()).append(")");
 
             final StringBuilder sbGerm = new StringBuilder();
-            sbGerm.append("DB$ Token | TokenAmount$ 1 | TokenScript$ b_0_0_phyrexian_germ | TokenOwner$ You | RememberTokens$ True");
+            sbGerm.append("DB$ Token | TokenScript$ b_0_0_phyrexian_germ | TokenOwner$ You | RememberTokens$ True");
 
             final SpellAbility saGerm = AbilityFactory.getAbility(sbGerm.toString(), card);
 
@@ -3983,7 +3983,7 @@ else if ("Artifact".equals(t))
                     + " | Secondary$ True | Description$ " + sb.toString() + " (" + inst.getReminderText() + ")";
             String trig = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self" +
                     " | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ When this creature dies, draw a card.";
-            String ab = "DB$ Draw | NumCards$ 1";
+            String ab = "DB$ Draw";
 
             StaticAbility st = StaticAbility.create(effect, state.getCard(), state, intrinsic);
 

forge-game/src/main/java/forge/game/cost/CostExile.java

@@ -223,11 +223,19 @@ else if (type.contains("FromTopGrave")) {
             list = CardLists.getValidCards(list, type.split(";"), payer, source, ability);
         }
 
-        int amount = this.getAbilityAmount(ability);
+        if (nTypes > -1 && AbilityUtils.countCardTypesFromList(list, false) < nTypes) {
+            return false;
+        }
 
-        if (nTypes > -1) {
-            if (AbilityUtils.countCardTypesFromList(list, false) < nTypes) return false;
+        if (totalCMC || totalCMCgreater) {
+            if (totalM.equals("X") && ability.getXManaCostPaid() == null) { // X hasn't yet been decided, let it pass
+                return true;
+            }
+            int i = AbilityUtils.calculateAmount(source, totalM, ability);
+            return totalCMCgreater ? CardLists.getTotalCMC(list) >= i : CardLists.cmcCanSumTo(i, list);
         }
+
+        int amount = this.getAbilityAmount(ability);
 
         if (sharedType) { // will need more logic if cost ever wants more than 2 that share a type
             if (list.size() < amount) return false;
@@ -242,14 +250,6 @@ else if (type.contains("FromTopGrave")) {
             return false;
         }
 
-        if (totalCMC || totalCMCgreater) {
-            if (totalM.equals("X") && ability.getXManaCostPaid() == null) { // X hasn't yet been decided, let it pass
-                return true;
-            }
-            int i = AbilityUtils.calculateAmount(source, totalM, ability);
-            return totalCMCgreater ? CardLists.getTotalCMC(list) >= i : CardLists.cmcCanSumTo(i, list);
-        }
-
         // for Craft: do not count the source card twice (it will be sacrificed)
         if (ability.isCraft()) {
             CostExile firstExileCost = ability.getPayCosts().getCostPartByType(CostExile.class);

forge-gui/res/cardsfolder/a/a_killer_among_us.txt

@@ -6,5 +6,5 @@ SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_human,u_1_1_merfolk,r_1_1_goblin |
 SVar:DBChooseType:DB$ ChooseType | Type$ Creature | ValidTypes$ Human,Merfolk,Goblin | Secretly$ True
 A:AB$ PutCounter | Cost$ Sac<1/CARDNAME> RevealChosen<Type/creature type> | ValidTgts$ Creature.token+attacking | TgtPrompt$ Select target attacking creature token | AITgts$ Creature.token+attacking+ChosenType | Defined$ Targeted.ChosenType | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ DBPump | StackDescription$ REP target attacking creature token_{c:Targeted} | SpellDescription$ If target attacking creature token is the chosen type, put three +1/+1 counters on it
 SVar:DBPump:DB$ Pump | Defined$ Targeted.ChosenType | KW$ Deathtouch | StackDescription$ SpellDescription | SpellDescription$ and it gains deathtouch until end of turn.
-DeckHas:Ability$Token|Sacrifice & Type$Human|Merfolk|Goblin & Color$White|Blue|Red
+DeckHas:Ability$Token|Sacrifice
 Oracle:When A Killer Among Us enters, create a 1/1 white Human creature token, a 1/1 blue Merfolk creature token, and a 1/1 red Goblin creature token. Then secretly choose Human, Merfolk, or Goblin.\nSacrifice A Killer Among Us, Reveal the chosen creature type: If target attacking creature token is the chosen type, put three +1/+1 counters on it and it gains deathtouch until end of turn.

forge-gui/res/cardsfolder/a/abby_merciless_soldier.txt

@@ -9,5 +9,5 @@ SVar:X:Count$CastTotalManaSpent
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBChooseOpp | Layer$ Control | Description$ NICKNAME enters under the control of an opponent of your choice.
 SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to | AILogic$ Curse | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ ChosenPlayer
-DeckHas:Ability$Token & Type$Zombie|Fungus
+DeckHas:Ability$Token
 Oracle:When you cast this spell, create a number of 1/1 black Fungus Zombie creature tokens named Cordyceps Infected equal to the amount of mana spent to cast it.\nAbby enters under the control of an opponent of your choice.\nPartner—Survivors (You can have two commanders if both have this ability.)

forge-gui/res/cardsfolder/a/abstruse_interference.txt

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Instant
 K:Devoid
 A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SubAbility$ DBToken | SpellDescription$ Counter target spell unless its controller pays {1}.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You | SpellDescription$ You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
+SVar:DBToken:DB$ Token | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You | SpellDescription$ You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
 DeckHas:Ability$Mana.Colorless|Token
 DeckHints:Type$Eldrazi
 Oracle:Devoid (This card has no color.)\nCounter target spell unless its controller pays {1}. You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)