Skip to content

refactor DuelScene #9608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benhunter wants to merge 3 commits into
base: master
Choose a base branch
from
+8 −17
Open

refactor DuelScene #9608

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc70700
refactor DuelScene
benhunter Jan 25, 2026
4114e79
Merge branch 'master' into refactor-DuelScene
benhunter Jan 26, 2026
ec359e9
Merge branch 'master' into refactor-DuelScene
benhunter Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public static DuelScene instance() {
boolean arenaBattleChallenge = false;
boolean isArena = false;
AdventureEventData eventData;
private LoadingOverlay matchOverlay;
final int enemyAvatarKey = 90001;
final int playerAvatarKey = 90000;
FOptionPane bossDialogue;
Expand Down Expand Up @@ -395,6 +394,7 @@ public void enter() {
hostedMatch.startMatch(rules, appliedVariants, players, guiMap, bossBattle ? MusicPlaylist.BOSS : MusicPlaylist.MATCH);
MatchController.instance.setGameView(hostedMatch.getGameView());
boolean showMessages = enemy.getData().boss || (enemy.getData().copyPlayerDeck && Current.player().isUsingCustomDeck());
LoadingOverlay matchOverlay;
if (chaosBattle || showMessages || isDeckMissing) {
final FBufferedImage fb = getFBEnemyAvatar();
bossDialogue = createFOption(isDeckMissing ? isDeckMissingMsg : Forge.getLocalizer().getMessage("AdvBossIntro" + Aggregates.randomInt(1, 35)),
Expand Down Expand Up @@ -496,23 +496,14 @@ public void initDuels(PlayerSprite playerSprite, EnemySprite enemySprite, boolea
private String selectAI(String ai) { //Decide opponent AI.
String AI = ""; //Use user settings if it's null.
if (ai != null) {
switch (ai.toLowerCase()) { //We use this way to ensure capitalization is exact.
AI = switch (ai.toLowerCase()) { //We use this way to ensure capitalization is exact.
//We don't want misspellings here.
case "default":
AI = "Default";
break;
case "reckless":
AI = "Reckless";
break;
case "cautious":
AI = "Cautious";
break;
case "experimental":
AI = "Experimental";
break;
default:
AI = ""; //User settings.
}
case "default" -> "Default";
case "reckless" -> "Reckless";
case "cautious" -> "Cautious";
case "experimental" -> "Experimental";
default -> ""; //User settings.
};
}
return AI;
}
Expand Down