quest fix & personal line impl

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

@@ -104,6 +104,8 @@ public class GameData {
 	@Getter private static final Int2ObjectMap<ActivityData> activityDataMap = new Int2ObjectOpenHashMap<>();
     @Getter private static final Int2ObjectMap<ActivityWatcherData> activityWatcherDataMap = new Int2ObjectOpenHashMap<>();
     @Getter private static final Int2ObjectMap<MusicGameBasicData> musicGameBasicDataMap = new Int2ObjectOpenHashMap<>();
+    @Getter private static final Int2ObjectMap<PersonalLineData> personalLineDataMap = new Int2ObjectOpenHashMap<>();
+    @Getter private static final Int2ObjectMap<ChapterData> chapterDataMap = new Int2ObjectOpenHashMap<>();
 
 	// Cache
 	private static Map<Integer, List<Integer>> fetters = new HashMap<>();

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

 package emu.grasscutter.data.binout;
 
-import emu.grasscutter.game.quest.enums.LogicType;
-import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.enums.QuestType;
+import lombok.Data;
 
 public class MainQuestData {
 	private int id;
@@ -43,11 +42,9 @@ public class MainQuestData {
 		return subQuests;
 	}
 
+    @Data
 	public static class SubQuestData {
 		private int subId;
-
-		public int getSubId() {
-			return subId;
-		}
+        private int order;
 	}
 }

src/main/java/emu/grasscutter/data/excels/ChapterData.java

+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@ResourceType(name = "ChapterExcelConfigData.json")
+@Getter
+@Setter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ChapterData extends GameResource {
+    int id;
+    int beginQuestId;
+    int endQuestId;
+    int needPlayerLevel;
+
+    public static final Map<Integer, ChapterData> beginQuestChapterMap = new HashMap<>();
+    public static final Map<Integer, ChapterData> endQuestChapterMap = new HashMap<>();
+
+    @Override
+    public int getId() {
+        return this.id;
+    }
+
+    @Override
+    public void onLoad() {
+        beginQuestChapterMap.put(beginQuestId, this);
+        beginQuestChapterMap.put(endQuestId, this);
+    }
+}

src/main/java/emu/grasscutter/data/excels/PersonalLineData.java

+package emu.grasscutter.data.excels;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+
+import java.util.List;
+
+@ResourceType(name = "PersonalLineExcelConfigData.json")
+@Getter
+@Setter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PersonalLineData extends GameResource {
+    int id;
+    int avatarID;
+    List<Integer> preQuestId;
+    int startQuestId;
+    int chapterId;
+
+    @Override
+    public int getId() {
+        return this.id;
+    }
+
+}

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

@@ -3,12 +3,20 @@ package emu.grasscutter.data.excels;
 import java.util.Arrays;
 import java.util.List;
 
+import com.google.gson.annotations.SerializedName;
 import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestTrigger;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.ToString;
+import lombok.experimental.FieldDefaults;
 
 @ResourceType(name = "QuestExcelConfigData.json")
+@Getter
+@ToString
 public class QuestData extends GameResource {
 	private int subId;
 	private int mainId;
@@ -19,15 +27,12 @@ public class QuestData extends GameResource {
 	private boolean isRewind;
 
 	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<QuestCondition> acceptCond;
+	private List<QuestCondition> finishCond;
+	private List<QuestCondition> failCond;
 	private List<QuestExecParam> beginExec;
 	private List<QuestExecParam> finishExec;
 	private List<QuestExecParam> failExec;
@@ -60,67 +65,57 @@ public class QuestData extends GameResource {
 		return acceptCondComb;
 	}
 
-	public QuestCondition[] getAcceptCond() {
-		return acceptConditons;
+	public List<QuestCondition> getAcceptCond() {
+		return acceptCond;
 	}
 
 	public LogicType getFinishCondComb() {
 		return finishCondComb;
 	}
 
-	public QuestCondition[] getFinishCond() {
-		return finishConditons;
+	public List<QuestCondition> getFinishCond() {
+		return finishCond;
 	}
 
 	public LogicType getFailCondComb() {
 		return failCondComb;
 	}
 
-	public QuestCondition[] getFailCond() {
-		return failConditons;
+	public List<QuestCondition> getFailCond() {
+		return failCond;
 	}
 
 	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;
-	}
+		this.acceptCond = acceptCond.stream().filter(p -> p.type != null).toList();
+		this.finishCond = finishCond.stream().filter(p -> p.type != null).toList();
+		this.failCond = failCond.stream().filter(p -> p.type != null).toList();
 
-	public class QuestParam {
-		QuestTrigger _type;
-		int[] _param;
-		String _count;
+        this.beginExec = beginExec.stream().filter(p -> p.type != null).toList();
+        this.finishExec = finishExec.stream().filter(p -> p.type != null).toList();
+        this.failExec = failExec.stream().filter(p -> p.type != null).toList();
 	}
 
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
 	public class QuestExecParam {
-		QuestTrigger _type;
-		String[] _param;
-		String _count;
+        @SerializedName("_type")
+		QuestTrigger type;
+        @SerializedName("_param")
+		String[] param;
+        @SerializedName("_count")
+		String count;
 	}
 
+    @Data
 	public static class QuestCondition {
+        @SerializedName("_type")
 		private QuestTrigger type;
+        @SerializedName("_param")
 		private int[] param;
+        @SerializedName("_param_str")
+		private String paramStr;
+        @SerializedName("_count")
 		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;
-		}
 	}
 }

src/main/java/emu/grasscutter/game/inventory/Inventory.java

@@ -271,6 +271,8 @@ public class Inventory implements Iterable<GameItem> {
                 this.player.getServer().getInventoryManager().upgradeAvatarFetterLevel(this.player, this.player.getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
             case 106 -> // Resin
                 this.player.getResinManager().addResin(count);
+            case 107 ->  // Legendary Key
+                this.player.addLegendaryKey(count);
             case 201 -> // Primogem
                 this.player.setPrimogems(this.player.getPrimogems() + count);
             case 202 -> // Mora
@@ -292,6 +294,8 @@ public class Inventory implements Iterable<GameItem> {
 				return this.player.getCrystals();
 			case 106:  // Resin
 				return this.player.getProperty(PlayerProperty.PROP_PLAYER_RESIN);
+            case 107:  // Legendary Key
+                return this.player.getProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY);
 			case 204:  // Home Coin
 				return this.player.getHomeCoin();
 			default:
@@ -334,6 +338,8 @@ public class Inventory implements Iterable<GameItem> {
 					player.setCrystals(player.getCrystals() - (cost.getCount() * quantity));
 				case 106 ->  // Resin
 					player.getResinManager().useResin(cost.getCount() * quantity);
+                case 107 ->  // LegendaryKey
+                    player.useLegendaryKey(cost.getCount() * quantity);
 				case 204 ->  // Home Coin
 						player.setHomeCoin(player.getHomeCoin() - (cost.getCount() * quantity));
 				default ->

src/main/java/emu/grasscutter/game/player/Player.java

@@ -4,10 +4,10 @@ import dev.morphia.annotations.*;
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.PersonalLineData;
 import emu.grasscutter.data.excels.PlayerLevelData;
 import emu.grasscutter.data.excels.WeatherData;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.database.DatabaseManager;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.CoopRequest;
 import emu.grasscutter.game.ability.AbilityManager;
@@ -1597,6 +1597,16 @@ public class Player {
 		getServer().getPlayers().values().removeIf(player1 -> player1 == this);
 	}
 
+    public int getLegendaryKey() {
+        return this.getProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY);
+    }
+    public synchronized void addLegendaryKey(int count) {
+        this.setProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY, getLegendaryKey() + count);
+    }
+    public synchronized void useLegendaryKey(int count) {
+        this.setProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY, getLegendaryKey() - count);
+    }
+
     public enum SceneLoadState {
 		NONE(0), LOADING(1), INIT(2), LOADED(3);
 

src/main/java/emu/grasscutter/game/props/PlayerProperty.java

@@ -39,7 +39,7 @@ public enum PlayerProperty {
     PROP_IS_ONLY_MP_WITH_PS_PLAYER			(10024, 0, 1), // Is only MP with PlayStation players? [0, 1]
     PROP_PLAYER_MCOIN						(10025), // Genesis Crystal (-inf, +inf) see 10015
     PROP_PLAYER_WAIT_SUB_MCOIN				(10026),
-    PROP_PLAYER_LEGENDARY_KEY				(10027),
+    PROP_PLAYER_LEGENDARY_KEY				(10027,0),
     PROP_IS_HAS_FIRST_SHARE					(10028),
     PROP_PLAYER_FORGE_POINT					(10029, 0, 300_000),
     PROP_CUR_CLIMATE_METER					(10035),

src/main/java/emu/grasscutter/game/quest/GameMainQuest.java

 package emu.grasscutter.game.quest;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
 import org.bson.types.ObjectId;
@@ -41,6 +40,7 @@ public class GameMainQuest {
 	private int[] questVars;
 	private ParentQuestState state;
 	private boolean isFinished;
+    List<QuestGroupSuite> questGroupSuites;
 
 	@Deprecated // Morphia only. Do not use.
 	public GameMainQuest() {}
@@ -52,6 +52,7 @@ public class GameMainQuest {
 		this.childQuests = new HashMap<>();
 		this.questVars = new int[5];
 		this.state = ParentQuestState.PARENT_QUEST_STATE_NONE;
+        this.questGroupSuites = new ArrayList<>();
 	}
 
 	public int getParentQuestId() {
@@ -91,6 +92,10 @@ public class GameMainQuest {
 		return isFinished;
 	}
 
+    public List<QuestGroupSuite> getQuestGroupSuites() {
+        return questGroupSuites;
+    }
+
     public void finish() {
 		this.isFinished = true;
 		this.state = ParentQuestState.PARENT_QUEST_STATE_FINISHED;
@@ -111,6 +116,12 @@ public class GameMainQuest {
 
 			getOwner().getInventory().addItemParamDatas(rewardData.getRewardItemList(), ActionReason.QuestReward);
 		}
+
+        // handoff main quest
+        if(mainQuestData.getSuggestTrackMainQuestList() != null){
+            Arrays.stream(mainQuestData.getSuggestTrackMainQuestList())
+                .forEach(getOwner().getQuestManager()::startMainQuest);
+        }
 	}
 
 	public void save() {

src/main/java/emu/grasscutter/game/quest/GameQuest.java

@@ -6,13 +6,16 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.MainQuestData;
 import emu.grasscutter.data.binout.MainQuestData.SubQuestData;
+import emu.grasscutter.data.excels.ChapterData;
 import emu.grasscutter.data.excels.QuestData;
 import emu.grasscutter.data.excels.QuestData.QuestCondition;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestState;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.net.proto.ChapterStateOuterClass;
 import emu.grasscutter.net.proto.QuestOuterClass.Quest;
-import emu.grasscutter.server.packet.send.PacketCodexDataUpdateNotify;
+import emu.grasscutter.server.packet.send.PacketChapterStateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
 import emu.grasscutter.utils.Utils;
@@ -45,15 +48,28 @@ public class GameQuest {
 		this.startTime = this.acceptTime;
 		this.state = QuestState.QUEST_STATE_UNFINISHED;
 
-		if (questData.getFinishCond() != null && questData.getAcceptCond().length != 0) {
-			this.finishProgressList = new int[questData.getFinishCond().length];
+		if (questData.getFinishCond() != null && questData.getAcceptCond().size() != 0) {
+			this.finishProgressList = new int[questData.getFinishCond().size()];
 		}
 
-		if (questData.getFailCond() != null && questData.getFailCond().length != 0) {
-			this.failProgressList = new int[questData.getFailCond().length];
+		if (questData.getFailCond() != null && questData.getFailCond().size() != 0) {
+			this.failProgressList = new int[questData.getFailCond().size()];
 		}
 
 		this.mainQuest.getChildQuests().put(this.questId, this);
+
+        this.getData().getBeginExec().forEach(e -> getOwner().getServer().getQuestHandler().triggerExec(this, e, e.getParam()));
+
+        this.getOwner().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_QUEST_STATE_EQUAL, this.questId, this.state.getValue());
+
+        if (ChapterData.beginQuestChapterMap.containsKey(questId)){
+            mainQuest.getOwner().sendPacket(new PacketChapterStateNotify(
+                ChapterData.beginQuestChapterMap.get(questId).getId(),
+                ChapterStateOuterClass.ChapterState.CHAPTER_STATE_BEGIN
+            ));
+        }
+
+        Grasscutter.getLogger().debug("Quest {} is started", questId);
 	}
 
 	public GameMainQuest getMainQuest() {
@@ -154,6 +170,19 @@ public class GameQuest {
 			this.tryAcceptQuestLine();
 			this.save();
 		}
+
+        this.getData().getFinishExec().forEach(e -> getOwner().getServer().getQuestHandler().triggerExec(this, e, e.getParam()));
+
+        this.getOwner().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_QUEST_STATE_EQUAL, this.questId, this.state.getValue());
+
+        if (ChapterData.endQuestChapterMap.containsKey(questId)){
+            mainQuest.getOwner().sendPacket(new PacketChapterStateNotify(
+                ChapterData.endQuestChapterMap.get(questId).getId(),
+                ChapterStateOuterClass.ChapterState.CHAPTER_STATE_END
+            ));
+        }
+
+        Grasscutter.getLogger().debug("Quest {} is finished", questId);
 	}
 
 	public boolean tryAcceptQuestLine() {
@@ -167,16 +196,17 @@ public class GameQuest {
 					QuestData questData = GameData.getQuestDataMap().get(subQuest.getSubId());
 
 					if (questData == null || questData.getAcceptCond() == null
-							|| questData.getAcceptCond().length == 0) {
+							|| questData.getAcceptCond().size() == 0) {
 						continue;
 					}
 
-					int[] accept = new int[questData.getAcceptCond().length];
+					int[] accept = new int[questData.getAcceptCond().size()];
 
 					// TODO
-					for (int i = 0; i < questData.getAcceptCond().length; i++) {
-						QuestCondition condition = questData.getAcceptCond()[i];
+					for (int i = 0; i < questData.getAcceptCond().size(); i++) {
+						QuestCondition condition = questData.getAcceptCond().get(i);
 						boolean result = getOwner().getServer().getQuestHandler().triggerCondition(this, condition,
+                                condition.getParamStr(),
 								condition.getParam());
 
 						accept[i] = result ? 1 : 0;

src/main/java/emu/grasscutter/game/quest/QuestGroupSuite.java

+package emu.grasscutter.game.quest;
+
+import dev.morphia.annotations.Entity;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Entity
+@Data
+@Builder(builderMethodName = "of")
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class QuestGroupSuite {
+    int scene;
+    int group;
+    int suite;
+}

src/main/java/emu/grasscutter/game/quest/QuestManager.java

 package emu.grasscutter.game.quest;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.binout.MainQuestData;
 import emu.grasscutter.data.excels.QuestData;
 import emu.grasscutter.data.excels.QuestData.QuestCondition;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.quest.enums.ParentQuestState;
 import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.enums.LogicType;
 import emu.grasscutter.game.quest.enums.QuestState;
-import emu.grasscutter.server.packet.send.PacketFinishedParentQuestUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketQuestListUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketQuestProgressUpdateNotify;
-import emu.grasscutter.server.packet.send.PacketServerCondMeetQuestListUpdateNotify;
+import emu.grasscutter.server.packet.send.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
@@ -122,27 +121,43 @@ public class QuestManager {
 
 		return quest;
 	}
+    public void startMainQuest(int mainQuestId){
+        var mainQuestData = GameData.getMainQuestDataMap().get(mainQuestId);
 
+        if (mainQuestData == null){
+            return;
+        }
+
+        Arrays.stream(mainQuestData.getSubQuests())
+            .min(Comparator.comparingInt(MainQuestData.SubQuestData::getOrder))
+            .map(MainQuestData.SubQuestData::getSubId)
+            .ifPresent(this::addQuest);
+    }
     public void triggerEvent(QuestTrigger condType, int... params) {
+        triggerEvent(condType, "", params);
+    }
+
+	public void triggerEvent(QuestTrigger condType, String paramStr, int... params) {
+        Grasscutter.getLogger().debug("Trigger Event {}, {}, {}", condType, paramStr, params);
 		Set<GameQuest> changedQuests = new HashSet<>();
 
 		this.forEachActiveQuest(quest -> {
 			QuestData data = quest.getData();
 
-			for (int i = 0; i < data.getFinishCond().length; i++) {
+			for (int i = 0; i < data.getFinishCond().size(); i++) {
 				if (quest.getFinishProgressList() == null
 					|| quest.getFinishProgressList().length == 0
 					|| quest.getFinishProgressList()[i] == 1) {
 					continue;
 				}
 
-				QuestCondition condition = data.getFinishCond()[i];
+				QuestCondition condition = data.getFinishCond().get(i);
 
 				if (condition.getType() != condType) {
 					continue;
 				}
 
-				boolean result = getPlayer().getServer().getQuestHandler().triggerContent(quest, condition, params);
+				boolean result = getPlayer().getServer().getQuestHandler().triggerContent(quest, condition, paramStr, params);
 
 				if (result) {
 					quest.getFinishProgressList()[i] = 1;
@@ -169,6 +184,15 @@ public class QuestManager {
 		}
 	}
 
+    public List<QuestGroupSuite> getSceneGroupSuite(int sceneId) {
+        return getQuests().values().stream()
+            .filter(i -> i.getState() != ParentQuestState.PARENT_QUEST_STATE_FINISHED)
+            .map(GameMainQuest::getQuestGroupSuites)
+            .filter(Objects::nonNull)
+            .flatMap(Collection::stream)
+            .filter(i -> i.getScene() == sceneId)
+            .toList();
+    }
 	public void loadFromDatabase() {
 		List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer());
 		

src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java

@@ -2,10 +2,12 @@ package emu.grasscutter.game.quest;
 
 import java.util.Set;
 
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import org.reflections.Reflections;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.excels.QuestData.QuestCondition;
+import emu.grasscutter.data.excels.QuestData.*;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@@ -14,7 +16,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 public class ServerQuestHandler {
 	private final Int2ObjectMap<QuestBaseHandler> condHandlers;
 	private final Int2ObjectMap<QuestBaseHandler> contHandlers;
-	private final Int2ObjectMap<QuestBaseHandler> execHandlers;
+	private final Int2ObjectMap<QuestExecHandler> execHandlers;
 
 	public ServerQuestHandler() {
 		this.condHandlers = new Int2ObjectOpenHashMap<>();
@@ -25,21 +27,21 @@ public class ServerQuestHandler {
 	}
 
 	public void registerHandlers() {
-		this.registerHandlers(this.condHandlers, "emu.grasscutter.game.quest.conditions");
-		this.registerHandlers(this.contHandlers, "emu.grasscutter.game.quest.content");
-		this.registerHandlers(this.execHandlers, "emu.grasscutter.game.quest.exec");
+		this.registerHandlers(this.condHandlers, "emu.grasscutter.game.quest.conditions", QuestBaseHandler.class);
+		this.registerHandlers(this.contHandlers, "emu.grasscutter.game.quest.content", QuestBaseHandler.class);
+		this.registerHandlers(this.execHandlers, "emu.grasscutter.game.quest.exec", QuestExecHandler.class);
 	}
 
-	public void registerHandlers(Int2ObjectMap<QuestBaseHandler> map, String packageName) {
+	public <T> void registerHandlers(Int2ObjectMap<T> map, String packageName, Class<T> clazz) {
 		Reflections reflections = new Reflections(packageName);
-		Set<?> handlerClasses = reflections.getSubTypesOf(QuestBaseHandler.class);
+		var handlerClasses = reflections.getSubTypesOf(clazz);
 
-		for (Object obj : handlerClasses) {
-			this.registerPacketHandler(map, (Class<? extends QuestBaseHandler>) obj);
+		for (var obj : handlerClasses) {
+			this.registerPacketHandler(map, obj);
 		}
 	}
 
-	public void registerPacketHandler(Int2ObjectMap<QuestBaseHandler> map, Class<? extends QuestBaseHandler> handlerClass) {
+	public <T> void registerPacketHandler(Int2ObjectMap<T> map, Class<? extends T> handlerClass) {
 		try {
 			QuestValue opcode = handlerClass.getAnnotation(QuestValue.class);
 
@@ -47,9 +49,7 @@ public class ServerQuestHandler {
 				return;
 			}
 
-			QuestBaseHandler packetHandler = (QuestBaseHandler) handlerClass.newInstance();
-
-			map.put(opcode.value().getValue(), packetHandler);
+			map.put(opcode.value().getValue(), handlerClass.newInstance());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -57,33 +57,36 @@ public class ServerQuestHandler {
 
 	// TODO make cleaner
 
-	public boolean triggerCondition(GameQuest quest, QuestCondition condition, int... params) {
+	public boolean triggerCondition(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
 		QuestBaseHandler handler = condHandlers.get(condition.getType().getValue());
 
 		if (handler == null || quest.getData() == null) {
+            Grasscutter.getLogger().debug("Could not trigger condition {} at {}", condition.getType().getValue(), quest.getData());
 			return false;
 		}
 
-		return handler.execute(quest, condition, params);
+		return handler.execute(quest, condition, paramStr, params);
 	}
 
-	public boolean triggerContent(GameQuest quest, QuestCondition condition, int... params) {
+	public boolean triggerContent(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
 		QuestBaseHandler handler = contHandlers.get(condition.getType().getValue());
 
 		if (handler == null || quest.getData() == null) {
+            Grasscutter.getLogger().debug("Could not trigger content {} at {}", condition.getType().getValue(), quest.getData());
 			return false;
 		}
 
-		return handler.execute(quest, condition, params);
+		return handler.execute(quest, condition, paramStr, params);
 	}
 
-	public boolean triggerExec(GameQuest quest, QuestCondition condition, int... params) {
-		QuestBaseHandler handler = execHandlers.get(condition.getType().getValue());
+	public boolean triggerExec(GameQuest quest, QuestExecParam execParam, String... params) {
+		QuestExecHandler handler = execHandlers.get(execParam.getType().getValue());
 
 		if (handler == null || quest.getData() == null) {
+            Grasscutter.getLogger().debug("Could not trigger exec {} at {}", execParam.getType().getValue(), quest.getData());
 			return false;
 		}
 
-		return handler.execute(quest, condition, params);
+		return handler.execute(quest, execParam, params);
 	}
 }

src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java

@@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 public class BaseCondition extends QuestBaseHandler {
 
 	@Override
-	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
 		// TODO Auto-generated method stub
 		return false;
 	}

src/main/java/emu/grasscutter/game/quest/conditions/ConditionLuaNotify.java

+package emu.grasscutter.game.quest.conditions;
+
+import emu.grasscutter.data.excels.QuestData.QuestCondition;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTrigger.QUEST_COND_LUA_NOTIFY)
+public class ConditionLuaNotify extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == Integer.parseInt(paramStr);
+	}
+
+}

src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java

@@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 public class ConditionPlayerLevelEqualGreater extends QuestBaseHandler {
 
 	@Override
-	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
 		return quest.getOwner().getLevel() >= params[0];
 	}
 

src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java

@@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 public class ConditionStateEqual extends QuestBaseHandler {
 
 	@Override
-	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
 		GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
 
 		if (checkQuest != null) {

src/main/java/emu/grasscutter/game/quest/content/BaseContent.java

@@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 public class BaseContent extends QuestBaseHandler {
 
 	@Override
-	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
 		// TODO Auto-generated method stub
 		return false;
 	}

src/main/java/emu/grasscutter/game/quest/content/ContentAddQuestProgress.java

+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.excels.QuestData.QuestCondition;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValue;
+import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
+
+@QuestValue(QuestTrigger.QUEST_CONTENT_ADD_QUEST_PROGRESS)
+public class ContentAddQuestProgress extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+		return condition.getParam()[0] == params[0];
+	}
+
+}

src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java

@@ -10,7 +10,7 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 public class ContentCompleteTalk extends QuestBaseHandler {
 
 	@Override
-	public boolean execute(GameQuest quest, QuestCondition condition, int... params) {
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
 		return condition.getParam()[0] == params[0];
 	}