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/exec/ExecAddCurAvatarEnergy.java

@@ -1,17 +1,17 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import emu.grasscutter.Grasscutter;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_ADD_CUR_AVATAR_ENERGY)
-public class ExecAddCurAvatarEnergy extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        Grasscutter.getLogger().info("Energy refilled");
-        return quest.getOwner().getEnergyManager().refillEntityAvatarEnergy();
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_ADD_CUR_AVATAR_ENERGY)
+public class ExecAddCurAvatarEnergy extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        Grasscutter.getLogger().info("Energy refilled");
+        return quest.getOwner().getEnergyManager().refillEntityAvatarEnergy();
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java

@@ -2,22 +2,19 @@ package emu.grasscutter.game.quest.exec;
 
 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.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import java.util.Arrays;
 
-@QuestValue(QuestTrigger.QUEST_EXEC_ADD_QUEST_PROGRESS)
+@QuestValueExec(QuestExec.QUEST_EXEC_ADD_QUEST_PROGRESS)
 public class ExecAddQuestProgress extends QuestExecHandler {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
         var param =
                 Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
 
-        quest
-                .getOwner()
-                .getQuestManager()
-                .triggerEvent(QuestTrigger.QUEST_CONTENT_ADD_QUEST_PROGRESS, param);
+        quest.getOwner().getProgressManager().addQuestProgress(param[0], param[1]);
 
         return true;
     }

src/main/java/emu/grasscutter/game/quest/exec/ExecChangeAvatarElemet.java

@@ -1,31 +1,34 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import lombok.val;
-
-/**
- * Changes the main avatar's element. First parameter is the elementType id
- */
-@QuestValueExec(QuestExec.QUEST_EXEC_CHANGE_AVATAR_ELEMET)
-public class ExecChangeAvatarElemet extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        val targetElement = ElementType.getTypeByValue(Integer.parseInt(paramStr[0]));
-        val owner = quest.getOwner();
-        val mainAvatar = owner.getAvatars().getAvatarById(owner.getMainCharacterId());
-
-        if(mainAvatar == null){
-            Grasscutter.getLogger().error("Failed to get main avatar for use {}", quest.getOwner().getUid());
-            return false;
-        }
-
-        Grasscutter.getLogger().info("Changing avatar element to {} for quest {}", targetElement.name(), quest.getSubQuestId());
-        return mainAvatar.changeElement(targetElement);
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.props.ElementType;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import lombok.val;
+
+/** Changes the main avatar's element. First parameter is the elementType id */
+@QuestValueExec(QuestExec.QUEST_EXEC_CHANGE_AVATAR_ELEMET)
+public class ExecChangeAvatarElemet extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        val targetElement = ElementType.getTypeByValue(Integer.parseInt(paramStr[0]));
+        val owner = quest.getOwner();
+        val mainAvatar = owner.getAvatars().getAvatarById(owner.getMainCharacterId());
+
+        if (mainAvatar == null) {
+            Grasscutter.getLogger()
+                    .error("Failed to get main avatar for use {}", quest.getOwner().getUid());
+            return false;
+        }
+
+        Grasscutter.getLogger()
+                .info(
+                        "Changing avatar element to {} for quest {}",
+                        targetElement.name(),
+                        quest.getSubQuestId());
+        return mainAvatar.changeElement(targetElement);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecClearTimeVar.java

@@ -1,19 +1,19 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import lombok.val;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_CLEAR_TIME_VAR)
-public class ExecClearTimeVar extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        val mainQuestId = Integer.parseInt(condition.getParam()[0]);
-        val timeVarId = Integer.parseInt(condition.getParam()[1]);
-        val mainQuest = quest.getOwner().getQuestManager().getMainQuestById(mainQuestId);
-        return mainQuest.clearTimeVar(timeVarId);
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import lombok.val;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_CLEAR_TIME_VAR)
+public class ExecClearTimeVar extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        val mainQuestId = Integer.parseInt(condition.getParam()[0]);
+        val timeVarId = Integer.parseInt(condition.getParam()[1]);
+        val mainQuest = quest.getOwner().getQuestManager().getMainQuestById(mainQuestId);
+        return mainQuest.clearTimeVar(timeVarId);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java

@@ -2,11 +2,11 @@ package emu.grasscutter.game.quest.exec;
 
 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.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
