Major quest framework improvements #1553
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
July 23, 2022 12:27
|
I don't know English. Where should I put the new documents? I put it in the Resources folder. It doesn't seem to work. When you finish the task, you stay in making food, and you can't continue to complete it. |
Hello! sorry for the confusion. this PR doesn't fix the cooking. Since most questTriggers are yet to be implemented, few quests are actually completable. Also, the ScriptSceneData folder is completely unrelated with your issue. I'll update the description to be less confusing |
akatatsu27
changed the title
ghost
self-assigned this
ghost
approved these changes
Jul 26, 2022
ghost
merged commit 
|
There were some issues during quest 351 in the latest version 1.2.3-dev-283a8819. I'm not sure whether it's an issue with Grasscutter or some LUA scripts? |
|
Birdulon
pushed a commit
to Birdulon/Grasscutter
that referenced
this pull request
Aug 21, 2022
Major quest framework improvements
github-actions bot
added a commit
that referenced
this pull request
Sep 3, 2022
Update languages [skip actions] Fix whitespace [skip actions] Add version increments to lint branch Plugin Manager localisation Update ru-RU.json fix serenitea pot main building Add command targeting by account username Fix elementless Traveler depotValue [BREAKING] dummy commit for Express -> Javalin Update contributing guidelines Move the remaining `HttpUtils` function over to `Router` Clean up http server content types Replace express with javalin in logger Update HttpServer & AuthenticationSystem to use Javalin Remove ``java-express``. Add javalin as dependency Custom Teams (#1731) Console output player command (#1722) Clean up adding extra embryo logic in Avatar::recalcStats Clean up OpenStateData onLoad logic Update default Banners.json (#1719) fix serenitea pot (#1726) fix: avatar energy transform in proudskill Update README.md Sequel (#1717) Add permission clear and list commands (#1715) Fix offline account deletion (fixes #1716) maybe drop my dev domain and use `grasscutter.io` Fix up some japanese references add dendro resonance Update README_NL.md Update readme interlinks Jp support (#1712) Update translation (#1711) Merge pull request #1710 from pfyy/development fix dungeon Dutch language updates For README (#1709) Fix weird conditional in `EquipAffixData` partial fix of dungeon Update `AvatarCostumeData` naming Fix `ReliquarySetData` naming Update README_zh-CN.md Show accessAddress in bold yellow on startup This should make it easier to help people troubleshoot networked setups. Consider telling people to try connecting to the address with a web browser on the client's machine. Update SetPropCommand strings, send cmd usage on target fail refactor some itemdepot lookups for later Fix account deletion Fix HelpCommand missing aliases Prevent material type from being null Move vehicle fightprop hacks Consolidate random point offsets De-hardcode ChestBatchUse Remove asset names from json and comments Actually fix RegionHandler Add new 3.0 Reliquary and SkillParticleGeneration data versionFix must be >= 50 not == 50 in RegionHandler Update game version to 3.0.0 Add Sumeru expeditions. Add scene tag for Vanarana. Make PointData compatible with alternative PointData Fixed Gadget Spawning 3.0 Opcodes Fix RegionHandler versions Update classes to match protos Update 3.0 protos Fix QuestEncryptionKeys Path (#1696) Update README.md (#1695) More literate README_ru-RU.md Avoid potential NPE on WL0 (#1693) Make lint workflows ignore generated folder But run them on linter and workflow changes Clean up some Position usage to avoid unneccessary unpacks Fix healing skills being able to heal dead characters Fix null pointer in `Avatar` if skill level map didnt already contain skill id Delete quests from the player if there are errors loading them from the db update zh-CN.json (#1684) Update ru-RU.json Rename lint_commit's job, don't fail on no changes Fix lint commit reference Allow adding constellations to playerless avatars Fixes #1682 Fix whitespace [skip actions] Don't lint src/generated Make TalentCommand show off new Translate function Improve translate function Make commands pass ints and floats instead of manually casting them to string first Hide resin from map when disabled Replace protos with generated protos small quest fixes (#1677) Blossom Implement (#1606) Merge pull request #1680 from 4Benj/development Remove uncompiled protos from compiled jar Remove crazy high AEXP drops from default chest rewards Fix talentcommand message key Refactor avatar skilldepot and constellation/talent changing Ensures Traveler retains talent levels and constellations on inactive elements when switching elements. Relevant for any other skillDepot-changing activities like Windtrace too, though keeping those in the db might not be as useful. Add README_fil-PH.md (#1675) Avoid allocations on Map::putIfAbsent usage Map::computeIfAbsent only runs the passed constructors when it needs to Add iterable payItems methods Shame they could never be fully generic, but oh well Change unlocked scenes from lists to sets Handbooks: use some sorted maps Stop vendoring fastutil Lombokify some more getters Remove erroneous references to excel skilldata instead of avatar skilldata Refactor team resonances and correct login behaviour and less-than-full-party behaviour Add README_ko-KR.md (#1673) Don't use UIDs as initial capacity for chat history ChatSystem nitpick Fix chat welcome messages and some slight refactoring. Fix deprecated chat references update zh-CN.json (#1662) Refactoring (#1660) chore: typo fix Bump config version. Update ConfigContainer.java (#1646) make fishhook_tp configurable Refactor Json helper functions to JsonUtils Funnel all gson calls into helper functions Remove beta message Fix TalentCommand for Traveler fix:command player said to server won't be shown at chat history (#1643) Update install_without_dependencies.sh Fixed install_without_dependencies.sh script Handle Unlocking of Waypoints and Statues (#1608) Stop language linter from fighting the main linter on \n Fix an edge case that breaks embryos if resources are loaded early Introduce a new arguments parser (#1629) Fix Claiming BP Reward Chests (#1634) Make missing languages not throw warnings Unify gacha mappings generation Remove vestigial references to gacha_mappings Remove language hack from handbook generation Generate handbooks on every launch, fix html docs Refactor handbook generation, remove singular handbook Cache used strings from TextMaps Load in all the textmaps! Implement working* burst/ultimate invincibility Added Indonesian README Added install_without_dependencies.sh file Add invoke-level invulnerability for bursts. Invoke `AbilityManager#onSkillStart` and `AbilityManager#onSkillEnd` Add a method to be invoked on skill perform and end Update README_pl-PL.md Update README_ru-RU.md Update README_es-ES.md Update README_fr-FR.md Update README_zh-TW.md Update README_zh-CN.md Update README.md fix typo Added Indonesian language Added install_without_dependencies.sh file Improve some documentation and JSON (#1618) Add `EntityDamageEvent` and implementations Add more events Update HandlerSceneTransToPointReq.java Update src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java Update src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java Update src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java Polish README and setConst translation (#1614) Update ru-RU.json Create ko-KR.json Add `PlayerUseFoodEvent` and implementations Move `PlayerTeleportEvent` occurrences into `World` Merge branch 'development' into more-events Clean-up the energy manager Explicitly declare the charset of a `FileReader` in `ConfigContainer` Update zh-CN.json Changed charset of FileReader in ConfigContainer from default to utf-8. Add files via upload Auto language lint Add explicit encoding on manage_languages.py for windows users Add lock function to SetStatsCommand Improve message formatting to clients Replaces tab indents with an extra linebreak. Also adds / to the start of command usage. Neither of these changes affect messages to the server console log. Update zh-CN.json Update zh-CN.json Merge pull request #1586 from Birdulon/development Suppress stacktrace on missing questkeys file Change loading quest keys from `info` to `debug`. Update zh-CN.json Fix an NPE in `EntityGadget` when `draft_id` isn't set SceneScriptManager fix nullPointer error Move `QuestEncryptionKeys` to `resources/` Traditional Chinese | Translation Patches fix nullPointer error small nullpointer fix in EntityGadget, in case meta gadget is not set Update ru-RU.json Add spanish translation for constellation commands Merge pull request #1553 from akatatsu27/questing token fix Merge branch 'development' into questing Update ru-RU.json [Bug] New avatars always created with C0 constellation Fixes #1552 2.7+ prerendered cutscene support two small activity/event fixes * fixed GetAcitivityInfoReq proto * added draft to gadget Scene gatget, to let the client know the propper minigame for some entities Set Constellation Command (#1565) Update French translation Fix remaining traces of `Player#getPos` Attempt to fix the `teleport` command. Add `PlayerTeamDeathEvent` and implementations Add `EntityDeathEvent` and implementations Add a `Location` class (Scene + Position) Remove deprecated class Merge branch 'development' into more-events call deregisterRegion appropriately Merge branch 'development' into questing Read Open States from Excels (#1557) and misc bug fixes Major questing improvements Merge branch 'development' into more-events Translated new changes in languages files to Spanish Fix taking battle pass rewards Add `unlockall` command to unlock all openstates Fix battle pass manager saving with 0 id Set `setChooseAvatarGuid` properly Implement food buffs Use sorted containers for commands & aliases Change commands to use new usage message method. Refactor Command usage and description strings Updated Russian localization (#1543) Refactor excel datas (Mainly item data) Add `kcpInterval` to the config Rename `hasSentAvatarDataNotify()` to `hasSentLoginPackets()` Fix host team size not changing when a player joins their world for the first time Lower kcp interval to 20 Bump project version Add `PlayerTeleportEvent` Update to support `PlayerMoveEvent` Remove `Cancellable` from `PlayerMoveEvent` Implement `PlayerMoveEvent`
GanyusLeftHorn
pushed a commit
that referenced
this pull request
Dec 11, 2022
Update languages [skip actions] Fix whitespace [skip actions] Add version increments to lint branch Plugin Manager localisation Update ru-RU.json fix serenitea pot main building Add command targeting by account username Fix elementless Traveler depotValue [BREAKING] dummy commit for Express -> Javalin Update contributing guidelines Move the remaining `HttpUtils` function over to `Router` Clean up http server content types Replace express with javalin in logger Update HttpServer & AuthenticationSystem to use Javalin Remove ``java-express``. Add javalin as dependency Custom Teams (#1731) Console output player command (#1722) Clean up adding extra embryo logic in Avatar::recalcStats Clean up OpenStateData onLoad logic Update default Banners.json (#1719) fix serenitea pot (#1726) fix: avatar energy transform in proudskill Update README.md Sequel (#1717) Add permission clear and list commands (#1715) Fix offline account deletion (fixes #1716) maybe drop my dev domain and use `grasscutter.io` Fix up some japanese references add dendro resonance Update README_NL.md Update readme interlinks Jp support (#1712) Update translation (#1711) Merge pull request #1710 from pfyy/development fix dungeon Dutch language updates For README (#1709) Fix weird conditional in `EquipAffixData` partial fix of dungeon Update `AvatarCostumeData` naming Fix `ReliquarySetData` naming Update README_zh-CN.md Show accessAddress in bold yellow on startup This should make it easier to help people troubleshoot networked setups. Consider telling people to try connecting to the address with a web browser on the client's machine. Update SetPropCommand strings, send cmd usage on target fail refactor some itemdepot lookups for later Fix account deletion Fix HelpCommand missing aliases Prevent material type from being null Move vehicle fightprop hacks Consolidate random point offsets De-hardcode ChestBatchUse Remove asset names from json and comments Actually fix RegionHandler Add new 3.0 Reliquary and SkillParticleGeneration data versionFix must be >= 50 not == 50 in RegionHandler Update game version to 3.0.0 Add Sumeru expeditions. Add scene tag for Vanarana. Make PointData compatible with alternative PointData Fixed Gadget Spawning 3.0 Opcodes Fix RegionHandler versions Update classes to match protos Update 3.0 protos Fix QuestEncryptionKeys Path (#1696) Update README.md (#1695) More literate README_ru-RU.md Avoid potential NPE on WL0 (#1693) Make lint workflows ignore generated folder But run them on linter and workflow changes Clean up some Position usage to avoid unneccessary unpacks Fix healing skills being able to heal dead characters Fix null pointer in `Avatar` if skill level map didnt already contain skill id Delete quests from the player if there are errors loading them from the db update zh-CN.json (#1684) Update ru-RU.json Rename lint_commit's job, don't fail on no changes Fix lint commit reference Allow adding constellations to playerless avatars Fixes #1682 Fix whitespace [skip actions] Don't lint src/generated Make TalentCommand show off new Translate function Improve translate function Make commands pass ints and floats instead of manually casting them to string first Hide resin from map when disabled Replace protos with generated protos small quest fixes (#1677) Blossom Implement (#1606) Merge pull request #1680 from 4Benj/development Remove uncompiled protos from compiled jar Remove crazy high AEXP drops from default chest rewards Fix talentcommand message key Refactor avatar skilldepot and constellation/talent changing Ensures Traveler retains talent levels and constellations on inactive elements when switching elements. Relevant for any other skillDepot-changing activities like Windtrace too, though keeping those in the db might not be as useful. Add README_fil-PH.md (#1675) Avoid allocations on Map::putIfAbsent usage Map::computeIfAbsent only runs the passed constructors when it needs to Add iterable payItems methods Shame they could never be fully generic, but oh well Change unlocked scenes from lists to sets Handbooks: use some sorted maps Stop vendoring fastutil Lombokify some more getters Remove erroneous references to excel skilldata instead of avatar skilldata Refactor team resonances and correct login behaviour and less-than-full-party behaviour Add README_ko-KR.md (#1673) Don't use UIDs as initial capacity for chat history ChatSystem nitpick Fix chat welcome messages and some slight refactoring. Fix deprecated chat references update zh-CN.json (#1662) Refactoring (#1660) chore: typo fix Bump config version. Update ConfigContainer.java (#1646) make fishhook_tp configurable Refactor Json helper functions to JsonUtils Funnel all gson calls into helper functions Remove beta message Fix TalentCommand for Traveler fix:command player said to server won't be shown at chat history (#1643) Update install_without_dependencies.sh Fixed install_without_dependencies.sh script Handle Unlocking of Waypoints and Statues (#1608) Stop language linter from fighting the main linter on \n Fix an edge case that breaks embryos if resources are loaded early Introduce a new arguments parser (#1629) Fix Claiming BP Reward Chests (#1634) Make missing languages not throw warnings Unify gacha mappings generation Remove vestigial references to gacha_mappings Remove language hack from handbook generation Generate handbooks on every launch, fix html docs Refactor handbook generation, remove singular handbook Cache used strings from TextMaps Load in all the textmaps! Implement working* burst/ultimate invincibility Added Indonesian README Added install_without_dependencies.sh file Add invoke-level invulnerability for bursts. Invoke `AbilityManager#onSkillStart` and `AbilityManager#onSkillEnd` Add a method to be invoked on skill perform and end Update README_pl-PL.md Update README_ru-RU.md Update README_es-ES.md Update README_fr-FR.md Update README_zh-TW.md Update README_zh-CN.md Update README.md fix typo Added Indonesian language Added install_without_dependencies.sh file Improve some documentation and JSON (#1618) Add `EntityDamageEvent` and implementations Add more events Update HandlerSceneTransToPointReq.java Update src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java Update src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java Update src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java Polish README and setConst translation (#1614) Update ru-RU.json Create ko-KR.json Add `PlayerUseFoodEvent` and implementations Move `PlayerTeleportEvent` occurrences into `World` Merge branch 'development' into more-events Clean-up the energy manager Explicitly declare the charset of a `FileReader` in `ConfigContainer` Update zh-CN.json Changed charset of FileReader in ConfigContainer from default to utf-8. Add files via upload Auto language lint Add explicit encoding on manage_languages.py for windows users Add lock function to SetStatsCommand Improve message formatting to clients Replaces tab indents with an extra linebreak. Also adds / to the start of command usage. Neither of these changes affect messages to the server console log. Update zh-CN.json Update zh-CN.json Merge pull request #1586 from Birdulon/development Suppress stacktrace on missing questkeys file Change loading quest keys from `info` to `debug`. Update zh-CN.json Fix an NPE in `EntityGadget` when `draft_id` isn't set SceneScriptManager fix nullPointer error Move `QuestEncryptionKeys` to `resources/` Traditional Chinese | Translation Patches fix nullPointer error small nullpointer fix in EntityGadget, in case meta gadget is not set Update ru-RU.json Add spanish translation for constellation commands Merge pull request #1553 from akatatsu27/questing token fix Merge branch 'development' into questing Update ru-RU.json [Bug] New avatars always created with C0 constellation Fixes #1552 2.7+ prerendered cutscene support two small activity/event fixes * fixed GetAcitivityInfoReq proto * added draft to gadget Scene gatget, to let the client know the propper minigame for some entities Set Constellation Command (#1565) Update French translation Fix remaining traces of `Player#getPos` Attempt to fix the `teleport` command. Add `PlayerTeamDeathEvent` and implementations Add `EntityDeathEvent` and implementations Add a `Location` class (Scene + Position) Remove deprecated class Merge branch 'development' into more-events call deregisterRegion appropriately Merge branch 'development' into questing Read Open States from Excels (#1557) and misc bug fixes Major questing improvements Merge branch 'development' into more-events Translated new changes in languages files to Spanish Fix taking battle pass rewards Add `unlockall` command to unlock all openstates Fix battle pass manager saving with 0 id Set `setChooseAvatarGuid` properly Implement food buffs Use sorted containers for commands & aliases Change commands to use new usage message method. Refactor Command usage and description strings Updated Russian localization (#1543) Refactor excel datas (Mainly item data) Add `kcpInterval` to the config Rename `hasSentAvatarDataNotify()` to `hasSentLoginPackets()` Fix host team size not changing when a player joins their world for the first time Lower kcp interval to 20 Bump project version Add `PlayerTeleportEvent` Update to support `PlayerMoveEvent` Remove `Cancellable` from `PlayerMoveEvent` Implement `PlayerMoveEvent`
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
-Newly added ContentTriggerFire won't work because luaj can't read. Tests with tnsc4502's jnlua worked flawlessly. I have made this branch "questing-jnlua" in my repository to illustrate the differences. Starting quest 35104 is a good way to see.
-Implement quest rewind
-QuestManager can now pass accept, fail and finish QuestTriggers to all active quests
-GameMainQuest is now responsible for handling its subQuests' conditions appropriately
-track and store in the database quest related talks in GameMainQuest (important for some conditions)
-Implement QuestGlobalVars and QuestVars
-Added various QuestTrigger handlers
-also added start() and fail() methods to GameQuest
-fix finishCond set to null if no acceptCond
-fix if accept/fail/finish CondComb is null, getAccept/Fail/FinishCondComb returns null (should return LOGIC_NONE)
-fix some packet handlers
-fix QuestManager::addQuest() notify client only one new subQuest added (there could be multiple)
-Made more clear in the code if referring to MainQuest or SubQuest
-Added comments to some wrongly handled QuestTriggers
I suggest testing by starting quest 100301 via console command (not fully completable)
Note: for quest rewind to work properly, a slightly modified version of Birdulon's "flat.luas.scenes.full_globals.lua" is needed, which can be found here: https://github.com/akatatsu27/MoarGCResources (put ScriptSceneData in the resources folder)
Issues fixed by this PR
Type of changes
Checklist: