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

Fix on the hunt hole (Adventure) (#7516)

Browse Source 
* Fixing an issue in which touching the space the map occupies outside of the world map does not allow the player to move (very relevant on maps with content in the top left corner)

* Fix an edge case where the On The Hunt quest can end up failing to ever spawn an enemy to hunt

---------

Co-authored-by: Agetian <stavdev@mail.ru>
This commit is contained in:
rwalters
2025-05-12 06:26:49 -04:00
committed by GitHub
parent c7816daaf6
commit 93f7987312
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
forge-gui-mobile/src/forge/adventure/data/AdventureQuestData.java
View File

@@ -246,8 +246,9 @@ public class AdventureQuestData implements Serializable {
}
EnemyData target = stage.getTargetEnemyData();
if (target != null)
enemyTokens.put("$(enemy_" + stage.id +")", target);
if (target != null) {
enemyTokens.put("$(enemy_" + stage.id + ")", target);
}
otherTokens.put("$(playername)", Current.player().getName());
otherTokens.put("$(currentbiome)", GameScene.instance().getAdventurePlayerLocation(false,true));
@@ -339,8 +340,18 @@ public class AdventureQuestData implements Serializable {
}
private EnemySprite generateTargetEnemySprite(AdventureQuestStage stage){
return generateTargetEnemySprite(stage, true);
}
private EnemySprite generateTargetEnemySprite(AdventureQuestStage stage, boolean genNewData){
if (stage.objective == AdventureQuestController.ObjectiveTypes.Hunt){
EnemyData toUse = generateTargetEnemyData(stage);
EnemyData toUse = null;
if (genNewData) {
toUse = generateTargetEnemyData(stage);
} else {
toUse = enemyTokens.get("$(enemy_" + stage.id +")");
}
toUse.lifetime = stage.count3;
EnemySprite toReturn = new EnemySprite(toUse);
toReturn.questStageID = stage.stageID.toString();
@@ -445,7 +456,6 @@ public class AdventureQuestData implements Serializable {
}
GameHUD.getInstance().addNotification(description.toString());
}
}
public PointOfInterest getClosestValidPOI(Vector2 pos) {
@@ -457,7 +467,25 @@ public class AdventureQuestData implements Serializable {
return null;
validPOIs.sort(Comparator.comparingInt(a -> (int) a.getPosition().dst(pos)));
return validPOIs.get(0);
}
}
/* Check if the player created an On the Hunt quest, left the city,
* saved, and then reloaded, such that the sprite for the enemy was never generated or failed to
* be added to save data properly
* @param AdventureQuestStage stage The specific step to check if it meets the criteria that defines this use case
* @param boolean Whether the quest meets the detach criteria
*/
public boolean qualifiesForDetachedQuest(AdventureQuestStage stage) {
return (stage.objective == AdventureQuestController.ObjectiveTypes.Hunt
&& enemyTokens.size() > 0
&& targetEnemySprite == null);
}
/* If the player is in fact detached, fix that specific case
* @param AdventureQuestStage stage The stage whose state should be fixed
*/
public void fixOrphanedHuntQuest(AdventureQuestStage stage) {
EnemySprite toSet = generateTargetEnemySprite(stage, false);
stage.setTargetSprite(toSet);
}
}

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

@@ -516,6 +516,17 @@ public class WorldStage extends GameStage implements SaveFileContent {
break;
}
if(adq.getTargetEnemySprite() == null
&& adq.getActiveStages().size() > 0
&& adq.qualifiesForDetachedQuest(adq.getActiveStages().get(0))) {
AdventureQuestStage brokenStage = adq.getActiveStages().get(0);
adq.fixOrphanedHuntQuest(brokenStage);
AdventureQuestController.instance().addQuestSprites(brokenStage);
// When we first load, we will not do this in time to actually spawn the sprite
// until the next loop, but as soon as the player moves, if the On the Hunt quest
// is tracked, we will immediately point to that sprite
}
if (adq.getTargetEnemySprite() != null) {
EnemySprite target = adq.getTargetEnemySprite();
for (Pair<Float, EnemySprite> active :enemies)