Skip to content

Reset the map and its children #10685

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
Eradev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reset the map and its children #10685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 43 additions & 6 deletions forge-gui-mobile/src/forge/adventure/stage/MapStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import java.util.*;
import java.util.Queue;


/**
* Stage to handle tiled maps for points of interests
*/
Expand Down Expand Up @@ -164,12 +163,10 @@ public void prepareCollision(Vector2 pos, Vector2 direction, Rectangle boundingR

}


Group collisionGroup;

@Override
public void debugCollision(boolean b) {

if (collisionGroup == null) {
collisionGroup = new Group();

Expand All @@ -192,8 +189,6 @@ public void debugCollision(boolean b) {
super.debugCollision(b);
}



Array<EntryActor> otherEntries = new Array<>();
Array<EntryActor> spawnClassified = new Array<>();
Array<EntryActor> sourceMapMatch = new Array<>();
Expand Down Expand Up @@ -762,7 +757,8 @@ public InnScene findLocalInn() {
public boolean exitDungeon(boolean defeated, boolean defeatedByBoss) {
if (mustClearOnExit) {
mustClearOnExit = false;
changes.clearDeletedObjects();

this.resetMapRecursive(AdventureQuestController.instance().mostRecentPOI.getData().map, new HashSet<>());
}

AdventureQuestController.instance().updateQuestsLeave();
Expand All @@ -780,6 +776,47 @@ else if (defeatedByBoss)
return true;
}

/**
* Recursively clears map objects for the current map and all connected maps to reset the state of the dungeon when exiting from it.
* @param currentMap The filename of the map to clear and check for connected maps from.
* @param clearedMaps A set of maps that have already been cleared to avoid infinite recursion from circular connections between maps.
*/
private void resetMapRecursive(String currentMap, HashSet<String> clearedMaps) {
if (clearedMaps.contains(currentMap)) {
return;
}

clearedMaps.add(currentMap);

// Clear the current map's deleted objects.
TileMapScene.instance().getPointOfInterestChanges(currentMap).clearDeletedObjects();

TiledMap currentTiledMap = loadMapFile(currentMap);

for (MapLayer layer : currentTiledMap.getLayers()) {
if (layer.getProperties().containsKey("spriteLayer") || layer instanceof TiledMapTileLayer) {
continue;
}

// Attemps to find connected maps through "entry" type MapObjects and recursively clear them as well.
for (MapObject obj : layer.getObjects()) {
MapProperties prop = obj.getProperties();
String type = prop.get("type", String.class);

if (type != null && type.equals("entry")) {
String targetMap = prop.containsKey("teleport") ? prop.get("teleport").toString() : "";

if (targetMap != null && !targetMap.isEmpty()) {
resetMapRecursive(targetMap, clearedMaps);
}
}
}
}
}

private TiledMap loadMapFile(String mapName) {
return new TemplateTmxMapLoader().load(Config.instance().getCommonFilePath(mapName));
}

@Override
public void setWinner(boolean playerWins, boolean isArena) {
Expand Down
Loading