Copy some files from Grasscutter-Quests

NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)

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

@@ -1,17 +1,17 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.excels.QuestData.QuestCondition;
+import emu.grasscutter.data.excels.QuestData;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValue;
-import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.enums.QuestContent;
 import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_NONE)
-public class BaseContent extends QuestBaseHandler {
+@QuestValueContent(QuestContent.QUEST_CONTENT_NONE)
+public class BaseContent extends QuestBaseHandler<QuestData.QuestContentCondition> {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         // TODO Auto-generated method stub
         return false;
     }

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

@@ -1,22 +1,23 @@
-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) {
-        /*
-            //paramStr is a lua group, params[0] may also be a lua group!
-             questid = xxxxxx lua group = xxxxxxyy
-            count seems relevant only for lua group
-        */
-        return condition.getParam()[0] == params[0]; //missing params[1], paramStr, and count
-    }
-
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ADD_QUEST_PROGRESS;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import lombok.val;
+
+@QuestValueContent(QUEST_CONTENT_ADD_QUEST_PROGRESS)
+public class ContentAddQuestProgress extends BaseContent {
+
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val progressId = condition.getParam()[0];
+        val currentCount = quest.getOwner().getPlayerProgress().getCurrentProgress(progressId);
+
+        // if the condition count is 0 I think it is safe to assume that the
+        // condition count from EXEC only needs to be 1
+        return currentCount >= condition.getCount();
+    }
+}

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ANY_MANUAL_TRANSPORT;
-
-@QuestValueContent(QUEST_CONTENT_ANY_MANUAL_TRANSPORT)
-public class ContentAnyManualTransport extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ANY_MANUAL_TRANSPORT;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_ANY_MANUAL_TRANSPORT)
+public class ContentAnyManualTransport extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return true;
+    }
+}

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

@@ -1,19 +1,20 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-import lombok.val;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_CLEAR_GROUP_MONSTER;
-
-@QuestValueContent(QUEST_CONTENT_CLEAR_GROUP_MONSTER)
-public class ContentClearGroupMonster extends BaseContent {
-
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        val groupId = condition.getParam()[0];
-
-        return quest.getOwner().getScene().getScriptManager().isClearedGroupMonsters(groupId);
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_CLEAR_GROUP_MONSTER;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import lombok.val;
+
+@QuestValueContent(QUEST_CONTENT_CLEAR_GROUP_MONSTER)
+public class ContentClearGroupMonster extends BaseContent {
+
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val groupId = condition.getParam()[0];
+
+        return quest.getOwner().getScene().getScriptManager().isClearedGroupMonsters(groupId);
+    }
+}

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

@@ -1,27 +1,33 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.binout.MainQuestData;
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameMainQuest;
-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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_COMPLETE_ANY_TALK)
-public class ContentCompleteAnyTalk extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import java.util.Arrays;
+import lombok.val;
+
+@QuestValueContent(QUEST_CONTENT_COMPLETE_ANY_TALK)
+public class ContentCompleteAnyTalk extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
-        GameMainQuest checkMainQuest =
-                quest.getOwner().getQuestManager().getMainQuestById(params[0] / 100);
-        if (checkMainQuest == null) {
-            return false;
-        }
-        MainQuestData.TalkData talkData = checkMainQuest.getTalks().get(Integer.valueOf(paramStr));
-        return talkData == null
-                || condition.getParamStr().contains(paramStr)
-                || checkMainQuest.getChildQuestById(params[0]) != null;
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val talkId = params[0];
+        val conditionTalk =
+                Arrays.stream(condition.getParamStr().split(",")).mapToInt(Integer::parseInt).toArray();
+        return Arrays.stream(conditionTalk).anyMatch(tids -> tids == talkId)
+                || Arrays.stream(conditionTalk)
+                        .anyMatch(
+                                tids -> {
+                                    val checkMainQuest =
+                                            quest.getOwner().getQuestManager().getMainQuestByTalkId(tids);
+                                    if (checkMainQuest == null) {
+                                        return false;
+                                    }
+                                    val talkData = checkMainQuest.getTalks().get(talkId);
+                                    return talkData != null;
+                                });
     }
 }

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

