Merge pull request #6002 from kevlahnota/master2

add resetPlayerLocation on defeat

forge-gui-mobile/src/forge/GuiMobile.java

@@ -153,7 +153,7 @@ public class GuiMobile implements IGuiBase {
     @Override
     public void showImageDialog(final ISkinImage image, final String message, final String title) {
         if (Forge.isMobileAdventureMode) {
-            FThreads.invokeInEdtNowOrLater(() -> MapStage.getInstance().showImageDialog("Achievement Earned\n"+message, (FBufferedImage)image));
+            FThreads.invokeInEdtNowOrLater(() -> MapStage.getInstance().showImageDialog("Achievement Earned\n"+message, (FBufferedImage)image, null));
             return;
         }
         new WaitCallback<Integer>() {

forge-gui-mobile/src/forge/adventure/character/EntryActor.java

@@ -43,7 +43,7 @@ public class EntryActor extends MapActor{
     {
         if(targetMap==null||targetMap.isEmpty())
         {
-            stage.exitDungeon();
+            stage.exitDungeon(false);
         }
         else
         {

forge-gui-mobile/src/forge/adventure/character/PortalActor.java

@@ -39,7 +39,7 @@ public class PortalActor extends EntryActor {
         }
         if (currentAnimationType == PortalAnimationTypes.Active) {
             if (targetMap == null || targetMap.isEmpty()) {
-                stage.exitDungeon();
+                stage.exitDungeon(false);
             } else {
                 if (targetMap.equals(currentMap)) {
                     stage.spawn(entryTargetObject);

forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java

@@ -737,11 +737,10 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
 
     public boolean defeated() {
         gold = (int) (gold - (gold * difficultyData.goldLoss));
-        int newLife = (int) (life - (maxLife * difficultyData.lifeLoss));
+        life = (int) (life - (maxLife * difficultyData.lifeLoss));
-        life = Math.max(1, newLife);
         onLifeTotalChangeList.emit();
         onGoldChangeList.emit();
-        return newLife < 1;
+        return life < 1;
         //If true, the player would have had 0 or less, and thus is actually "defeated" if the caller cares about it
     }
 

forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java

@@ -193,7 +193,7 @@ public class ConsoleCommandInterpreter {
         });
         registerCommand(new String[]{"leave"}, s -> {
             if (!MapStage.getInstance().isInMap()) return "not on a map";
-            MapStage.getInstance().exitDungeon();
+            MapStage.getInstance().exitDungeon(false);
             return "Got out";
         });
         registerCommand(new String[]{"debug", "collision"}, s -> {

forge-gui-mobile/src/forge/adventure/stage/GameHUD.java

@@ -882,7 +882,7 @@ public class GameHUD extends Stage {
             @Override
             public boolean act(float v) {
                 if (exitDungeon) {
-                    MapStage.getInstance().exitDungeon();
+                    MapStage.getInstance().exitDungeon(false);
                     setDisabled(exitToWorldMapActor, true, "[%120][+ExitToWorldMap]", "\uFF0F");
                     setDisabled(bookmarkActor, true, "[%120][+Bookmark]", "\uFF0F");
                 }

forge-gui-mobile/src/forge/adventure/stage/GameStage.java

@@ -34,6 +34,7 @@ import forge.adventure.scene.Scene;
 import forge.adventure.scene.StartScene;
 import forge.adventure.scene.TileMapScene;
 import forge.adventure.util.Controls;
+import forge.adventure.util.Current;
 import forge.adventure.util.KeyBinding;
 import forge.adventure.util.MapDialog;
 import forge.adventure.util.Paths;
@@ -46,7 +47,9 @@ import forge.card.ColorSet;
 import forge.deck.Deck;
 import forge.deck.DeckProxy;
 import forge.game.GameType;
+import forge.gui.FThreads;
 import forge.gui.GuiBase;
+import forge.screens.TransitionScreen;
 import forge.util.MyRandom;
 
 import java.util.HashMap;
@@ -144,12 +147,12 @@ public abstract class GameStage extends Stage {
         showDialog();
     }
 
-    public void showImageDialog(String message, FBufferedImage fb) {
+    public void showImageDialog(String message, FBufferedImage fb, Runnable runnable) {
         dialog.getContentTable().clear();
         dialog.getButtonTable().clear();
         dialog.clearListeners();
 
-        if (fb.getTexture() != null) {
+        if (fb != null && fb.getTexture() != null) {
             TextureRegion tr = new TextureRegion(fb.getTexture());
             tr.flip(true, true);
             Image image = new Image(tr);
@@ -166,9 +169,13 @@ public abstract class GameStage extends Stage {
             Timer.schedule(new Timer.Task() {
                 @Override
                 public void run() {
-                    fb.dispose();
+                    if (fb != null)
+                        fb.dispose();
                 }
             }, 0.5f);
+            if (runnable != null) {
+                runnable.run();
+            }
         })).width(240f);
         dialog.setKeepWithinStage(true);
         setDialogStage(GameHUD.getInstance());
@@ -634,4 +641,17 @@ public abstract class GameStage extends Stage {
         teleported(position);
     }
 
+    public void resetPlayerLocation()
+    {
+        PointOfInterest poi = Current.world().findPointsOfInterest("Spawn");
+        if (poi != null) {
+            showImageDialog(Forge.getLocalizer().getMessage("lblYouDied", Current.player().getName()), null,
+                () -> FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new TransitionScreen(() -> {
+                    WorldStage.getInstance().setPosition(new Vector2(poi.getPosition().x - 16f, poi.getPosition().y + 16f));
+                    WorldStage.getInstance().loadPOI(poi);
+                    Forge.clearTransitionScreen();
+                    }, null, false, true, false, false))));
+        }//Spawn shouldn't be null
+    }
+
 }

forge-gui-mobile/src/forge/adventure/stage/MapStage.java

@@ -605,7 +605,7 @@ public class MapStage extends GameStage {
                         }));
                         break;
                     case "exit":
-                        addMapActor(obj, new OnCollide(MapStage.this::exitDungeon));
+                        addMapActor(obj, new OnCollide(() -> MapStage.this.exitDungeon(false)));
                         break;
                     case "dialog":
                         if (obj instanceof TiledMapTileMapObject) {
@@ -749,13 +749,15 @@ public class MapStage extends GameStage {
         }
     }
 
-    public boolean exitDungeon() {
+    public boolean exitDungeon(boolean defeated) {
         WorldSave.getCurrentSave().autoSave();
         AdventureQuestController.instance().updateQuestsLeave();
         clearIsInMap();
         AdventureQuestController.instance().showQuestDialogs(this);
         isLoadingMatch = false;
         effect = null; //Reset dungeon effects.
+        if (defeated)
+            WorldStage.getInstance().resetPlayerLocation();
         Forge.switchScene(GameScene.instance());
         return true;
     }
@@ -799,18 +801,18 @@ public class MapStage extends GameStage {
                 AdventureQuestController.instance().updateQuestsLose(currentMob);
                 AdventureQuestController.instance().showQuestDialogs(MapStage.this);
                 boolean defeated = Current.player().defeated();
-                if (canFailDungeon && defeated) {
+                //If hardcore mode is added, check and redirect to game over screen here
-                    //If hardcore mode is added, check and redirect to game over screen here
+                if (canFailDungeon && !defeated)
-                    dungeonFailedDialog();
+                    dungeonFailedDialog(true);
-                    exitDungeon();
+                else
-                }
+                    exitDungeon(defeated);
                 MapStage.this.stop();
                 currentMob = null;
             });
         }
     }
 
-    private void dungeonFailedDialog() {
+    private void dungeonFailedDialog(boolean exit) {
         dialog.getButtonTable().clear();
         dialog.getContentTable().clear();
         dialog.clearListeners();
@@ -829,7 +831,8 @@ public class MapStage extends GameStage {
             public void clicked(InputEvent event, float x, float y) {
                 L.skipToTheEnd();
                 super.clicked(event, x, y);
-                //exitDungeon();
+                if (exit)
+                    exitDungeon(false);
             }
         });
         dialog.getButtonTable().add(ok).width(240f);

forge-gui-mobile/src/forge/adventure/stage/WorldStage.java

@@ -188,11 +188,14 @@ public class WorldStage extends GameStage implements SaveFileContent {
             currentMob.setAnimation(CharacterSprite.AnimationTypes.Attack);
             startPause(0.5f, () -> {
                 currentMob.resetCollisionHeight();
-                Current.player().defeated();
+                boolean defeated = Current.player().defeated();
                 AdventureQuestController.instance().updateQuestsLose(currentMob);
                 AdventureQuestController.instance().showQuestDialogs(MapStage.getInstance());
                 WorldStage.this.removeEnemy(currentMob);
                 currentMob = null;
+                if (defeated) {
+                    WorldStage.getInstance().resetPlayerLocation();
+                }
             });
         }
     }
@@ -209,17 +212,9 @@ public class WorldStage extends GameStage implements SaveFileContent {
                     if (point == collidingPoint) {
                         continue;
                     }
-                    try {
+                    WorldSave.getCurrentSave().autoSave();
-                        WorldSave.getCurrentSave().autoSave();
+                    loadPOI(point.getPointOfInterest());
-                        TileMapScene.instance().load(point.getPointOfInterest());
+                    point.getMapSprite().checkOut();
-                        stop();
-                        TileMapScene.instance().setFromWorldMap(true);
-                        Forge.switchScene(TileMapScene.instance());
-                        point.getMapSprite().checkOut();
-                    } catch (Exception e) {
-                        System.err.println("Error loading map...");
-                        e.printStackTrace();
-                    }
                 } else {
                     if (point == collidingPoint) {
                         collidingPoint = null;
@@ -229,6 +224,18 @@ public class WorldStage extends GameStage implements SaveFileContent {
         }
     }
 
+    public void loadPOI(PointOfInterest poi) {
+        try {
+            TileMapScene.instance().load(poi);
+            stop();
+            TileMapScene.instance().setFromWorldMap(true);
+            Forge.switchScene(TileMapScene.instance());
+        } catch (Exception e) {
+            System.err.println("Error loading map...");
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public boolean isColliding(Rectangle boundingRect) {
         if (currentModifications.containsKey(PlayerModification.Fly))

forge-gui/res/languages/de-DE.properties

@@ -3420,3 +3420,4 @@ AdvBossIntro32=Nicht blinzeln!
 AdvBossIntro33=Hier kann man nicht verlieren!
 AdvBossIntro34=Es gibt kein Zurück!
 AdvBossIntro35=Jetzt geht es um alles oder nichts!
+lblYouDied={0}, du bist gestorben!!!

forge-gui/res/languages/en-US.properties

@@ -3153,3 +3153,4 @@ AdvBossIntro32=Don't blink!
 AdvBossIntro33=You can't lose here!
 AdvBossIntro34=There's no turning back!
 AdvBossIntro35=It's all or nothing now!
+lblYouDied={0}, You Died!!!

forge-gui/res/languages/es-ES.properties

@@ -3434,3 +3434,4 @@ AdvBossIntro32=¡No parpadees!
 AdvBossIntro33=¡No puedes perder aquí!
 AdvBossIntro34=¡No hay marcha atrás!
 AdvBossIntro35=¡Ahora es todo o nada!
+lblYouDied={0}, ¡¡¡Moriste!!!

forge-gui/res/languages/fr-FR.properties

@@ -3428,3 +3428,4 @@ AdvBossIntro32=Ne clignez pas des yeux !
 AdvBossIntro33=Vous ne pouvez pas perdre ici !
 AdvBossIntro34=Il n'y a pas de retour en arrière!
 AdvBossIntro35=C'est tout ou rien maintenant !
+lblYouDied={0}, tu es mort !!!

forge-gui/res/languages/it-IT.properties

@@ -3426,3 +3426,4 @@ AdvBossIntro32=Non sbattere le palpebre!
 AdvBossIntro33=Non puoi perdere qui!
 AdvBossIntro34=Non si può tornare indietro!
 AdvBossIntro35=Adesso è tutto o niente!
+lblYouDied={0}, sei morto!!!

forge-gui/res/languages/ja-JP.properties

@@ -3422,3 +3422,4 @@ AdvBossIntro32=瞬きしないでください！
 AdvBossIntro33=ここで負けるわけにはいかない！
 AdvBossIntro34=もう後戻りはできない！
 AdvBossIntro35=もう、オール・オア・ナッシングだ！
+lblYouDied={0}、死んだ!!!

forge-gui/res/languages/pt-BR.properties

@@ -3512,3 +3512,4 @@ AdvBossIntro32=Não pisque!
 AdvBossIntro33=Você não pode perder aqui!
 AdvBossIntro34=Não há como voltar atrás!
 AdvBossIntro35=É tudo ou nada agora!
+lblYouDied={0}, você morreu!!!

forge-gui/res/languages/zh-CN.properties

@@ -3413,3 +3413,4 @@ AdvBossIntro32=别眨眼！
 AdvBossIntro33=在这里你不能输！
 AdvBossIntro34=没有回头路了！
 AdvBossIntro35=现在要么全有要么全无！
+lblYouDied={0}，你死了！！！