-@QuestValue(QuestTrigger.QUEST_EXEC_DEC_QUEST_GLOBAL_VAR)
+@QuestValueExec(QuestExec.QUEST_EXEC_DEC_QUEST_GLOBAL_VAR)
 public class ExecDecQuestGlobalVar extends QuestExecHandler {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {

src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java

@@ -1,16 +1,16 @@
-package emu.grasscutter.game.quest.exec;
-
-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.QuestExecHandler;
-
-@QuestValue(QuestTrigger.QUEST_EXEC_DEC_QUEST_VAR)
-public class ExecDecQuestVar extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        quest.getMainQuest().decQuestVar(Integer.parseInt(paramStr[0]), Integer.parseInt(paramStr[1]));
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_DEC_QUEST_VAR)
+public class ExecDecQuestVar extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        quest.getMainQuest().decQuestVar(Integer.parseInt(paramStr[0]), Integer.parseInt(paramStr[1]));
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItem.java

@@ -1,17 +1,17 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_DEL_PACK_ITEM)
-public class ExecDelPackItem extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        int itemId = Integer.parseInt(paramStr[0]);
-        int amount = Integer.parseInt(paramStr[1]);
-        return quest.getOwner().getInventory().removeItem(itemId, amount);
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_DEL_PACK_ITEM)
+public class ExecDelPackItem extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        int itemId = Integer.parseInt(paramStr[0]);
+        int amount = Integer.parseInt(paramStr[1]);
+        return quest.getOwner().getInventory().removeItem(itemId, amount);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItemBatch.java

@@ -1,26 +1,26 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_DEL_PACK_ITEM_BATCH)
-public class ExecDelPackItemBatch extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        // input is like this: "100497:999,100498:999,100499:999"
-        var items = paramStr[0].split(",");
-        boolean success = true;
-        for (var itemString : items){
-            var itemFields = itemString.split(":");
-            var itemId = Integer.parseInt(itemFields[0]);
-            var amount = Integer.parseInt(itemFields[1]);
-            if(!quest.getOwner().getInventory().removeItem(itemId, amount)){
-                success = false;
-            }
-        }
-        return success;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_DEL_PACK_ITEM_BATCH)
+public class ExecDelPackItemBatch extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        // input is like this: "100497:999,100498:999,100499:999"
+        var items = paramStr[0].split(",");
+        boolean success = true;
+        for (var itemString : items) {
+            var itemFields = itemString.split(":");
+            var itemId = Integer.parseInt(itemFields[0]);
+            var amount = Integer.parseInt(itemFields[1]);
+            if (!quest.getOwner().getInventory().removeItem(itemId, amount)) {
+                success = false;
+            }
+        }
+        return success;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java

@@ -1,21 +1,27 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.Grasscutter;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_GRANT_TRIAL_AVATAR)
-public class ExecGrantTrialAvatar extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        if (quest.getOwner().addTrialAvatarForQuest(Integer.parseInt(paramStr[0]), quest.getMainQuestId())) {
-            Grasscutter.getLogger().info("Added trial avatar to team for quest {}", quest.getSubQuestId());
-            return true;
-        }
-        return false;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_GRANT_TRIAL_AVATAR)
+public class ExecGrantTrialAvatar extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        try {
+            quest
+                    .getOwner()
+                    .getTeamManager()
+                    .addTrialAvatar(Integer.parseInt(paramStr[0]), quest.getMainQuestId());
+            Grasscutter.getLogger()
+                    .debug("Added trial avatar to team for quest {}", quest.getSubQuestId());
+
+            return true;
+        } catch (RuntimeException ignored) {
+            return false;
+        }
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java

@@ -2,11 +2,11 @@ package emu.grasscutter.game.quest.exec;
 
 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.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
