Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 08:36:38 +00:00
Code Issues Projects Releases Wiki Activity

Fixed quests not finishing their questline

Browse Source
This commit is contained in:
Melledy 2022-05-13 06:24:50 -07:00
parent c35b2b965a
commit 00ffbea451
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/emu/grasscutter/data/def/QuestData.java
View File

@ -15,6 +15,9 @@ public class QuestData extends GameResource {
private int Order;
private long DescTextMapHash;
private boolean FinishParent;
private boolean IsRewind;
private LogicType AcceptCondComb;
private QuestCondition[] acceptConditons;
private LogicType FinishCondComb;
@ -45,6 +48,14 @@ public class QuestData extends GameResource {
return DescTextMapHash;
}
public boolean finishParent() {
return FinishParent;
}
public boolean isRewind() {
return IsRewind;
}
public LogicType getAcceptCondComb() {
return AcceptCondComb;
}

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

@ -91,6 +91,7 @@ public class GameMainQuest {
this.isFinished = true;
this.state = ParentQuestState.PARENT_QUEST_STATE_FINISHED;
this.getOwner().getSession().send(new PacketFinishedParentQuestUpdateNotify(this));
this.save();
}
public void save() {

11
src/main/java/emu/grasscutter/game/quest/GameQuest.java
View File

@ -143,21 +143,28 @@ public class GameQuest {
this.getOwner().getSession().send(new PacketQuestProgressUpdateNotify(this));
this.getOwner().getSession().send(new PacketQuestListUpdateNotify(this));
this.save();
if (this.getData().finishParent()) {
// This quest finishes the questline - the main quest will also save the quest to db so we dont have to call save() here
this.getMainQuest().finish();
} else {
// Try and accept other quests if possible
this.tryAcceptQuestLine();
this.save();
}
}
public boolean tryAcceptQuestLine() {
try {
MainQuestData questConfig = GameData.getMainQuestDataMap().get(this.getMainQuestId());
for (SubQuestData subQuest : questConfig.getSubQuests()) {
GameQuest quest = getMainQuest().getChildQuestById(subQuest.getSubId());
if (quest == null) {
QuestData questData = GameData.getQuestDataMap().get(subQuest.getSubId());
if (questData == null) {
if (questData == null || questData.getAcceptCond() == null) {
continue;
}

2
src/main/java/emu/grasscutter/game/quest/QuestManager.java
View File

@ -128,7 +128,7 @@ public class QuestManager {
QuestData data = quest.getData();
for (int i = 0; i < data.getFinishCond().length; i++) {
if (quest.getFinishProgressList()[i] == 1) {
if (quest.getFinishProgressList() == null || quest.getFinishProgressList()[i] == 1) {
continue;
}