Merge unstable into development (#2173)

* Remove more scene synchronized * Fix worktop options not appearing * Format code [skip actions] * Fix delay with server tasks * Format code [skip actions] * Fully fix fairy clock (#2146) * Fix scene transition * fully fix fairy clock * Re-add call to `Player#updatePlayerGameTime` * Format code [skip actions] * Initialize the script loader in `ResourceLoader#loadAll` * Fix region removal checking * Format code [skip actions] * Use Lombok's `EqualsAndHashCode` for comparing scene regions * Format code [skip actions] * Move 'invalid gather object' to `trace` * Add more information to the 'unknown condition handler' message * Move invalid ability action to trace * Make `KcpTunnel` public * Validate the NPC being talked to * Format code [skip actions] * NPCs are not spawned server side; change logic to handle it * Format code [skip actions] * unload scene when there are no players (#2147) * unload scene when there are no players * Update src/main/java/emu/grasscutter/game/world/Scene.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Check if a command should be copied or HTTP should be used * Lint Code [skip actions] * Fix character names rendering incorrectly * Add basic troubleshooting command * Implement handbook teleporting also a few formatting changes and sort data by logical sense * Fix listener `ConcurrentModificationException` issue * Add color change to `Join the Community!` * Lint Code [skip actions] * Make clickable buttons appear clickable * Remove 'Mechanicus' entities from the list of entities * Format code [skip actions] * Fix going back returning a blank screen * Implement entity spawning * Add setting level to entity card * Add support for 'plain text' mode * Make descriptions of objects scrollable * Lint Code [skip actions] * Format code [skip actions] * Change the way existing hooks work * Format code [skip actions] * Upgrade Javalin to 5.5.0 & Fix project warnings * Upgrade logging libraries * Fix gacha mappings static file issue * Add temporary backwards compatability for `ServerHelper` * Format code [skip actions] * Remove artifact signatures from VCS * Fix forge queue data protocol definition * Run `spotlessApply` * Format code [skip actions] * Download data required for building artifacts * Add call for Facebook logins * Add the wiki page as a submodule * Format code [skip actions] * Update translation (#2150) * Update translation * Update translation * Separate the dispatch and game servers (pt. 1) gacha is still broken, handbook still needs to be done * Format code [skip actions] * Separate the dispatch and game servers (pt. 2) this commit fixes the gacha page * Add description for '/troubleshoot' * Set default avatar talent level to 10 * Separate the dispatch and game servers (pt. 3) implement handbook across servers! * Format code [skip actions] * Update GitHub Actions to use 'download-file' over 'wget' * Gm handbook lmao (#2149) * Fix font issue * Fix avatars * Fix text overflow in commands * Fix virtualized lists and items page 😭😭 * magix why 💀 * use hover style in all minicards * button * remove console.log * lint * Add icons * magix asked * Fix overflow padding issue * Fix achievement text overflow * remove icons from repo * Change command icon * Add the wiki page as a submodule * total magix moment * fix text overflow in commands * Fix discord button * Make text scale on Minicard * import icons and font from another source * Add hover effects to siebar buttons * move font and readme to submodule repo * Make data folder a submodule * import icons and font from data submodule * Update README.md * total magix moment * magix moment v2 * submodule change * Import `.webp` files * Resize `HomeButton` * Fix 'Copy Command' reappearing after changing pages --------- Co-authored-by: KingRainbow44 <kobedo11@gmail.com> * Lint Code [skip actions] * Download data for the build, not for the lint * format imports this is really just to see if build handbook works kek * Implement proper handbook authentication (pt. 1) * Implement proper handbook authentication (pt. 2) * Format code [skip actions] * Add quest data dumping for the handbook * Change colors to fit _something suitable_ * Format code [skip actions] * Fix force pushing to branches after linting * Fix logic of `SetPlayerPropReq` * Move more group loading to `trace` * Add handbook IP authentication in hybrid mode * Fix player level up not displaying on the client properly * Format code [skip actions] * Fix game time locking * Format code [skip actions] * Update player properties * Format code [skip actions] * Move `warn`s for groups to `debug` * Fix player pausing * Move more logs to `trace` * Use `removeItemById` for deleting items via quests * Clean up logger more * Pause in-game time when the world is paused * Format code [skip actions] * More player property documentation * Multi-threaded resource loading * Format code [skip actions] * Add quest widgets * Add quests page (basic impl.) * Add/fix colors also fix tailwind * Remove banned packets client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted * Re-add `BeginCameraSceneLookNotify` * Fix being unable to attack (#2157) * Add `PlayerOpenChestEvent` * Add methods to get players from the server * Add static methods to register an event handler * Add `PlayerEnterDungeonEvent` * Remove legacy documentation from `PlayerMoveEvent` * Add `PlayerChatEvent` * Add defaults to `Position` * Clean up `.utils` * Revert `Multi-threaded resource loading` * Fix changing target UID when talking to the server * Lint Code [skip actions] * Format code [skip actions] * fix NPC talk triggering main quest in 46101 (#2158) Make it so that only talks where the param matches the talkId are checked. * Format code [skip actions] * Partially fix Chasing Shadows (#2159) * Partially fix Chasing Shadows * Go ahead and move it before the return before Magix tells me to. * Format code [skip actions] * Bring back period lol (#2160) * Disable SNI for the HTTPS server * Add `EntityCreationEvent` * Add initial startup message this is so the server appears like its preparing to start * Format code [skip actions] * Enable debug mode for plugin loggers if enabled for the primary logger * Add documentation about `WorldAreaConfigData` * Make more fields in excels accessible * Remove deprecated fields from `GetShopRsp` * Run `spotlessApply` on definitions * Add `PlayerEnterAreaEvent` * Optimize event calls * Fix event invokes * Format code [skip actions] * Remove manual autofinish for main quests. (#2162) * Add world areas to the textmap cache * Format code [skip actions] * Don't overdefine variables in extended classes (#2163) * Add dumper for world areas * Format code [skip actions] * instantiate personalLineList (#2165) * Fix protocol definitions thank you Nazrin! (+ hiro for raw definitions) * Fix the background color leaking from the character widget * Change HTML spacing to 2 spaces * Implement hiding widgets * Change scrollbar to a vibrant color * Add _some_ scaling to the home buttons and its text * Build the handbook with Gradle * Fix the 'finer details' with the handbook UI * Lint Code [skip actions] * Fix target destination for the Gradle-built handbook * Implement fetching a player across servers & Add a chainable JsonObject useful for plugins! might be used in grasscutter eventually * Fix GitHub actions * Fix event calling & canceling * Run `spotlessApply` * Rename fields (might be wrong) * Add/update all/more protocol definitions * Add/update all/more protocol definitions * Remove outdated packet * Fix protocol definitions * Format code [skip actions] * Implement some lua variables for less console spam (#2172) * Implement some lua variables for less console spam * Add GetHostQuestState This fixes some chapter 3 stuff. * Format code [skip actions] * Fix merge import * Format code [skip actions] * Fully fix fairy clock for real this time (#2167) * Fully fix fairy clock For real this time * Make it so relogging keeps the time lock state. * Refactor out questLockTime * Per Hartie, the client packet needs to be changed too * Update src/main/java/emu/grasscutter/game/world/World.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java * Remove all code not needed to get clock working --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Implement a proper ability system (#2166) * Apply fix `21dec2fe` * Apply fix `89d01d5f` * Apply fix `d900f154` this one was already implemented; updated to use call from previous commit * Ability changing commit TODO: change info to debug * Remove use of deprecated methods/fields * Temp commit v2 (Adding LoseHP and some fixes) * Oopsie * Probably fix monster battle * Fix issue with reflecting into fields * Fix some things * Fix ability names for 3.6 resources * Improve logging --------- Co-authored-by: StartForKiller <jesussanz2003@gmail.com> * Format code [skip actions] * Add system for sending messages between servers * Format some code * Remove protocol definitions from Spotless * Default debug to false; enable with `-debug` * Implement completely useless global value copying * HACK: Return the avatar which holds the weapon when the weapon is referred to by ID * Add properties to `AbilityModifier` * Change the way HTML is served after authentication * Use thread executors to speed up the database loading process * Format code [skip actions] * Add system for setting handbook address and port * Lint Code [skip actions] * Format code [skip actions] * Fix game-related data not saving * Format code [skip actions] * Fix handbook server details * Lint Code [skip actions] * Format code [skip actions] * Use the headers provided by a context to get the IP address should acknowledge #1975 * Format code [skip actions] * Move more logs to `trace` * Format code [skip actions] * more trace * Fix something and implement weapon entities * Format code [skip actions] * Fix `EntityWeapon` * Remove deprecated API & Fix resource checking * Fix unnecessary warning for first-time setup * Implement handbook request limiting * Format code [skip actions] * Fix new avatar weapons being null * Format code [skip actions] * Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met * Load activity config on server startup * Require plugins to specify an API version and match with the server * Add default open state ignore list * Format code [skip actions] * Quick fix for questing, needs more investigation This would make the questing work again * Remove existing hack for 35303 * Fix ignored open states from being set * Format code [skip actions] * fix the stupidest bug ive ever seen * Optimize player kicking on server close * Format code [skip actions] * Re-add hack to fix 35303 * Update GitHub actions * Format code [skip actions] * Potentially fix issues with regions * Download additional handbook data * Revert "Potentially fix issues with regions" This reverts commit 84e3823695. --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: scooterboo <lewasite@yahoo.com> Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com> Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com> Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2026-04-06 16:02:48 +02:00 · 2023-05-31 20:48:16 -07:00
parent f46fd372d2
commit 9e5b57a043
3839 changed files with 1841548 additions and 37533 deletions
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecAddCurAvatarEnergy.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecAddCurAvatarEnergy.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.quest.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().debug("Energy refilled");
+        return quest.getOwner().getEnergyManager().refillActiveEnergy();
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecAddQuestProgress.java
@@ -1,23 +1,20 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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)
-public class ExecAddQuestProgress extends QuestExecHandler {
+@QuestValueExec(QuestExec.QUEST_EXEC_ADD_QUEST_PROGRESS)
+public final 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();
+        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;
    }
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecChangeAvatarElemet.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecChangeAvatarElemet.java
@@ -0,0 +1,34 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.quest.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()
+                .debug(
+                        "Changing avatar element to {} for quest {}.",
+                        targetElement.name(),
+                        quest.getSubQuestId());
+        return mainAvatar.changeElement(targetElement);
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecClearTimeVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecClearTimeVar.java
@@ -0,0 +1,19 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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);
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java
@@ -1,17 +1,19 @@
 package emu.grasscutter.game.quest.exec;

