Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 04:19:40 +00:00
Code Issues Projects Releases Wiki Activity
2,334 Commits 7 Branches 22 Tags 133 MiB
5bdfc8770b
Commit Graph

1858 Commits

Author SHA1 Message Date
AnimeGitB
d9f85ba2a7 Allow adding constellations to playerless avatars 
Fixes #1682
 2022-08-22 01:35:11 +09:30
github-actions
c517b8a2c9 Fix whitespace [skip actions] 2022-08-21 11:33:54 +00:00
AnimeGitB
3fca950050 Make TalentCommand show off new Translate function 2022-08-21 20:53:37 +09:30
AnimeGitB
955004343f Improve translate function 
Make commands pass ints and floats instead of manually casting them to string first
 2022-08-21 20:53:37 +09:30
AnimeGitB
4b03770ec1 Hide resin from map when disabled 2022-08-21 19:38:38 +09:30
akatatsu27
77f2bcf5bf small quest fixes (#1677) 
* small quest fixes

* uncomment hack
 2022-08-21 00:08:37 -07:00
赵怡然
abd1e7569e Blossom Implement (#1606) 
* Blossom!

* rename

* delete SpawnBlossomEntry.java

* use MAP

* use List

* use LIST

* use List

* useCondensedResin

* useCondensedResin

* fix build

* enhance

* fix bug

* REMOVE BOSS

* fix condensed resin

* fix condensed resin

* use POSITIVE_INFINITY

* use RewardPreviewData

* fix build

* fix resources

* add BLOSSOM_MONSTER_FIGHTING_VOLUME

* edit monster score

* edit monster score

* fix bug

* fix bug

* improve logic

* fix monsters level

* Deleted comment blocks

* nitpick

* Fix compilation problems

* nitpick

* Refactor + nitpick

* Clean up overall diff to develop

* Clean up other usage of condensed resin

* Clean up overall diff to develop

* Lombokify Scene.java

* Missed an odd getter name

* Unhardcode reward previews

* EDIT NAME

* remove leyline 1

* remove leyline 2

* Update BlossomManager.java

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-20 23:19:59 -07:00
AnimeGitB
b3a7cde76c Remove crazy high AEXP drops from default chest rewards 2022-08-20 14:06:28 +09:30
AnimeGitB
48d31e45ed Fix talentcommand message key 2022-08-19 16:52:02 +09:30
AnimeGitB
fb1bacb0f8 Refactor avatar skilldepot and constellation/talent changing 
Ensures Traveler retains talent levels and constellations on inactive elements when switching elements.
Relevant for any other skillDepot-changing activities like Windtrace too, though keeping those in the db might not be as useful.

Refactor avatar talent upgrade and access
Refactor skillExtraCharges
 2022-08-19 16:43:57 +09:30
AnimeGitB
7d523efd41 Avoid allocations on Map::putIfAbsent usage 
Map::computeIfAbsent only runs the passed constructors when it needs to
 2022-08-19 12:47:50 +09:30
AnimeGitB
0cb75aeb5f Add iterable payItems methods 
Shame they could never be fully generic, but oh well
 2022-08-18 23:02:26 +09:30
AnimeGitB
efa69c007d Change unlocked scenes from lists to sets 2022-08-18 22:38:55 +09:30
AnimeGitB
c3450e8905 Handbooks: use some sorted maps 2022-08-18 22:06:08 +09:30
AnimeGitB
9e0d6538e9 Lombokify some more getters 2022-08-17 21:11:40 +09:30
AnimeGitB
02deeb2852 Remove erroneous references to excel skilldata instead of avatar skilldata 
Refactor team resonances and correct login behaviour and less-than-full-party behaviour
 2022-08-17 21:07:29 +09:30
AnimeGitB
48cd9f6be2 Don't use UIDs as initial capacity for chat history 2022-08-17 03:20:06 +09:30
AnimeGitB
fab7e4a461 ChatSystem nitpick 2022-08-17 00:17:41 +09:30
GanyusLeftHorn
dc153572dd Fix chat welcome messages and some slight refactoring. 2022-08-17 00:12:27 +09:30
AnimeGitB
97779fd35a Fix deprecated chat references 2022-08-16 15:13:51 +09:30
2y8e9h22
c115fe1abe update zh-CN.json (#1662) 
Original commits:
* .
* Apply suggestions from code review
 2022-08-16 10:11:26 +09:30
Luke H-W
dc9cef8ab7 Refactoring (#1660) 
* Refactor a couple of iterators

* Use side-effect instead of second iterator

* Make World::onTick return shouldDelete instead of success

* Replace Shop iterator with side effects

* Scene

* Clean up Expeditions

* Refactor Expeditions

* Clean up Expeditions, Player

* Limit Expeditions by AR

* Lombokify props

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-15 23:19:13 +09:30
Magix
3ec411b11a Bump config version. 2022-08-14 11:00:29 -04:00
dragon
3bd00fcb07 Update ConfigContainer.java (#1646) 
make it more similar to official behavior.
 2022-08-11 21:27:45 +09:30
dragon
823980046e make fishhook_tp configurable 2022-08-11 21:21:30 +09:30
AnimeGitB
46223c8976 Refactor Json helper functions to JsonUtils 2022-08-11 17:59:08 +09:30
AnimeGitB
c6323e9759 Funnel all gson calls into helper functions 
Add deprecated getGsonFactory for plugin compat until 3.0
 2022-08-11 17:59:08 +09:30
Luke H-W
76fcbb477b Remove beta message 2022-08-11 16:21:59 +09:30
AnimeGitB
325fe6c44a Fix TalentCommand for Traveler 2022-08-11 16:21:27 +09:30
dragon
edd4c8ca88 fix:command player said to server won't be shown at chat history (#1643) 
Original commits:

* fix:command player said to server won't be shown at chat history

* Update ChatManager.java
 2022-08-11 15:20:08 +09:30
GanyusLeftHorn
04f0fae898 Handle Unlocking of Waypoints and Statues (#1608) 
Original commits:

* Add necessary protos for scene point/area unlocking.

* Rename PlayerOpenStateManager to PlayerProgressManager and move data to Player.

* Handle unlocking of waypoints.

* Add primo rewards for waypoint unlock.

* Statue unlocking.

* Add statue quest on player login.

* I forgor to add an unlock command.

* Give EXP as reward, fire quest trigger, make EXP UI show up.
 2022-08-10 19:33:47 +09:30
AnimeGitB
c624479439 Fix an edge case that breaks embryos if resources are loaded early 2022-08-10 17:00:43 +09:30
Magix
3121e3e67d Introduce a new arguments parser (#1629) 
Original commits:

* Clean-up

* Introduce a new application arguments parser & handler

* Clean-up and deprecate `Tools#getLanguageOption`

* Fix `-debug` and `-debugall` parameters

* found this while debugging, ...why

* Remove deprecated parameters

* Invoke startup argument parser before handbook generation

* Move command map instantiation to `Grasscutter `(prevent making 3 instances on startup)

* Ensure \n at EOF

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-10 11:54:43 +09:30
GanyusLeftHorn
e20b185dc0 Fix Claiming BP Reward Chests (#1634) 
Original commits:

* Fix claiming BP chests.

* Remove logging.
 2022-08-10 11:04:22 +09:30
AnimeGitB
a2cdec02af Make missing languages not throw warnings 2022-08-09 04:57:44 -07:00
AnimeGitB
9c66ba137f Unify gacha mappings generation 2022-08-09 20:59:11 +09:30
AnimeGitB
ef805f26cc Remove vestigial references to gacha_mappings 2022-08-09 20:59:11 +09:30
AnimeGitB
0091fb87ea Remove language hack from handbook generation 2022-08-09 20:59:11 +09:30
AnimeGitB
c1ff7332fe Generate handbooks on every launch, fix html docs 2022-08-09 20:59:11 +09:30
AnimeGitB
e963419956 Refactor handbook generation, remove singular handbook 2022-08-09 20:59:11 +09:30
AnimeGitB
0994417261 Cache used strings from TextMaps 2022-08-09 20:59:11 +09:30
AnimeGitB
4790158ac6 Load in all the textmaps! 2022-08-09 20:59:11 +09:30
KingRainbow44
6ec372e64f Add invoke-level invulnerability for bursts. 2022-08-06 23:35:57 -04:00
KingRainbow44
7df41f616b Invoke AbilityManager#onSkillStart and AbilityManager#onSkillEnd 2022-08-06 23:35:09 -04:00
KingRainbow44
6420428660 Add a method to be invoked on skill perform and end 2022-08-06 23:34:35 -04:00
Kawaa
352aa7d689 Improve some documentation and JSON (#1618) 
Original commits:

* Updated instructions

* 更新说明

* 更新说明

* 更新说明

* 更新说明

* 更新说明

* Updated instructions

* Updated instructions
 2022-08-05 19:05:44 +09:30
KingRainbow44
cf2832ae72 Add EntityDamageEvent and implementations 2022-08-04 21:36:00 -04:00
Magix
d05b3207e5 Add more events 
Merge pull request #1516 from Grasscutters/more-events
 2022-08-04 13:57:00 -04:00
Magix
a3e0f7f5f0 Update HandlerSceneTransToPointReq.java 2022-08-04 13:49:38 -04:00
Magix
d24c10eec5 Update src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:45:02 -04:00
Magix
164baa7251 Update src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:44:56 -04:00
Magix
9cb9fe099c Update src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:44:50 -04:00
Penelopeep
9a104f6f69 Polish README and setConst translation (#1614) 
Original commits:
* setConst translation
* New pl README link
* Polish README
* fix
 2022-08-04 18:02:34 +09:30
Abdul
1a2f25d67b Update ru-RU.json 2022-08-04 18:01:26 +09:30
유여름
1b3963a83a Create ko-KR.json 2022-08-02 22:45:49 +09:30
KingRainbow44
faeb96927a Add PlayerUseFoodEvent and implementations 2022-08-01 21:32:30 -04:00
KingRainbow44
89575f587e Move PlayerTeleportEvent occurrences into World 2022-08-01 21:25:29 -04:00
KingRainbow44
1de402bd6f Merge branch 'development' into more-events 2022-08-01 21:13:19 -04:00
KingRainbow44
b9b4b6f428 Clean-up the energy manager 2022-08-01 21:12:57 -04:00
Magix
f25fb62942 Explicitly declare the charset of a FileReader in ConfigContainer 
Changed charset of FileReader in ConfigContainer from default to utf-8.
Merge pull request #1600 from Someone999/development
 2022-07-31 07:17:46 -04:00
millet6
5df46dab86 Update zh-CN.json 
修正 用户登录提示
 2022-07-30 13:57:27 +09:30
Someone999
f3baa0b8e7 Changed charset of FileReader in ConfigContainer from default to utf-8. 2022-07-29 19:08:07 +08:00
RBNXI
66dadece8a Add files via upload 2022-07-28 21:07:17 +09:30
AnimeGitB
cb8b21d03d Auto language lint 2022-07-28 04:23:58 -07:00
AnimeGitB
b80126fdda Add lock function to SetStatsCommand 2022-07-28 04:23:58 -07:00
AnimeGitB
0fa3d0e8d1 Improve message formatting to clients 
Replaces tab indents with an extra linebreak.
Also adds / to the start of command usage.
Neither of these changes affect messages to the server console log.
 2022-07-28 00:16:41 -07:00
Magix
24dfac65b2 Update zh-CN.json 
Merge pull request #1584 from millet6/patch-1
 2022-07-27 13:33:40 -04:00
Magix
f25dc4d2fc Update zh-CN.json 2022-07-27 13:32:11 -04:00
AnimeGitB
0d9116225c Suppress stacktrace on missing questkeys file 2022-07-27 21:10:32 +09:30
Magix
6ba4846e58 Change loading quest keys from info to debug. 
Please for the love of god use `debug` for information not important to the enduser when starting the server.
 2022-07-26 14:49:45 -04:00
millet6
d8f8aed816 Update zh-CN.json 
更新汉化内容
Update Chinese content
 2022-07-27 01:38:24 +08:00
Magix
9781d5e6c9 Fix an NPE in EntityGadget when draft_id isn't set 
Merge pull request #1579 from Hartie95/nullfix
 2022-07-26 12:14:08 -04:00
Magix
107111d3fc SceneScriptManager fix nullPointer error 
Merge pull request #1581 from akatatsu27/development
 2022-07-26 12:02:14 -04:00
Melledy
7600f706b5 Move QuestEncryptionKeys to resources/ 2022-07-26 08:22:27 -07:00
Kimi
2fe6bcf2cf Traditional Chinese | Translation Patches 
Added missing some commands translation, and fixing up another mainlander's CHS = CHT mindset.
 2022-07-27 00:28:44 +09:30
akatatsu27
7ca947b05f fix nullPointer error 2022-07-26 17:58:28 +03:00
ah
964e73f0f6 small nullpointer fix in EntityGadget, in case meta gadget is not set 2022-07-26 16:09:52 +02:00
Abdul
bb8ae4c443 Update ru-RU.json 
- Add unlockall translations
 2022-07-26 06:29:57 -07:00
RBNXI
5a3dfcd4b4 Add spanish translation for constellation commands 2022-07-26 22:56:36 +09:30
akatatsu27
8bdcfb8908 token fix 2022-07-26 14:28:39 +03:00
akatatsu27
92aeb79ac3 Merge branch 'development' into questing 2022-07-26 14:17:42 +03:00
Abdul
1c5c3633d1 Update ru-RU.json 2022-07-26 18:58:15 +09:30
AnimeGitB
883b6f1fcc [Bug] New avatars always created with C0 constellation 
Fixes #1552
 2022-07-26 17:56:49 +09:30
hartie95
ffeff92dd6 2.7+ prerendered cutscene support 2022-07-26 16:55:53 +09:30
hartie95
938b54c2ee two small activity/event fixes 
* fixed GetAcitivityInfoReq proto
* added draft to gadget Scene gatget, to let the client know the propper minigame for some entities
 2022-07-26 16:49:52 +09:30
lactose
59a412cc83 Set Constellation Command (#1565) 
Original commits:

* create `SetConstCommand` class and translations

* (partially) functional `setconst` command

* fixed punctuation

* added success message

* implemented `SetConstCommand`

* added translation keys

* update keys

* refactor + automatic reload

* Nitpick (Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>)
 2022-07-26 16:44:17 +09:30
loulou310
63fd4dfe3a Update French translation 2022-07-26 10:35:05 +09:30
KingRainbow44
c35705010a Fix remaining traces of Player#getPos 2022-07-24 13:27:43 -04:00
KingRainbow44
41ec2316e4 Attempt to fix the teleport command. 2022-07-24 13:23:51 -04:00
KingRainbow44
818bfb8c5b Add PlayerTeamDeathEvent and implementations 2022-07-24 13:20:58 -04:00
KingRainbow44
886c2e2f43 Add EntityDeathEvent and implementations 2022-07-24 13:20:42 -04:00
KingRainbow44
a13725b1cb Add a Location class (Scene + Position) 2022-07-24 12:17:38 -04:00
KingRainbow44
7397c7f300 Remove deprecated class 2022-07-24 12:08:59 -04:00
KingRainbow44
90cded16d9 Merge branch 'development' into more-events 2022-07-24 12:05:35 -04:00
akatatsu27
44d8a6482e call deregisterRegion appropriately 2022-07-24 13:33:48 +03:00
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
GanyusLeftHorn
54c4f60abb Fix next sunday. 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
7cb4c9fee2 Remove comments 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
0c8db8f00e Remove comments 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
b0d19e54db Implement selection chests for BP rewards. 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
8104378b95 Add daily and weekly mission reset. 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
814d4819d4 Unlock Gnostic Hymn 2022-06-26 21:38:35 -07:00
KingRainbow44
422e25e0e4 Enable complete debugging info with -debug 2022-06-26 13:07:43 -04:00
KingRainbow44
f5bc750150 Clean up the server's logger. 2022-06-26 13:03:10 -04:00
KingRainbow44
f86b4bec11 Reformat 2022-06-26 13:00:23 -04:00
KingRainbow44
269149bb1f Formatting changes 2022-06-26 12:50:58 -04:00
KingRainbow44
163c6bf47d Move drop data loading to debug 2022-06-26 12:42:37 -04:00
KingRainbow44
7e0c19021c Move expedition rewards loading to debug 2022-06-26 12:42:14 -04:00
KingRainbow44
e842c23539 Move registering packet handlers to debug 2022-06-26 12:40:34 -04:00
KingRainbow44
a896928e61 Move energy data loading to debug 2022-06-26 12:36:17 -04:00
KingRainbow44
286d6289b2 Move banner loading to debug 2022-06-26 12:34:56 -04:00
KingRainbow44
5895439a3f Move shop data messages to debug 2022-06-26 12:34:03 -04:00
KingRainbow44
19d81463bc Merge remote-tracking branch 'origin/development' into development 2022-06-26 12:33:03 -04:00
KingRainbow44
71b118dd9f Add a start and finish message to resource loading 2022-06-26 12:31:09 -04:00
KingRainbow44
2dcdb839c4 Move resource loading messages to the debug level 2022-06-26 12:26:39 -04:00
KingRainbow44
091d8c69a3 Add a debug flag for the logger 2022-06-26 12:23:07 -04:00
KingRainbow44
447360594d Log script messages to debug instead of info. 2022-06-26 12:20:48 -04:00
Paimon2022
46916b8216 Fix healing abilities for Q skill of Hu Tao 2022-06-26 22:29:06 +08:00
zhaodice
541c38b74c Avoid disconnection notification 2022-06-26 02:34:45 -07:00
xingluo233
b5fd8c1acd Update TowerSchedule.json 2022-06-26 02:34:24 -07:00
zhaodice
d5866dd36d Update HandlerPlayerForceExitReq.java 2022-06-25 22:39:32 -07:00
zhaodice
6e90067101 Logout immediately 2022-06-25 22:39:32 -07:00
Paimon2022
57e0f7ba40 Fix healing abilities for Q skill of Kokomi, Qiqi and Barbara. 2022-06-25 22:20:26 -07:00
zhaodice
0144e55d3a Lunch Support (#1373) 
* PacketSetUpLunchBoxWidgetRsp

* HandlerSetUpLunchBoxWidgetReq
 2022-06-25 22:19:59 -07:00
AnimeGitB
9425f672e0 Remove BPLevel, GodMode, NoStamina, SetWorldLevel, UnlimitEnergy, UnlockTower commands 2022-06-25 22:19:29 -07:00
AnimeGitB
fc9acf42c2 PlayerProperty Refactor 2022-06-25 22:19:29 -07:00
AnimeGitB
baafb4104c Remove GiveAll, GiveArt, GiveChar commands 2022-06-25 22:19:29 -07:00
AnimeGitB
6fd1ce813c Remove Drop, ChangeScene, Restart, Broadcast commands 2022-06-25 22:19:29 -07:00
AnimeGitB
bb37201105 Small putItem refactor 2022-06-25 22:19:29 -07:00
AnimeGitB
bcc20c2d03 Allow PermissionCommand to target offline players again 2022-06-25 02:12:33 -07:00
AnimeGitB
f00db7b7b2 Allow offline Player objects to return their Account 2022-06-25 02:12:33 -07:00
AnimeGitB
a3b4a11863 Add permission to BanCommand, rework its targeting 2022-06-25 02:12:33 -07:00
GanyusLeftHorn
1ba415c66a Remove logging. 2022-06-24 17:51:30 -07:00
GanyusLeftHorn
3ec2c4e21e Reset forge points every day to enable crafting of enhancement ores. 2022-06-24 17:51:30 -07:00
GanyusLeftHorn
2cdfea1fb2 Move worldlevel for World to Player::setWorldLevel 2022-06-24 17:51:30 -07:00
AnimeGitB
088b3dbbcc Add initializers to GameServer 2022-06-25 00:58:09 +09:30
Melledy
cdc23a0647 Random cleanups in the gameserver and player 2022-06-24 07:43:43 -07:00
Melledy
a16bc72101 Implement weekly points for the battle pass 2022-06-24 07:34:24 -07:00
Melledy
5eb1d34b14 Implement battle pass triggers/rewards 2022-06-24 01:12:52 -07:00
KingRainbow44
34f7c6e780 Formatting changes 2022-06-24 01:22:18 -04:00
KingRainbow44
95df9a3162 Hardcode EventType.GAME for ServerLogEvent 2022-06-24 01:22:11 -04:00
KingRainbow44
52da2c235d Add & implement EntityMoveEvent 2022-06-24 01:21:41 -04:00
KingRainbow44
47f3353342 Add entity event base class 2022-06-24 01:21:06 -04:00
KingRainbow44
20b2554e39 Merge remote-tracking branch 'origin/development' into development 2022-06-24 01:06:57 -04:00
KingRainbow44
a16812551a Replace CommandResponseEvent with ReceiveCommandFeedbackEvent 2022-06-24 01:06:19 -04:00
Tesutarin
52c1d2f540 Update translation 2022-06-23 21:23:27 -07:00
GanyusLeftHorn
3a2ebd1edd Set world level automatically on level up. 2022-06-23 21:23:14 -07:00
Luke H-W
f04035da34 Merge branch 'development' into Weather 2022-06-24 00:47:14 +09:30
Magix
1c9a9599be Change plugin manager logic 
Merge pull request #1346 from Grasscutters/plugin-priority
 2022-06-23 11:13:15 -04:00
@Roly
74151c204c Fix chest types 2022-06-23 05:38:38 -07:00
Akka
67ac0d700d add region entity 2022-06-23 03:14:38 -07:00
Akka
1c6c581399 fix gadget infinity create 2022-06-22 22:39:54 -07:00
KingRainbow44
b796372042 Merge remote-tracking branch 'origin/development' into development 2022-06-23 00:28:35 -04:00
KingRainbow44
f4ba460de1 Fix PlayerCreationEvent to match expected logic 2022-06-23 00:28:13 -04:00
Magix
3585fd597b Merge branch 'development' into plugin-priority 2022-06-23 00:06:31 -04:00
AnimeGitB
b2e620553a Tweak messages 2022-06-23 02:38:04 +09:30
AnimeGitB
c9363ef5e5 Move weather from Scene to Player 2022-06-23 02:32:38 +09:30
Magix
ed7ffa74da Enable development repository for artifacts 
Uploading dev builds to 4Benj Repo via Jenkins for plugin developers.
 2022-06-22 11:08:55 -04:00
Luke H-W
aa835ecac7 Update src/main/resources/languages/en-US.json 
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
 2022-06-22 23:41:14 +09:30
AnimeGitB
371acb9ba5 Deduplicate some translation keys 2022-06-22 23:20:16 +09:30
AnimeGitB
dcd3c696ea Add default Climates per weather 2022-06-22 22:41:07 +09:30
14eyes
4df068bba0 Add missing lua constants (#1342) 
* Add missing script constants

* Fix formating
 2022-06-22 05:00:22 -07:00
Magix
1b58ba254e Revert deprecation of registerCommand 
i was going to make commands plugin specific but then decided against it
 2022-06-22 02:59:45 -04:00
KingRainbow44
c76f0c0e70 Fix event 2022-06-22 00:48:04 -04:00
KingRainbow44
0cb490605e Re-implement scheduler system (check #1321) 2022-06-22 00:46:34 -04:00
KingRainbow44
3c361b432f Fix method of loading dependant plugins 2022-06-22 00:22:51 -04:00
KingRainbow44
5a8b76d97b Update EventHandler with new register syntax 2022-06-22 00:22:50 -04:00
KingRainbow44
6175e957b5 Fix issue when exiting server when plugin manager hasn't loaded 2022-06-22 00:22:49 -04:00
KingRainbow44
91d232d625 Fix Player on this branch 2022-06-22 00:22:23 -04:00
KingRainbow44
eed59e0d77 Fix filenames issue (pt. 2) 2022-06-22 00:21:46 -04:00
KingRainbow44
74cbad261d Fix filenames issue 2022-06-22 00:21:43 -04:00
KingRainbow44
07a97f65f6 Separate aliases from the command map 2022-06-22 00:21:10 -04:00
KingRainbow44
82eefde4c0 Plugin-specific listeners & dependency loading 2022-06-22 00:20:15 -04:00
KingRainbow44
e2cfe94bf0 Add loadAfter plugin setting 2022-06-22 00:19:43 -04:00
GanyusLeftHorn
63b6b805cc Bring back dungeon drops. 2022-06-21 19:49:46 -07:00
Benj
f331afe339 Refix Javadoc and readd getPlugin comments 2022-06-22 09:24:11 +08:00
Melledy
f18f06fd1b Migrate battlepass to its own db collection 2022-06-21 07:59:10 -07:00
诗音澄鸢 镜苑芳依
b9bf33c2f7 implement BattlePass (Except missions) (#1316) 
* BattlePass

* BattlePass
 2022-06-21 07:18:13 -07:00
loulou310
c171b5904e French translation for ban and unban and typos fix (#1337) 
* Fixed french readme's typos, and the Discord server link

* Translated ban and unban commands for French
 2022-06-21 07:14:47 -07:00
Tesutarin
d3c0d2e53c Update 2.7 second half banners 2022-06-21 02:43:21 -07:00
Kimi
8a1df19ed8 Traditional Chinese | Translation Patches (#1310) 
* Traditional Chinese | Translation Patches

* Update zh-TW.json

* Update zh-TW.json

* Update zh-TW.json
 2022-06-18 23:29:28 -07:00
Miralyn
f3544e98fc Fixed some mistakes in the ru json (#1312) 
* Don't know what Dispatch means and can't really find it in Russian anywhere, not a specialist anyway so decided to not invent things.

* lost some symbols accidentally

* accidentally messed up some escape characters. translated a bit more
 2022-06-18 23:28:07 -07:00
Akka
706dc5e4c7 MonsterInvestigation (boss icon in map) 2022-06-18 08:04:06 -07:00
Miralyn
80c61466e3 Add Russian translation for server software (#1304) 
* Don't know what Dispatch means and can't really find it in Russian anywhere, not a specialist anyway so decided to not invent things.

* lost some symbols accidentally
 2022-06-18 15:02:21 +00:00
诗音澄鸢 镜苑芳依
79e4172c47 Fix daily dungeon didn't display in note(笔记) (#1296) 
* Fix Daily dungeon didn't display in note(笔记) -- Buggy

* 123
 2022-06-17 23:50:55 -07:00
Melledy
2915b14c1f 2.7 Merge 2022-06-17 23:36:16 -07:00
Melledy
30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Melledy
8e6aa50c3a Move ban check to GetPlayerTokenReq 2022-06-17 19:42:42 -07:00
Yazawazi
a2de0e2376 no more bin 2022-06-17 19:42:42 -07:00
Yazawazi
3ccaf535ef 2nd null check 2022-06-17 19:42:42 -07:00
Yazawazi
aba4080b0e feat(ban): Implementing ban. 
Rough code, not based on permission.
 2022-06-17 19:42:42 -07:00
Akka
557298f847 a little fix 2022-06-17 18:15:49 -07:00
Akka
2d461641f1 a little fix 2022-06-17 18:15:49 -07:00
Akka
247412b17e fix the rot of furniture 2022-06-17 18:15:49 -07:00
Akka
211d7d6fbf implement furniture make system 2022-06-17 18:15:49 -07:00
Akka
7a247e70e0 npc/animals arrangement & support enter room scene 2022-06-17 18:15:49 -07:00
Akka
e16633e34b Implement the Home System (Serenitea Pot) 2022-06-17 18:15:49 -07:00
zhaodice
bddb96e3b2 Fix friend request pending list 2022-06-16 23:45:40 -07:00
Melledy
359e83596c Refactor gacha banner proto creation to not do a lookup on the database 2022-06-16 08:18:24 -07:00
CamChua_VN
2624f48a84 Update Epitomized Path (#1254) 
* Update Epitomized Path

* Update Epitomized Path

* Update Epitomized Path

* Refactor doRarePull

* Update Epitomized Path

Co-authored-by: AnimeGitUserB <AnimeGitUserB@bigblueball.in>
 2022-06-16 08:01:27 -07:00
4Benj_
bb07d9ea41 Custom Permission Handler (#1282) 
Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-16 08:00:03 -07:00
Melledy
6d59159b8b Cleanup package names 2022-06-16 07:57:57 -07:00
Melledy
ac49114c45 Add embryos for all skill depots for the main characters 2022-06-16 07:54:53 -07:00
Tesutarin
cc4094549e Gacha Records: Support multiple languages 2022-06-15 23:44:57 -07:00
Paimon2022
37230d1274 Fix issue: skill recovery value of a character should benefit from his/her own property, 
not the character he/she treats.
 2022-06-15 23:10:17 -07:00
ImmuState
50c8f43d5b Fix giveall and givechar giving broken characters. 2022-06-15 23:10:04 -07:00
zhaodice
c056ad5cd1 [Ready]Replace deprecated KCP library (#1237) 
* Replace deprecated KCP library

support get srtt

Waiting server to establish

logicThread

Print Bad Package Information

Avoid orphan data

improve conv id security

* Improve connection subsequence
 2022-06-15 04:13:35 -07:00
yuyuko
8a3d6e3db4 Fix multi server function 2022-06-14 18:28:35 -07:00
ImmuState
ebab89d433 Don't show internal server error on gacha with full inventory. 2022-06-14 18:09:02 -07:00
ImmuState
e0d386105a Only send full clear notification on burst cast. 2022-06-14 18:08:55 -07:00
ImmuState
0db1472195 Adapt protocol for clearing energy. 2022-06-14 18:08:55 -07:00
xlpmyxhdr
521deab4f2 Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at once 
Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at one time, so that one Ancient Rock Dragon Lizard was generated at a time, and the attributes were different
 2022-06-14 18:08:43 -07:00
loulou310
57918d0344 Added fr-FR.json 2022-06-14 21:44:42 +02:00
saucebing
458aadc2ff fix healing ability of some characters to some extent (#1201) 
* fix healing ability of some characters to some extent

* using SerialName to replace replaceAll in avatar ability files reading

* add class HealAbilityManager

* move codes in onAbilityInvoke of class AbilityManager to class HealAbilityManager
 2022-06-14 04:36:53 -07:00
Tesutarin
7c9db30bca KickCommand: Remove unnecessary subpermission 2022-06-14 01:14:33 -07:00
ImmuState
6e955c9fdb Implement Resin (#1257) 
* Basic resin usage/refresh.

* Honor resin config, move some logic to logon.

* Add resin usage to DungeonChallenge

* Make fragile and transient resin usable.

* Get resin cost from dungeon excel.

* Add ability to unlock combine diagrams.

* Refactor CombineManager to use Inventory.payItems, enabling crafting of condensed resin.

* Refactor ForgingManager to use Inventory.payItems, to prepare for eventually forging Mystic Enhancement Ores using resin.

* Remove comment

* Check resin usage in addResin
 2022-06-14 01:14:15 -07:00
Luke Hubmayer-Werner
2fd2fab54c Partial revert of #1245 2022-06-12 21:49:47 -07:00
Tesutarin
c5b45358e7 Command: Add permissionTargeted or targetRequirement 2022-06-12 17:55:19 -07:00
ImmuState
c4ce6caeba Add alternate name for tranSceneId, and fix inconsistent indentation. 2022-06-11 19:42:11 -07:00
zhaodice
db039cc35b make sure towerData is not null (#1240) 
* make sure towerData is not null

* Update Player.java

* add notice
 2022-06-11 04:34:25 -07:00
Tesutarin
eb170bcb15 Language: Update translation 2022-06-10 21:20:50 -07:00
zhaodice
052e70e488 Fix inconformity of Player Object at TowerManager (#1226) 
* Fix inconformity of Player Object at TowerManager

Fix inconformity of Player Object at TowerManager class from GameSession

* fix with a reasonable resolution

* Make sure towerManager'player is online player

* Make sure towerManager'player is online player

* Obsolete storage

* Fix build

* fix build

* fix build

* add @Entity

* set record map

* replace tab with space

* add Entity to TowerData

* make infomater more accurate

* move player register to onLogin
 2022-06-09 13:38:53 -07:00
ImmuState
a8d972c0c0 Make UI for blueprint unlocking behave. 2022-06-08 05:43:38 -07:00
ImmuState
4309e96253 Make calculation for partial claims better. 2022-06-08 05:43:38 -07:00
ImmuState
443cc8fc4b Make the UI behave. 2022-06-08 05:43:38 -07:00
ImmuState
9a313e50eb Send periodic notifications to the client for ongoing forges. 2022-06-08 05:43:38 -07:00
ImmuState
4b77e84e81 Add ForgeQueueDataNotify, unwhack UI. 2022-06-08 05:43:38 -07:00
ImmuState
0e1c8dc526 Cancel forging and refund items. 2022-06-08 05:43:38 -07:00
ImmuState
0cc4bad18c Obtain forging results (UI is broken though). 2022-06-08 05:43:38 -07:00
ImmuState
28a8475cea Consume material. 2022-06-08 05:43:38 -07:00
ImmuState
a668bd6ec1 Check materials and mora 2022-06-08 05:43:38 -07:00
ImmuState
5db5c90a8b Start a new forge (no checking for now). 2022-06-08 05:43:38 -07:00
ImmuState
e5498e373e Add handling for ForgeExcelConfigData. 2022-06-08 05:43:38 -07:00
ImmuState
9d6bc2a910 Change active forges in player to list. 2022-06-08 05:43:38 -07:00
ImmuState
8db0500e9d Add missing forging protos, add data for ongoing forges to player, handler for ForgeStartReq. 2022-06-08 05:43:38 -07:00
ImmuState
3fc63c2c4b Move forging stuff to ForgingManager, make client respond to ForgeGetQueueDataReq and actually display forging queues. 2022-06-08 05:43:38 -07:00
zhaodice
ecf7a81ad1 Fix unable to save game data occasionally (#1194) 
* Fix unable to save game data occasionally

* No self-kicking

* Game data synchronization

* finally

* prevent duplicated saving

* reverse changing

* keep the previous code

* Update GameServerInitializer.java

* Update GameSession.java

* remove sanity check because of try block

* a session needs can be created without a pipeline.
 2022-06-05 04:23:19 -07:00
liizfq
934fb5873a add new command (unlimitenergy):toggle energyusage for each player (#1186) 
* add new command (unlimitenergy):toggle energyusage for each player while  energyusage is ture in config.json

* Solve the problem of layout and naming errors

* make currentActiveTeam's Avatar full-energy while turn on the ule.

* Resolve language document errors

* add config_error message while player try to execute UnlimitEnergyCommand in GAME_OPTIONS.energyUsage == false
 2022-06-04 19:14:52 -07:00
AZ
fa2ab59887 List game & server version when starting server (#1181) 
* When the server starts, it now outputs the game and server version. Too dumb to not hardcode it - sorry!

* ...

* sorry i dropped my spaghetti, I'll help clean that

* Doing simple stuff: now without hardcoding!

* Restored Git hash functionality

* Fixed other languages and made the output more useful.

* Forgot this file lol
 2022-06-04 02:41:18 -07:00
Melledy
910a5749f0 Refactor and optimize DatabaseHelper::checkIfPlayerExists 2022-06-03 19:32:10 -07:00
AZthemute
06546707e1 Fixed sendmessage command output. 
Also clarified coop command in help command.
 2022-06-03 19:11:47 -07:00
Tesutarin
66b642ef06 Language: Update translation 2022-06-03 10:16:45 -07:00
leonier-test
09580ef448 Ruin Guards/Hunters/Graders should drop Chaos Device series instead of Chaos Gear series. 2022-06-03 06:12:25 -07:00
leonier-test
0c5ff4377e Fix default Shop.json (for Mondstadt General Goods) 2022-06-03 06:12:04 -07:00
Paimon2022
a19e7c6db6 Spawn default monsters with different levels according to data/Spawns.json when worldLevelOverride is not zero. 
For example, in world with worldlevel 8, base monster level is 90 according to resources/ExcelBinOutput/WorldLevelExcelConfigData.json,
monster level bias in data/Spawns.json belongs to [1,32], so the monster level would belong to [69, 100].
 2022-06-03 03:20:07 -07:00
Paimon2022
4119f8b787 Add coordinate support for spawn command (monster only) 
Now the spawn command is: spawn <entityID> [amount] [level(monster only)] <x> <y> <z>(monster only, optional)
The coordinate is optional
 2022-06-03 03:19:59 -07:00
zhaodice
73a1c5762a skipping right characters panel for Android 2022-06-03 02:42:17 -07:00
zhaodice
bbc398d374 Incompletely implement about QuickUseWidgetReq 
WARNING: with the consuming of material widget ( Example: bomb ),
this is just a implement designed to the decreasing of count

### Known Bug: No effects after using item but decrease. ###

If you know which Packet could make the effects, feel free to contribute!
 2022-06-03 00:52:32 -07:00
ImmuState
e140284d37 Persist unlocked blueprints to the database. 2022-06-03 00:52:22 -07:00
ImmuState
f243c10157 Unlock forging blueprints. 2022-06-03 00:52:22 -07:00
zhaodice
056ba678a8 Fix Irreversible equipping 
Fix that can not detach equipment after attached
 2022-06-03 00:52:10 -07:00
zhaodice
01481fd524 Arresting small creature support (#1150) 
* Arresting small creature support

* add InsectCaptureManager

* use EnvAnimalGatherExcelConfigData.json

* Update InsectCaptureManager.java
 2022-06-03 00:51:51 -07:00
Magix
27b7ce7cc1 Update NoStaminaCommand.java 2022-06-02 19:02:26 -04:00
tamilpp25
71b53e0be4 Adding toggle feature to "nostamina" command similar to "godmode" command (#1152) 
* stamina command enhancement

* added "ns" as command aliases for NoStaminaCommand
 2022-06-02 03:33:46 -07:00
ImmuState
e1688c866f Make sure no player already has the reserved UID when creating and account. 2022-06-01 16:14:18 -07:00
zhaodice
7f3e8984ac Fix receiving reward repeatedly (#1140) 
* Fix receiving reward repeatedly

fix #1105 （just fix "无限发送领取请求"）

* Fix dead code and prevent getting item repeatedly

* fix again
 2022-06-01 16:13:48 -07:00
Tesutarin
d10fe0cdd3 WeatherCommand: Make it clear 2022-06-01 06:27:07 -07:00
Tesutarin
4c42e00a8b Language: Update translation 2022-05-31 22:06:47 -07:00
line-bear
28b505e187 Fix stuck when talking to npc seller (#1128) 
* Fix zero length array check method

* Import grasscutter logger
 2022-05-31 02:42:16 -07:00
tester233
6f5a290a3a Update translation 2022-05-31 02:41:43 -07:00
tester233
ba6a9fc798 Usage: Unified specification 2022-05-31 02:41:43 -07:00
lhhxxxxx
0e6ac4a827 Update default config to match the one in Koko-boya/Grasscutter_Resources 2022-05-31 02:07:18 -07:00
Melledy
aaf7777020 Fix players not setting their nickname properly after the opening cutscene 2022-05-31 02:06:40 -07:00
Elapse
f5347cf98b fix banner title display 2022-05-30 21:22:42 -07:00
Elapse
550776a502 Update Banners.json 2022-05-30 20:15:11 -07:00
Melledy
184eec82b3 Limit spawn amount if too many entities are in the world 
Can be controlled in the config with `sceneEntityLimit`
 2022-05-30 20:06:25 -07:00
Anush
18721758cc Fix Aqua Simulacra & Fading Twilight not given by GiveAll command 2022-05-30 20:06:25 -07:00
ImmuState
2e167d2d78 Add energy generation probabilities to WeaponType. 2022-05-30 20:06:25 -07:00
line-bear
52a3f95729 Fix starglitter/stardust exchange error (#1108) 2022-05-30 20:06:25 -07:00
Melledy
e9a7032c4d Fix weapon curve excels and camel case relic affix ecels 2022-05-30 20:06:25 -07:00
Melledy
ef6e16aaf5 Refactor WeaponType and MonsterType into enums 2022-05-30 20:06:25 -07:00
ImmuState
b9ca4a5dbd Make NA/CA energy not scale with ER. 2022-05-30 20:06:25 -07:00
ImmuState
635e342a3d Make sure the hit target is actually a monster. 2022-05-30 20:06:25 -07:00
ImmuState
febdb99855 Add a rough implementation for NA/CA energy generation. 2022-05-30 20:06:25 -07:00
line-bear
3773f4df68 Add skill particle generation info for Yelan and Kuki Shinobu (#1097) 
* Fix enter tower dungeons

* Add skill particle generation info for Yelan and Kuki Shinobu

* Update SkillParticleGeneration.json
 2022-05-30 20:06:25 -07:00
linebear
18df521347 Fix enter tower dungeons 2022-05-30 20:06:25 -07:00
Melledy
0ba13ef7ff Fix map mark issues from updating from 2.6 
Close #1086
 2022-05-30 20:06:25 -07:00
Melledy
7cfa2b6c5b Fixed constellation issues from new binout 2022-05-30 20:06:25 -07:00
Melledy
3ee13b3b1e Fixed dungeon entries not working with new binout 2022-05-30 20:06:25 -07:00
Melledy
153280ea08 Fix quest data parser 2022-05-30 20:06:25 -07:00
Melledy
a23b29b65a Rename excel classes 2022-05-30 20:06:25 -07:00
Yazawazi
f139818224 [Anime Game Version update] Support 2.7 (#1072) 
* feature(2.7 version): support 2.7 version & upload new protos

1. Support GC in GI 2.7.0;
2. Upload new protos;
3. Fix some bugs cuz by new protos.

BREAKING CHANGE: all

* fix(database helper): fix player uid issues

* fix(ability embryo): uint32 to fixed32

* fix(proto): map mark

rename MAP_MARK_FROM_TYPE_NOE to MAP_MARK_FROM_TYPE_NONE

* fix(game version): change game version to 2.7.0

* perf(proto): remove unused protos

1. Remove unused protos;
2. Temporarily commented out some of the proto fields.

* fix(proto): uint32 to fixed32
 2022-05-30 20:06:25 -07:00
zhaodice
a95002fd40 Hunting and deforestation support. (#1083) 
* add drops for animals wild pig,fishes,foxes,birds

* append fox

* Deforestation Support

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* add AutoRecycleHashMap

Map's KEY is automatic expire if key long time no use (query or modify from HashMap)

* use AutoRecycleHashMap in case of memory leak

* fix bug

* remove prints

* static AutoRecycleHashMap

* fix problems

* Delete AutoRecycleHashMap.java

* remove log

* fix build

* improve

* remove unnecessary information

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>
 2022-05-29 06:16:49 -07:00
tester233
830ac793fe Update translation 2022-05-28 21:34:38 -07:00
tester233
2a3d9fd06c CoopCommand: Fix usage 2022-05-28 21:34:38 -07:00
tester233
02e737e920 Complement usage 2022-05-28 16:01:21 -07:00
KingRainbow44
68e1c8d75a Merge remote-tracking branch 'origin/development' into development 2022-05-28 18:52:56 -04:00
KingRainbow44
05527fcb7c Use static reference instead of local 2022-05-28 18:52:47 -04:00
Yazawazi
c164b25f90 fix(database helper): fix player uid issues 2022-05-28 04:28:36 -07:00
tester233
9af10859bb Update translation keys 2022-05-28 04:22:53 -07:00
Luke H-W
eb899ccd91 Fix setstats command feedback for targeting others (#1079) 
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-28 13:03:31 +02:00
ImmuState
cb3f3b92f5 Make sure energy drops are only processed for actual monsters. 2022-05-27 23:48:54 -07:00
KingRainbow44
b34ab5f8ec Fix OAuth Authenticator 2022-05-27 20:09:13 -04:00
KingRainbow44
52c86afef0 [BREAKING] Refactor OAuth handler 2022-05-27 19:58:04 -04:00
Melledy
243ad3abe5 Refactor accounts to not use a player uid 2022-05-27 00:22:55 -07:00
ProxyismGH
880d177034 TeamManager avatar add refactor. 2022-05-26 22:54:36 -07:00
logictc
6a9018e310 fix no melee attach and adjust skill particle amount 2022-05-26 15:26:47 -07:00
ImmuState
b57cf83bbd Some refactoring. 2022-05-26 03:41:19 -07:00
ImmuState
de8b0be36e Introduce a simpler way to get the original owner of an EntityClientGadget 2022-05-26 03:41:19 -07:00
logictc
fa90e37da3 remove debug msg 2022-05-25 21:10:10 -07:00
logictc
baef25680f change indentation to tab 2022-05-25 21:10:10 -07:00
logictc
c26bf08d90 fix indentation 2022-05-25 21:10:10 -07:00
logictc
95bc655882 implement skill particle generation 2022-05-25 21:10:10 -07:00
Akka
5a3e9bc34e Fixed excessive memory usage of Spatial Index 2022-05-25 00:42:52 -07:00
Akka
d95708ec03 Support spawn NPC 2022-05-24 21:43:51 -07:00
ImmuState
2a76e904ad Energy: Particle/Orb Drops from Monsters (#1054) 
* Generate energy drops for monsters + make sure picking up particles honors their count.

* Use drop info from excels instead.

* Remove double newline.

* Remove commented code.
 2022-05-24 21:43:04 -07:00
logictc
5811556630 don't take effect if energyUsage is false 2022-05-24 14:43:02 -07:00
logictc
af381dcf42 clear energy on death 2022-05-24 14:43:02 -07:00
logictc
e0593554b6 implement persist energy 2022-05-24 14:43:02 -07:00
tester233
7f7e82e748 Update zh-CN.json 2022-05-24 14:19:24 -07:00
tester233
9b9e29b5d3 Fix usage & update zh-CN.json 2022-05-24 14:19:24 -07:00
ShiroSaki
c8a7aea78b Fix new account can't load codex datas 2022-05-23 23:55:46 -07:00
ShigemoriHakura
9e8b6eff09 remove unused import 2022-05-23 15:46:21 -07:00
ShiroSaki
fef5c06a29 Fix the bug that can't kill command-generated monsters 
Command-generated monsters do not have spawnentry so we have to get data from getMonsterData
 2022-05-23 15:46:21 -07:00
Akka
5a4a708931 remove unused imports 2022-05-23 15:46:17 -07:00
Akka
791b9534b7 refactor the challenge 2022-05-23 15:46:17 -07:00
ShiroSaki
2b799958d2 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
Luke H-W
117a947b07 Fix team command (#1035) 
* Fix logic error in team command

* Sugar team command messages

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-23 02:45:03 -07:00
CCasusensa
6f798f838f Traditional Chinese | Translation Patch 2022-05-23 02:44:34 -07:00
ImmuState
922ae91771 Fix EnergyManager indentation. 2022-05-22 12:55:55 -07:00
ImmuState
ab1341f0d9 Make sure offFieldPenalty does not go below 0.1 2022-05-22 12:55:55 -07:00
ImmuState
88781fdd82 Remove debug stuff 2022-05-22 12:55:55 -07:00
ImmuState
4649680101 Fix traveller not being able to gain energy. 2022-05-22 12:55:55 -07:00
ImmuState
28323fed66 Move energy-related logic to a new EnergyManager. 2022-05-22 12:55:55 -07:00
ImmuState
1d2fde40d5 Make energy usage configurable, and preserve current behavior as the default. 2022-05-22 12:55:55 -07:00
ImmuState
531683f370 Make sure to use absolute energy to deplete burst. 2022-05-22 12:55:55 -07:00
ImmuState
8f5bd2f220 Give correct amount of energy for collecting particles/orbs, and consume energy on burst cast. 2022-05-22 12:55:55 -07:00
ImmuState
1df9acbb6a Generate energy particle of the correct element for abilities. 2022-05-22 12:55:55 -07:00
tester233
2d2dc5d0a8 Update translation keys 2022-05-22 12:55:45 -07:00
Luke H-W
0ae3c3d7da Allow commands to target offline players (#1022) 
* Add targetRequirement annotation for Command

* Added MTL lines for other langs

* Fix TargetRequirement enum scoping

* Adjust commands to targetRequirement system

* Add translation message sugar to prevent future messages from being translated for wrong player

* Temporarily disable offline targeting on /permission and /clear

* Preliminary README cleanup

* Readme commands cleanup

* Clean up command table in README, including column shuffle

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-22 01:02:11 -07:00
Kimi
fa0344d1f9 Traditional Chinese | Translation Patches 2022-05-22 01:01:56 -07:00
Benjamin Elsdon
5bd88d596b More Web Static Languages 2022-05-20 19:33:29 -07:00
xtaodada
7c899ce1d0 Fix dataloader not getting path correctly 2022-05-20 19:32:27 -07:00
Benjamin Elsdon
d1775b130f Attempt to fix untranslated login window 2022-05-20 05:52:15 -07:00
Няшик Няшный
e6514f7ad1 Added banner start and end time checks 2022-05-20 05:51:44 -07:00
Няшик Няшный
1662278586 Changing how banners work 2022-05-20 05:51:44 -07:00
zrll_
eb54dcec0e Update FileUtils.java 
fix: Error when checking files & always checking "/default/data" instead of folder
 2022-05-20 05:49:28 -07:00
4Benj_
92f1a93ba2 Server Log Events (#996) 
* Server Log Event

* LogEventAppender Encoder
 2022-05-20 05:48:20 -07:00
ButterCookies
9125bacfce Set the maximum number of player on the server through the config.json (#1001) 
* Show server status to three-party game launcher

* Set the maximum number of player on the server through the config.json

* modify the logical order and show the number of maxplayer to API /status/server

* Now even players who have token already cannot bypass the maxPlayer check
 2022-05-20 05:47:47 -07:00
Akka
717c2d1dd7 Support Boss Chest 2022-05-19 23:36:13 -07:00
zhaodice
2a467a48dc Fix connection bugs without removing binding address (#993) 
* Fix connection bugs according to #921

Fix this for connect to game by local device or remote devices according to #921

* Fix connection bugs according to #921

same

* Update GameServer.java

* fix build

* Update GameServer.java
 2022-05-19 08:35:14 -07:00
tester233
cf7c4832fe Remove outdated text & update zh-CN.json 2022-05-19 08:34:58 -07:00
Melledy
1282e1388f Add error message in case data files in resources could not be found 2022-05-19 03:06:07 -07:00
Melledy
5429469852 Add error message in case data files in resources could not be found 2022-05-19 03:05:57 -07:00
Melledy
86dee4bae7 Fix dataloader not getting path correctly 2022-05-19 03:01:21 -07:00
Melledy
01987279b5 Fix dataloader not getting path correctly 2022-05-19 03:00:59 -07:00
Melledy
28dda4c307 Add area_id to SceneObject 2022-05-19 02:28:46 -07:00
Melledy
8c860308ba Fix bad casting exceptions with scene garbages objects 2022-05-19 02:28:25 -07:00
Melledy
0dac404f0d Fix issue with groups that dont have any suites 2022-05-19 02:19:18 -07:00
Melledy
a088ea9b6b Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
Melledy
cd77fb90a3 Move gadget/monster creation events to after they are spawned in scene 2022-05-19 00:36:38 -07:00
Melledy
512021b234 Fix dataloader with eclipse 2022-05-19 00:10:02 -07:00
xtaodada
7fb26c3843 Autogenerate document files 2022-05-18 23:19:13 -07:00
Akka
bad853573c optimized the Lua func binding so that the script will not eval again 2022-05-18 20:51:39 -07:00
Melledy
a8f38ad995 Move chest rewards to new data format 2022-05-18 15:54:55 -07:00
Melledy
fe4e599014 Merge branch 'development' into dev-world-scripts 2022-05-18 15:54:35 -07:00
2bllw8
e3ed396889 Add web documentation 
- '/documentation': home page with all links
- '/documentation/handbook': html version of the gm handbook
- '/documentation/gachamapping': json document with the gacha mappings
 2022-05-18 15:41:19 -07:00
linebear
827044b3da Fix this does not look like a tar archive error when extract log file 2022-05-18 15:38:26 -07:00
tester233
efe459e17f Fix punctuation & update zh-CN.json (#976) 
* Fix punctuation & update zh-CN.json

* Fix error
 2022-05-18 13:46:47 -07:00
tester233
b8cb6e108b Improve text & update zh-CN.json 2022-05-18 05:48:17 -07:00
Melledy
3cffdd9773 Cleanup and remove business_type filter 2022-05-18 05:33:00 -07:00
Melledy
4b5f5b3db5 Only load groups that have a business type of 0 2022-05-18 05:10:45 -07:00
Melledy
b375881a3e Fix errors caused by merge + Refactor chests into GadgetChest 2022-05-18 02:36:50 -07:00
Melledy
94997276db Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into dev-world-scripts 2022-05-18 02:24:00 -07:00
Melledy
a48585d124 Implement local specialty spawning 2022-05-18 02:21:34 -07:00
Akka
5f13a51668 Support Open Chest 2022-05-18 01:07:06 -07:00
AZthemute
e45ef7de51 General housekeeping and clarification of en-us.json file 2022-05-17 21:11:10 -07:00
YukariChiba
d15c32df23 Add OAuth in AuthenticationSystem 2022-05-17 12:25:59 -07:00
muhammadeko
0c6521806c add CommandResponseEvent 2022-05-17 12:21:17 -07:00
Benjamin Elsdon
10fe5d11ca AuthenticationSystem::verifyUser now returns the user's Account instead of a boolean 2022-05-17 05:30:22 -07:00
YukariChiba
cc98c56916 Do not add default region if there are already regions 2022-05-17 04:30:28 -07:00
tester233
d0ab5fa5df Add translation key 2022-05-17 04:24:18 -07:00
tester233
263369af9a Modify usage 2022-05-17 04:24:18 -07:00
tester233
b5632aa62d Fix usage & remove outdated text 2022-05-17 04:24:18 -07:00
Benjamin Elsdon
ef63708675 Change BANNED_PACKETS to HashSet instaed of List 2022-05-17 04:24:01 -07:00
Benjamin Elsdon
fffa5a9c47 Fix "Attempt to get java.util.List field 'PacketOpcodes.BANNED_PACKETS' with illegal data type conversion to int" 2022-05-17 04:24:01 -07:00
Benjamin Elsdon
20feb75c86 Permanent fix for version.json stuff (causes 4206) 2022-05-17 04:11:50 -07:00
4Benj_
f473e44611 "Autogenerate" data files with data fallbacks and moved keys folder into jar resources (#927) 
* Autogenerate keys and data files

* Update gacha html files

Accidentally pushed with old html files

* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation

Removed unused code from old GC as well.

* Moved somethings and better errors

* Fixed resources from loading twice

* Data files fallback
 2022-05-17 03:00:52 -07:00
Melledy
df580bf519 Fixed issue with scene groups after merge 2022-05-16 22:09:10 -07:00
Melledy
81183db104 Merge branch 'development' into dev-world-scripts 2022-05-16 22:08:28 -07:00
xtaodada
1adffc21c0 Enhance the default permissions logic 2022-05-16 21:55:47 -07:00
RDsatan
21478b0a33 fixed 2022-05-16 21:53:16 -07:00
RDsatan
34ea3089b6 Optimize the join and remove commands to team 2022-05-16 21:53:16 -07:00
Akka
593de83847 optimized the lua serializer 2022-05-16 21:30:04 -07:00
muhammadeko
5ddf67d9e5 add config to enable/disable console 2022-05-16 17:57:14 -07:00
TangHuLuTaiTian
1925bf64d8 Some clients Code 4206 Error 2022-05-16 17:49:46 -07:00
Magix
3e2ff211ec Merge pull request #928 from 6ixfalls/dispatch-fix 
Fix "/" Route
 2022-05-16 12:56:13 -04:00
Elapse
58a5ad4909 update opcodes, correct op names, and update relative codes 2022-05-16 06:20:34 -07:00
line-bear
87966b9e98 Remove the extra slash while loading resources. (#893) 
* Remove the extra slash

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Import java.nio.file.Paths to use Paths.get

* Mark fields as private to prevent use *FOLDER directly

* Remove unnecessary slash

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>
 2022-05-15 23:32:03 -07:00
Akka
18ef5ee7de fix the dynamic group loading 2022-05-15 12:40:36 -07:00
6ixfalls
c71842c9d0 Fix "/" Route 2022-05-15 09:41:10 -07:00
Akka
6dc30e4def Enable script in big world (#884) 
* add docs for tower

* fix: LEAK: ByteBuf.release() was not called

* enableScriptInBigWorld

* not print log when loaded scripts from cache

* revert the change of server tick

* revert the change of server tick

* fix

* optimize the performance: lazy load & cache

* fix the refresh group

* fix NPE

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-15 04:19:24 -07:00
Melledy
eb64b25f12 Implement quest rewards 2022-05-15 03:48:47 -07:00
AnimeGitB
f5cdedcc88 Fix logic error in remove command 2022-05-15 01:17:26 -07:00
AnimeGitB
efd7467a71 Fix targeting on Join and Remove commands 2022-05-15 01:17:26 -07:00
muhammadeko
05e13d81ad Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -07:00
lsCoding666
7a66f22827 fix join command and remove command bug and update docs (#904) 
* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix

* fix(command):fix remove command a stupid bug.Loop delete element bug.

* fix(command):fix join command. When adding avatars, repeat avatars skip and non repeat avatars join.

* fix(language):fix join command remove command translate

* fix(ReadMe):update README.md join and remove command.
 2022-05-14 23:27:23 -07:00
muhammadeko
b05a5f85f6 fix permission command 2022-05-14 21:06:57 -07:00
Hotaru
3a216bf1bb Move gacha files to separate directory and refactor file serving 2022-05-14 20:07:08 -07:00
HotaruYS
159feb4064 Properly handle static assets for announcements (#891) 2022-05-14 20:05:19 -07:00
tiantian520
5b3c05a9a0 Add a new command "nostamina" (#877) 
* Add a new command " nostamina\

* Fix

* Fix 2

* Renamed some names.

* Update zh-CN.json

Fix an existing language expression error.
 2022-05-14 16:06:48 -07:00
KingRainbow44
6ec27cd17a Update routes 2022-05-14 12:41:49 -04:00
KingRainbow44
04d9613fac External authentication 2022-05-14 12:39:21 -04:00
KingRainbow44
5d7edc389e Implement PR #657 2022-05-14 12:21:55 -04:00
KingRainbow44
0dcf0862f8 JavaDoc Fix 2022-05-14 12:13:41 -04:00
KingRainbow44
2e7cd0b46f Fix errors 2022-05-14 12:10:43 -04:00
KingRainbow44
a2ff8c8470 Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
Melledy
a751e71da9 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-14 06:35:37 -07:00
lsCoding666
741e5749ad new command join and remove to force join or remove avatars into your current team (#549) 
* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix
 2022-05-14 06:28:02 -07:00
zrll_
470007a6c0 Fix connot execute quest command in console 2022-05-14 05:28:57 -07:00
luluxiaoyu
3c654cf030 Update zh-TW.json 2022-05-13 22:12:14 -07:00
muhammadeko
4f553f6694 remove log 2022-05-13 22:12:07 -07:00
muhammadeko
855a098aa7 fix logic and some cleaning 2022-05-13 22:12:07 -07:00
muhammadeko
922359d6e6 add negative permission check 2022-05-13 22:12:07 -07:00
KingRainbow44
3adf0d448c Refactor dispatch (now called HTTP) server (pt. 2) 2022-05-13 23:22:30 -04:00
ShiroSaki
20e3b8ffda add support for announcement page 2022-05-13 16:48:37 -07:00
Melledy
248b655f07 Use scene types instead of hardcoding scene ids for checking enter reason 2022-05-13 16:35:03 -07:00
tester233
82698d5623 Improve text 2022-05-13 16:33:18 -07:00
ShigemoriHakura
749ef3ff23 Add support for codexQuests (#870) 2022-05-13 16:33:07 -07:00
Yazawazi
ab6aa96144 fix(serenitea pot): teleport & read born pos from lua 2022-05-13 16:32:52 -07:00
Yazawazi
95a062123f feature(serenitea pot): Implementation of enter 
Ugly hard code
 2022-05-13 16:32:52 -07:00
Yazawazi
19ee983c08 feature(serenitea pot): Implementation of the entry function 
It's being perfected, so don't worry. (probably)
 2022-05-13 16:32:52 -07:00
KingRainbow44
840f4706b5 Refactor dispatch (now called HTTP) server (pt. 1) 2022-05-13 11:39:40 -04:00
KingRainbow44
a0067b664e Add JSON-related methods to Utils.java 2022-05-13 11:38:54 -04:00
KingRainbow44
39f23a0c47 Add new authentication system 2022-05-13 11:38:17 -04:00
Melledy
83f8bec947 Implement QUEST_CONTENT_FINISH_PLOT 2022-05-13 06:33:12 -07:00
Melledy
a227b44c70 Fixed quests not finishing their questline 2022-05-13 06:24:50 -07:00
Melledy
f4770cf20a Merge pull request #816 from Grasscutters/dev-quests 
Implement quests
 2022-05-13 05:36:30 -07:00
Kimi
891c70e5ea Traditional Chinese | Translation Patches 2022-05-13 05:35:21 -07:00
kyoko12
d4eb686fe2 Don't silently delete config.json if there is an error. 2022-05-13 05:34:59 -07:00
AnimeGitB
395da1ebcb Fix gachadetails 2022-05-13 05:34:14 -07:00
AnimeGitB
420801b49e Updated cost logic and default weights 2022-05-13 05:34:14 -07:00
AnimeGitB
736ca85300 Remove debug log from gacha 2022-05-13 05:34:14 -07:00
AnimeGitB
83c46cb9c8 Custom costs for different gacha pulls 2022-05-13 05:34:14 -07:00
AnimeGitB
f83f13204e Gacha rework 
Add fallback stripping and C6 stripping
Converting banner definitions from pity vars to lerp arrays
Properly implement rates and pool smoothing
Also move reusable functions to Utils
 2022-05-13 05:34:14 -07:00
Melledy
cbd46e9215 Add one more quest trigger 2022-05-13 05:33:43 -07:00
Melledy
631a53030c Switch to using quest excels 2022-05-13 03:12:25 -07:00
Akka
3c55aa64eb fix: LEAK: ByteBuf.release() was not called 2022-05-13 00:21:26 -07:00
Hotaru
92b103d529 Fix UTF-8 encoding in announcements 2022-05-12 17:54:50 -07:00
tester233
12c7c8f8c1 Improve text 2022-05-12 14:54:53 -07:00
tester233
4d9c2becb5 Improve text 2022-05-12 14:54:53 -07:00
tester233
28f4f73dbe Improve text 2022-05-12 14:54:53 -07:00
Akka
00ea35b81f add docs for tower 2022-05-12 14:54:44 -07:00
Hotaru
2451d2c897 Build region_list and cur_region dynamically 2022-05-12 14:54:33 -07:00
gentlespoon
65fcae7961 Slowly recover HP near statue 2022-05-12 02:32:39 -07:00
gentlespoon
8c71af26f0 Clean up map mark related code 
1. Remove unnecessary manager from player collection.
2. Clean up MarkMapReq handler.
3. Remove redundant checks.
 2022-05-12 02:32:11 -07:00
Melledy
9b26426e8a Merge branch 'development' into dev-quests 2022-05-12 02:31:28 -07:00
Melledy
1231802192 Implement basic quest condition handling 
Quests that require talking to npcs now work.
 2022-05-12 02:30:34 -07:00
Yazawazi
8c32438b52 feature(widget): simple implementation of widget 
Simple implementation of a part of the gadget support, very rough, hard code variables, I am very sorry for that. It can now handle part of the gadget rig. More features and better support await PRs from others. if no one else does, I'll give it a try.
 2022-05-12 01:23:16 -07:00
AnimeGitB
f45e106b2a Fix immutable lists 2022-05-11 21:56:53 -07:00
AnimeGitB
b787c70cb0 More usage of payItems 2022-05-11 21:56:53 -07:00
AnimeGitB
b4d457d78a Add some usage of Inventory.payItems() 
And add quantity to it
 2022-05-11 21:56:53 -07:00
AnimeGitB
595234cc84 Add Inventory.payItems() method 2022-05-11 21:56:53 -07:00
gentlespoon
226a29f7c2 Fix logging level 2022-05-11 17:39:45 -07:00
gentlespoon
2531ae366d Feature: vehicle stamina 
1. Remove references.
2. Handle vehicle stamina.
 2022-05-11 17:39:45 -07:00
gentlespoon
ba5635bf39 Update StaminaManager 
1. Update function signatures to prepare for vehicle stamina.
3. Remove hard-coded skills.
2. Wind resonance -15% stamina cost.
4. Climb talent cost reduction.
5. Swim talent cost reduction.
6. Diluc will now consume stamina at full price if talent not activated.
7. Sayu's windwheel no longer consumes stamina.
 2022-05-11 17:39:45 -07:00
Melledy
7befebe37f Add quest ids to handbook 2022-05-11 12:47:16 -07:00
Melledy
5d4f245293 Merge branch 'development' into dev-quests 2022-05-11 12:39:28 -07:00
ImmuState
e5a85f81c2 Insert language setting based on the player's account. 2022-05-11 12:02:45 -07:00
ImmuState
57c7f7a43b Add gacha details page. 2022-05-11 12:02:45 -07:00
mingjun97
570635ea02 Revise version format 2022-05-11 11:52:56 -07:00
mingjun97
895e2bc44a Display version info at console starting 2022-05-11 11:52:56 -07:00
mingjun97
a77ae0bc3c Introduce -version argument to display version 2022-05-11 11:52:56 -07:00
tester233
9fc18151c9 Improve text 2022-05-11 11:51:24 -07:00
tester233
99de46e261 Improve text & remove extra punctuation 2022-05-11 11:51:24 -07:00
Benjamin Elsdon
c932f9c7e5 Add verifyUser to AuthenticationHandler 2022-05-11 11:51:11 -07:00
Secretboy-SMR
9ed1bb9b94 It will use the english as default rather than tell you the value is not exist if there's no translation for currently language 2022-05-11 11:50:53 -07:00
KingRainbow44
03a2876233 Add plugin loggers 2022-05-11 11:46:36 -04:00
KingRainbow44
d215035fc8 Refactor config database settings 2022-05-11 11:38:30 -04:00
ayy lmao
3c0d85621e Fix InRouting on dispatch server 2022-05-11 17:35:52 +03:00
Melledy
dfd8fcb250 Fix build error from merge 2022-05-11 04:01:38 -07:00
Melledy
51844b6535 Merge branch 'development' into dev-quests 2022-05-11 03:56:59 -07:00
Melledy
e9d7d5d5f2 Implement quests 2022-05-11 03:56:40 -07:00
Secretboy-SMR
e3fd2eaa17 Removed invalid code in getLanguageFileDescription,When the language is not discovered, it will use the built-in language fallback mechanism to fall back,At the same time, we also fix the issue that using language in the server does not save the settings of the server side locale 2022-05-11 03:11:10 -07:00
coooookies
7e3bfed003 Show server status to three-party game launcher 2022-05-11 02:45:21 -07:00
Secretboy-SMR
04f6e73447 fixed language not found prompt 2022-05-11 01:18:10 -07:00
mingjun97
8ad6bda3b2 Bug fixes. 
* Fix default port for the game server
* Fix the returning region info
 2022-05-11 01:17:51 -07:00
gentlespoon
37e1ffed28 Fix incorrect ascension level in givechar command 2022-05-11 01:17:10 -07:00
Magix
22cbe74875 Merge pull request #802 from Grasscutters/better-config 
Implement a better config structure
 2022-05-11 01:23:43 -04:00
KingRainbow44
812f4b372c Fix ClassDefNotFound & NullPointerException errors 2022-05-11 01:23:18 -04:00
KingRainbow44
0b3e2b3017 Remove config file 2022-05-11 00:48:40 -04:00
KingRainbow44
bd9e207a8c Remove old config & migrate legacy configs 2022-05-11 00:46:49 -04:00
KingRainbow44
11161227ab Convert to the far superior config system 2022-05-11 00:30:07 -04:00
KingRainbow44
c274907e9a Create new config class 2022-05-10 22:49:25 -04:00
gentlespoon
54cf45a72e Claymore charged attack stamina cost 2022-05-10 17:25:18 -07:00
Magix
099e45b581 Merge pull request #688 from HotaruYS/patch-3 
Improve logging pattern by including caller class name
 2022-05-10 20:17:13 -04:00
KingRainbow44
5d49323c37 my poor, poor, language system (Formatting refactor) 2022-05-10 20:00:47 -04:00
Secretboy-SMR
a26afe7d47 Fix language switching prompt and save 2022-05-10 13:36:57 -07:00
tester233
f92e839ad1 Improve text 2022-05-10 06:36:19 -07:00
Secretboy
94409b8635 fixed pr780, uploaded LanguageCommand.java (#782) 
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate

* I forgot to git add...sorry,,this pr is to fix pr780, uploaded LanguageCommand.java
 2022-05-10 06:35:37 -07:00
Secretboy
ecf028d0c6 add /language command (#780) 
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate
 2022-05-10 05:33:45 -07:00
gentlespoon
0f1341512c Reset first tick on new skill 2022-05-10 05:21:29 -07:00
gentlespoon
2a3708ee46 Talent moving stamina cost 2022-05-10 05:21:29 -07:00
gentlespoon
99dbac8ad3 Add UTF8 charset in dispatch server HTML template. 2022-05-10 05:21:21 -07:00
Kinesis
b1bd0a5a95 fixed KillCharacter help command description typo case 2022-05-10 05:21:13 -07:00
tester233
70cfe3e42a Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
ad1d45fa90 Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
7efbdbf1ed Update zh-CN.json & fix typo 2022-05-10 03:10:08 -07:00
Bi Jiakai
f26fe213a2 Fixed account delete can not delete all related data (#767) 2022-05-10 03:09:47 -07:00
gentlespoon
fb3c3b71c8 Temporarily set statue auto use to 1 and 100%. 2022-05-10 02:14:09 -07:00
gentlespoon
0ea0eab6b6 Stamina will be set to full if Stamina is disabled. 2022-05-10 02:13:49 -07:00