Anime-Game-Servers/Grasscutter-Quests
1
0
Fork 0
mirror of https://github.com/Anime-Game-Servers/Grasscutter-Quests.git synced 2025-03-01 09:55:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,123 Commits 19 Branches 4 Tags
Commit Graph

2123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hartie95
a9874cea74 [ScriptLib] Implement some missing ScriptLib functions 2023-06-24 16:50:28 +02:00
hartie95
e278733d90 [Fixes/Upstream] More upstream fixes 
* Don't tick scenes without players (thx @scooterboo )
* Fix Scriptlib.IsPlayerAllAvatarDie return type (thx @scooterboo )
* Add eventSource for EVENT_VARIABLE_CHANGE calls (thx @scooterboo )
 2023-06-24 16:50:28 +02:00
hartie95
4dae0d19a4 [Fix] fixed building 2023-06-14 21:47:18 +02:00
hartie95
7653364889 [Fixes/Features] More upstream backports 
* [Fix] Added missing VissionLevelType defintions (thx @eternalcomet )
* [Fix/refactoring] Fix mailsystem on 3.0+ (thx @hamusuke0323 and @KingRainbow44 )
* [Opcodes] Add propper names for some opcodes
 2023-06-14 20:16:09 +02:00
hartie95
c06b75cde8 [Fixes] upstream fixes 
* [Fix] Fixed displaying of boss names (thx @eternalcomet )
* [Fix] Fixed sceneRegion size handling (thx @scooterboo )
* [Fix] Add missing fields in scene objects (thx @ ZanyRain )
* [Fix] Add some extra null handling in GameMainQuest (thx @ZanyRain )
 2023-06-12 22:16:43 +02:00
hartie95
c2877f5fb0 [Fix] fixed finishing quests and mainquests after my command changes 2023-06-12 02:47:06 +02:00
hartie95
0c1e9eede4 [Fixes/Features] More upstream backports 
* [Fix] Don't force finish quests on manual parent finish, only when doing it via command (thx @scooterboo )
* [Fix] Fix climb stamina jump handling (thx @ NotThorny )
* [Feature] Add coop lyre support (thx @Moistcrafter )
* [Feature] Add ability to buy resin with primogems (thx @hamusuke0323 )
 2023-06-12 02:45:28 +02:00
Alexander Hartmann
f7af549772
Merge pull request #65 from Anime-Game-Servers/small-fixes 
[Fixes] Multiple small fixes and starting to get code wise up to date with upstream
 2023-06-12 01:37:19 +02:00
hartie95
740b2095d5 [Codesmells] fix some codesmells form sonar cloud 2023-06-09 22:55:59 +02:00
hartie95
6c34ad38db [Dispatch] Support for CNREL (thx @rwx9032 and @xlpmyxhdr ) 2023-06-09 22:44:36 +02:00
hartie95
dbcdc9c0e5 [Fix] More small fixes 
* Fix compount data groupId deseralize (thx @NotThorny )
* add NEXBoolean to Dynamic fleat (thx @Lemon-miaow )
* Unlock hidden points (thx @ghjbvvgh )
 2023-06-09 22:41:43 +02:00
hartie95
0803cb63e7 [Fix] multiple small fixes and refactorings 
* Fix permission for sound command (thx @jie65535 )
* Trigger is dayTime condition
* Implement Quest exec set game time
* Add force flag to changeTime
* Use lombok to generate the equals and hashcode for SceneTrigger (thx @scooterboo)
* Add two missing scriptlib functions and an enum (thx @ scooterboo )
 2023-06-09 22:39:15 +02:00
Alexander Hartmann
bd67a88261
Merge pull request #64 from Anime-Game-Servers/generated_quests 
Use the generated quests from the resource patcher+small other changes
 2023-06-01 10:08:05 +02:00
hartie95
61541729d4 [Proto] add missing proto 2023-05-29 19:31:44 +02:00
hartie95
eb0bd6234c [Bugfix] don't spawn garbages, since they are removed entities 2023-05-29 19:09:32 +02:00
hartie95
58a29c1ce5 [Refactoring] More cleanups for using generated quests 2023-05-29 19:08:49 +02:00
hartie95
e41e719c3e [refactor/feature] Implement gameTime locking and change GameTime handling 2023-05-29 17:22:51 +02:00
hartie95
2e351591e1 [Fixes/refactoring] some small fixes for generated quests and improvements around quests and region events 
* Improved enter and leave region logic a bit and made them group dependend
* Marked paramStr as nulleable and handle the null case
* Added some quest status debugging commands and allow using multiple quests and parent quest as parameter
*
 2023-05-29 17:20:02 +02:00
hartie95
4cb57323fa some more quest fixes and refactorings 2023-05-26 13:19:09 +02:00
hartie95
fb1f8fc206 [WIP/POC] use the generated quests frmo the resource patcher 
* also use gainItems instead of hardcoding amber
 2023-05-21 22:04:17 +02:00