@@ -1,30 +1,25 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.binout.MainQuestData;
-import emu.grasscutter.data.excels.QuestData.QuestCondition;
-import emu.grasscutter.game.quest.GameMainQuest;
-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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_COMPLETE_TALK)
-public class ContentCompleteTalk extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import lombok.val;
+
+@QuestValueContent(QUEST_CONTENT_COMPLETE_TALK)
+public class ContentCompleteTalk extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
-        GameMainQuest checkMainQuest =
-                quest.getOwner().getQuestManager().getMainQuestById(params[0] / 100);
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val talkId = condition.getParam()[0];
+        val checkMainQuest = quest.getOwner().getQuestManager().getMainQuestByTalkId(talkId);
         if (checkMainQuest == null) {
             return false;
         }
 
-        MainQuestData.TalkData talkData = checkMainQuest.getTalks().get(condition.getParam()[0]);
+        val talkData = checkMainQuest.getTalks().get(talkId);
         return talkData != null;
-
-        // This expression makes zero sense.
-        // return talkData == null || condition.getParamStr().contains(paramStr) ||
-        // checkMainQuest.getChildQuestById(params[0]) != null;
     }
 }

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_DESTROY_GADGET;
-
-@QuestValueContent(QUEST_CONTENT_DESTROY_GADGET)
-public class ContentDestroyGadget extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_DESTROY_GADGET;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_DESTROY_GADGET)
+public class ContentDestroyGadget extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,17 +1,17 @@
 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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_DUNGEON;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_ENTER_DUNGEON)
-public class ContentEnterDungeon extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_ENTER_DUNGEON)
+public class ContentEnterDungeon extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         return condition.getParam()[0] == params[0]; // missing params[1]
     }
 }

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

@@ -1,17 +1,17 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD;
-
-@QuestValueContent(QUEST_CONTENT_ENTER_MY_WORLD)
-public class ContentEnterMyWorld extends BaseContent {
-    // params[0] scene ID
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_ENTER_MY_WORLD)
+public class ContentEnterMyWorld extends BaseContent {
+    // params[0] scene ID
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,17 +1,17 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD_SCENE;
-
-@QuestValueContent(QUEST_CONTENT_ENTER_MY_WORLD_SCENE)
-public class ContentEnterMyWorldScene extends BaseContent {
-    // params[0] scene ID
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_MY_WORLD_SCENE;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_ENTER_MY_WORLD_SCENE)
+public class ContentEnterMyWorldScene extends BaseContent {
+    // params[0] scene ID
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,17 +1,17 @@
 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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_ROOM;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_ENTER_ROOM)
-public class ContentEnterRoom extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_ENTER_ROOM)
+public class ContentEnterRoom extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         return condition.getParam()[0] == params[0];
     }
 }

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_VEHICLE;
-
-@QuestValueContent(QUEST_CONTENT_ENTER_VEHICLE)
-public class ContentEnterVehicle extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ENTER_VEHICLE;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_ENTER_VEHICLE)
+public class ContentEnterVehicle extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,18 +1,18 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FAIL_DUNGEON;
-
-@QuestValueContent(QUEST_CONTENT_FAIL_DUNGEON)
-public class ContentFailDungeon extends BaseContent {
-
-    // params[0] dungeon ID
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FAIL_DUNGEON;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_FAIL_DUNGEON)
+public class ContentFailDungeon extends BaseContent {
+
+    // params[0] dungeon ID
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,18 +1,18 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FINISH_DUNGEON;
-
-@QuestValueContent(QUEST_CONTENT_FINISH_DUNGEON)
-public class ContentFinishDungeon extends BaseContent {
-
-    // params[0] dungeon ID, params[1] unknown
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FINISH_DUNGEON;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_FINISH_DUNGEON)
+public class ContentFinishDungeon extends BaseContent {
+
+    // params[0] dungeon ID, params[1] unknown
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,21 +1,22 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.binout.MainQuestData;
-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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_FINISH_PLOT;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_FINISH_PLOT)
-public class ContentFinishPlot extends QuestBaseHandler {
+import emu.grasscutter.data.binout.MainQuestData;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_FINISH_PLOT)
+public class ContentFinishPlot extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         MainQuestData.TalkData talkData =
                 quest.getMainQuest().getTalks().get(Integer.valueOf(params[0]));
         GameQuest subQuest = quest.getMainQuest().getChildQuestById(params[0]);
-        return talkData != null || subQuest != null;
+        return talkData != null && subQuest != null
+                || condition.getParamStr().equals(paramStr) && condition.getParam()[0] == params[0];
     }
 }

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

