diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java index dfa053c5e6f..67860c9c8ff 100644 --- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java +++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java @@ -129,21 +129,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent { avatarIndex = avatar; isFemale = !male; - if (fantasyMode){ //Set a random ColorID in fantasy mode. - switch (MyRandom.getRandom().nextInt(5)) - { - case 0:colorIdentity=ColorSet.fromMask(MagicColor.WHITE); - case 1:colorIdentity=ColorSet.fromMask(MagicColor.BLUE); - case 2:colorIdentity=ColorSet.fromMask(MagicColor.BLACK); - case 3:colorIdentity=ColorSet.fromMask(MagicColor.RED); - case 4:colorIdentity=ColorSet.fromMask(MagicColor.GREEN); - case 5:colorIdentity=ColorSet.fromMask(MagicColor.COLORLESS); - } - } - else - { - setColorIdentity(DeckProxy.getColorIdentity(deck)); - } + setColorIdentity(DeckProxy.getColorIdentity(deck)); life = maxLife = difficultyData.startingLife; @@ -156,8 +142,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent { if(slot>=0&&slot stringList, random; public NewGameScene() { super(Forge.isLandscapeMode() ? "ui/new_game.json" : "ui/new_game_portrait.json"); @@ -83,12 +86,21 @@ public class NewGameScene extends UIScene { colorIds = new ColorSet[colorSet.length]; for(int i = 0; i< colorIds.length; i++) colorIds[i]= ColorSet.fromNames(colorSet[i].toCharArray()); - - Array stringList = new Array<>(colorIds.length); + stringList = new Array<>(colorIds.length); for (String idName : colorIdNames) stringList.add(UIActor.localize(idName)); - colorId.setTextList(stringList); + random = new Array<>(); + random.add(Forge.getLocalizer().getMessage("lblRandomDeck")); + mode.addListener(new ChangeListener() { + @Override + public void changed(ChangeEvent changeEvent, Actor actor) { + if (mode.getCurrentIndex() == 2) + colorId.setTextList(random); + else + colorId.setTextList(stringList); + } + }); race = ui.findActor("race"); race.addListener(event -> NewGameScene.this.updateAvatar()); race.setTextList(HeroListData.getRaces());