Adventure: QOL improvements for "Clear All" quests (#10244)

jumpinjackie · web-flow · commit f6289a290c83 · 2026-04-05T20:12:18.000+03:00
* Add enemy counter feature to GameHUD and localization support for remaining enemies when in a dungeon with an active "clear all" quest.

* Add setting to draw chevrons for hidden enemies in clear all quests. Gate this behavior behind a new "Draw chevrons pointing to hidden enemies in a clear all quest" flag in settings.

* Fix casing of "Clear All" quests
diff --git a/forge-gui-mobile/src/forge/adventure/data/SettingData.java b/forge-gui-mobile/src/forge/adventure/data/SettingData.java
@@ -27,4 +27,5 @@ public class SettingData {
     public boolean excludeAlchemyVariants;
     public boolean generateLDADecks;
     public boolean bindEquipmentLoadoutsToDecks;
+    public boolean drawChevronsToHiddenEnemiesInClearQuest;
 }
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
@@ -267,6 +267,13 @@ public void changed(ChangeEvent event, Actor actor) {
                 Config.instance().saveSettings();
             }
         });
+        addSettingField(Forge.getLocalizer().getMessage("lblDrawChevronsToHiddenEnemiesInClearQuest"), Config.instance().getSettingData().drawChevronsToHiddenEnemiesInClearQuest, new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                Config.instance().getSettingData().drawChevronsToHiddenEnemiesInClearQuest = ((CheckBox) actor).isChecked();
+                Config.instance().saveSettings();
+            }
+        });
         CheckBox cbAnte = addCheckBox(Forge.getLocalizer().getMessage("cbAnte"), ForgePreferences.FPref.UI_ANTE);
         CheckBox cbAnteMatchRarity = addCheckBox(Forge.getLocalizer().getMessage("cbAnteMatchRarity"), ForgePreferences.FPref.UI_ANTE_MATCH_RARITY);
         CheckBox cbAnteIncludeBasicLands = addCheckBox(Forge.getLocalizer().getMessage("cbAnteIncludeBasicLands"), ForgePreferences.FPref.UI_ANTE_INCLUDE_BASIC_LANDS);
diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
@@ -6,6 +6,7 @@
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.scenes.scene2d.Action;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Group;
@@ -18,6 +19,7 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane.ScrollPaneStyle;
 import com.badlogic.gdx.scenes.scene2d.ui.Touchpad;
 import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
@@ -34,6 +36,7 @@
 import java.util.EnumSet;
 
 import forge.Forge;
+import forge.adventure.character.EnemySprite;
 import forge.adventure.character.CharacterSprite;
 import forge.adventure.data.AdventureQuestData;
 import forge.adventure.data.ItemData;
@@ -50,6 +53,7 @@
 import forge.adventure.util.Controls;
 import forge.adventure.util.Current;
 import forge.adventure.util.KeyBinding;
+import forge.adventure.util.NavArrowActor;
 import forge.adventure.util.UIActor;
 import forge.adventure.world.WorldSave;
 import forge.deck.Deck;
