Fix Waterbend-testing humans Invasion Submersible (Card-Forge#9198)

Author: tool4ever

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

@@ -26,11 +26,11 @@ There are a few other properties that will appear in many cards. These are
 | Property | Description
 | - | -
 |`A`|[Ability effect](Card-scripting-API/AbilityFactory.md)
-|`AI`|RemoveDeck:<br />* `All`<br />This will prevent the card from appearing in random AI decks. It is applicable for cards the AI can't use at all like Dark Ritual and also for cards that the AI could use, but only ineffectively like Tortoise Formation. The AI won't draft these cards.<br />* `Random`<br /> This will prevent the card from appearing in random decks. It is only applicable for cards that are too narrow for random decks like Root Cage or Into the North. The AI won't draft these cards.<br />* `NonCommander`<br /> 
-|`Colors`|Color(s) of the card<br /><br />When a card's color is determined by a color indicator rather than shards in a mana cost, this property must be defined. If no identifier is needed, this property should be omitted.<br /><br />* `Colors:red` - This is used on Kobolds of Kher Keep, which has a casting cost of {0} and requires a red indicator to make it red.<br /><br />* `Colors:red,green` - Since Arlinn, Embraced by the Moon has no casting cost (it's the back of a double-faced card), the red and green indicator must be included.
-|`DeckHints`|AI-related hints for a deck including this card<br /><br />To improve synergy this will increase the rank of of all other cards that share some of its DeckHints types. This helps with smoothing the selection so cards without these Entries won't be at an unfair disadvantage.<br /><br />The relevant code can be found in the [CardRanker](https://github.com/Card-Forge/forge/blob/master/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java) class.
+|`AI`|RemoveDeck:<br />* `All`<br />This will prevent the card from appearing in random AI decks. It is applicable for cards the AI can't use at all and also for cards that the AI could use, but only ineffectively. The AI won't draft these cards.<br />* `Random`<br /> This will prevent the card from appearing in random decks. It is only applicable for cards that are too narrow for random decks like *Root Cage* or *Into the North*. The AI won't draft these cards.<br />* `NonCommander`<br />
+|`Colors`|Color(s) of the card<br /><br />When a card's color is determined by a color indicator rather than shards in a mana cost, this property must be defined. If no identifier is needed, this property should be omitted.<br /><br />Example:<br />`Colors:red,green` - Since *Arlinn, Embraced by the Moon* has no mana cost (it's the back of a double-faced card), the red and green indicator must be included.
+|`DeckHints`|AI-related hints for a deck including this card<br /><br />To improve synergy this will increase the rank of of all other cards that share some of its DeckHints types. The following types are supported:<br />* Color<br />* Keyword<br />* Name<br />* Type<br /><br />This helps with smoothing the selection so cards without these Entries won't be at an unfair disadvantage.<br /><br />The relevant code can be found in the [CardRanker](https://github.com/Card-Forge/forge/blob/master/forge-gui/src/main/java/forge/gamemodes/limited/CardRanker.java) class.
 |`DeckNeeds`|This can be considered a stronger variant when the AI should not put this card into its deck unless it has whatever other type is specified. The way this works is "inverted": it will directly decrease the rank of the card unless other cards are able to satisfy its types.<br />If a card demands more than one kind of type you can reuse it:<br />`DeckNeeds:Type$Human & Type$Warrior` will only find Human Warrior compared to `DeckNeeds:Type$Human\|Warrior` which is either
