Wiki update (Card-Forge#9313)

Author: tool4ever

docs/AI.md

@@ -19,15 +19,14 @@ Please understand, the AI is still the AI, and it's limitations exist even again
 ## Syntax
 `sim -d <deck1[.dck]> ... <deckX[.dck]> -D [path] -n [N] -f [F] -t [T] -p [P] -q`
 
-In linux and mac, command line arguments are not currently passed through the sh script, please call `java -jar` manually, instead of the exe.
 - `sim` - "Simulation Mode" forces Forge to not start the GUI and automatically runs the AI matches in command line. Enables all other switches for simulation mode.
 - `-d <deck1[.dck]> ... <deckX[.dck]>` - Space separated list of deck files, in `-f` game type path. (For example; If `-f` is set to Commander, decks from `<userdata>/decks/commander/` will be searched. If `-f` is not set then default is `<userdata>/decks/constructed/`.) Names must use quote marks when they contain spaces.
   - `deck1.dck` - Literal deck file name, when the value has ".dck" extension.
   - `deck` - A meta deck name of a deck file.
 - `-D [path]` - [path] is absolute directory path to load decks from. (Overrides path for `-d`.)
 - `-n [N]` - [N] number of games, just flat test the AI multiple times. Default is 1.
 - `-m [M]` - [M] number of matches, best of [M] matches. (Overrides -n) Recommended 1, 3, or 5. Default is 1.
-- `-f [F]` - Runs [F] format of game. Default is "constructed" (other options may not work, list extracted from code)
+- `-f [F]` - Runs [F] format of game. Default is "constructed"
   - `Commander`
   - `Oathbreaker`
   - `TinyLeaders`
@@ -41,10 +40,9 @@ In linux and mac, command line arguments are not currently passed through the sh
   - `Swiss` - See wikipedia for [Swiss Pairing Tournaments](https://en.wikipedia.org/wiki/Swiss-system_tournament)
 - `-p [P]` - [P] number of players paired, only used in tournament mode. Default is 2.
 - `-q` - Quiet Mode, only prints the result not the entire log.
+- `-c [S]` - Clock flag, maximum time of [S] seconds before calling the match a draw. Default is 120.
 
 ## Examples
-In linux and macos you must run forge by evoking java and calling the jar, currently command line parameters are not passed through the script. The forge jar filename is truncated in these examples from `forge-whatever-version-youre-on.jar` to `forge.jar`.
-
 In Windows, if you use the EXE file as described below, the simulation runs in the background and output is sent to the forge log file only. If you want to have output to the console, please use the `java -jar` evocation of forge.
 
 To simulate a basic three games of two decks (deck1 and deck2 must be meta deck names of decks in `<userdata>\decks\constructed\`):
@@ -55,10 +53,6 @@ To simulate a single 3-player Commander game (deck1, deck2, and deck3 must be me
 - Windows/Linux/MacOS: `java -jar forge.jar sim -d deck1 deck2 deck3 -f commander`
 - Windows: `.\forge.exe sim -d deck1 deck2 deck3 -f commander`
 
-To simulate a round robin tournament; best of three, with all decks in a directory:
-- Windows/Linux/MacOS: `java -jar forge.jar sim -D /path/to/DecksFolder/ -m 3 -t RoundRobin`
-- Windows: `.\forge.exe sim -D C:\DecksFolder\ -m 3 -t RoundRobin`
-
 To simulate a swiss tournament; best of three, all decks in a directory, 3 player pairings:
 - Windows/Linux/MacOS: `java -jar forge.jar sim -D /path/to/DecksFolder/ -m 3 -t Swiss -p 3`
 - Windows: `.\forge.exe sim -D C:\DecksFolder\ -m 3 -t Swiss -p 3`

docs/Card-scripting-API/AbilityFactory.md

@@ -395,6 +395,12 @@ Parameters (all optional):
 - `NumDef$` - pumps Toughness
 - `KW$` - gives keywords
 
+Due to its generic nature Pump is also the conventional "helper AF" when an effect requires more than one target with different restrictions, e.g. *Political Trickery*:
+```
+A:SP$ Pump | ValidTgts$ Land.YouCtrl | TgtPrompt$ Choose target land you control | SubAbility$ DBExchange | SpellDescription$ Exchange control of target land you control and target land an opponent controls. (This effect lasts indefinitely.)
+SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Land.OppCtrl | TgtPrompt$ Choose target land an opponent controls
+```
+
 ## Regenerate
 Regenerate is for creating regeneration shields.
 

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

@@ -182,7 +182,7 @@ Creatures with "Multiple" in this SVar will always be preferred when the AI ench
 
 * `EquipMe:{Multiple/Once>}`
 
-Creatures with "Multiple" in this SVar will always be prefered when the AI equips, creatures with "Once" only if they are not equipped already.
+Creatures with "Multiple" in this SVar will always be preferred when the AI equips, creatures with "Once" only if they are not equipped already.
 
 * `EndOfTurnLeavePlay:True`
 
@@ -210,7 +210,13 @@ Uses operand-operator syntax, where `{cmp}` is a comparator:
 **GE** *Greater than or Equal*  
 **GT** *Greater Than*  
 
-*Tip:* the AI is smart enough to not play permanents if they have ineffective ETB triggers.
+*Tip:* the AI is (usually) smart enough to not play permanents if they have obviously ineffective ETB triggers.
+
+Here's a good example from *Eldrazi Monument* where the extra heuristics try to avoid playing it without a good enough boardstate:
+```
+SVar:NeedsToPlayVar:Y GE3
+SVar:Y:Count$Valid Creature.YouCtrl
+```
 
 * `NonStackingEffect:True`
 

docs/Card-scripting-API/Statics.md

@@ -10,6 +10,8 @@ By default `Affected-/EffectZone` are both Battlefield.
 Here's an example for layer 7c:  
 `Affected$ Creature.YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control get +1/+1.`
 
+`CharacteristicDefining$ True`
+
 See [StaticAbility.generateLayer()](https://github.com/Card-Forge/forge/blob/master/forge-game/src/main/java/forge/game/staticability/StaticAbility.java) for the full list of params on each Layer.
 
 *Note:* Layer 1 is currently only implemented as a resolving effect instead.

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

@@ -400,30 +400,13 @@ private boolean checkETBEffectsPreparedCard(final Card card, final SpellAbility
         return rightapi;
     }
 
-    private static List<SpellAbility> getPlayableCounters(final CardCollection l) {
+    private static List<SpellAbility> getPlayableCounters(final CardCollection all) {
         final List<SpellAbility> spellAbility = Lists.newArrayList();
-        for (final Card c : l) {
-            if (c.isForetold() && c.getAlternateState() != null) {
-                try {
-                    for (final SpellAbility sa : c.getAlternateState().getNonManaAbilities()) {
-                        // Check if this AF is a Counterspell
-                        if (sa.getApi() == ApiType.Counter) {
-                            spellAbility.add(sa);
-                        } else {
-                            if (sa.getApi() != null && sa.getApi().toString().contains("Foretell") && c.getAlternateState().getName().equalsIgnoreCase("Saw It Coming"))
-                                spellAbility.add(sa);
-                        }
-                    }
-                } catch (Exception e) {
-                    // facedown and alternatestate counters should be accessible
-                    e.printStackTrace();
-                }
-            } else {
-                for (final SpellAbility sa : c.getNonManaAbilities()) {
-                    // Check if this AF is a Counterspell
-                    if (sa.getApi() == ApiType.Counter) {
-                        spellAbility.add(sa);
-                    }
+        for (final Card c : all) {
+            CardState state = c.isForetold() && c.getAlternateState() != null ? c.getAlternateState() : c.getCurrentState();
+            for (final SpellAbility sa : state.getNonManaAbilities()) {
+                if (sa.getApi() == ApiType.Counter) {
+                    spellAbility.add(sa);
                 }
             }
         }

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

@@ -35,7 +35,7 @@ public AiDeckStatistics(float averageCMC, float stddevCMC, int maxCost, int maxC
         this.numLands = numLands;
     }
 
-    public static AiDeckStatistics fromCards(List<Card> cards) {
+    public static AiDeckStatistics fromCards(Iterable<Card> cards) {
         int totalCMC = 0;
         int totalCount = 0;
         int numLands = 0;
@@ -72,7 +72,6 @@ public static AiDeckStatistics fromCards(List<Card> cards) {
             // find the sources
             // What about non-mana-ability mana sources?
             // fetchlands, ramp spells, etc
-
         }
 
         return new AiDeckStatistics(totalCount == 0 ? 0 : totalCMC / (float)totalCount,
@@ -84,7 +83,6 @@ public static AiDeckStatistics fromCards(List<Card> cards) {
                 );
     }
 
-
     public static AiDeckStatistics fromDeck(Deck deck, Player player) {
         List<Card> cardlist = new ArrayList<>();
         for (final Map.Entry<DeckSection, CardPool> deckEntry : deck) {

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

@@ -90,15 +90,14 @@ public static List<SpellAbility> getSpellAbilities(final CardCollectionView l, f
     }
 
     public static List<SpellAbility> getOriginalAndAltCostAbilities(final List<SpellAbility> originList, final Player player) {
-        final List<SpellAbility> newAbilities = Lists.newArrayList();
-
         List<SpellAbility> originListWithAddCosts = Lists.newArrayList();
         for (SpellAbility sa : originList) {
             // If this spell has alternative additional costs, add them instead of the unmodified SA itself
             sa.setActivatingPlayer(player);
             originListWithAddCosts.addAll(GameActionUtil.getAdditionalCostSpell(sa));
         }
 
+        final List<SpellAbility> newAbilities = Lists.newArrayList();
         for (SpellAbility sa : originListWithAddCosts) {
             // determine which alternative costs are cheaper than the original and prioritize them
             List<SpellAbility> saAltCosts = GameActionUtil.getAlternativeCosts(sa, player, false);
@@ -323,10 +322,11 @@ public int compareEvaluator(final SpellAbility a, final SpellAbility b, boolean
             a1 += getSpellAbilityPriority(a);
             b1 += getSpellAbilityPriority(b);
 
-            // If both are creature spells sort them after
+            // if both are creature spells sort them after
             if (safeToEvaluateCreatures) {
-                a1 += Math.round(ComputerUtilCard.evaluateCreature(a) / 100f);
-                b1 += Math.round(ComputerUtilCard.evaluateCreature(b) / 100f);
+                // try to align the scales: if priority swings in either direction extra evaluation matters less
+                a1 += Math.round(ComputerUtilCard.evaluateCreature(a) / (10.5f + Math.abs(a1)));
+                b1 += Math.round(ComputerUtilCard.evaluateCreature(b) / (10.5f + Math.abs(b1)));
             }
 
             return b1 - a1;

forge-game/src/main/java/forge/game/ability/effects/DigEffect.java

@@ -35,7 +35,7 @@ protected String getStackDescription(SpellAbility sa) {
         } else {
             final int numToDig = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
             final String toChange = sa.getParamOrDefault("ChangeNum", "1");
-            final int numToChange = toChange.startsWith("All") ? numToDig : AbilityUtils.calculateAmount(host, sa.getParam("ChangeNum"), sa);
+            final int numToChange = toChange.equals("All") || toChange.equals("Any") ? numToDig : AbilityUtils.calculateAmount(host, sa.getParam("ChangeNum"), sa);
 
             String verb = " looks at ";
             if (sa.hasParam("DestinationZone") && sa.getParam("DestinationZone").equals("Exile") &&

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

@@ -3446,10 +3446,8 @@ public final boolean canProduceColorMana(final Set<String> colors) {
                     if (CardUtil.getReflectableManaColors(mana).contains(s)) {
                         return true;
                     }
-                } else {
-                    if (mana.canProduce(MagicColor.toShortString(s))) {
-                        return true;
-                    }
+                } else if (mana.canProduce(MagicColor.toShortString(s))) {
+                    return true;
                 }
             }
         }
@@ -7662,8 +7660,8 @@ public List<SpellAbility> getAllPossibleAbilities(final Player player, final boo
             if (sa.isAdventure() && isOnAdventure()) {
                 continue; // skip since it's already on adventure
             }
-            //add alternative costs as additional spell abilities
             abilities.add(sa);
+            //add alternative costs as additional spell abilities
             abilities.addAll(GameActionUtil.getAlternativeCosts(sa, player, false));
         }
 
@@ -7683,7 +7681,6 @@ public List<SpellAbility> getAllPossibleAbilities(final Player player, final boo
         // Add Modal Spells
         if (isModal() && hasState(CardStateName.Backside)) {
             for (SpellAbility sa : getState(CardStateName.Backside).getSpellAbilities()) {
-                //add alternative costs as additional spell abilities
                 // only add Spells there
                 if (sa.isSpell() || sa.isLandAbility()) {
                     abilities.add(sa);

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

@@ -7,7 +7,6 @@ K:Menace
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of Elves you control plus the number of Elf cards in your graveyard.
 SVar:X:Count$Valid Elf.YouCtrl/Plus.Y
 SVar:Y:Count$ValidGraveyard Elf.YouOwn
-SVar:NeedsToPlayVar:X GE1
 SVar:BuffedBy:Elf
 DeckNeeds:Type$Elf
 Oracle:Vigilance; menace (This creature can't be blocked except by two or more creatures.)\nAbomination of Llanowar's power and toughness are each equal to the number of Elves you control plus the number of Elf cards in your graveyard.