Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-12 03:43:21 +08:00
Code Issues Projects Releases Wiki Activity
2,113 Commits 7 Branches 22 Tags 150 MiB
fb78df0caa
Commit Graph

1646 Commits

Author SHA1 Message Date
scooterboo
be2eef410a
fix /give avatars - currentTalentLevel cannot be negative (#2132) 2023-04-26 23:15:35 -04:00
scooterboo
4109cb0625
Remove garbages from Scene.java (#2131) 2023-04-24 21:00:34 -04:00
KingRainbow44
34c3c6229f
Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
 2023-04-24 21:00:03 -04:00
KingRainbow44
52ac9cd75e
Remove obsolete code 2023-04-24 20:56:20 -04:00
Moistcrafter
60e8106b01
use intstream instead of silly list in prop cmd (#2128) 2023-04-24 20:55:08 -04:00
KingRainbow44
3e6b38c407
Catch LuaError when loading scene groups 2023-04-24 03:11:47 -04:00
KingRainbow44
9c77ddc42e
Move cache hit to trace 2023-04-24 03:11:26 -04:00
KingRainbow44
66b0e6f3c6
Fix issue with serialized GridPositions 2023-04-24 03:11:09 -04:00
KingRainbow44
25c72a19e0
Fix main quest data loading issue 2023-04-24 03:10:22 -04:00
KingRainbow44
486582b81c
Revert previous; fix data parsing issue 2023-04-24 02:26:00 -04:00
KingRainbow44
fb686b2afc
Add sub-quest data only in BinOutput 
could fix things sometimes
 2023-04-24 02:01:17 -04:00
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
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
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
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
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
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
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
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
af01282594
Add data for new drop system 2023-04-13 22:44:50 -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
KingRainbow44
64eb6ee325
Add correct player defaults when questing is enabled 2023-04-13 17:55:47 -04:00
KingRainbow44
38ba9771ec
Remove default Anemo skill depot from a Traveler when questing is enabled 2023-04-13 17:53:18 -04:00
KingRainbow44
ecd0ea7a8c
Auto-enable questing in the config 2023-04-13 17:37:32 -04:00
KingRainbow44
d6efaaea86
Call Player#onPlayerBorn when the player is created 2023-04-13 17:34:04 -04:00
KingRainbow44
6819ef6bdc
line separators?? 2023-04-13 15:49:38 -04:00
KingRainbow44
349f76b7d8
Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests 2023-04-13 15:47:32 -04:00
dragon
4251b53d75
Fix boss name display. (#2111) 2023-04-13 00:59:40 -04:00
KingRainbow44
b42d8b67ed
Fix quest progression when entering a domain 2023-04-12 02:59:44 -04:00
KingRainbow44
60eb62fa42
Spawn the player at the scene's start position when sent to a dungeon 2023-04-12 02:34:13 -04:00
KingRainbow44
0de69cd1fa
Show available story dungeons to the player 2023-04-12 02:01:22 -04:00
KingRainbow44
b0ab0c68ad
Fix hanging on scene creation 
Invoke `SceneScriptManager#init` in a thread.
 2023-04-11 23:11:23 -04:00
KingRainbow44
7bac95098a
Optimize 71a8ca2a 2023-04-11 21:09:52 -04:00
KingRainbow44
97f74d9d55
Move persistant logger calls to trace 2023-04-11 21:07:50 -04:00
KingRainbow44
71a8ca2a8a
Implement scripting: SetEntityServerGlobalValueByConfigId 
w/ help from: Moistcrafter#9172
 2023-04-11 21:07:29 -04:00
KingRainbow44
68561369f3
Move services loggers to 'debug-all' 2023-04-11 17:58:57 -04:00
KingRainbow44
5851761d59
Enable 'big world scripts' by default 
this uses significantly more system resources, but in turn allows for the *quest* system to work!
 2023-04-11 02:12:33 -04:00
KingRainbow44
76be70d4a8
Fix grid parsing 
now compatiable with Yukki's resources!
 2023-04-11 02:05:38 -04:00
KingRainbow44
990b36cbce
Move scripting-related logger messages to debug 2023-04-11 02:05:12 -04:00
KingRainbow44
54b7d1251e
Fix order of logging scene group loading errors 2023-04-10 23:44:22 -04:00
KingRainbow44
06cbae31fa
Fix player fields not being set 
line seps r weird
 2023-04-10 22:46:19 -04:00
KingRainbow44
5e56b5e3a8
Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/managers/ResinManager.java
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
#	src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
#	src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
#	src/main/java/emu/grasscutter/utils/Crypto.java
 2023-04-10 22:13:50 -04:00
tamilpp25
3c60f792ca
reject clients on version mismatch (#2106) 2023-04-10 20:05:11 -04:00
Moistcrafter
c905d493af
Add co-op lyre support (#2105) 2023-04-10 01:43:26 -04:00
hamusuke
caf9521013
feat: add ability to buy resin with primogems (#2104) 
* feat: add ability to buy resin with primogems

* ResinManager#buy returns RetCode value
 2023-04-09 20:20:12 -04:00
KingRainbow44
e20c7c151b
Lint code 2023-04-09 14:50:59 -04:00
KingRainbow44
bb6569b736
Add language keys for new commands 2023-04-09 14:46:55 -04:00
KingRainbow44
644f1b3ab9
Continue merging quests (pt. 2) 2023-04-09 14:35:45 -04:00
KingRainbow44
97ee71bcf4
Continue merging quests (pt. 1) 
Finished last at: `World.java`, line `player.setAvatarsAbilityForScene(newScene);`
 2023-04-09 13:25:16 -04:00
KingRainbow44
a3970f8e43
Format code 2023-04-02 21:34:07 -04:00
hamusuke
9181d1cbfd
fix: mail system (#2096) 
* fix: mail

* Simplify the mail handler

---------

Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
 2023-04-02 21:32:30 -04:00
KingRainbow44
b2c9e8de3e
Merge branch 'unstable' into unstable-quests 2023-04-02 21:31:39 -04:00
KingRainbow44
95e1d77b65
Merge branch 'fixmail' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/game/mail/Mail.java
#	src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java
#	src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
#	src/main/java/emu/grasscutter/utils/Utils.java
 2023-04-02 21:30:52 -04:00
KingRainbow44
90fb606f68
Simplify the mail handler 2023-04-02 21:23:02 -04:00
KingRainbow44
8b4471ee54
Check if the scene has a config 2023-04-02 20:42:12 -04:00
ハムスケ ハム
ddafeb9ed3 fix: mail 2023-04-03 00:18:48 +09:00
KingRainbow44
9fbb7fb3be
Continue updating/refactoring classes 
Most code is matched from `Grasscutter-Quests`.
 2023-04-01 22:17:10 -04:00
KingRainbow44
772532515e
Comment-out unknown packet handlers/encoders 
These are mostly related to the teapot, music game, and custom teams
 2023-04-01 20:00:08 -04:00
KingRainbow44
29956421f0
Fix existing protocol classes 
Using `gc-quest-fix`
 2023-04-01 19:53:46 -04:00
KingRainbow44
daa51e53b7
Copy some files from Grasscutter-Quests 
NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)
 2023-04-01 18:06:30 -04:00
KingRainbow44
262ee38ded
Create files from Grasscutter-Quests 
these files are NOT directly compatible with Grasscutter, and require additional modifications to the codebase to work.
 2023-03-31 23:58:12 -04:00
KingRainbow44
fc05602128
Run Spotless on src/main 2023-03-31 22:30:45 -04:00
KingRainbow44
bbe51fb945
Add support for unit testing 
- Add argument `-testing`, which allows for a threaded console
 2023-03-31 22:13:58 -04:00
KingRainbow44
15e2f3ca34
Run IntelliJ IDEA code formatter 2023-03-31 17:19:26 -04:00
Colleiflower
516e5975e1
Add support for v3.5.0 (#2090) 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
 2023-03-31 15:13:32 -04:00
yzr
cf4cd80010
Fix delombok package not exists error with proto generated files (#2083) 
Fix javadoc & suppress no comments warning
Fix terminal interaction in IDEA
Update lombok onMethod to JDK8 version
Some code reformat
 2023-03-31 02:16:32 -04:00
Xotak
5f011b477b
Update fr-FR.json (#2084) 2023-03-26 20:10:59 -04:00
TotallyNotOndre
8d09b8833c
Update ru-RU.json (#2081) 2023-03-12 21:10:01 -04:00
rwx9032
fdaa487b2a
Add support for the Chinese client (#2076) 
* Add CNREL support

* Improve logic

* Maintain spacing

* Remove language keys & switch to debug

* Improve Format
 2023-03-12 00:51:21 -05:00