hartie95
d900f154a3 [Fix] fix Quest state lua event source 2023-05-09 20:44:20 +02:00
hartie95
89d01d5f74 [Fix] use challengeIndex as eventSource for challenge events 2023-05-09 19:42:24 +02:00
hartie95
21dec2fec0 [Fix] nullfix at player born 2023-05-09 19:41:25 +02:00
Alexander Hartmann
0daf58c1e3
Merge pull request #63 from StartForKiller/activity_dev 
Grid and gadget ability optimisations and fixes
 2023-04-23 04:07:35 +02:00
hartie95
86b967f47e small fix and optimisation in AbilityManager 2023-04-23 03:45:36 +02:00
hartie95
0fab4ce841 move abilityManager log to debug level 2023-04-23 03:00:13 +02:00
StartForKiller
e4c46c704e
Fix grid loading and use rtree for getNearbyGroups 2023-04-18 03:54:51 +02:00
StartForKiller
a7f14a9cd8
Modify grid caching and organized it a bit, @skycomet work 2023-04-18 03:15:47 +02:00
StartForKiller
c7b6e2cb0e
Optimize code 2023-04-17 19:34:22 +02:00
StartForKiller
0277aaa050
Merge branch 'activity_dev' of github.com:StartForKiller/Grasscutter-Quests into activity_dev 2023-04-16 15:34:50 +02:00
StartForKiller
27da992848
Optimized entity adding and group checking 2023-04-16 15:34:35 +02:00
hartie95
7539eb45a3 Merge branch 'quests' of github.com:Anime-Game-Servers/Grasscutter-Quests into activity_dev 
# Conflicts:
#	src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java
#	src/main/java/emu/grasscutter/game/entity/EntityGadget.java
#	src/main/java/emu/grasscutter/game/entity/EntityMonster.java
#	src/main/java/emu/grasscutter/game/world/Scene.java
#	src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
 2023-04-12 23:58:24 +02:00
StartForKiller
22a46b576f
Fix loading 2023-04-07 15:09:38 +02:00
StartForKiller
d9d819b587
Move grid to another custom folder 2023-04-07 15:08:00 +02:00
StartForKiller
72b56b45de
Fix grid cache 2023-04-07 13:58:29 +02:00
StartForKiller
6e6198d172
Fixed some smells again 2023-04-07 01:32:16 +02:00
StartForKiller
ae86400890
Fixed some critical and major code smells 2023-04-07 01:27:22 +02:00
StartForKiller
fb97f7a7c0
Maybe fix all the serializable smells 2023-04-07 01:11:54 +02:00
StartForKiller
f67942b547
Fixed some issues 2023-04-07 01:06:39 +02:00
StartForKiller
769abcfb98
Make grids cached 2023-04-06 17:41:16 +02:00
Alexander Hartmann
a78f2635c6
Merge pull request #61 from Anime-Game-Servers/conditions 
Extended some commands a bit, changed questCondition handling and some smaller bugfixes
 2023-04-01 23:48:19 +02:00
hartie95
15f1a4ec9c update group command usage and add Sound command to play sounds 2023-03-17 00:16:23 +01:00
StartForKiller
88bb5ee82c
Update handling technique 2023-03-14 03:09:25 +01:00
StartForKiller
f99789f13a
Temp commit to store all he changes to test 2023-03-12 20:16:57 +01:00
hartie95
82e2b6bf3f Extended some commands a bit, changed questCondition handling and some smaller bugfixes 2023-02-26 20:09:15 +01:00
Alexander Hartmann
e48d6f7986
Merge pull request #60 from Anime-Game-Servers/activity 
[Activity] fix music game activity and some activity condition changes
 2023-02-26 19:50:16 +01:00
hartie95
8a2f17f9c5 [Activity] fix music game activity and some activity condition changes 
* renamed changed protos for user generated content (music game
* added ACtivityCondGroups
* added open and close time to ACtivityConfigItem
* actually add meet conditions to the acitivty info
* fix wrong quest state enum being used in activityCondition for questFinished
 2023-02-26 19:46:36 +01:00
Alexander Hartmann
c3ffa339d0
Merge pull request #59 from Anime-Game-Servers/some_fixes 
Some more fixes and additions
 2023-02-11 11:25:50 +01:00
hartie95
4830c1ed69 [Lua] Implemented PlayCutScene method and added a placeholder for PlayCutSceneWithParam 
* also added the cutscene packages
 2023-02-08 20:28:04 +01:00
hartie95
3006e16e9b [Challenges] Added support for some more challenges and fixed others (thx @NotThorny for finding the parameter bug for the guard challenge) 2023-02-08 20:19:15 +01:00