Fix Nexus Mentality (Card-Forge#10723)

Author: tool4ever

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

@@ -2661,7 +2661,6 @@ public void scry(final List<Player> players, int numScry, SpellAbility cause) {
     }
 
     public CardCollection mill(final PlayerCollection millers, final int numCards, final ZoneType destination, final SpellAbility sa, final Map<AbilityKey, Object> moveParams) {
-        final boolean reveal = sa != null && !sa.hasParam("NoReveal");
         final boolean showRevealDialog = sa != null && sa.hasParam("ShowMilledCards");
 
         final CardCollection milled = new CardCollection();
@@ -2676,17 +2675,15 @@ public CardCollection mill(final PlayerCollection millers, final int numCards, f
 
             // Reveal the milled cards, so players don't have to manually inspect the
             // graveyard to figure out which ones were milled.
-            if (reveal) { // do not reveal when exiling face down
-                String toZoneStr = destination.equals(ZoneType.Graveyard) ? "" : " (" +
-                        Localizer.getInstance().getMessage("lblMilledToZone", destination.getTranslatedName()) + ")";
-                if (showRevealDialog) {
-                    final String message = Localizer.getInstance().getMessage("lblMilledCards");
-                    final boolean addSuffix = !toZoneStr.isEmpty();
-                    reveal(milledPlayer, destination, p, false, message, addSuffix);
-                }
-                game.fireEvent(new GameEventAddLog(GameLogEntryType.ZONE_CHANGE, p + " milled " +
-                        Lang.joinHomogenous(milledPlayer) + toZoneStr + "."));
+            String toZoneStr = destination.equals(ZoneType.Graveyard) ? "" : " (" +
+                    Localizer.getInstance().getMessage("lblMilledToZone", destination.getTranslatedName()) + ")";
+            if (showRevealDialog) {
+                final String message = Localizer.getInstance().getMessage("lblMilledCards");
+                final boolean addSuffix = !toZoneStr.isEmpty();
+                reveal(milledPlayer, destination, p, false, message, addSuffix);
             }
+            game.fireEvent(new GameEventAddLog(GameLogEntryType.ZONE_CHANGE, p + " milled " +
+                    Lang.joinHomogenous(milledPlayer) + toZoneStr + "."));
         }
 
         if (!milled.isEmpty()) {

forge-gui/res/cardsfolder/g/grindstone.txt

@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact
 A:AB$ Repeat | Cost$ 3 T | ValidTgts$ Player | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesColor | RepeatSVarCompare$ GE2 | SubAbility$ DBCleanup | SpellDescription$ Target player mills two cards. If two cards that share a color were milled this way, repeat this process. | StackDescription$ SpellDescription
 SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBGrind
-SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted | NoReveal$ True | RememberMilled$ True
+SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted | RememberMilled$ True
 SVar:MaxRepeats:TargetedPlayer$CardsInLibrary
 SVar:MilledSharesColor:Remembered$Valid Card.SharesColorWithOther Remembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

forge-gui/res/cardsfolder/h/helm_of_obedience.txt

@@ -4,7 +4,7 @@ Types:Artifact
 # Doesn't interact properly with Myr Welder right now
 A:AB$ Repeat | Cost$ XMin1 X T | ValidTgts$ Opponent | MaxRepeat$ MaxRepeats | RepeatSubAbility$ DBCleanBeforeRepeat | RepeatCheckSVar$ AccumulatedMilled | RepeatSVarCompare$ LTX | AILogic$ MaxXAtOppEOT | StackDescription$ SpellDescription | SpellDescription$ Target opponent mills a card, then repeats this process until a creature card or X cards have been put into their graveyard this way, whichever comes first. If one or more creature cards were put into that graveyard this way, sacrifice CARDNAME and put one of them onto the battlefield under your control. X can't be 0. | SubAbility$ DBSacHelm
 SVar:DBCleanBeforeRepeat:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBMill
-SVar:DBMill:DB$ Mill | NumCards$ 1 | RememberMilled$ True | Defined$ Targeted | SubAbility$ DBAccumulateX | NoReveal$ True
+SVar:DBMill:DB$ Mill | NumCards$ 1 | RememberMilled$ True | Defined$ Targeted | SubAbility$ DBAccumulateX
 SVar:DBAccumulateX:DB$ StoreSVar | SVar$ AccumulatedMilled | Type$ CountSVar | Expression$ AccumulatedMilled/Plus.1 | ConditionCheckSVar$ MilledCard | ConditionSVarCompare$ EQ1 | SubAbility$ DBMilledCreature
 SVar:DBMilledCreature:DB$ StoreSVar | SVar$ AccumulatedMilled | Type$ Calculate | Expression$ X | ConditionCheckSVar$ MilledCreature | ConditionSVarCompare$ EQ1 | SubAbility$ DBEmptyLibrary
 SVar:DBEmptyLibrary:DB$ StoreSVar | SVar$ AccumulatedMilled | Type$ Calculate | Expression$ X | ConditionCheckSVar$ TargetedLibrary | ConditionSVarCompare$ EQ0

forge-gui/res/cardsfolder/m/mesmeric_orb.txt

@@ -2,6 +2,6 @@ Name:Mesmeric Orb
 ManaCost:2
 Types:Artifact
 T:Mode$ Untaps | ValidCard$ Card | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever a permanent becomes untapped, that permanent's controller mills a card.
-SVar:TrigMill:DB$ Mill | Defined$ TriggeredCardController | NumCards$ 1 | NoReveal$ True
+SVar:TrigMill:DB$ Mill | Defined$ TriggeredCardController | NumCards$ 1
 AI:RemoveDeck:Random
 Oracle:Whenever a permanent becomes untapped, that permanent's controller mills a card.

forge-gui/res/cardsfolder/n/nexus_mentality.txt

@@ -3,9 +3,9 @@ ManaCost:3 U
 Types:Instant
 A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ Count$Compare X GE1.2.1 | Choices$ DBMove,DBRemove | AdditionalDescription$ If you control a commander as you cast this spell, you may choose both.
 SVar:DBMove:DB$ MoveCounter | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Permanent.nonLand+YouCtrl | ValidTgtDesc$ nonland permanent you control (move counters) | CounterType$ All | CounterNum$ All | SpellDescription$ Move all counters from target nonland permanent you control onto another target nonland permanent you control.
-SVar:DBRemove:DB$ RemoveCounter | ValidTgts$ Permanent.nonLand+YouCtrl | ValidTgtDesc$ nonland permanent you control (remove counters) | CounterType$ All | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBDraw | SpellDescription$ Remove all counters from target nonland permanent you control. Draw a card for each counter removed this way.
+SVar:DBRemove:DB$ RemoveCounter | ValidTgts$ Permanent.nonLand+YouCtrl | ValidTgtDesc$ nonland permanent you control (remove counters) | CounterType$ All | CounterNum$ All | RememberAmount$ True | SubAbility$ DBDraw | SpellDescription$ Remove all counters from target nonland permanent you control. Draw a card for each counter removed this way.
 SVar:DBDraw:DB$ Draw | NumCards$ Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Card.IsCommander+YouCtrl
-SVar:Y:Count$RememberedSize
+SVar:Y:Count$RememberedNumber
 Oracle:Choose one. If you control a commander as you cast this spell, you may choose both instead.\n• Move all counters from target nonland permanent you control onto another target nonland permanent you control.\n• Remove all counters from target nonland permanent you control. Draw a card for each counter removed this way.

forge-gui/res/cardsfolder/s/sphinxs_tutelage.txt

@@ -4,7 +4,7 @@ Types:Enchantment
 T:Mode$ Drawn | ValidCard$ Card.YouOwn | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever you draw a card, target opponent mills two cards. If two nonland cards that share a color were milled this way, repeat this process.
 SVar:TrigMill:DB$ Repeat | ValidTgts$ Opponent | IsCurse$ True | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesColor | RepeatSVarCompare$ GE2 | SubAbility$ DBCleanup
 SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBGrind
-SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted | NoReveal$ True | RememberMilled$ True
+SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted | RememberMilled$ True
 SVar:MaxRepeats:TargetedPlayer$CardsInLibrary
 SVar:MilledSharesColor:Remembered$Valid Card.nonLand+SharesColorWithOther Remembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

forge-gui/res/cardsfolder/t/the_tale_of_tamiyo.txt

@@ -4,7 +4,7 @@ Types:Legendary Enchantment Saga
 K:Chapter:4:DBRepeat,DBRepeat,DBRepeat,DBChangeZone
 SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBCleanAndGrind | MaxRepeat$ MaxRepeats | RepeatCheckSVar$ MilledSharesType | RepeatSVarCompare$ GE2 | SubAbility$ DBCleanup | SpellDescription$ Mill two cards. If two cards that share a card type were milled this way, draw a card and repeat this process.
 SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBGrind
-SVar:DBGrind:DB$ Mill | NumCards$ 2 | NoReveal$ True | RememberMilled$ True | SubAbility$ DBDraw
+SVar:DBGrind:DB$ Mill | NumCards$ 2 | RememberMilled$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ MilledSharesType | ConditionSVarCompare$ GE2
 SVar:MaxRepeats:Count$ValidLibrary Card.YouOwn
 SVar:MilledSharesType:Remembered$Valid Card.sharesCardTypeWithOther Remembered