-@QuestValue(QuestTrigger.QUEST_EXEC_INC_QUEST_GLOBAL_VAR)
+@QuestValueExec(QuestExec.QUEST_EXEC_INC_QUEST_GLOBAL_VAR)
 public class ExecIncQuestGlobalVar extends QuestExecHandler {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {

src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java

@@ -1,16 +1,16 @@
-package emu.grasscutter.game.quest.exec;
-
-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.QuestExecHandler;
-
-@QuestValue(QuestTrigger.QUEST_EXEC_INC_QUEST_VAR)
-public class ExecIncQuestVar extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        quest.getMainQuest().incQuestVar(Integer.parseInt(paramStr[0]), Integer.parseInt(paramStr[1]));
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_INC_QUEST_VAR)
+public class ExecIncQuestVar extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        quest.getMainQuest().incQuestVar(Integer.parseInt(paramStr[0]), Integer.parseInt(paramStr[1]));
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecInitTimeVar.java

@@ -1,18 +1,18 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import lombok.val;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_INIT_TIME_VAR)
-public class ExecInitTimeVar extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        val timeVarId = Integer.parseInt(condition.getParam()[0]);
-        val mainQuest = quest.getMainQuest();
-        return mainQuest.initTimeVar(timeVarId);
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import lombok.val;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_INIT_TIME_VAR)
+public class ExecInitTimeVar extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        val timeVarId = Integer.parseInt(condition.getParam()[0]);
+        val mainQuest = quest.getMainQuest();
+        return mainQuest.initTimeVar(timeVarId);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java

@@ -1,31 +1,59 @@
 package emu.grasscutter.game.quest.exec;
 
+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.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.enums.QuestState;
-import emu.grasscutter.game.quest.enums.QuestTrigger;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 import emu.grasscutter.scripts.constants.EventType;
 import emu.grasscutter.scripts.data.ScriptArgs;
+import lombok.val;
 
