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

Adventure quest updates

Browse Source 
Arena quest stage objectives now available, one quest added.
Removed extra trigger for accepting quest in "A Vision of Destruction" offer dialog.
Minor dialog enhancements.
This commit is contained in:
jjayers99
2023-04-14 22:14:12 -04:00
parent 93204bdd13
commit fb8a7b904a
6 changed files with 254 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,9 @@ public class AdventureQuestData implements Serializable {
private int id;
public int getID(){
if (isTemplate && id < 1)
id = Current.world().getNextQuestId();
if (isTemplate && id < 1) {
id = AdventureQuestController.instance().getNextQuestID();
}
return id;
}
public boolean isTemplate = false;

3
forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java
View File

@@ -303,6 +303,9 @@ public class AdventureQuestStage implements Serializable {
if (winner){
status = AdventureQuestController.QuestStatus.Complete;
}
else {
status = AdventureQuestController.QuestStatus.Failed;
}
}
}
}

12
forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java
View File

@@ -58,6 +58,7 @@ public class AdventureQuestController implements Serializable {
private Map<String,Date> questAvailability = new HashMap<>();
public PointOfInterest mostRecentPOI;
private List<EnemySprite> enemySpriteList= new ArrayList<>();
private int nextQuestID = 0;
public void showQuestDialogs(GameStage stage) {
List<AdventureQuestData> finishedQuests = new ArrayList<>();
@@ -203,6 +204,17 @@ public class AdventureQuestController implements Serializable {
}
}
public int getNextQuestID(){
if (nextQuestID == 0 && allQuests.size > 0) {
for (int i = 0; i < allQuests.size; i++) {
if (allQuests.get(i).getID() >= nextQuestID){
nextQuestID = allQuests.get(i).getID() + 1;
}
}
}
return nextQuestID++;
}
public void updateEnteredPOI(PointOfInterest arrivedAt)
{
for(AdventureQuestData currentQuest : Current.player().getQuests()) {

9
forge-gui-mobile/src/forge/adventure/world/World.java
View File

@@ -47,7 +47,6 @@ public class World implements Disposable, SaveFileContent {
private final Random random = new Random();
private boolean worldDataLoaded = false;
private Texture globalTexture = null;
private int nextQuestId;
public Random getRandom() {
return random;
@@ -115,7 +114,6 @@ public class World implements Disposable, SaveFileContent {
mapPoiIds = new PointOfInterestMap(getChunkSize(), this.data.tileSize, this.data.width / getChunkSize(), this.data.height / getChunkSize());
mapPoiIds.load(saveFileData.readSubData("mapPoiIds"));
seed = saveFileData.readLong("seed");
nextQuestId = saveFileData.readInt("nextQuestId");
}
@Override
@@ -131,9 +129,6 @@ public class World implements Disposable, SaveFileContent {
data.store("mapObjectIds", mapObjectIds.save());
data.store("mapPoiIds", mapPoiIds.save());
data.store("seed", seed);
data.store("nextQuestId", nextQuestId);
return data;
}
@@ -926,8 +921,4 @@ public class World implements Disposable, SaveFileContent {
}
return globalTexture;
}
public int getNextQuestId() {
return nextQuestId++;
}
}