VentureEffect: move Dungeon to Tokens (Card-Forge#9404)

Hanmac · web-flow · commit 43bb33b3a91b · 2026-01-02T15:20:27.000+01:00
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -1540,30 +1540,6 @@ public CardState chooseSingleCardState(SpellAbility sa, List<CardState> states,
         return SpellApiToAi.Converter.get(sa).chooseCardState(player, sa, states, params);
     }
 
-    @Override
-    public Card chooseDungeon(Player ai, List<PaperCard> dungeonCards, String message) {
-        // TODO: improve the conditions that define which dungeon is a viable option to choose
-        List<String> dungeonNames = Lists.newArrayList();
-        for (PaperCard pc : dungeonCards) {
-            dungeonNames.add(pc.getName());
-        }
-
-        // Don't choose Tomb of Annihilation when life in danger unless we can win right away or can't lose for 0 life
-        int lifeInDanger = AiProfileUtil.getIntProperty(player, AiProps.AI_IN_DANGER_THRESHOLD);
-        if ((ai.getLife() <= lifeInDanger && !ai.cantLoseForZeroOrLessLife())
-                && !(ai.getLife() > 1 && ai.getWeakestOpponent().getLife() == 1)) {
-            dungeonNames.remove("Tomb of Annihilation");
-        }
-
-        try {
-            // if this fail somehow add fallback to get any from dungeonCards
-            int i = MyRandom.getRandom().nextInt(dungeonNames.size());
-            return Card.fromPaperCard(dungeonCards.get(i), ai);
-        } catch (Exception e) {
-            return Card.fromPaperCard(Aggregates.random(dungeonCards), ai);
-        }
-    }
-
     @Override
     public List<Card> chooseCardsForSplice(SpellAbility sa, List<Card> cards) {
         // sort from best to worst
diff --git a/forge-ai/src/main/java/forge/ai/ability/VentureAi.java b/forge-ai/src/main/java/forge/ai/ability/VentureAi.java
@@ -3,8 +3,11 @@
 import com.google.common.collect.Lists;
 import forge.ai.AiAbilityDecision;
 import forge.ai.AiPlayDecision;
+import forge.ai.AiProfileUtil;
+import forge.ai.AiProps;
 import forge.ai.PlayerControllerAi;
 import forge.ai.SpellAbilityAi;
+import forge.card.ICardFace;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -74,4 +77,19 @@ public SpellAbility chooseSingleSpellAbility(Player player, SpellAbility sa, Lis
         return Aggregates.random(spells);
     }
 
+    @Override
+    public ICardFace chooseCardFace(Player ai, SpellAbility sa, List<ICardFace> faces) {
+        if (faces.size() == 1) {
+            return faces.get(0);
+        }
+
+        // Don't choose Tomb of Annihilation when life in danger unless we can win right away or can't lose for 0 life
+        int lifeInDanger = AiProfileUtil.getIntProperty(ai, AiProps.AI_IN_DANGER_THRESHOLD);
+        if ((ai.getLife() <= lifeInDanger && !ai.cantLoseForZeroOrLessLife())
+                && !(ai.getLife() > 1 && ai.getWeakestOpponent().getLife() == 1)) {
+            faces.removeIf(f -> "Tomb of Annihilation".equals(f.getName()));
+        }
+
+        return Aggregates.random(faces);
+    }
 }
diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -142,7 +142,6 @@ public enum EditionSectionWithCollectorNumbers {
         PRERELEASE_PROMO("prerelease promo"),
         BUNDLE("bundle"),
         BOX_TOPPER("box topper"),
-        DUNGEONS("dungeons"),
         JUMPSTART("jumpstart"),
         REBALANCED("rebalanced"),
         ETERNAL("eternal"),
diff --git a/forge-core/src/main/java/forge/token/TokenDb.java b/forge-core/src/main/java/forge/token/TokenDb.java
@@ -202,4 +202,6 @@ public Predicate<? super PaperToken> wasPrintedInSets(List<String> allowedSetCod
     public Iterator<PaperToken> iterator() {
         return allTokenByName.values().iterator();
     }
+
+    public Map<String, CardRules> getRules() { return this.rulesByName;}
 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java b/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java
@@ -4,15 +4,22 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.ObjectUtils;
+
+import com.google.common.collect.Lists;
 
 import forge.StaticData;
 import forge.card.CardRules;
-import forge.card.CardRulesPredicates;
+import forge.card.GamePieceType;
+import forge.card.ICardFace;
 import forge.game.Game;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
 import forge.game.card.CardCollectionView;
+import forge.game.card.CardFactory;
 import forge.game.card.CounterType;
 import forge.game.event.GameEventCardCounters;
 import forge.game.player.Player;
@@ -22,10 +29,7 @@
 import forge.game.trigger.TriggerType;
 import forge.game.trigger.WrappedAbility;
 import forge.game.zone.ZoneType;
-import forge.item.PaperCard;
-import forge.item.PaperCardPredicates;
 import forge.util.Localizer;
-import forge.util.PredicateString.StringOp;
 
 public class VentureEffect extends SpellAbilityEffect {
 
@@ -44,20 +48,30 @@ private Card getDungeonCard(SpellAbility sa, Player player, Map<AbilityKey, Obje
             }
         }
 
-        List<PaperCard> dungeonCards;
+        Predicate<Map.Entry<String, CardRules>> filter;
         if (sa.hasParam("Dungeon")) {
             String dungeonType = sa.getParam("Dungeon");
-            Predicate<CardRules> rulesPredicate = CardRulesPredicates.IS_DUNGEON.and(CardRulesPredicates.subType(StringOp.EQUALS, dungeonType));
-            dungeonCards = StaticData.instance().getVariantCards().getAllCards(
-                    PaperCardPredicates.fromRules(rulesPredicate));
+            filter = e -> e.getValue().getType().hasSubtype(dungeonType);
         } else {
             // Create a new dungeon card chosen by player in command zone.
-            dungeonCards = StaticData.instance().getVariantCards().getAllCards(
-                    PaperCardPredicates.fromRules(CardRulesPredicates.IS_DUNGEON));
-            dungeonCards.removeIf(c -> !c.getRules().isEnterableDungeon());
+            filter = e -> e.getValue().isEnterableDungeon();
         }
+        Map<ICardFace, String> mapping = StaticData.instance().getAllTokens().getRules().entrySet()
+                .stream().filter(filter).collect(Collectors.toMap(e -> e.getValue().getMainPart(), Map.Entry::getKey));
         String message = Localizer.getInstance().getMessage("lblChooseDungeon");
-        Card dungeon = player.getController().chooseDungeon(player, dungeonCards, message);
+        ICardFace chosen = player.getController().chooseSingleCardFace(sa, Lists.newArrayList(mapping.keySet()), message);
+        if (chosen == null) {
+            return null;
+        }
+        String script = mapping.get(chosen);
+        final Card host = sa.getHostCard();
+        Card editionHost = sa.getOriginalHost();
+
+        String edition = ObjectUtils.firstNonNull(editionHost, host).getSetCode();
+        edition = ObjectUtils.firstNonNull(StaticData.instance().getCardEdition(edition).getTokenSet(script), edition);
+
+        final Card dungeon = CardFactory.getCard(StaticData.instance().getAllTokens().getToken(script, edition), player, game);
+        dungeon.setGamePieceType(GamePieceType.DUNGEON);
 
         game.getAction().moveToCommand(dungeon, sa, moveParams);
 
diff --git a/forge-game/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java
@@ -318,7 +318,6 @@ public final boolean payManaCost(CostPartMana costPartMana, SpellAbility sa, Str
     public abstract String chooseCardName(SpellAbility sa, Predicate<ICardFace> cpp, String valid, String message);
     public abstract String chooseCardName(SpellAbility sa, List<ICardFace> faces, String message);
 
-    public abstract Card chooseDungeon(Player player, List<PaperCard> dungeonCards, String message);
     // better to have this odd method than those if playerType comparison in ChangeZone
     public abstract Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, CardCollection fetchList, DelayedReveal delayedReveal, String selectPrompt, boolean isOptional, Player decider);
     public abstract List<Card> chooseCardsForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, CardCollection fetchList, int min, int max, DelayedReveal delayedReveal, String selectPrompt, Player decider);
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
@@ -767,12 +767,6 @@ public CardState chooseSingleCardState(SpellAbility sa, List<CardState> states,
         return null;
     }
 
-    @Override
-    public Card chooseDungeon(Player player, List<PaperCard> dungeonCards, String message) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     @Override
     public List<Card> chooseCardsForSplice(SpellAbility sa, List<Card> cards) {
         return Lists.newArrayList();
diff --git a/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt b/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt
@@ -960,9 +960,6 @@ ScryfallCode=CLB
 [buy a box]
 936 R Elder Brain @Nino Is
 
-[dungeons]
-20 Undercity
-
 [foils]
 Abdel Adrian, Gorion's Ward+|CLB
 Ellyn Harbreeze, Busybody+|CLB
@@ -1165,6 +1162,7 @@ Zevlor, Elturel Exile|CLB
 16 c_1_1_a_construct @Jakub Kasper
 17 c_a_treasure_sac @Dan Murayama Scott
 18 volos_journal @Zoltan Boros
+20 undercity
 21 c_3_2_eldrazi_horror @Jason Felix
 22 c_1_1_shapeshifter_changeling @Steve Prescott
 23 c_2_2_shapeshifter_changeling @Johann Bodin
@@ -1195,4 +1193,4 @@ Zevlor, Elturel Exile|CLB
 48 c_a_gold_sac @Yeong-Hao Han
 
 [other]
-20☇ initiative @Ioannis Fiore
+20☇ initiative @Ioannis Fiore
diff --git a/forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms.txt b/forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms.txt
@@ -447,11 +447,6 @@ A-233 R A-Sorcerer Class @Alexander Mokhov
 A-237 R A-Triumphant Adventurer @Alexander Mokhov
 A-255 R A-Dungeon Descent @Kasia 'Kafis' Zielińska
 
-[dungeons]
-20 Dungeon of the Mad Mage
-21 Lost Mine of Phandelver
-22 Tomb of Annihilation
-
 [tokens]
 1 w_3_3_angel_flying @Irina Nordsol
 2 icingdeath_frost_tongue @Kieran Yanner
@@ -468,12 +463,12 @@ A-255 R A-Dungeon Descent @Kasia 'Kafis' Zielińska
 13 guenhwyvar @Brian Valeza
 14 g_2_2_wolf @Daren Bader
 15 c_a_treasure_sac @Dan Murayama Scott
+20 dungeon_of_the_mad_mage
+21 lost_mine_of_phandelver
+22 tomb_of_annihilation
 
 [other]
 16 emblem_ellywick_tumblestrum @Anna Steinbauer
 17 emblem_lolth_spider_queen @Tyler Jacobson
 18 emblem_mordenkainen @Ryan Pancoast
 19 emblem_zariel_archduke_of_avernus @Heonhwa Choe
-20 Dungeon of the Mad Mage
-21 Lost Mine of Phandelver
-22 Tomb of Annihilation
diff --git a/forge-gui/res/tokenscripts/dungeon_of_the_mad_mage.txt b/forge-gui/res/tokenscripts/dungeon_of_the_mad_mage.txt
diff --git a/forge-gui/res/tokenscripts/lost_mine_of_phandelver.txt b/forge-gui/res/tokenscripts/lost_mine_of_phandelver.txt
diff --git a/forge-gui/res/tokenscripts/tomb_of_annihilation.txt b/forge-gui/res/tokenscripts/tomb_of_annihilation.txt
diff --git a/forge-gui/res/tokenscripts/undercity.txt b/forge-gui/res/tokenscripts/undercity.txt
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -3294,12 +3294,6 @@ public String chooseCardName(SpellAbility sa, List<ICardFace> faces, String mess
         return face == null ? "" : face.getName();
     }
 
-    @Override
-    public Card chooseDungeon(Player player, List<PaperCard> dungeonCards, String message) {
-        PaperCard dungeon = getGui().one(message, dungeonCards);
-        return Card.fromPaperCard(dungeon, player);
-    }
-
     @Override
     public List<Card> chooseCardsForSplice(SpellAbility sa, List<Card> cards) {
         GameEntityViewMap<Card, CardView> gameCacheSplice = GameEntityView.getMap(cards);

Original file line number	Diff line number	Diff line change
`@@ -202,4 +202,6 @@ public Predicate<? super PaperToken> wasPrintedInSets(List<String> allowedSetCod`
`202`	`202`	`public Iterator<PaperToken> iterator() {`
`203`	`203`	`return allTokenByName.values().iterator();`
`204`	`204`	`}`
	`205`	`+`
	`206`	`+ public Map<String, CardRules> getRules() { return this.rulesByName;}`
`205`	`207`	`}`