-|`DeckHas`|specifies that the deck now has a certain ability (like, token generation or counters) so that the drafting/deckbuilding AI knows that it now meets requirements for DeckHints/DeckNeeds. This is actually very useful since many of these (such as `Ability$Graveyard, Ability$Token, Ability$Counters`) are not deduced by parsing the abilities, so an explicit hint is necessary. Using the other types is also supported in case the implicit parsing wouldn't find it (TokenScript$ is also included).<br />It doesn't require exact matching to have an effect but cards that care about multiple entries for a given type will be judged higher if a card seems to provide even "more" synergy for it.<br />Example:<br />Chishiro has two abilities so `DeckHas:Ability$Token & Ability$Counters` is used, therefore score for `DeckNeeds:Ability$Token\|Counters` is increased
+|`DeckHas`|Specifies that the deck now has a certain ability (like, token generation) so that the drafting/deckbuilding AI knows that it now meets requirements for DeckHints/DeckNeeds. This is useful since many of these are not deduced by parsing the abilities, so an explicit hint is necessary. If you want to create a new archetype make sure to tag at least roughly 50 cards to start with and balacing the Has/Needs ratio. Currently used values are:<br />* Counters<br />* Graveyard<br />* Token<br /><br />Using the generic types is also supported in case the implicit parsing wouldn't find it (TokenScript$ is also included).<br />It doesn't require exact matching to have an effect but cards that care about multiple entries for a given type will be judged higher if a card seems to provide even "more" synergy for it.<br /><br />Example:<br />*Chishiro* has two abilities so `DeckHas:Ability$Token & Ability$Counters` is used, therefore score for `DeckNeeds:Ability$Token\|Counters` is increased
 |`K`|Keyword (see below)
 |`Loyalty`|Number of starting loyalty counters
 |`ManaCost`|Cost to cast the card shown in mana shards<br /><br />This property is required. It has a single parameter that is a mana cost.<br /><br />* `ManaCost:no cost` for cards that cannot be cast<br />* `ManaCost:1 W W` sets the casting cost to {1}{W}{W}
@@ -41,7 +41,7 @@ There are a few other properties that will appear in many cards. These are
 |`S`|[Static ability](Card-scripting-API/Statics.md)
 |`SVar`|String variable. Used throughout scripting in a handful of different ways.
 |`T`|[Triggered ability](Card-scripting-API/Triggers.md)
-|`Text`|Additional text that needs to be displayed on the CardDetailPanel that doesn't have any spell/ability that generates a description for it, for example "CARDNAME can be your commander." or "X can't be 0.".
+|`Text`|Additional text that needs to be displayed on the CardDetailPanel that doesn't have any spell/ability that generates a description for it, e.g. "CARDNAME can be your commander." or "X can't be 0.".
 |`Types`|Card types and subtypes<br /><br />Include all card types and subtypes, separated by spaces.<br /><br />Example:<br />* `Types:Enchantment Artifact Creature Golem` for a card that reads Enchantment Artifact Creature -- Golem
 
 Rarity and Set info are now defined in edition definition files. These can be found at /res/reditions path.
@@ -198,8 +198,6 @@ equipped already (Kor Duelist).
 
 `SVar:EndOfTurnLeavePlay:True`
 
-`SVar:maxLevel:`
-
 `SVar:HasCombatEffect:True`
 
 `SVar:HasAttackEffect:True`

docs/Development/ownership.md

@@ -34,7 +34,7 @@ The "Ancestors" column is basically there to list currently inactive developers
 ## Forge Script DSL
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
-| [Card Scripting](cardscripting) | TRT, Northmoc, Simisays, Fulgur14, Dracontes | a lot | - implement new Sets<br>- clean up outdated elements<br>- apply Oracle updates |
+| [Card Scripting](cardscripting) | TRT, Northmoc, Simisays, Fulgur14, Dracontes | a lot | - implement new Sets<br>- review script PR<br>- clean up outdated elements<br>- apply Oracle updates |
 | ForgeScribe | | Austinino | |
 
 ## Modes

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

