Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 16:40:55 +00:00
Code Issues Projects Releases Wiki Activity
2,425 Commits 7 Branches 22 Tags 133 MiB
9b58105120
Commit Graph

2425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KingRainbow44
1a8d7e901a
Apply additional data from specific main quest lines 2023-04-24 01:44:58 -04:00
KingRainbow44
0d680a6310
Fix quest domains not showing up 2023-04-24 00:09:59 -04:00
KingRainbow44
40b23ec4a4
Add new protocol definitions 2023-04-23 23:12:20 -04:00
KingRainbow44
e85d269518
Run spotlessApply on previous commit 2023-04-23 23:12:01 -04:00
KingRainbow44
c9d6225194
Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests) 2023-04-23 22:51:08 -04:00
KingRainbow44
d608831594
Update quest line documentation 2023-04-20 01:12:25 -04:00
KingRainbow44
375bb77abe
Attempt to keep parity with Grasscutter-Quests & Fix add trial avatar issue 2023-04-20 00:58:23 -04:00
KingRainbow44
ae45177ed5
Fixing the starting world time 
the proper start time should be 9 game hours
 2023-04-20 00:40:13 -04:00
KingRainbow44
84c5a76e5d
Fix quests always showing dungeon IDs 2023-04-20 00:26:35 -04:00
KingRainbow44
a53328346a
Fix avatar trial status being saved to the database 2023-04-20 00:22:29 -04:00
Colleiflower
016eae9b44
Update the README (#2126) 
* Update the README

1. GNUify to maintain consistency 
2. Update troubleshooting

* Per Magix
 2023-04-19 23:08:54 -04:00
KingRainbow44
de19116191
Check for custom server resources 2023-04-18 17:43:10 -04:00
KingRainbow44
ee298235c2
Run spotlessApply 2023-04-18 17:17:55 -04:00
KingRainbow44
75f163f704
Fix avatar type values 2023-04-18 16:01:29 -04:00
KingRainbow44
de0217f435
Send avatar type to client 
also switch to lambda reference
 2023-04-18 15:56:19 -04:00
KingRainbow44
361620de6d
Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
 2023-04-18 15:36:29 -04:00
KingRainbow44
c11b8a53a3
Merge branch 'development' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
 2023-04-18 15:32:50 -04:00
FlourishingWorld
8c6b166a42
fix co-op mode avatar animation interrupt (#2124) 2023-04-18 15:19:34 -04:00
dragon
0dd41f9350
implement getCachePath (#2121) 
* implement getCachePath

for further use like grids cache.

* Update src/main/java/emu/grasscutter/utils/FileUtils.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-04-18 15:19:29 -04:00
Moistcrafter
abcabc9861
Parse dungeon entry info req from payload instead of player scene (#2122) 2023-04-17 01:08:08 -04:00
KingRainbow44
6989d49080
Remove the first area from being auto-unlocked when questing is enabled 2023-04-15 13:33:30 -04:00
KingRainbow44
c672a2d9cb
Move gadget controller loaded message to debug 2023-04-15 13:17:09 -04:00
SpikeHD
b302c2b73b
forever engraved (#2120) 2023-04-15 02:35:15 -04:00
KingRainbow44
d8f90b26cf
Fix entity controllers not loading 
elemental monuments should now work
 2023-04-15 01:41:19 -04:00
KingRainbow44
2b4feba86f
Fix issue with Amber not being added 
the field for an item's `useOnGain` was final!
 2023-04-15 01:23:32 -04:00
KingRainbow44
f2019aa88a
Fix drop system error 2023-04-15 00:50:03 -04:00
KingRainbow44
f08ba95071
Remove forEach on group replacements 2023-04-14 23:56:42 -04:00
KingRainbow44
fcc68891be
Remove .gitattributes 
this should fix some line separator issues
 2023-04-14 23:33:54 -04:00
KingRainbow44
55118c802d
Load custom server resources 2023-04-14 23:27:08 -04:00
KingRainbow44
a8a78547a1
Fix level entity data loading 2023-04-14 22:59:57 -04:00
KingRainbow44
6b492656a1
Set dungeon manager when entering a dungeon 2023-04-14 22:44:59 -04:00
KingRainbow44
e93175621b
Use the player's selected main character when setOwner is called 2023-04-14 22:01:09 -04:00
KingRainbow44
7bdcf4e0d2
Merge packet handlers from quests/quests 2023-04-14 21:59:15 -04:00
KingRainbow44
b5190bca45
Update quest line documentation 2023-04-14 02:39:15 -04:00
KingRainbow44
c08633aa46
Fix issue with trial teams 2023-04-14 02:37:15 -04:00
KingRainbow44
ae56b33265
Fix avatar skill behavior when changing elements 2023-04-14 01:54:43 -04:00
KingRainbow44
3224bbeb4f
Fix setOrFetch on 0 values 2023-04-14 01:02:11 -04:00
KingRainbow44
2a5c7bf75c
Temporarily fix issue with all quests being added at once 2023-04-14 00:35:16 -04:00
KingRainbow44
6c1cff38b4
Fix default Traveler 2023-04-14 00:31:46 -04:00
KingRainbow44
8687e60b92
Merge branch 'development' into unstable 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
 2023-04-13 22:45:15 -04:00
KingRainbow44
af01282594
Add data for new drop system 2023-04-13 22:44:50 -04:00
KingRainbow44
84713d9b2e
Set CRLF as the default line separator 
this will be changed back to LF after unstable-quests is finished
 2023-04-13 22:43:46 -04:00
dragon
f71b29c00a
Implement a new item drops system (#2112) 
* 1

* Delete .gitattributes

* implement

* Update PacketDropHintNotify.java

* Update PacketWorldChestOpenNotify.java

* Update FileUtils.java

* Update PacketDropHintNotify.java

* Update WorldDataSystem.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-04-13 22:28:54 -04:00
KingRainbow44
eda5e8c5e0
Fix #2114 (metaMonster can be null) 2023-04-13 21:47:47 -04:00
KingRainbow44
55a7c0314d
Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests 2023-04-13 21:34:55 -04:00
KingRainbow44
22fd7ab619
Fix potential NPR 2023-04-13 21:22:21 -04:00
dragon
b9a2694ea7
Fix Lua exec call (#2115) 
* Fix Lua exec call

## Description
fix 352 should not have any slime spawns, its 353 and 351 has a single slime spawn

Please carefully read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md) before making any pull requests.

## Issues fixed by this PR

<!--- Put the links of issues that may be fixed by this PR here (if any). -->
## Type of changes

<!--- Put an `x` in all the boxes that apply your changes. -->

- [x] Bug fix
- [ ] New feature 
- [ ] Enhancement
- [ ] Documentation

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] My pull request is unique and no other pull requests have been opened for these changes
- [x] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md)
- [x] I am responsible for any copyright issues with my code if it occurs in the future.

* Update ExecNotifyGroupLua.java

* Update ExecNotifyGroupLua.java

* Update ExecNotifyGroupLua.java

* new ScriptArgs(groupId, eventType, quest.getSubQuestId())          .setEventSource(String.valueOf(quest.getSubQuestId()));
 2023-04-13 21:21:43 -04:00
KingRainbow44
c71386c69e
Implement quest data field: gainItems 2023-04-13 20:33:31 -04:00
KingRainbow44
29501bcd81
Add flyable status to /prop 2023-04-13 18:06:35 -04:00
KingRainbow44
47cdfe5c14
Handle quest execute which sets the player's flying state 2023-04-13 18:00:25 -04:00