-@QuestValue(QuestTrigger.QUEST_EXEC_NOTIFY_GROUP_LUA)
+@QuestValueExec(QuestExec.QUEST_EXEC_NOTIFY_GROUP_LUA)
 public class ExecNotifyGroupLua extends QuestExecHandler {
 
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var sceneId = Integer.parseInt(paramStr[0]);
-        var groupId = Integer.parseInt(paramStr[1]);
+        val sceneId = Integer.parseInt(paramStr[0]);
+        val groupId = Integer.parseInt(paramStr[1]);
 
-        var scriptManager = quest.getOwner().getScene().getScriptManager();
+        val scene = quest.getOwner().getScene();
+        val scriptManager = scene.getScriptManager();
 
-        if (quest.getOwner().getScene().getId() == sceneId) {
-            scriptManager.callEvent(
-                    quest.getState() == QuestState.QUEST_STATE_FINISHED
-                            ? EventType.EVENT_QUEST_FINISH
-                            : EventType.EVENT_QUEST_START,
-                    new ScriptArgs());
+        if (scene.getId() != sceneId) {
+            return false;
         }
+        scene.runWhenFinished(
+                () -> {
+                    val groupInstance = scriptManager.getGroupInstanceById(groupId);
+
+                    if (groupInstance != null) {
+                        // workaround to make sure the triggers are still there todo find better way of trigger
+                        // handling
+                        scriptManager.refreshGroup(groupInstance);
+                        Grasscutter.getLogger()
+                                .debug(
+                                        "group: {} \ncondition: {} \nparamStr {}",
+                                        groupInstance.getLuaGroup(),
+                                        condition,
+                                        paramStr);
+                    } else {
+                        Grasscutter.getLogger()
+                                .warn(
+                                        "notify, no group instance for:\n group: {} \ncondition: {} \nparamStr {}",
+                                        groupId,
+                                        condition,
+                                        paramStr);
+                    }
+
+                    val eventType =
+                            quest.getState() == QuestState.QUEST_STATE_FINISHED
+                                    ? EventType.EVENT_QUEST_FINISH
+                                    : EventType.EVENT_QUEST_START;
+                    scriptManager.callEvent(new ScriptArgs(groupId, eventType, quest.getSubQuestId()));
+                });
 
         return true;
     }

src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupMonster.java

@@ -1,19 +1,18 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_REFRESH_GROUP_MONSTER)
-public class ExecRefreshGroupMonster extends QuestExecHandler {
-
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var groupId = Integer.parseInt(paramStr[0]);
-
-        return quest.getOwner().getScene().getScriptManager().refreshGroupMonster(groupId);
-    }
-
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_REFRESH_GROUP_MONSTER)
+public class ExecRefreshGroupMonster extends QuestExecHandler {
+
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var groupId = Integer.parseInt(paramStr[0]);
+
+        return quest.getOwner().getScene().getScriptManager().refreshGroupMonster(groupId);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java

@@ -2,34 +2,31 @@ package emu.grasscutter.game.quest.exec;
 
 import emu.grasscutter.data.excels.QuestData;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestGroupSuite;
-import emu.grasscutter.game.quest.QuestValue;
-import emu.grasscutter.game.quest.enums.QuestTrigger;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
+import lombok.val;
 
-@QuestValue(QuestTrigger.QUEST_EXEC_REFRESH_GROUP_SUITE)
+@QuestValueExec(QuestExec.QUEST_EXEC_REFRESH_GROUP_SUITE)
 public class ExecRefreshGroupSuite extends QuestExecHandler {
 
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var sceneId = Integer.parseInt(paramStr[0]);
-        var groupId = Integer.parseInt(paramStr[1].split(",")[0]);
-        var suiteId = Integer.parseInt(paramStr[1].split(",")[1]);
+        val sceneId = Integer.parseInt(paramStr[0]);
+        val entries = paramStr[1].split(";");
+        val scriptManager = quest.getOwner().getWorld().getSceneById(sceneId).getScriptManager();
 
-        var scriptManager = quest.getOwner().getScene().getScriptManager();
+        boolean result = true;
+        for (var entry : entries) {
+            val entryArray = entry.split(",");
+            val groupId = Integer.parseInt(entryArray[0]);
+            val suiteId = Integer.parseInt(entryArray[1]);
 
-        quest
-                .getMainQuest()
-                .getQuestGroupSuites()
-                .add(QuestGroupSuite.of().scene(sceneId).group(groupId).suite(suiteId).build());
-
-        // refresh immediately if player is in this scene
-        if (quest.getOwner().getScene().getId() == sceneId) {
-            scriptManager.refreshGroup(scriptManager.getGroupById(groupId), suiteId);
-            quest.getOwner().sendPacket(new PacketGroupSuiteNotify(groupId, suiteId));
+            if (!scriptManager.refreshGroupSuite(groupId, suiteId, quest)) {
+                result = false;
+            }
         }
 
-        return true;
+        return result;
     }
 }

src/main/java/emu/grasscutter/game/quest/exec/ExecRegisterDynamicGroup.java

@@ -1,39 +1,38 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestGroupSuite;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import emu.grasscutter.game.world.Scene;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_REGISTER_DYNAMIC_GROUP)
-public class ExecRegisterDynamicGroup extends QuestExecHandler {
-
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var sceneId = Integer.parseInt(paramStr[0]);
-        var groupId = Integer.parseInt(paramStr[1]);
-
-        Grasscutter.getLogger().warn("Registering group {}", groupId);
-
-        Scene scene = quest.getOwner().getWorld().getSceneById(sceneId);
-        if(scene == null) return false;
-
-        int suiteId = scene.loadDynamicGroup(groupId);
-        if(suiteId == -1) return false;
-
-        quest.getMainQuest().getQuestGroupSuites().add(QuestGroupSuite.of()
-            .scene(sceneId)
-            .group(groupId)
-            .suite(suiteId)
-            .build());
-
-        Grasscutter.getLogger().warn("Registered group {}, suite {} in scene {}", groupId, suiteId, scene.getId());
-
-        return true;
-    }
-
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestGroupSuite;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import emu.grasscutter.game.world.Scene;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_REGISTER_DYNAMIC_GROUP)
+public class ExecRegisterDynamicGroup extends QuestExecHandler {
+
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var sceneId = Integer.parseInt(paramStr[0]);
+        var groupId = Integer.parseInt(paramStr[1]);
+
+        Grasscutter.getLogger().warn("Registering group {}", groupId);
+
+        Scene scene = quest.getOwner().getWorld().getSceneById(sceneId);
+        if (scene == null) return false;
+
+        int suiteId = scene.loadDynamicGroup(groupId);
+        if (suiteId == -1) return false;
+
+        quest
+                .getMainQuest()
+                .getQuestGroupSuites()
+                .add(QuestGroupSuite.of().scene(sceneId).group(groupId).suite(suiteId).build());
+
+        Grasscutter.getLogger()
+                .warn("Registered group {}, suite {} in scene {}", groupId, suiteId, scene.getId());
+
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java

@@ -1,21 +1,23 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.Grasscutter;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_REMOVE_TRIAL_AVATAR)
-public class ExecRemoveTrialAvatar extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        if (quest.getOwner().removeTrialAvatarForQuest(Integer.parseInt(paramStr[0]))) {
-            Grasscutter.getLogger().info("Removed trial avatar from team for quest {}", quest.getSubQuestId());
-            return true;
-        }
-        return false;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_REMOVE_TRIAL_AVATAR)
+public class ExecRemoveTrialAvatar extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        try {
+            quest.getOwner().getTeamManager().removeTrialAvatar(Integer.parseInt(paramStr[0]));
+            Grasscutter.getLogger()
+                    .debug("Removed trial avatar from team for quest {}", quest.getSubQuestId());
+            return true;
+        } catch (RuntimeException ignored) {
+            return false;
+        }
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackParentQuest.java

