quest fix & personal line impl

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

@@ -10,9 +10,9 @@ 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

@@ -0,0 +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;
+
+@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,8 +10,8 @@ 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];
 	}
-	
+
 }

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

@@ -10,8 +10,8 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 public class ContentEnterDungeon 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];
 	}
-	
+
 }

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

@@ -0,0 +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;
+
+@QuestValue(QuestTrigger.QUEST_CONTENT_ENTER_ROOM)
+public class ContentEnterRoom 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/ContentFinishPlot.java

@@ -10,8 +10,8 @@ import emu.grasscutter.game.quest.handlers.QuestBaseHandler;
 public class ContentFinishPlot 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];
 	}
-	
+
 }

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

@@ -0,0 +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_GAME_TIME_TICK)
+public class ContentGameTimeTick extends QuestBaseHandler {
+
+	@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]));
+
+        // params[0] is clock, params[1] is day
+		return params[0] >= min && params[0] <= max &&
+            params[1] >= condition.getParam()[0];
+	}
+
+}

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

@@ -0,0 +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;
+
+@QuestValue(QuestTrigger.QUEST_CONTENT_INTERACT_GADGET)
+public class ContentInteractGadget extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+		return params[0] == condition.getParam()[0];
+	}
+
+}

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

@@ -0,0 +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;
+
+@QuestValue(QuestTrigger.QUEST_CONTENT_LUA_NOTIFY)
+public class ContentLuaNotify extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+		return condition.getParamStr().equals(paramStr);
+	}
+
+}

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

@@ -0,0 +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_QUEST_STATE_EQUAL)
+public class ContentQuestStateEqual extends QuestBaseHandler {
+
+	@Override
+	public boolean execute(GameQuest quest, QuestCondition condition, String paramStr, int... params) {
+        GameQuest checkQuest = quest.getOwner().getQuestManager().getQuestById(params[0]);
+
+        if (checkQuest != null) {
+            return checkQuest.getState().getValue() == params[1];
+        }
+
+        return false;
+	}
+
+}