@@ -1,22 +1,38 @@
 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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_GAME_TIME_TICK;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_GAME_TIME_TICK)
-public class ContentGameTimeTick extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import lombok.val;
+
+@QuestValueContent(QUEST_CONTENT_GAME_TIME_TICK)
+public class ContentGameTimeTick extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
-        var range = condition.getParamStr().split(",");
-        var min = Math.min(Integer.parseInt(range[0]), Integer.parseInt(range[1]));
-        var max = Math.max(Integer.parseInt(range[0]), Integer.parseInt(range[1]));
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val daysSinceStart =
+                quest.getOwner().getWorld().getTotalGameTimeDays() - quest.getStartGameDay();
+        val currentHour = quest.getOwner().getWorld().getGameTimeHours();
 
-        // params[0] is clock, params[1] is day
-        return params[0] >= min && params[0] <= max && params[1] >= condition.getParam()[0];
+        // params[0] is days since start, str is hours of day
+        val range = condition.getParamStr().split(",");
+        val from = Integer.parseInt(range[0]);
+        val to = Integer.parseInt(range[1]);
+
+        val daysToPass = condition.getParam()[0];
+        // if to is at the beginning of the day, we need to pass it one more time
+        val daysMod = to < from && daysToPass > 0 && currentHour < to ? 1 : 0;
+
+        val isTimeMet =
+                from < to
+                        ? currentHour >= from && currentHour < to
+                        : currentHour < to || currentHour >= from;
+
+        val isDaysSinceMet = daysSinceStart >= daysToPass + daysMod;
+
+        return isTimeMet && isDaysSinceMet;
     }
 }

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

@@ -1,17 +1,17 @@
 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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_INTERACT_GADGET;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_INTERACT_GADGET)
-public class ContentInteractGadget extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_INTERACT_GADGET)
+public class ContentInteractGadget extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         return params[0] == condition.getParam()[0];
     }
 }

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ITEM_LESS_THAN;
-
-@QuestValueContent(QUEST_CONTENT_ITEM_LESS_THAN)
-public class ContentItemLessThan extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0] && condition.getCount() > params[1];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_ITEM_LESS_THAN;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_ITEM_LESS_THAN)
+public class ContentItemLessThan extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0] && condition.getCount() > params[1];
+    }
+}

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_KILL_MONSTER;
-
-@QuestValueContent(QUEST_CONTENT_KILL_MONSTER)
-public class ContentKillMonster extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_KILL_MONSTER;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_KILL_MONSTER)
+public class ContentKillMonster extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,17 +1,17 @@
 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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_LEAVE_SCENE;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_LEAVE_SCENE)
-public class ContentLeaveScene extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_LEAVE_SCENE)
+public class ContentLeaveScene extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         return quest.getOwner().getScene().getPrevScene() == params[0];
     }
 }

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

@@ -1,17 +1,17 @@
 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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_LUA_NOTIFY;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_LUA_NOTIFY)