@@ -1726,6 +1726,7 @@ else if (!sa.getHostCard().isPermanent() && sa.canCastTiming(player)
             return future.get(game.getAITimeout(), TimeUnit.SECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             try {
+                e.printStackTrace();
                 t.stop();
             } catch (UnsupportedOperationException ex) {
                 // Android and Java 20 dropped support to stop so sadly thread will keep running

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

@@ -1285,20 +1285,6 @@ public static boolean castPermanentInMain1(final Player ai, final SpellAbility s
             }
         } // AntiBuffedBy
 
-        // Plane cards that give Haste (e.g. Sokenzan)
-        if (ai.getGame().getRules().hasAppliedVariant(GameType.Planechase)) {
-            for (Card c : ai.getGame().getActivePlanes()) {
-                for (StaticAbility s : c.getStaticAbilities()) {
-                    if (s.hasParam("AddKeyword")
-                            && s.getParam("AddKeyword").contains("Haste")
-                            && "Creature".equals(s.getParam("Affected"))
-                            && card.isCreature()) {
-                        return true;
-                    }
-                }
-            }
-        }
-
         final CardCollectionView vengevines = ai.getCardsIn(ZoneType.Graveyard, "Vengevine");
         if (!vengevines.isEmpty()) {
             final CardCollectionView creatures = ai.getCardsIn(ZoneType.Hand);
@@ -1458,16 +1444,15 @@ public static boolean hasACardGivingHaste(final Player ai, final boolean checkOp
             for (StaticAbility stAb : c.getStaticAbilities()) {
                 if (stAb.checkMode(StaticAbilityMode.Continuous) && stAb.hasParam("AddKeyword")
                         && stAb.getParam("AddKeyword").contains("Haste")) {
-
                     if (c.isEquipment() && c.getEquipping() == null) {
                         return true;
                     }
 
                     final String affected = stAb.getParam("Affected");
-                    if (affected.contains("Creature.YouCtrl")
-                            || affected.contains("Other+YouCtrl")) {
+                    if (affected.startsWith("Creature") && (affected.contains("YouCtrl") || !affected.contains("."))) {
                         return true;
-                    } else if (affected.contains("Creature.PairedWith") && !c.isPaired()) {
+                    }
+                    if (affected.contains("Creature.PairedWith") && !c.isPaired()) {
                         return true;
                     }
                 }
@@ -1482,8 +1467,7 @@ public static boolean hasACardGivingHaste(final Player ai, final boolean checkOp
                 }
 
                 final String valid = params.get("ValidCard");
-                if (valid.contains("Creature.YouCtrl")
-                        || valid.contains("Other+YouCtrl") ) {
+                if (valid.contains("Creature.YouCtrl") || valid.contains("Other+YouCtrl") ) {
 
                     final SpellAbility sa = t.getOverridingAbility();
                     if (sa != null && sa.getApi() == ApiType.Pump && sa.hasParam("KW")

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

@@ -1302,6 +1302,10 @@ public static ManaCostBeingPaid calculateManaCost(final Cost cost, final SpellAb
         Cost payCosts;
         if (test) {
             payCosts = CostAdjustment.adjust(cost, sa, effect);
+            // prevent asking Human when only predicting
+            if (!payer.getController().isAI()) {
+                sa.setMaxWaterbend(null);
+            }
         } else {
             // when not testing CostPayment already handled raise
             payCosts = cost;

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

@@ -1066,10 +1066,8 @@ public Collection<PaperCard> getAllNonPromosNonReprintsNoAlt() {
     }
 
     public String getNormalizedName(final String cardName) {
-        String cardName1 = cardName;
         // normalize Names first
-        cardName1 = normalizedNames.getOrDefault(cardName1, cardName1);
-        return cardName1;
+        return normalizedNames.getOrDefault(cardName, cardName);
     }
 
     @Override

forge-game/src/main/java/forge/game/spellability/SpellAbility.java

@@ -2699,6 +2699,7 @@ public Integer getMaxWaterbend() {
     }
     public void setMaxWaterbend(Cost cost) {
         if (cost == null || cost.getMaxWaterbend() == null) {
+            maxWaterbend = 0;
             return;
         }
         maxWaterbend = AbilityUtils.calculateAmount(getHostCard(), cost.getMaxWaterbend(), this);

forge-gui/src/main/java/forge/player/PlayerControllerHuman.java

@@ -2942,13 +2942,11 @@ private void addCardToZone(ZoneType zone, final boolean repeatLast, final boolea
             }
             final Player p = pOld;
 
-
             final CardDb carddb = FModel.getMagicDb().getCommonCards();
-            final List<ICardFace> faces = Lists.newArrayList(carddb.getAllFaces());
 
             List<CardFaceView> choices = new ArrayList<>();
             CardFaceView cardFaceView;
-            for (ICardFace cardFace : faces) {
+            for (ICardFace cardFace : carddb.getAllFaces()) {
                 cardFaceView = new CardFaceView(CardTranslation.getTranslatedName(cardFace.getDisplayName()), cardFace.getName());
                 choices.add(cardFaceView);
             }