Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-12 06:42:56 +08:00
Code Issues Projects Releases Wiki Activity
1,994 Commits 7 Branches 22 Tags 150 MiB
349f76b7d8
Commit Graph

1408 Commits

Author SHA1 Message Date
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
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
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
hamusuke
3ab3d5bc04
Simply implement achievement system and add achievement command (#2068) 
* Implement achievement system

* Update src/main/java/emu/grasscutter/command/commands/AchievementCommand.java

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>

* fix: redundant codes

* fix: redundant codes

* Update language files

---------

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>
 2023-02-26 00:14:27 -05:00
Thoronium
b209d91947
Add home resource gain (#2064) 2023-02-23 23:22:25 -05:00
hamusuke
220c23b960
feat: change game time (#2061) 
* feat: change game time

* Update proto names
 2023-02-23 23:21:44 -05:00
yeyeye
71a1e31d37
update gc 3.4 (#2041) 
* update 3.4

* update3.4

* update 3.4

* update 3.4

* Add files via upload

* Delete SetPropCommand.java

* update 3.4 area id

* update version

* exchange cmdid

* exchange cmdid

* exchange cmdid

* my fault

* update AiSyncInfo
 2023-02-18 22:18:27 -05:00
Thoronium
1b2210f5a7
Improved satiation (#2055) 
* Natural satiation decreasing
Graphic showing satiation when eating (usually)

* Reworking values to match original

* Little fixes

* Satiation bar matches real values
Revival correctly updates bar

* Greatly simplify handling
Some fixes

* Inline variables
Add TODO for bug

* Satiation works correctly
Finally it all works as intended

* Remove unnecessary packets

* Improve satiation reduction handling
 2023-02-15 19:32:59 -05:00
Thoronium
b4b8f1ec38
Fix climb jump stamina (#2056) 
* Fix climb jump stamina

* Update StaminaManager.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-02-15 19:32:11 -05:00
Thoronium
d1c7ced0ef
Fix load order (#2057) 2023-02-15 19:31:33 -05:00
Lemon_miaow
11351d9866
Fixed only the issue about "BOOLEAN" occurring when importing resources. (#2028) 
* Only Fix 'Exception in thread 'main' com.google.gson.JsonSyntaxException: java.io.IOException: Invalid DynamicFloat definition - BOOLEAN' problem.

* Update ResourceLoader.java

* Modify code indentation and optimization.

* Update JsonUtils.java

* Update JsonUtils.java

* Update DynamicFloat.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-02-15 19:31:09 -05:00
Thoronium
1a50cccb38
Fix goal (#2052) 2023-02-09 17:12:01 +01:00
ZanyRain
3b29ba032e
Some fix about scene script and quest (#2029) 
* [ScriptLib] Query player when not get entity from scene

* Fix NPE when doing quests

* Add QUEST_CONTENT_SKILL trigger

Q353 need it

* Add some missing fields that contain in scene scripts

* Add a lua table serializer implement with jackson

This do not replace the original one,it is useful when debug

* Fix point_array type error

* feat: fix space
 2023-02-09 17:10:07 +01:00