Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 13:23:01 +08:00
Code Issues Projects Releases Wiki Activity
1,632 Commits 7 Branches 22 Tags 150 MiB
3859048dc6
Commit Graph

1263 Commits

Author SHA1 Message Date
akatatsu27
29bdb7f3f6 Merge branch 'development' into questing 2022-07-24 12:16:22 +03:00
GanyusLeftHorn
d0edd39465 Read Open States from Excels (#1557) 
* Make sure we never access PlayerOpenStateManager::map directly.

* Read OpenStates from excels.

* Add defaultState

* Replace hardcoded open states with the ones read from excels.

* Don't send change notify when unlocking on login.

* Add open state blacklist for default unlocks.

* Add a way to temporarily set open states for dev

* Remove old OpenState.java

* Fix UnlockAllCommand

* Change condType to an enum.
 2022-07-24 00:12:07 -07:00
akatatsu27
8050f0cc07 and misc bug fixes 2022-07-23 12:28:49 +03:00
akatatsu27
02a56fcec4 Major questing improvements 2022-07-23 12:27:14 +03:00
KingRainbow44
956d4023c7 Merge branch 'development' into more-events 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
#	src/main/java/emu/grasscutter/game/entity/GameEntity.java
#	src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
 2022-07-22 17:52:58 -04:00
RBNXI
89717f3c15 Translated new changes in languages files to Spanish 
Just realized that some commits have changed the language files to add some new things, so this is the Spanish translation of those... things.
 2022-07-23 03:01:58 +09:30
Melledy
e5ff253624 Add unlockall command to unlock all openstates 2022-07-22 09:26:00 -07:00
Melledy
705bee0595 Fix battle pass manager saving with 0 id 2022-07-22 08:35:37 -07:00
Melledy
7254fe1612 Set setChooseAvatarGuid properly 2022-07-22 08:30:11 -07:00
Melledy
0d17c4a088 Implement food buffs 2022-07-22 03:46:59 -07:00
AnimeGitB
e9a95b89cf Use sorted containers for commands & aliases 2022-07-22 19:08:26 +09:30
AnimeGitB
104e04f70a Change commands to use new usage message method. 2022-07-22 19:08:26 +09:30
AnimeGitB
2cfbe78184 Refactor Command usage and description strings 2022-07-22 19:08:26 +09:30
Miralyn
e9464784bb Updated Russian localization (#1543) 
* updated russian localization

* Update ru-RU.json
 2022-07-22 02:17:58 -07:00
Melledy
f15262dd3e Refactor excel datas (Mainly item data) 2022-07-22 00:53:12 -07:00
Melledy
c0418067d6 Add kcpInterval to the config 2022-07-21 18:39:39 -07:00
Melledy
8651cdd12b Rename hasSentAvatarDataNotify() to hasSentLoginPackets() 2022-07-21 16:27:43 -07:00
Melledy
b505b0825a Fix host team size not changing when a player joins their world for the first time 2022-07-21 16:24:04 -07:00
Melledy
62e54010ad Lower kcp interval to 20 2022-07-21 16:23:59 -07:00
Melledy
c9c45e4c32 Partial fix for player attacks in co-op not working 2022-07-21 03:42:16 -07:00
Melledy
5e041b333b Forgot to remove extra player var from TeamManager 2022-07-21 01:19:28 -07:00
Melledy
7189e3701d Use getOpenStateMap() in PlayerOpenStateManager 2022-07-21 01:06:17 -07:00
github-actions
f87088f4f4 Update languages [skip actions] 2022-07-21 00:22:26 -07:00
github-actions
ae2d1fe438 Fix whitespace [skip actions] 2022-07-21 00:22:26 -07:00
Melledy
510d564bcb Dont use discriminator for PlayerCollectionRecords 2022-07-21 00:21:00 -07:00
Melledy
bc701cfad0 Add missing scene load state to PacketPlayerEnterSceneNotify 2022-07-21 00:21:00 -07:00
Melledy
b9b0f00232 Move PlayerManagers and GameServerSystems around 2022-07-21 00:21:00 -07:00
Melledy
8b4212ffb9 Refactor PacketOpcodesUtil to be more... useful 2022-07-21 00:21:00 -07:00
Melledy
52ee229e96 Split config debugLevel into logPackets (Game) and logRequests (Dispatch) 2022-07-21 00:21:00 -07:00
Melledy
408fa90728 Move config java files to their own package 2022-07-21 00:21:00 -07:00
Melledy
55541fa1da Add a loadReader helper function to DataLoader 
Also minor name changing on a few DataLoader methods
 2022-07-21 00:21:00 -07:00
Melledy
f22b92b08f Add a save() function to player managers 2022-07-21 00:21:00 -07:00
Melledy
abccec785b Delete AccountManager.java 
This file was never used by anyone. RIP.
 2022-07-21 00:21:00 -07:00
Melledy
fc16f9d694 Refactor out InsectCaptureManager 2022-07-21 00:21:00 -07:00
Melledy
f020cefd80 Set default player position to be the starting position 2022-07-21 00:21:00 -07:00
Melledy
5feabc8f9a Add Entity::OnInteract 2022-07-21 00:21:00 -07:00
Melledy
1a2f7fb5a7 Forgot to remove extra player variable from AbilityManager 2022-07-21 00:21:00 -07:00
Melledy
cc5b292bc3 Refactor Player::GetPos() -> Player::GetPosition() 2022-07-21 00:21:00 -07:00
Melledy
2e19e70fe1 Refactor game server managers to systems 2022-07-21 00:21:00 -07:00
Melledy
d20e9d1f72 Refactor player managers 2022-07-21 00:21:00 -07:00
AnimeGitB
3957616b6c Fix 2.8 banners, readd Beginner's banner 2022-07-18 22:29:00 -07:00
AZthemute
3eb85b82a7 Updated banners for 2.8, added comments to the banners and removed beginner's banner (it was breaking things) 2022-07-18 13:40:58 -07:00
GanyusLeftHorn
b266854c72 Handle existing players who might already have passed a level. 2022-07-18 11:20:33 -07:00
GanyusLeftHorn
af7bbdaadd Set certain OpenStates on level-up. 2022-07-18 11:20:33 -07:00
zhaodice
6c49fab137 Block loader (sort and merge gadgets into different blocks) (#1517) 
Original commits:

* block loader
* fix
* fix
* fix foolish bug
* add scales
* rename
* set to 600
* nitpick

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-07-18 19:43:55 +09:30
Melledy
7f898417b0 Fix a few null pointer issues. 2022-07-18 02:33:13 -07:00
Melledy
2e85834e9c Update OpenState protos and rework OpenStateManager 
OpenState map no longer contains default openstates, they should not be saved in the database for efficiency reasons.
 2022-07-18 02:28:38 -07:00
akatatsu27
b5a4ab7524 Open state framework (#1483) 
* Added more server debug options

* made server debug code prettier

* fixed initialization bug

* Enables logging of packets contained in UnionCmdNotify, when debug level is WHITELIST or BLACKLIST

* Fully Implement OpenState Framework

* added devOpenStates

* Commented out newPlayerOpenStates

* Removed OPEN_STATE_NONE from devOpenStates
 2022-07-18 01:33:57 -07:00
Yazawazi
ae8b5e30ac Full support for both parties 2022-07-17 13:43:45 +09:30
真心
0a557ccfcd Update GameConstants.java 2022-07-17 13:43:45 +09:30
AnimeGitB
591ca4805a Some proto name changes 2022-07-17 13:43:45 +09:30
AnimeGitB
bc2c5deb48 Add Dispatch Password authentication 2022-07-17 13:43:45 +09:30
AnimeGitB
413f11d504 PacketOpcodes 2022-07-17 13:43:45 +09:30
AnimeGitB
e14d1cedde Hack for GAA unlock 2022-07-17 13:43:45 +09:30
AnimeGitB
4103558272 Bump game version 2022-07-17 13:43:45 +09:30
kyoko
80f9346983 Fix the chat history not correctly showing. 2022-07-17 13:43:45 +09:30
AnimeGitB
d7742d94db Add dispatch keys 2022-07-17 13:43:45 +09:30
KingRainbow44
f6b4016f1b Add PlayerTeleportEvent 2022-07-15 16:18:46 -04:00
KingRainbow44
02ca5cf23c Update to support PlayerMoveEvent 2022-07-15 16:12:22 -04:00
KingRainbow44
1b8df002d1 Remove Cancellable from PlayerMoveEvent 2022-07-15 12:48:55 -04:00
KingRainbow44
80e75fd023 Implement PlayerMoveEvent 2022-07-15 12:43:49 -04:00
Luke H-W
8843276c41 Language linting (#1382) 2022-07-11 16:21:05 +02:00
AnimeGitB
bb84432b4c Add maximum level/refinement/rank to clear command 2022-07-11 23:45:24 +09:30
GanyusLeftHorn
fbf80e7156 Fix crafting for mystic enhancement ores. 2022-07-11 16:07:19 +02:00
GanyusLeftHorn
4cbd3c7bde Add missing dungeons for dungeon drops. 2022-07-10 18:16:49 +09:30
Akka
910008216f quest fix & personal line impl 2022-07-10 17:52:47 +09:30
Tesutarin
7bae35f51b Update translation & bug fix (#1472) 
Original commits:

* Update translation

* Bug fix

* Update translation

* Update Announcement.json
 2022-07-09 23:09:40 +09:30
akatatsu27
c79ca3028f Added more server debug options (#1444) 
Original commits:

* Added more server debug options

* made server debug code prettier

* fixed initialization bug

* Enables logging of packets contained in UnionCmdNotify, when debug level is WHITELIST or BLACKLIST
 2022-07-09 03:01:29 +09:30
dragon
0196231c7e Merge branch 'Grasscutters:development' into development 2022-07-08 12:53:52 +08:00
dragon
a96f7f4de1 Update DatabaseHelper.java 
fix account delete
 2022-07-08 12:37:40 +08:00
shädam
a4a87fe75b Don't send success upon failure 2022-07-07 22:40:58 +09:30
Typhoon
730d112a0f Update ro-RO.json 
A couple small errors
 2022-07-07 20:02:39 +09:30
RBNXI
2923187b0b Fix some typos in spanish translations (#1456) 
Original commits:

* Fix some typos and fixes from original Readme

* Fix some typos
 2022-07-07 20:02:14 +09:30
Luke H-W
ad02dacdfd Apply suggestions from code review 2022-07-07 16:43:09 +09:30
haxxorer
1f62792074 Create ro-RO.json 2022-07-07 16:43:09 +09:30
GanyusLeftHorn
6338c17189 Add reliquary decomposition (aka strongbox). 2022-07-05 22:59:19 -07:00
loulou310
952448220d Update translation (#1438) 
Original commits:
* Update translation

* Update traslation

* Fix typo
 2022-07-05 11:08:27 +09:30
AnimeGitB
c848db607f Add beginner banner to default banners 2022-07-04 15:22:46 +09:30
AnimeGitB
e8371677bd Add gachaTimesLimit for beginner banner 
Also add some more return codes
 2022-07-04 15:22:46 +09:30
Someone999
fe50a42a3c Added permission information to help command (#1427) 
Original commits:
* Added command CommandPermissionCommand. Added permission information in HelpCommand.

* Removed command CommandPermissionCommand

* Display permission for single command when use help.

* Display permission targeted when use help.
 2022-07-04 13:51:41 +09:30
Akka
b92cc6a882 fix some region errors 2022-07-03 11:40:09 -07:00
Akka
4cd31af011 fix announcement interval 2022-07-03 19:27:23 +09:30
Akka
9bafc2c5d5 Implement server announcement (#1420) 
* implement server announcement

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

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Added arg numbers check

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-07-02 06:43:22 -07:00
AnimeGitB
a80302cdcd Fix commands in party chat, re-add optional positional item quantity to give command, error out and print usage if excess arguments given to give command 2022-07-02 06:41:56 -07:00
GanyusLeftHorn
13a7f08665 Add character's specialty food. 2022-07-01 23:14:36 -07:00
GanyusLeftHorn
d95a30a1a5 Cooking and unlocking recipies. 2022-07-01 23:14:36 -07:00
GanyusLeftHorn
a957b8c5b8 Notify client of unlocked recipies on login. 2022-07-01 23:14:36 -07:00
GanyusLeftHorn
8484a535f4 Load recipe excels. 2022-07-01 23:14:36 -07:00
Akka
9951bec6b7 optimize npc group load & fix some NPE in suite 2022-07-01 23:13:26 -07:00
Magix
bd40ecee2a Add the es-ES language 
By: `Blue#7596` or `<@470933959929364481>`
 2022-07-01 18:17:23 -04:00
zhaodice
f90b65120a Fix no static gadget in the map,example: no tree but a fruit in the air (#1415) 
* fixGadget

* fixGadget

* add gadgetObject

* fix bug
 2022-07-01 11:41:53 -07:00
loulou310
b703201598 Update translation 2022-07-01 23:58:59 +09:30
zhaodice
efd30593a1 Fireworks support (#1393) 
* Firework Implement

* add legacy function

* remove obfusucated names

* remove obfusucated names

* remove obfusucated names

* remove obfusucated names

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-29 14:33:21 -07:00
Tesutarin
8267d796db Update translation 2022-06-30 00:54:57 +09:30
Akka
a8690ef720 fix bug 2022-06-29 05:23:02 -07:00
Akka
12146ff09c implement the music game 2022-06-29 05:23:02 -07:00
Akka
977f1ca2ea implement the activity system 2022-06-29 05:23:02 -07:00
Melledy
5d35cb49b4 Change -debug to only output grasscutter debug info 
The old -debug flag is now -debugall
 2022-06-29 05:02:49 -07:00
zhaodice
2462da2ede Big World Resources Collection Implement (#1368) 
* init

* init

* init

* revoke

* fix error

* mining support

* mining support

* Roks endurance support

* Roks endurance support

* Timed refresh

* upgrade resource data

* Timed refresh support

* remove null gadget

* Coordination

* full synchronized

* oh no, my math teacher will hit me!

* synchronized onInteract

* remove break;

* supply re-spawn time , thanks to @wl23333

* Clean up and integrate collection spawns into SpawnDataEntries

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-29 04:53:50 -07:00
GanyusLeftHorn
17fb19ebc9 Add BP login trigger to daily reset. 2022-06-28 04:04:35 -07:00