-public class ContentLuaNotify extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_LUA_NOTIFY)
+public class ContentLuaNotify extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         return condition.getParamStr().equals(paramStr);
     }
 }

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_MONSTER_DIE;
-
-@QuestValueContent(QUEST_CONTENT_MONSTER_DIE)
-public class ContentMonsterDie extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_MONSTER_DIE;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_MONSTER_DIE)
+public class ContentMonsterDie extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,25 +1,24 @@
 package emu.grasscutter.game.quest.content;
 
-import emu.grasscutter.data.binout.MainQuestData;
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameMainQuest;
-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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_NOT_FINISH_PLOT;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_NOT_FINISH_PLOT)
-public class ContentNotFinishPlot extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import lombok.val;
+
+@QuestValueContent(QUEST_CONTENT_NOT_FINISH_PLOT)
+public class ContentNotFinishPlot extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
-        GameMainQuest checkMainQuest =
-                quest.getOwner().getQuestManager().getMainQuestById(params[0] / 100);
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val talkId = condition.getParam()[0];
+        val checkMainQuest = quest.getOwner().getQuestManager().getMainQuestByTalkId(talkId);
         if (checkMainQuest == null) {
-            return false;
+            return true;
         }
-        MainQuestData.TalkData talkData = checkMainQuest.getTalks().get(Integer.valueOf(params[0]));
+        val talkData = checkMainQuest.getTalks().get(talkId);
         return talkData == null;
     }
 }

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

@@ -1,19 +1,20 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_OBTAIN_ITEM;
-
-@QuestValueContent(QUEST_CONTENT_OBTAIN_ITEM)
-public class ContentObtainItem extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        var targetCount = condition.getCount();
-        if (targetCount == 0) {
-            targetCount = 1;
-        }
-        return condition.getParam()[0] == params[0] && targetCount <= params[1];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_OBTAIN_ITEM;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_OBTAIN_ITEM)
+public class ContentObtainItem extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        var targetCount = condition.getCount();
+        if (targetCount == 0) {
+            targetCount = 1;
+        }
+        return condition.getParam()[0] == params[0] && targetCount <= params[1];
+    }
+}

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_PLAYER_LEVEL_UP;
-
-@QuestValueContent(QUEST_CONTENT_PLAYER_LEVEL_UP)
-public class ContentPlayerLevelUp extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return quest.getOwner().getLevel() >= condition.getCount();
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_PLAYER_LEVEL_UP;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_PLAYER_LEVEL_UP)
+public class ContentPlayerLevelUp extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return quest.getOwner().getLevel() >= condition.getCount();
+    }
+}

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

