Switch to using quest excels

src/main/java/emu/grasscutter/data/GameData.java

@@ -12,7 +12,7 @@ import emu.grasscutter.data.custom.AbilityEmbryoEntry;
 import emu.grasscutter.data.custom.AbilityModifier;
 import emu.grasscutter.data.custom.AbilityModifierEntry;
 import emu.grasscutter.data.custom.OpenConfigEntry;
-import emu.grasscutter.data.custom.QuestConfig;
+import emu.grasscutter.data.custom.MainQuestData;
 import emu.grasscutter.data.custom.ScenePointEntry;
 import emu.grasscutter.data.def.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
@@ -28,7 +28,7 @@ public class GameData {
 	private static final Map<String, AbilityModifierEntry> abilityModifiers = new HashMap<>();
 	private static final Map<String, OpenConfigEntry> openConfigEntries = new HashMap<>();
 	private static final Map<String, ScenePointEntry> scenePointEntries = new HashMap<>();
-	private static final Int2ObjectMap<QuestConfig> questConfigs = new Int2ObjectOpenHashMap<>();
+	private static final Int2ObjectMap<MainQuestData> mainQuestData = new Int2ObjectOpenHashMap<>();
 	
 	// ExcelConfigs
 	private static final Int2ObjectMap<PlayerLevelData> playerLevelDataMap = new Int2ObjectOpenHashMap<>();
@@ -70,6 +70,7 @@ public class GameData {
 	private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<DailyDungeonData> dailyDungeonDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
+	private static final Int2ObjectMap<QuestData> questDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<ShopGoodsData> shopGoodsDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<CombineData> combineDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardPreviewData> rewardPreviewDataMap = new Int2ObjectOpenHashMap<>();
@@ -124,8 +125,8 @@ public class GameData {
 		return getScenePointEntries().get(sceneId + "_" + pointId);
 	}
 
-	public static Int2ObjectMap<QuestConfig> getQuestConfigs() {
-		return questConfigs;
+	public static Int2ObjectMap<MainQuestData> getMainQuestDataMap() {
+		return mainQuestData;
 	}
 
 	public static Int2ObjectMap<AvatarData> getAvatarDataMap() {
@@ -337,4 +338,8 @@ public class GameData {
 	public static Int2ObjectMap<TowerScheduleData> getTowerScheduleDataMap(){
 		return towerScheduleDataMap;
 	}
+
+	public static Int2ObjectMap<QuestData> getQuestDataMap() {
+		return questDataMap;
+	}
 }

src/main/java/emu/grasscutter/data/ResourceLoader.java

@@ -24,9 +24,7 @@ import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierAction;
 import emu.grasscutter.data.custom.AbilityModifier.AbilityModifierActionType;
 import emu.grasscutter.data.custom.AbilityModifierEntry;
 import emu.grasscutter.data.custom.OpenConfigEntry;
-import emu.grasscutter.data.custom.QuestConfig;
-import emu.grasscutter.data.custom.QuestConfigData;
-import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
+import emu.grasscutter.data.custom.MainQuestData;
 import emu.grasscutter.data.custom.ScenePointEntry;
 import emu.grasscutter.game.world.SpawnDataEntry.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -407,24 +405,19 @@ public class ResourceLoader {
 		}
 		
 		for (File file : folder.listFiles()) {
-			QuestConfigData mainQuest = null;
+			MainQuestData mainQuest = null;
 			
 			try (FileReader fileReader = new FileReader(file)) {
-				mainQuest = Grasscutter.getGsonFactory().fromJson(fileReader, QuestConfigData.class);
+				mainQuest = Grasscutter.getGsonFactory().fromJson(fileReader, MainQuestData.class);
 			} catch (Exception e) {
 				e.printStackTrace();
 				continue;
 			}
 			
-			if (mainQuest.getSubQuests() != null) {
-				for (SubQuestConfigData subQuest : mainQuest.getSubQuests()) {
-					QuestConfig quest = new QuestConfig(mainQuest, subQuest);
-					GameData.getQuestConfigs().put(quest.getId(), quest);
-				}
-			}
+			GameData.getMainQuestDataMap().put(mainQuest.getId(), mainQuest);
 		}
 		
-		Grasscutter.getLogger().info("Loaded " + GameData.getQuestConfigs().size() + " Quest Configs");
+		Grasscutter.getLogger().info("Loaded " + GameData.getMainQuestDataMap().size() + " MainQuestDatas.");
 	}
 
 	// BinOutput configs

src/main/java/emu/grasscutter/data/custom/MainQuestData.java

@@ -0,0 +1,53 @@
+package emu.grasscutter.data.custom;
+
+import emu.grasscutter.game.quest.enums.LogicType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.enums.QuestType;
+
+public class MainQuestData {
+	private int id;
+	private int series;
+	private QuestType type;
+	
+	private long titleTextMapHash;
+	private int[] suggestTrackMainQuestList;
+	private int[] rewardIdList;
+	
+	private SubQuestData[] subQuests;
+	
+	public int getId() {
+		return id;
+	}
+	
+	public int getSeries() {
+		return series;
+	}
+	
+	public QuestType getType() {
+		return type;
+	}
+	
+	public long getTitleTextMapHash() {
+		return titleTextMapHash;
+	}
+	
+	public int[] getSuggestTrackMainQuestList() {
+		return suggestTrackMainQuestList;
+	}
+
+	public int[] getRewardIdList() {
+		return rewardIdList;
+	}
+	
+	public SubQuestData[] getSubQuests() {
+		return subQuests;
+	}
+	
+	public static class SubQuestData {
+		private int subId;
+
+		public int getSubId() {
+			return subId;
+		}
+	}
+}

src/main/java/emu/grasscutter/data/custom/QuestConfig.java

@@ -1,25 +0,0 @@
-package emu.grasscutter.data.custom;
-
-import emu.grasscutter.data.custom.QuestConfigData.SubQuestConfigData;
-
-public class QuestConfig {
-	private final QuestConfigData mainQuest;
-	private final SubQuestConfigData subQuest;
-	
-	public QuestConfig(QuestConfigData mainQuest, SubQuestConfigData subQuest) {
-		this.mainQuest = mainQuest;
-		this.subQuest = subQuest;
-	}
-
-	public int getId() {
-		return subQuest.getSubId();
-	}
-
-	public QuestConfigData getMainQuest() {
-		return mainQuest;
-	}
-
-	public SubQuestConfigData getSubQuest() {
-		return subQuest;
-	}
-}

src/main/java/emu/grasscutter/data/custom/QuestConfigData.java

@@ -1,104 +0,0 @@
-package emu.grasscutter.data.custom;
-
-import emu.grasscutter.game.quest.enums.LogicType;
-import emu.grasscutter.game.quest.enums.QuestTriggerType;
-import emu.grasscutter.game.quest.enums.QuestType;
-
-public class QuestConfigData {
-	private int id;
-	private int series;
-	private QuestType type;
-	
-	private long titleTextMapHash;
-	private int[] suggestTrackMainQuestList;
-	private int[] rewardIdList;
-	
-	private SubQuestConfigData[] subQuests;
-	
-	public int getId() {
-		return id;
-	}
-
-	public int getSeries() {
-		return series;
-	}
-
-	public QuestType getType() {
-		return type;
-	}
-
-	public long getTitleTextMapHash() {
-		return titleTextMapHash;
-	}
-
-	public int[] getSuggestTrackMainQuestList() {
-		return suggestTrackMainQuestList;
-	}
-
-	public int[] getRewardIdList() {
-		return rewardIdList;
-	}
-
-	public SubQuestConfigData[] getSubQuests() {
-		return subQuests;
-	}
-
-	public class SubQuestConfigData {
-		private int subId;
-		private int mainId;
-		
-		private LogicType acceptCondComb;
-		private QuestCondition[] acceptCond;
-		
-		private LogicType finishCondComb;
-		private QuestCondition[] finishCond;
-		
-		private LogicType failCondComb;
-		private QuestCondition[] failCond;
-		
-		public int getSubId() {
-			return subId;
-		}
-		
-		public int getMainId() {
-			return mainId;
-		}
-		
-		public LogicType getAcceptCondComb() {
-			return acceptCondComb;
-		}
-		
-		public QuestCondition[] getAcceptCond() {
-			return acceptCond;
-		}
-		
-		public LogicType getFinishCondComb() {
-			return finishCondComb;
-		}
-		
-		public QuestCondition[] getFinishCond() {
-			return finishCond;
-		}
-		
-		public LogicType getFailCondComb() {
-			return failCondComb;
-		}
-		
-		public QuestCondition[] getFailCond() {
-			return failCond;
-		}
-	}
-	
-	public class QuestCondition {
-		private QuestTriggerType type;
-		private int[] param;
-		
-		public QuestTriggerType getType() {
-			return type;
-		}
-		
-		public int[] getParam() {
-			return param;
-		}
-	}
-}

src/main/java/emu/grasscutter/data/def/QuestData.java

@@ -0,0 +1,115 @@
+package emu.grasscutter.data.def;
+
+import java.util.Arrays;
+import java.util.List;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.game.quest.enums.LogicType;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+
+@ResourceType(name = "QuestExcelConfigData.json")
+public class QuestData extends GameResource {
+	private int SubId;
+	private int MainId;
+	private int Order;
+	private long DescTextMapHash;
+	
+	private LogicType AcceptCondComb;
+	private QuestCondition[] acceptConditons;
+	private LogicType FinishCondComb;
+	private QuestCondition[] finishConditons;
+	private LogicType FailCondComb;
+	private QuestCondition[] failConditons;
+	
+	private List<QuestParam> AcceptCond;
+	private List<QuestParam> FinishCond;
+	private List<QuestParam> FailCond;
+	private List<QuestExecParam> BeginExec;
+	private List<QuestExecParam> FinishExec;
+	private List<QuestExecParam> FailExec;
+
+	public int getId() {
+		return SubId;
+	}
+
+	public int getMainId() {
+		return MainId;
+	}
+
+	public int getOrder() {
+		return Order;
+	}
+
+	public long getDescTextMapHash() {
+		return DescTextMapHash;
+	}
+
+	public LogicType getAcceptCondComb() {
+		return AcceptCondComb;
+	}
+
+	public QuestCondition[] getAcceptCond() {
+		return acceptConditons;
+	}
+
+	public LogicType getFinishCondComb() {
+		return FinishCondComb;
+	}
+
+	public QuestCondition[] getFinishCond() {
+		return finishConditons;
+	}
+
+	public LogicType getFailCondComb() {
+		return FailCondComb;
+	}
+
+	public QuestCondition[] getFailCond() {
+		return failConditons;
+	}
+
+	public void onLoad() {
+		this.acceptConditons = AcceptCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
+		AcceptCond = null;
+		this.finishConditons = FinishCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
+		FinishCond = null;
+		this.failConditons = FailCond.stream().filter(p -> p.Type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
+		FailCond = null;
+	}
+	
+	public class QuestParam {
+		QuestTrigger Type;
+		int[] Param;
+		String count;
+	}
+	
+	public class QuestExecParam {
+		QuestTrigger Type;
+		String[] Param;
+		String count;
+	}
+	
+	public static class QuestCondition {
+		private QuestTrigger type;
+		private int[] param;
+		private String count;
+		
+		public QuestCondition(QuestParam param) {
+			this.type = param.Type;
+			this.param = param.Param;
+		}
+		
+		public QuestTrigger getType() {
+			return type;
+		}
+		
+		public int[] getParam() {
+			return param;
+		}
+
+		public String getCount() {
+			return count;
+		}
+	}
+}