external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

add resetPlayerLocation on defeat

Browse Source
This commit is contained in:
Anthony Calosa
2024-08-28 21:54:48 +08:00
parent 53084f43c3
commit 24d4899cde
7 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/adventure/character/EntryActor.java
View File

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

2
forge-gui-mobile/src/forge/adventure/character/PortalActor.java
View File

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

2
forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
View File

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

2
forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
View File

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

26
forge-gui-mobile/src/forge/adventure/stage/GameStage.java
View File

@@ -34,6 +34,7 @@ import forge.adventure.scene.Scene;
import forge.adventure.scene.StartScene; import forge.adventure.scene.StartScene;
import forge.adventure.scene.TileMapScene; import forge.adventure.scene.TileMapScene;
import forge.adventure.util.Controls; import forge.adventure.util.Controls;
import forge.adventure.util.Current;
import forge.adventure.util.KeyBinding; import forge.adventure.util.KeyBinding;
import forge.adventure.util.MapDialog; import forge.adventure.util.MapDialog;
import forge.adventure.util.Paths; import forge.adventure.util.Paths;
@@ -46,7 +47,9 @@ import forge.card.ColorSet;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckProxy; import forge.deck.DeckProxy;
import forge.game.GameType; import forge.game.GameType;
import forge.gui.FThreads;
import forge.gui.GuiBase; import forge.gui.GuiBase;
import forge.screens.TransitionScreen;
import forge.util.MyRandom; import forge.util.MyRandom;
import java.util.HashMap; import java.util.HashMap;
@@ -149,7 +152,7 @@ public abstract class GameStage extends Stage {
dialog.getButtonTable().clear(); dialog.getButtonTable().clear();
dialog.clearListeners(); dialog.clearListeners();
if (fb.getTexture() != null) { if (fb != null && fb.getTexture() != null) {
TextureRegion tr = new TextureRegion(fb.getTexture()); TextureRegion tr = new TextureRegion(fb.getTexture());
tr.flip(true, true); tr.flip(true, true);
Image image = new Image(tr); Image image = new Image(tr);
@@ -166,7 +169,8 @@ public abstract class GameStage extends Stage {
Timer.schedule(new Timer.Task() { Timer.schedule(new Timer.Task() {
@Override @Override
public void run() { public void run() {
fb.dispose(); if (fb != null)
fb.dispose();
} }
}, 0.5f); }, 0.5f);
})).width(240f); })).width(240f);
@@ -634,4 +638,22 @@ public abstract class GameStage extends Stage {
teleported(position); teleported(position);
} }
public void resetPlayerLocation()
{
PointOfInterest poi = Current.world().findPointsOfInterest("Spawn");
if (poi != null) {
Timer.schedule(new Timer.Task() {
@Override
public void run() {
FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new TransitionScreen(() -> {
WorldStage.getInstance().setPosition(poi.getPosition());
WorldStage.getInstance().loadPOI(poi);
Forge.clearTransitionScreen();
showImageDialog(Forge.getLocalizer().getMessage("lblYouLostTheLastGame", Current.player().getName()), null);
}, null, false, true, false, false)));
}
}, 0.3f);
}
}
} }

13
forge-gui-mobile/src/forge/adventure/stage/MapStage.java
View File

@@ -605,7 +605,7 @@ public class MapStage extends GameStage {
})); }));
break; break;
case "exit": case "exit":
addMapActor(obj, new OnCollide(MapStage.this::exitDungeon)); addMapActor(obj, new OnCollide(() -> MapStage.this.exitDungeon(false)));
break; break;
case "dialog": case "dialog":
if (obj instanceof TiledMapTileMapObject) { if (obj instanceof TiledMapTileMapObject) {
@@ -749,13 +749,15 @@ public class MapStage extends GameStage {
} }
} }
public boolean exitDungeon() { public boolean exitDungeon(boolean defeated) {
WorldSave.getCurrentSave().autoSave(); WorldSave.getCurrentSave().autoSave();
AdventureQuestController.instance().updateQuestsLeave(); AdventureQuestController.instance().updateQuestsLeave();
clearIsInMap(); clearIsInMap();
AdventureQuestController.instance().showQuestDialogs(this); AdventureQuestController.instance().showQuestDialogs(this);
isLoadingMatch = false; isLoadingMatch = false;
effect = null; //Reset dungeon effects. effect = null; //Reset dungeon effects.
if (defeated)
WorldStage.getInstance().resetPlayerLocation();
Forge.switchScene(GameScene.instance()); Forge.switchScene(GameScene.instance());
return true; return true;
} }
@@ -799,10 +801,11 @@ public class MapStage extends GameStage {
AdventureQuestController.instance().updateQuestsLose(currentMob); AdventureQuestController.instance().updateQuestsLose(currentMob);
AdventureQuestController.instance().showQuestDialogs(MapStage.this); AdventureQuestController.instance().showQuestDialogs(MapStage.this);
boolean defeated = Current.player().defeated(); boolean defeated = Current.player().defeated();
if (canFailDungeon && defeated) { if (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
dungeonFailedDialog(); if (canFailDungeon)
exitDungeon(); dungeonFailedDialog();
exitDungeon(true);
} }
MapStage.this.stop(); MapStage.this.stop();
currentMob = null; currentMob = null;

31
forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
View File

@@ -188,11 +188,14 @@ public class WorldStage extends GameStage implements SaveFileContent {
currentMob.setAnimation(CharacterSprite.AnimationTypes.Attack); currentMob.setAnimation(CharacterSprite.AnimationTypes.Attack);
startPause(0.5f, () -> { startPause(0.5f, () -> {
currentMob.resetCollisionHeight(); currentMob.resetCollisionHeight();
Current.player().defeated(); boolean defeated = Current.player().defeated();
AdventureQuestController.instance().updateQuestsLose(currentMob); AdventureQuestController.instance().updateQuestsLose(currentMob);
AdventureQuestController.instance().showQuestDialogs(MapStage.getInstance()); AdventureQuestController.instance().showQuestDialogs(MapStage.getInstance());
WorldStage.this.removeEnemy(currentMob); WorldStage.this.removeEnemy(currentMob);
currentMob = null; currentMob = null;
if (defeated) {
WorldStage.getInstance().resetPlayerLocation();
}
}); });
} }
} }
@@ -209,17 +212,9 @@ public class WorldStage extends GameStage implements SaveFileContent {
if (point == collidingPoint) { if (point == collidingPoint) {
continue; 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 { } else {
if (point == collidingPoint) { if (point == collidingPoint) {
collidingPoint = null; 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 @Override
public boolean isColliding(Rectangle boundingRect) { public boolean isColliding(Rectangle boundingRect) {
if (currentModifications.containsKey(PlayerModification.Fly)) if (currentModifications.containsKey(PlayerModification.Fly))