@@ -1,17 +1,17 @@
 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;
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_STATE_EQUAL;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_QUEST_STATE_EQUAL)
-public class ContentQuestStateEqual extends QuestBaseHandler {
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_QUEST_STATE_EQUAL)
+public class ContentQuestStateEqual extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(condition.getParam()[0]);
         if (checkQuest == null) {
             return false;

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

@@ -1,17 +1,17 @@
 package emu.grasscutter.game.quest.content;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_STATE_NOT_EQUAL;
+
 import emu.grasscutter.data.excels.QuestData;
 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;
+import emu.grasscutter.game.quest.QuestValueContent;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_QUEST_STATE_NOT_EQUAL)
-public class ContentQuestStateNotEqual extends QuestBaseHandler {
+@QuestValueContent(QUEST_CONTENT_QUEST_STATE_NOT_EQUAL)
+public class ContentQuestStateNotEqual extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
 
         if (checkQuest != null) {

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

@@ -1,18 +1,18 @@
 package emu.grasscutter.game.quest.content;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_EQUAL;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.QuestData;
 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;
+import emu.grasscutter.game.quest.QuestValueContent;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_QUEST_VAR_EQUAL)
-public class ContentQuestVarEqual extends QuestBaseHandler {
+@QuestValueContent(QUEST_CONTENT_QUEST_VAR_EQUAL)
+public class ContentQuestVarEqual extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         int questVarValue = quest.getMainQuest().getQuestVars()[params[0]];
         Grasscutter.getLogger().debug("questVar {} : {}", params[0], questVarValue);
         return questVarValue == params[1];

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

@@ -1,18 +1,18 @@
 package emu.grasscutter.game.quest.content;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_GREATER;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.QuestData;
 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;
+import emu.grasscutter.game.quest.QuestValueContent;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_QUEST_VAR_GREATER)
-public class ContentQuestVarGreater extends QuestBaseHandler {
+@QuestValueContent(QUEST_CONTENT_QUEST_VAR_GREATER)
+public class ContentQuestVarGreater extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         int questVarValue = quest.getMainQuest().getQuestVars()[params[0]];
         Grasscutter.getLogger().debug("questVar {} : {}", params[0], questVarValue);
         return questVarValue > params[1];

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

@@ -1,18 +1,18 @@
 package emu.grasscutter.game.quest.content;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_QUEST_VAR_LESS;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.QuestData;
 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;
+import emu.grasscutter.game.quest.QuestValueContent;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_QUEST_VAR_LESS)
-public class ContentQuestVarLess extends QuestBaseHandler {
+@QuestValueContent(QUEST_CONTENT_QUEST_VAR_LESS)
+public class ContentQuestVarLess extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         int questVarValue = quest.getMainQuest().getQuestVars()[params[0]];
         Grasscutter.getLogger().debug("questVar {} : {}", params[0], questVarValue);
         return questVarValue < params[1];

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

@@ -1,15 +1,16 @@
 package emu.grasscutter.game.quest.content;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_SKILL;
+
 import emu.grasscutter.data.excels.QuestData;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValue;
-import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.QuestValueContent;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_SKILL)
+@QuestValueContent(QUEST_CONTENT_SKILL)
 public class ContentSkill extends BaseContent {
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
-        return (condition.getParam()[0] == params[0]) && (condition.getParam()[1] == params[1]);
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
     }
 }

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

@@ -1,25 +1,26 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-import emu.grasscutter.game.quest.enums.QuestContent;
-import lombok.val;
-
-@QuestValueContent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ)
-public class ContentTimeVarMoreOrEqual extends BaseContent{
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        val mainQuestId = condition.getParam()[0];
-        val timeVarIndex = condition.getParam()[1];
-        val minTime = Integer.parseInt(condition.getParamStr());
-
-        val mainQuest = quest.getOwner().getQuestManager().getMainQuestById(mainQuestId);
-
-        if(mainQuest == null){
-            return false;
-        }
-
-        return mainQuest.getHoursSinceTimeVar(timeVarIndex) >= minTime;
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import lombok.val;
+
+@QuestValueContent(QuestContent.QUEST_CONTENT_TIME_VAR_GT_EQ)
+public class ContentTimeVarMoreOrEqual extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val mainQuestId = condition.getParam()[0];
+        val timeVarIndex = condition.getParam()[1];
+        val minTime = Integer.parseInt(condition.getParamStr());
+
+        val mainQuest = quest.getOwner().getQuestManager().getMainQuestById(mainQuestId);
+
+        if (mainQuest == null) {
+            return false;
+        }
+
+        return mainQuest.getHoursSinceTimeVar(timeVarIndex) >= minTime;
+    }
+}

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

