Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 11:24:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Continue merging quests (pt. 2)

Browse Source
This commit is contained in:
KingRainbow44
2023-04-09 14:35:45 -04:00
parent 97ee71bcf4
commit 644f1b3ab9
31 changed files with 4392 additions and 3984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
View File

@@ -16,7 +16,6 @@ import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ActionReason;
import emu.grasscutter.game.quest.enums.*;
import emu.grasscutter.game.world.World;
import emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest;
import emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest;
import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
@@ -41,7 +40,7 @@ public class GameMainQuest {
@Getter private int[] questVars;
@Getter private long[] timeVar;
//QuestUpdateQuestVarReq is sent in two stages...
@Getter private List<Integer> questVarsUpdate;
private List<Integer> questVarsUpdate;
@Getter private ParentQuestState state;
@Getter private boolean isFinished;
@Getter List<QuestGroupSuite> questGroupSuites;
@@ -67,6 +66,13 @@ public class GameMainQuest {
addAllChildQuests();
}
public List<Integer> getQuestVarsUpdate() {
if(questVarsUpdate == null){
questVarsUpdate = new ArrayList<>();
}
return questVarsUpdate;
}
private void addAllChildQuests() {
List<Integer> subQuestIds = Arrays.stream(GameData.getMainQuestDataMap().get(this.parentQuestId).getSubQuests()).map(SubQuestData::getSubId).toList();
for (Integer subQuestId : subQuestIds) {
@@ -166,10 +172,10 @@ public class GameMainQuest {
}
// handoff main quest
if (mainQuestData.getSuggestTrackMainQuestList() != null) {
Arrays.stream(mainQuestData.getSuggestTrackMainQuestList())
.forEach(getQuestManager()::startMainQuest);
}
// if (mainQuestData.getSuggestTrackMainQuestList() != null) {
// Arrays.stream(mainQuestData.getSuggestTrackMainQuestList())
// .forEach(getQuestManager()::startMainQuest);
// }
}
//TODO
public void fail() {}
@@ -181,9 +187,9 @@ public class GameMainQuest {
return null;
}
/*if(rewindPositions.isEmpty()){
addRewindPoints();
}*/
// if(rewindPositions.isEmpty()){
// this.addRewindPoints();
// }
List<Position> posAndRot = new ArrayList<>();
if(hasRewindPosition(targetQuest.getSubQuestId(), posAndRot)){
@@ -198,8 +204,8 @@ public class GameMainQuest {
if (hasRewindPosition(quest.getSubQuestId(), posAndRot)) {
return posAndRot;
}
}
return null;
}