@@ -1,24 +1,24 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_ROLLBACK_PARENT_QUEST)
-public class ExecRollbackParentQuest extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var targetPosition = quest.getMainQuest().rewind();
-        if(targetPosition == null){
-            return false;
-        }
-        quest.getOwner().getPosition().set(targetPosition.get(0));
-        quest.getOwner().getRotation().set(targetPosition.get(1));
-        quest.getOwner().sendPacket(new PacketScenePlayerLocationNotify(quest.getOwner().getScene()));
-        // todo proper reset and warp
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_ROLLBACK_PARENT_QUEST)
+public class ExecRollbackParentQuest extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var targetPosition = quest.getMainQuest().rewind();
+        if (targetPosition == null) {
+            return false;
+        }
+        quest.getOwner().getPosition().set(targetPosition.get(0));
+        quest.getOwner().getRotation().set(targetPosition.get(1));
+        quest.getOwner().sendPacket(new PacketScenePlayerLocationNotify(quest.getOwner().getScene()));
+        // todo proper reset and warp
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackQuest.java

@@ -1,26 +1,26 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_ROLLBACK_QUEST)
-public class ExecRollbackQuest extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        var targetQuestId = Integer.parseInt(paramStr[0]);
-        var targetQuest = quest.getOwner().getQuestManager().getQuestById(targetQuestId);
-        var targetPosition = targetQuest.getMainQuest().rewindTo(targetQuest, true);
-        if(targetPosition == null){
-            return false;
-        }
-        quest.getOwner().getPosition().set(targetPosition.get(0));
-        quest.getOwner().getRotation().set(targetPosition.get(1));
-        quest.getOwner().sendPacket(new PacketScenePlayerLocationNotify(quest.getOwner().getScene()));
-        // todo proper reset and warp
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import emu.grasscutter.server.packet.send.PacketScenePlayerLocationNotify;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_ROLLBACK_QUEST)
+public class ExecRollbackQuest extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var targetQuestId = Integer.parseInt(paramStr[0]);
+        var targetQuest = quest.getOwner().getQuestManager().getQuestById(targetQuestId);
+        var targetPosition = targetQuest.getMainQuest().rewindTo(targetQuest, true);
+        if (targetPosition == null) {
+            return false;
+        }
+        quest.getOwner().getPosition().set(targetPosition.get(0));
+        quest.getOwner().getRotation().set(targetPosition.get(1));
+        quest.getOwner().sendPacket(new PacketScenePlayerLocationNotify(quest.getOwner().getScene()));
+        // todo proper reset and warp
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java

@@ -1,24 +1,21 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import lombok.val;
-
-import java.util.Arrays;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_SET_OPEN_STATE)
-public class ExecSetOpenState extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        val param = Arrays.stream(paramStr)
-            .filter(i -> !i.isBlank())
-            .mapToInt(Integer::parseInt)
-            .toArray();
-
-        quest.getOwner().getProgressManager().forceSetOpenState(param[0], param[1]);
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import java.util.Arrays;
+import lombok.val;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_SET_OPEN_STATE)
+public class ExecSetOpenState extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        val param =
+                Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
+
+        quest.getOwner().getProgressManager().forceSetOpenState(param[0], param[1]);
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java

@@ -2,11 +2,11 @@ package emu.grasscutter.game.quest.exec;
 
 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.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