@@ -1,30 +1,31 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-import emu.grasscutter.game.quest.enums.QuestContent;
-import lombok.val;
-
-@QuestValueContent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY)
-public class ContentTimeVarPassDay extends BaseContent{
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        val mainQuestId = condition.getParam()[0];
-        val timeVarIndex = condition.getParam()[1];
-        val minDays = Integer.parseInt(condition.getParamStr());
-
-        val mainQuest = quest.getOwner().getQuestManager().getMainQuestById(mainQuestId);
-
-        if(mainQuest == null){
-            return false;
-        }
-
-        val daysSinceTimeVar = mainQuest.getDaysSinceTimeVar(timeVarIndex);
-        if(daysSinceTimeVar == -1){
-            return false;
-        }
-
-        return daysSinceTimeVar >= minDays;
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+import emu.grasscutter.game.quest.enums.QuestContent;
+import lombok.val;
+
+@QuestValueContent(QuestContent.QUEST_CONTENT_TIME_VAR_PASS_DAY)
+public class ContentTimeVarPassDay extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        val mainQuestId = condition.getParam()[0];
+        val timeVarIndex = condition.getParam()[1];
+        val minDays = Integer.parseInt(condition.getParamStr());
+
+        val mainQuest = quest.getOwner().getQuestManager().getMainQuestById(mainQuestId);
+
+        if (mainQuest == null) {
+            return false;
+        }
+
+        val daysSinceTimeVar = mainQuest.getDaysSinceTimeVar(timeVarIndex);
+        if (daysSinceTimeVar == -1) {
+            return false;
+        }
+
+        return daysSinceTimeVar >= minDays;
+    }
+}

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

@@ -1,18 +1,18 @@
 package emu.grasscutter.game.quest.content;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_TRIGGER_FIRE;
+
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.excels.QuestData;
 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;
+import emu.grasscutter.game.quest.QuestValueContent;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_TRIGGER_FIRE)
-public class ContentTriggerFire extends QuestBaseHandler {
+@QuestValueContent(QUEST_CONTENT_TRIGGER_FIRE)
+public class ContentTriggerFire extends BaseContent {
 
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         if (quest.getTriggers().containsKey(quest.getTriggerNameById(params[0]))) {
             // We don't want to put a new key here
             return quest.getTriggers().get(quest.getTriggerNameById(params[0]));

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_UNLOCK_AREA;
-
-@QuestValueContent(QUEST_CONTENT_UNLOCK_AREA)
-public class ContentUnlockArea extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0] || condition.getParam()[1] == params[1];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_UNLOCK_AREA;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_UNLOCK_AREA)
+public class ContentUnlockArea extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0] || condition.getParam()[1] == params[1];
+    }
+}

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

@@ -1,16 +1,16 @@
 package emu.grasscutter.game.quest.content;
 
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_UNLOCK_TRANS_POINT;
+
 import emu.grasscutter.data.excels.QuestData;
 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;
+import emu.grasscutter.game.quest.QuestValueContent;
 
-@QuestValue(QuestTrigger.QUEST_CONTENT_UNLOCK_TRANS_POINT)
-public class ContentUnlockTransPoint extends QuestBaseHandler {
+@QuestValueContent(QUEST_CONTENT_UNLOCK_TRANS_POINT)
+public class ContentUnlockTransPoint extends BaseContent {
     @Override
     public boolean execute(
-            GameQuest quest, QuestData.QuestCondition condition, String paramStr, int... params) {
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
         return condition.getParam()[0] == params[0] && condition.getParam()[1] == params[1];
     }
 }

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_USE_ITEM;
-
-@QuestValueContent(QUEST_CONTENT_USE_ITEM)
-public class ContentUseItem extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_USE_ITEM;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_USE_ITEM)
+public class ContentUseItem extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0];
+    }
+}

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

@@ -1,15 +1,16 @@
-package emu.grasscutter.game.quest.content;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueContent;
-
-import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_WORKTOP_SELECT;
-
-@QuestValueContent(QUEST_CONTENT_WORKTOP_SELECT)
-public class ContentWorktopSelect extends BaseContent {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return condition.getParam()[0] == params[0] || condition.getParam()[1] == params[1];
-    }
-}
+package emu.grasscutter.game.quest.content;
+
+import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_WORKTOP_SELECT;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueContent;
+
+@QuestValueContent(QUEST_CONTENT_WORKTOP_SELECT)
+public class ContentWorktopSelect extends BaseContent {
+    @Override
+    public boolean execute(
+            GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
+        return condition.getParam()[0] == params[0] || condition.getParam()[1] == params[1];
+    }
+}