update chaos battle dialogue

forge-gui-mobile/src/forge/adventure/scene/DuelScene.java

@@ -35,6 +35,7 @@ import forge.sound.SoundSystem;
 import forge.toolbox.FOptionPane;
 import forge.trackable.TrackableCollection;
 import forge.util.Aggregates;
+import forge.util.Callback;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
@@ -70,6 +71,39 @@ public class DuelScene extends ForgeScene {
         boolean winner=humanPlayer == hostedMatch.getGame().getMatch().getWinner();
         String enemyName=(enemy.nameOverride.isEmpty() ? enemy.getData().name : enemy.nameOverride);
         Current.player().clearBlessing();
+        if (chaosBattle && !winner) {
+            List<String> insult = Lists.newArrayList("I'm sorry...","... ...." ,"Learn from your defeat.",
+                    "I haven't begun to use my full power.","No matter how much you try, you still won't beat me.",
+                    "Your technique need work.","Rookie.","That's your best?","Hah ha ha ha ha ha ha!","?!......... (Seriously?!)",
+                    "Forget about a rematch. Practice more instead." ,"That was a 100% effort on my part! Well, actually, no... That was more like 50%.",
+                    "If you expected me to lose out of generosity, I'm truly sorry!" ,"You'll appreciate that I held back during the match!",
+                    "That's the best you can do?","Don't waste my time with your skills!","Ha-ha-ha! What's the matter?",
+                    "I hope I didn't hurt your ego too badly... Oops!","This match... I think I've learned something from this.",
+                    "Hey! Don't worry about it!","You are not worthy!","Hm! You should go back to playing puzzle games!",
+                    "Thought you could beat me?  Whew, talk about conceited.","*Yawn* ... Huh? It's over already? But I just woke up!",
+                    "Next time bring an army. It might give you a chance." ,"The reason you lost is quite simple...",
+                    "Is that all you can do?","You need to learn more to stand a chance.","You weren't that bad.","You made an effort at least.",
+                    "From today, you can call me teacher.");
+            String message = Aggregates.random(insult);
+            FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemyName, new FBufferedImage(120, 120) {
+                @Override
+                protected void draw(Graphics g, float w, float h) {
+                    if (FSkin.getAvatars().get(90000) != null)
+                        g.drawImage(FSkin.getAvatars().get(90000), 0, 0, w, h);
+                }
+            }, new Callback<Integer>() {
+                @Override
+                public void run(Integer result) {
+                    if (result == 0) {
+                        afterGameEnd(enemyName, winner);
+                    }
+                }
+            }));
+        } else {
+            afterGameEnd(enemyName, winner);
+        }
+    }
+    void afterGameEnd(String enemyName, boolean winner) {
         Gdx.app.postRunnable(new Runnable() {
             @Override
             public void run() {
@@ -83,8 +117,6 @@ public class DuelScene extends ForgeScene {
                 }
             }
         });
-
-
     }
     void addEffects(RegisteredPlayer player,Array<EffectData> effects) {
         if( effects == null ) return;
@@ -213,9 +245,10 @@ public class DuelScene extends ForgeScene {
                     "It's all or nothing!","It's all on the line!","You can't back down now!","Do you have what it takes?","What will happen next?",
                     "Don't blink!","You can't lose here!","There's no turning back!","It's all or nothing now!");
             String message = Aggregates.random(list);
-            FThreads.delayInEDT(1000, () -> FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, aiPlayer.getPlayer().getName(), new FBufferedImage(120, 120) {
+            FThreads.delayInEDT(600, () -> FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, aiPlayer.getPlayer().getName(), new FBufferedImage(120, 120) {
                 @Override
                 protected void draw(Graphics g, float w, float h) {
+                    if (FSkin.getAvatars().get(90000) != null)
                         g.drawImage(FSkin.getAvatars().get(90000), 0, 0, w, h);
                 }
             })));

forge-gui-mobile/src/forge/screens/match/MatchController.java

@@ -312,14 +312,6 @@ public class MatchController extends AbstractGuiGame {
     @Override
     public void finishGame() {
         if (Forge.isMobileAdventureMode) {
-            Runnable runnable = new Runnable() {
-                @Override
-                public void run() {
-                    Forge.clearTransitionScreen();
-                    Forge.clearCurrentScreen();
-                }
-            };
-            Forge.setTransitionScreen(new TransitionScreen(runnable, ScreenUtils.getFrameBufferTexture(), false, false));
             Forge.setCursor(null, "0");
             return;
         }