Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 09:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

and misc bug fixes

Browse Source
This commit is contained in:
akatatsu27
2022-07-23 12:28:49 +03:00
parent 02a56fcec4
commit 8050f0cc07
28 changed files with 1045 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/emu/grasscutter/data/excels/QuestData.java
View File

@@ -36,10 +36,14 @@ public class QuestData extends GameResource {
private List<QuestExecParam> beginExec;
private List<QuestExecParam> finishExec;
private List<QuestExecParam> failExec;
private Guide guide;
//ResourceLoader not happy if you remove getId() ~~
public int getId() {
return subId;
}
//Added getSubId() for clarity
public int getSubId() {return subId;}
public int getMainId() {
return mainId;
@@ -62,7 +66,7 @@ public class QuestData extends GameResource {
}
public LogicType getAcceptCondComb() {
return acceptCondComb;
return acceptCondComb == null ? LogicType.LOGIC_NONE : acceptCondComb;
}
public List<QuestCondition> getAcceptCond() {
@@ -70,7 +74,7 @@ public class QuestData extends GameResource {
}
public LogicType getFinishCondComb() {
return finishCondComb;
return finishCondComb == null ? LogicType.LOGIC_NONE : finishCondComb;
}
public List<QuestCondition> getFinishCond() {
@@ -78,7 +82,7 @@ public class QuestData extends GameResource {
}
public LogicType getFailCondComb() {
return failCondComb;
return failCondComb == null ? LogicType.LOGIC_NONE : failCondComb;
}
public List<QuestCondition> getFailCond() {
@@ -118,4 +122,11 @@ public class QuestData extends GameResource {
private String count;
}
@Data
public static class Guide {
private String type;
private List<String> param;
private int guideScene;
}
}