-@QuestValue(QuestTrigger.QUEST_EXEC_SET_QUEST_GLOBAL_VAR)
+@QuestValueExec(QuestExec.QUEST_EXEC_SET_QUEST_GLOBAL_VAR)
 public class ExecSetQuestGlobalVar extends QuestExecHandler {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {

src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java

@@ -1,16 +1,16 @@
-package emu.grasscutter.game.quest.exec;
-
-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.QuestExecHandler;
-
-@QuestValue(QuestTrigger.QUEST_EXEC_SET_QUEST_VAR)
-public class ExecSetQuestVar extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        quest.getMainQuest().setQuestVar(Integer.parseInt(paramStr[0]), Integer.parseInt(paramStr[1]));
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_SET_QUEST_VAR)
+public class ExecSetQuestVar extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        quest.getMainQuest().setQuestVar(Integer.parseInt(paramStr[0]), Integer.parseInt(paramStr[1]));
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockArea.java

@@ -2,11 +2,11 @@ package emu.grasscutter.game.quest.exec;
 
 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.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
 import emu.grasscutter.game.quest.handlers.QuestExecHandler;
 
-@QuestValue(QuestTrigger.QUEST_EXEC_UNLOCK_AREA)
+@QuestValueExec(QuestExec.QUEST_EXEC_UNLOCK_AREA)
 public class ExecUnlockArea extends QuestExecHandler {
     @Override
     public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {

src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java

@@ -1,23 +1,21 @@
-package emu.grasscutter.game.quest.exec;
-
-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.QuestExecHandler;
-
-@QuestValue(QuestTrigger.QUEST_EXEC_UNLOCK_POINT)
-public class ExecUnlockPoint extends QuestExecHandler {
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        // Unlock the trans point for the player.
-        int sceneId = Integer.parseInt(paramStr[0]);
-        int pointId = Integer.parseInt(paramStr[1]);
-        boolean isStatue = quest.getMainQuestId() == 303 || quest.getMainQuestId() == 352;
-
-        quest.getOwner().getProgressManager().unlockTransPoint(sceneId, pointId, isStatue);
-
-        // Done.
-        return true;
-    }
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_UNLOCK_POINT)
+public class ExecUnlockPoint extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        // Unlock the trans point for the player.
+        int sceneId = Integer.parseInt(paramStr[0]);
+        int pointId = Integer.parseInt(paramStr[1]);
+        boolean isStatue = quest.getMainQuestId() == 303 || quest.getMainQuestId() == 352;
+
+        // Done.
+        return quest.getOwner().getProgressManager().unlockTransPoint(sceneId, pointId, isStatue);
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecUnregisterDynamicGroup.java

@@ -1,37 +1,37 @@
-package emu.grasscutter.game.quest.exec;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.excels.QuestData;
-import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestValueExec;
-import emu.grasscutter.game.quest.enums.QuestExec;
-import emu.grasscutter.game.quest.handlers.QuestExecHandler;
-import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.scripts.data.SceneBlock;
-import emu.grasscutter.scripts.data.SceneGroup;
-import lombok.val;
-
-@QuestValueExec(QuestExec.QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP)
-public class ExecUnregisterDynamicGroup extends QuestExecHandler {
-
-    @Override
-    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
-        val groupId = Integer.parseInt(paramStr[0]);
-        val unknownParam = Integer.parseInt(paramStr[1]); //TODO: Goes from 0 to 1, maybe is a boolean. Investigate
-        val scene = quest.getOwner().getScene();
-
-        Grasscutter.getLogger().warn("Unregistering group {}", groupId);
-
-        if(!scene.unregisterDynamicGroup(groupId)){
-            return false;
-        }
-
-        //Remove suites if they are registered
-        quest.getMainQuest().getQuestGroupSuites().removeIf(gs -> gs.getGroup() == groupId && gs.getScene() == scene.getId());
-
-        Grasscutter.getLogger().warn("Unregistered group {} in scene {}", groupId, scene.getId());
-
-        return true;
-    }
-
-}
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.game.quest.GameQuest;
+import emu.grasscutter.game.quest.QuestValueExec;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import lombok.val;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP)
+public class ExecUnregisterDynamicGroup extends QuestExecHandler {
+
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        val groupId = Integer.parseInt(paramStr[0]);
+        val unknownParam =
+                Integer.parseInt(paramStr[1]); // TODO: Goes from 0 to 1, maybe is a boolean. Investigate
+        val scene = quest.getOwner().getScene();
+
+        Grasscutter.getLogger().warn("Unregistering group {}", groupId);
+
+        if (!scene.unregisterDynamicGroup(groupId)) {
+            return false;
+        }
+
+        // Remove suites if they are registered
+        quest
+                .getMainQuest()
+                .getQuestGroupSuites()
+                .removeIf(gs -> gs.getGroup() == groupId && gs.getScene() == scene.getId());
+
+        Grasscutter.getLogger().warn("Unregistered group {} in scene {}", groupId, scene.getId());
+
+        return true;
+    }
+}