-
-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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) {
-        quest.getOwner().getQuestManager().decQuestGlobalVarValue(Integer.valueOf(paramStr[0]),Integer.valueOf(paramStr[1]));
+        quest
+                .getOwner()
+                .getQuestManager()
+                .decQuestGlobalVarValue(Integer.valueOf(paramStr[0]), Integer.valueOf(paramStr[1]));
        return true;
    }
 }
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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_VAR)
+@QuestValueExec(QuestExec.QUEST_EXEC_DEC_QUEST_VAR)
 public class ExecDecQuestVar extends QuestExecHandler {
    @Override
    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItem.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItem.java
@@ -0,0 +1,17 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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().removeItemById(itemId, amount);
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItemBatch.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecDelPackItemBatch.java
@@ -0,0 +1,26 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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().removeItemById(itemId, amount)) {
+                success = false;
+            }
+        }
+        return success;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java
@@ -0,0 +1,27 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.quest.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 exception) {
+            exception.printStackTrace();
+            return false;
+        }
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java
@@ -1,16 +1,19 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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) {
-        quest.getOwner().getQuestManager().incQuestGlobalVarValue(Integer.valueOf(paramStr[0]),Integer.valueOf(paramStr[1]));
+        quest
+                .getOwner()
+                .getQuestManager()
+                .incQuestGlobalVarValue(Integer.valueOf(paramStr[0]), Integer.valueOf(paramStr[1]));
        return true;
    }
 }
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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_VAR)
+@QuestValueExec(QuestExec.QUEST_EXEC_INC_QUEST_VAR)
 public class ExecIncQuestVar extends QuestExecHandler {
    @Override
    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecInitTimeVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecInitTimeVar.java
@@ -0,0 +1,18 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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);
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecNotifyGroupLua.java
@@ -1,34 +1,62 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.quest.QuestData;
 import emu.grasscutter.game.quest.GameQuest;