@@ -69,6 +73,8 @@ public class GameHUD extends Stage {
     private final TypingLabel lifePoints;
     private final TypingLabel money;
     private final TypingLabel shards;
+    private final TypingLabel enemyCounterText;
+    private final Image enemyCounterBackground;
     private final TextraLabel notificationText = Controls.newTextraLabel("");
     private final Image miniMap, gamehud, mapborder, avatarborder, blank;
     private final InputEvent eventTouchDown, eventTouchUp;
@@ -84,6 +90,9 @@ public class GameHUD extends Stage {
     private boolean dialogOnlyInput;
     private final Array<TextraButton> dialogButtonMap = new Array<>();
     private final Array<TextraButton> abilityButtonMap = new Array<>();
+    private final Array<NavArrowActor> hiddenEnemyChevrons = new Array<>();
+    private final Vector2 chevronStageCoordinates = new Vector2();
+    private final Vector3 playerProjectedCoordinates = new Vector3();
     private String lifepointsTextColor = "";
     private final ScrollPane notificationPane;
     private final Group mapGroup = new Group();
@@ -159,6 +168,14 @@ public void changed(ChangeEvent changeEvent, Actor actor) {
         shards.setText("[%95][+Shards]");
         money.setText("[%95][+Gold]");
         lifePoints.setText("[%95][+Life]");
+        enemyCounterText = Controls.newTypingLabel(Forge.getLocalizer().getMessage("lblRemainingEnemies", String.valueOf(0)));
+        enemyCounterText.setColor(Color.BLACK);
+        enemyCounterText.skipToTheEnd();
+        enemyCounterText.setVisible(false);
+
+        ScrollPaneStyle paperStyle = Controls.getSkin().get("paper", ScrollPaneStyle.class);
+        enemyCounterBackground = new Image(paperStyle.background);
+        enemyCounterBackground.setVisible(false);
         AdventurePlayer.current().onLifeChange(() -> {
             String effect = "{EMERGE}";
             String effectEnd = "{ENDEMERGE}";
@@ -183,6 +200,8 @@ public void changed(ChangeEvent changeEvent, Actor actor) {
         AdventurePlayer.current().onEquipmentChanged(this::updateAbility);
         addActor(ui);
         addActor(miniMapPlayer);
+        addActor(enemyCounterBackground);
+        addActor(enemyCounterText);
         console = new Console();
         console.setBounds(0, GuiBase.isAndroid() ? getHeight() : 0, getWidth(), getHeight() / 2);
         console.setVisible(false);
@@ -338,6 +357,7 @@ public void draw() {
         int yPos = (int) gameStage.player.getY();
         int xPos = (int) gameStage.player.getX();
         act(Gdx.graphics.getDeltaTime()); //act the Hud
+        updateHiddenEnemyChevrons();
         super.draw(); //draw the Hud
         int xPosMini = (int) (((float) xPos / (float) WorldSave.getCurrentSave().getWorld().getTileSize() / (float) WorldSave.getCurrentSave().getWorld().getWidthInTiles()) * miniMap.getWidth());
         int yPosMini = (int) (((float) yPos / (float) WorldSave.getCurrentSave().getWorld().getTileSize() / (float) WorldSave.getCurrentSave().getWorld().getHeightInTiles()) * miniMap.getHeight());
@@ -416,6 +436,7 @@ public void enter() {
         }
         if (MapStage.getInstance().isInMap())
             updateBookmarkActor(MapStage.getInstance().getChanges().isBookmarked());
+        updateEnemyCounter();
         avatarGroup.setZIndex(ui.getChildren().size);
     }
 
@@ -430,6 +451,100 @@ void updateKeys() {
         keyCollection.setText(keys);
     }
 
+    public void updateEnemyCounter() {
+        if (MapStage.getInstance().isInMap() && AdventureQuestController.instance().hasClearQuestActive()) {
+            int remaining = MapStage.getInstance().getRemainingEnemyCount();
+            enemyCounterText.setText(Forge.getLocalizer().getMessage("lblRemainingEnemies", String.valueOf(remaining)));
+            enemyCounterText.setVisible(true);
+            enemyCounterBackground.setVisible(true);
+
+            float paddingX = 4f;
+            float paddingY = 1.5f;
+            float margin = 2f;
+            float textWidth = enemyCounterText.getPrefWidth();
+            float textHeight = Math.max(enemyCounterText.getPrefHeight(), 12f);
+            float bgWidth = textWidth + paddingX * 2f;
+            float bgHeight = textHeight + paddingY * 2f;
+
+            float bgX = getWidth() - bgWidth - margin;
+            float bgY = margin;
+
+            enemyCounterBackground.setBounds(bgX, bgY, bgWidth, bgHeight);
+            enemyCounterText.setBounds(bgX + paddingX, bgY + paddingY, textWidth, textHeight);
+        } else {
+            enemyCounterText.setVisible(false);
+            enemyCounterBackground.setVisible(false);
+        }
+    }
+
+    private void hideHiddenEnemyChevrons() {
+        for (NavArrowActor chevron : hiddenEnemyChevrons) {
+            chevron.setVisible(false);
+        }
+    }
+
+    private NavArrowActor getChevronActor(int index) {
+        while (hiddenEnemyChevrons.size <= index) {
+            NavArrowActor chevron = new NavArrowActor();
+            chevron.setTouchable(Touchable.disabled);
+            chevron.setVisible(false);
+            hiddenEnemyChevrons.add(chevron);
+            addActor(chevron);
+        }
+        return hiddenEnemyChevrons.get(index);
+    }
+
+    private void positionChevron(NavArrowActor chevron, EnemySprite enemy, int index) {
+        playerProjectedCoordinates.set(MapStage.getInstance().player.getX() + MapStage.getInstance().player.getWidth() * 0.5f,
+                MapStage.getInstance().player.getY() + MapStage.getInstance().player.getHeight() * 0.5f, 0f);
+        MapStage.getInstance().getCamera().project(playerProjectedCoordinates, 0f, 0f, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+        chevronStageCoordinates.set(playerProjectedCoordinates.x, playerProjectedCoordinates.y);
+        screenToStageCoordinates(chevronStageCoordinates);
+
+        Vector2 navDirection = new Vector2(enemy.pos()).sub(MapStage.getInstance().player.pos());
+        if (navDirection.isZero(0.01f)) {
+            navDirection.set(1f, 0f);
+        } else {
+            navDirection.nor();
+        }
+
+        Vector2 side = new Vector2(-navDirection.y, navDirection.x);
+        int lane = index / 2;
+        float spread = (index % 2 == 0 ? 1f : -1f) * lane * 9f;
+        float offsetFromPlayer = 18f;
+        float pointerX = chevronStageCoordinates.x + navDirection.x * offsetFromPlayer + side.x * spread;
+        float pointerY = chevronStageCoordinates.y + navDirection.y * offsetFromPlayer + side.y * spread;
+
+        chevron.navTargetAngle = navDirection.angleDeg();
+        chevron.setPosition(pointerX, pointerY);
+        chevron.setVisible(true);
+    }
+
+    private void updateHiddenEnemyChevrons() {
+        if (!Config.instance().getSettingData().drawChevronsToHiddenEnemiesInClearQuest
+                || hidden
+                || !MapStage.getInstance().isInMap()
+                || !AdventureQuestController.instance().hasClearQuestActive()
+                || MapStage.getInstance().getRemainingEnemyCount() <= 0) {
+            hideHiddenEnemyChevrons();
+            return;
+        }
+
+        int chevronIndex = 0;
+        for (EnemySprite enemy : MapStage.getInstance().enemies) {
+            if (!enemy.hidden || enemy.getStage() == null || enemy.defeatDialog != null) {
+                continue;
+            }
+            NavArrowActor chevron = getChevronActor(chevronIndex);
+            positionChevron(chevron, enemy, chevronIndex);
+            chevronIndex++;
+        }
+
+        while (chevronIndex < hiddenEnemyChevrons.size) {
+            hiddenEnemyChevrons.get(chevronIndex++).setVisible(false);
+        }
+    }
+
     void clearAbility() {
         for (TextraButton button : abilityButtonMap) {
             button.remove();
diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
@@ -916,6 +916,16 @@ public EnemySprite getEnemyByID(int id) { //Search actor by ID, enemies only.
         return null;
     }
 
+    public int getRemainingEnemyCount() {
+        int count = 0;
+        for (EnemySprite enemy : enemies) {
+            if (enemy.getStage() != null && enemy.defeatDialog == null) {
+                count++;
+            }
+        }
+        return count;
+    }
+
     public Actor getByID(int id) { //Search actor by ID.
         for (MapActor A : new Array.ArrayIterator<>(actors)) {
             if (A.getId() == id)
diff --git a/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java b/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java
@@ -11,6 +11,7 @@
 import forge.adventure.data.*;
 import forge.adventure.pointofintrest.PointOfInterest;
 import forge.adventure.pointofintrest.PointOfInterestChanges;
+import forge.adventure.scene.TileMapScene;
 import forge.adventure.stage.GameStage;
 import forge.adventure.stage.MapStage;
 import forge.adventure.world.WorldSave;
@@ -285,6 +286,22 @@ public static void clear(){
         object = null;
     }
 
+    public boolean hasClearQuestActive() {
+        if (!MapStage.getInstance().isInMap() || TileMapScene.instance().rootPoint == null) {
+            return false;
+        }
+        for (AdventureQuestData quest : Current.player().getQuests()) {
+            for (AdventureQuestStage stage : quest.stages) {
+                if (stage.getStatus() == ACTIVE
+                        && stage.objective == ObjectiveTypes.Clear
+                        && stage.checkIfTargetLocation(TileMapScene.instance().rootPoint)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private AdventureQuestController(){
 
     }
diff --git a/forge-gui-mobile/src/forge/adventure/util/NavArrowActor.java b/forge-gui-mobile/src/forge/adventure/util/NavArrowActor.java
@@ -6,6 +6,7 @@
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.graphics.Color;
 
 public class NavArrowActor extends Actor {
 
@@ -38,7 +39,12 @@ public void draw(Batch batch, float parentAlpha) {
         setHeight(currentFrame.getRegionHeight());
         setWidth(currentFrame.getRegionWidth());
 
+        Color oldColor = batch.getColor();
+        Color actorColor = getColor();
+        batch.setColor(actorColor.r, actorColor.g, actorColor.b, actorColor.a * parentAlpha);
+
         //TODO: Simplify params somehow for readability? All this does is spin the image around the player.
         batch.draw(currentFrame, getX() - currentFrame.getRegionWidth() / 2, getY() - currentFrame.getRegionHeight() / 2, (currentFrame.getRegionWidth() * 0.5f), (currentFrame.getRegionHeight() * 0.5f), currentFrame.getRegionWidth(), currentFrame.getRegionHeight(), 1, 1, navTargetAngle);
+        batch.setColor(oldColor);
     }
 }
diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
@@ -3097,7 +3097,9 @@ lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblBindEquipmentLoadoutsToDecks=Ausrüstung an Decks binden
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=Zurück zur Weltkarte?
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=Willst du in die Arena gehen?
 lblWouldYouLikeDestroy=Möchten Sie {0} zerstören?
 lblAdventureDescription=Im Abenteuermodus erkunden Sie die sich ständig ändernde Landschaft von Shandalar und Duell-Kreaturen; um Gold, Scherben, Ausrüstung und neue Karten zu gewinnen, sie alle zu sammeln und der Beste zu werden!
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
@@ -3246,7 +3246,9 @@ lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblBindEquipmentLoadoutsToDecks=Bind equipment loadouts to decks
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=Exit to the World Map?
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=Do you want to go into the Arena?
 lblWouldYouLikeDestroy=Would you like to destroy {0}?
 lblAdventureDescription=Adventure mode is where you explore the ever-changing landscape of Shandalar, and duel creatures to gain gold, shards, equipment and new cards to become the best and collect them all!
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
@@ -3085,7 +3085,9 @@ lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblBindEquipmentLoadoutsToDecks=Vincular equipamiento a mazos
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=Salir al mapa del mundo?
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=¿Quieres ir a la arena?
 lblWouldYouLikeDestroy=¿Le gustaría destruir {0}?
 lblAdventureDescription=¡El modo de aventura es donde exploras el paisaje siempre cambiante de Shandalar, y criaturas de duelo para ganar oro, fragmentos, equipos y nuevas tarjetas para convertirte en el mejor y recogerlas a todos!
diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties
@@ -3079,7 +3079,9 @@ lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblBindEquipmentLoadoutsToDecks=Lier l'équipement aux decks
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=Sortir sur la carte du monde?
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=Voulez-vous entrer dans l'arène?
 lblWouldYouLikeDestroy=Souhaitez-vous détruire {0}?
 lblAdventureDescription=Le mode aventure est l'endroit où vous explorez le paysage en constante évolution de Shandalar, et des créatures duel pour gagner de l'or, des éclats, de l'équipement et de nouvelles cartes pour devenir les meilleurs et les récupérer tous!
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
@@ -3077,7 +3077,9 @@ lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblBindEquipmentLoadoutsToDecks=Associa equipaggiamento ai mazzi
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=Esci alla mappa del mondo?
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=Vuoi andare nell'arena?
 lblWouldYouLikeDestroy=Vorresti distruggere {0}?
 lblAdventureDescription=La modalità Adventure è dove esplori il paesaggio in continua evoluzione di Shandalar e le creature di duello per guadagnare oro, frammenti, attrezzature e nuove carte per diventare i migliori e raccoglierle tutte!
diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties
@@ -3073,7 +3073,9 @@ lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblBindEquipmentLoadoutsToDecks=装備をデッキに紐付ける
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=世界地図に終了しますか？
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=アリーナに行きたいですか？
 lblWouldYouLikeDestroy={0}を破壊しますか？
 lblAdventureDescription=アドベンチャーモードは、金、破片、機器、新しいカードを獲得して最高のものになり、すべてを集めるために、Shandalarの絶えず変化する風景と決闘の生き物を探求する場所です！
diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties
@@ -3162,7 +3162,9 @@ lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblBindEquipmentLoadoutsToDecks=Vincular equipamentos aos decks
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=Sair para o mapa do mundo?
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=Você quer entrar na arena?
 lblWouldYouLikeDestroy=Você gostaria de destruir {0}?
 lblAdventureDescription=O modo de aventura é onde você explora a paisagem em constante mudança de Shandalar, e duelo para ganhar ouro, fragmentos, equipamentos e novos cartões para se tornarem os melhores e colecioná-los!
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
@@ -3064,7 +3064,9 @@ lblUseAllCardVariants=使用来自所有系列的牌张重印版（这需要重
 lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=生成原型套牌而不是由AI生成的套牌
 lblBindEquipmentLoadoutsToDecks=将装备配置绑定到套牌
+lblDrawChevronsToHiddenEnemiesInClearQuest=Draw chevrons pointing to hidden enemies in a Clear All quest
 lblExitToWoldMap=退出世界地图？
+lblRemainingEnemies=Remaining Enemies: {0}
 lblStartArena=您想进入竞技场吗？
 lblWouldYouLikeDestroy=您想销毁{0}吗？
 lblAdventureDescription=冒险模式是您探索山达尔（Shandalar）不断变化的景观，以及决斗生物获得黄金，碎片，设备和新卡片，使其成为最好的，并收集所有这些！

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,5 @@ public class SettingData {`
`27`	`27`	`public boolean excludeAlchemyVariants;`
`28`	`28`	`public boolean generateLDADecks;`
`29`	`29`	`public boolean bindEquipmentLoadoutsToDecks;`
	`30`	`+ public boolean drawChevronsToHiddenEnemiesInClearQuest;`
`30`	`31`	`}`