-import emu.grasscutter.game.quest.QuestGroupSuite;
-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 emu.grasscutter.server.packet.send.PacketGroupSuiteNotify;
+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()
+                                .trace(
+                                        "group: {} \ncondition: {} \nparamStr {}",
+                                        groupInstance.getLuaGroup(),
+                                        condition,
+                                        paramStr);
+                    } else {
+                        Grasscutter.getLogger()
+                                .debug(
+                                        "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())
+                                    .setEventSource(quest.getSubQuestId()));
+                });

        return true;
    }
-
 }
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupMonster.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupMonster.java
@@ -0,0 +1,18 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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);
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java
@@ -1,39 +1,32 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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;

-import java.util.Arrays;
-
-@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;
    }
-
 }
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRegisterDynamicGroup.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRegisterDynamicGroup.java
@@ -0,0 +1,37 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.quest.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;
+
+@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().debug("Registering group {}", groupId);
+
+        var 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()
+                .debug("Registered group {}, suite {} in scene {}", groupId, suiteId, scene.getId());
+
+        return true;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java
@@ -0,0 +1,29 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.quest.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 (IllegalStateException ignored) {
+            // The player does not have any trial avatars equipped.
+            Grasscutter.getLogger()
+                    .warn("Attempted to remove trial avatars from player with none equipped.");
+            return true;
+        } catch (RuntimeException exception) {
+            exception.printStackTrace();
+            return false;
+        }
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackParentQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackParentQuest.java
@@ -0,0 +1,24 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackQuest.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecRollbackQuest.java
@@ -0,0 +1,26 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetFlyable.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetFlyable.java
@@ -0,0 +1,18 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.QuestData;
+import emu.grasscutter.game.props.PlayerProperty;
+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_IS_FLYABLE)
+public final class ExecSetFlyable extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var canFly = Integer.parseInt(paramStr[0]);
+        quest.getOwner().setProperty(PlayerProperty.PROP_IS_FLYABLE, canFly);
+        return true;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetGameTimeLocked.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetGameTimeLocked.java
@@ -0,0 +1,19 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.QuestData.QuestExecParam;
+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.Objects;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_SET_IS_GAME_TIME_LOCKED)
+public final class ExecSetGameTimeLocked extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestExecParam condition, String... paramStr) {
+        var isLocked = Objects.equals(condition.getParam()[0], "1");
+        quest.getOwner().getWorld().lockTime(isLocked);
+
+        return true;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetOpenState.java
@@ -0,0 +1,20 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.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;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_SET_OPEN_STATE)
+public class ExecSetOpenState 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().getProgressManager().forceSetOpenState(param[0], param[1]);
+        return true;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java
@@ -1,16 +1,19 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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) {
-        quest.getOwner().getQuestManager().setQuestGlobalVarValue(Integer.valueOf(paramStr[0]),Integer.valueOf(paramStr[1]));
+        quest
+                .getOwner()
+                .getQuestManager()
+                .setQuestGlobalVarValue(Integer.valueOf(paramStr[0]), Integer.valueOf(paramStr[1]));
        return true;
    }
 }
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java
@@ -1,12 +1,12 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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_VAR)
+@QuestValueExec(QuestExec.QUEST_EXEC_SET_QUEST_VAR)
 public class ExecSetQuestVar extends QuestExecHandler {
    @Override
    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockArea.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockArea.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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_UNLOCK_AREA)
+@QuestValueExec(QuestExec.QUEST_EXEC_UNLOCK_AREA)
 public class ExecUnlockArea extends QuestExecHandler {
    @Override
    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
@@ -1,23 +1,24 @@
 package emu.grasscutter.game.quest.exec;

-import emu.grasscutter.data.excels.QuestData;
+import emu.grasscutter.data.excels.quest.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_POINT)
+@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]);
+
+        // TODO: Determine if the point is a statue.
+        // This is currently a hardcoded value.
        boolean isStatue = quest.getMainQuestId() == 303 || quest.getMainQuestId() == 352;

-        quest.getOwner().getProgressManager().unlockTransPoint(sceneId, pointId, isStatue);
-
        // Done.
-        return true;
+        return quest.getOwner().getProgressManager().unlockTransPoint(sceneId, pointId, isStatue);
    }
 }
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnregisterDynamicGroup.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnregisterDynamicGroup.java
@@ -0,0 +1,37 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.excels.quest.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().debug("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().debug("Unregistered group {} in scene {}", groupId, scene.getId());
+
+        return true;
+    }
+}