Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 08:36:38 +00:00
Code Issues Projects Releases Wiki Activity
1,491 Commits 7 Branches 22 Tags 133 MiB
c79ca3028f
Commit Graph

1146 Commits

Author SHA1 Message Date
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
Melledy
c424d15b32 Remove previous fix for falling to death in godmode 
This fix is more efficient
 2022-05-10 01:50:04 -07:00
gentlespoon
a601e13d80 No more fallen to death in god mode 2022-05-10 01:50:04 -07:00
Secretboy-SMR
5a37acde2b 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
 2022-05-09 23:15:58 -07:00
FpguDhk
d179b5c7dc Fix the decision statement of adding map marker. (#763) 
* Fix the Chinese messy code problem.

* Fix the decision statement of adding map marker.
 2022-05-09 23:15:17 -07:00
hatsune-miku
f5509d1e7d Disable falling damage for godmode 2022-05-09 13:44:16 -07:00
Kinesis
c2230485c1 fixed error KillCharacter description in the help command 2022-05-09 12:51:08 -07:00
ImmuState
1c8207500c Remove commented method and unused import. 2022-05-09 12:50:47 -07:00
ImmuState
19e798a28b Change ccount delete to delete all referenced items in the database. 2022-05-09 12:50:47 -07:00
Melledy
85f5a753e1 Merge pull request #746 from Akka0/tower 
fix the Monster spawn between stage challenges
 2022-05-09 12:50:33 -07:00
筱傑
bdc9e483ae Fixed MissingFormatArgumentException (#727) 
Format string is `"given_level": "Given %s with level %s %s times to %s"`
 2022-05-09 12:50:23 -07:00
Akka
66b17cad26 little fix 2022-05-10 00:14:50 +08:00
Akka
2e69a4d8f7 Merge remote-tracking branch 'origin/development' into tower 2022-05-10 00:07:10 +08:00
Akka
faa3cde575 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
Mateoust
9a7d78e0b7 Update translation keys to fix issues 648 677 
fix issues 648 677
 2022-05-09 04:18:12 -07:00
Mateoust
c432ace5d8 Updating language files fixed the issue 648 677 
fix issue 648 677
 2022-05-09 04:18:12 -07:00
AnimeGitB
63efef8d05 Fix /talent saving to level instead of id 2022-05-09 04:18:04 -07:00
gentlespoon
5d917f185f Move "if Grasscutter.getConfig().OpenStamina" to the correct place. 2022-05-09 03:46:18 -07:00
Akka
eb2b23928b Fix #719 2022-05-09 02:28:41 -07:00
gentlespoon
ccdc3d1214 Only handle motion notify for current entity. 2022-05-09 02:28:13 -07:00
Akka
45b45c4beb Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
Akka
722e710c7b Fix #719 2022-05-09 17:01:08 +08:00
Melledy
f0aa8c2c53 Merge pull request #718 from Akka0/tower 
Support Team Toggle in Tower & Refactor MonsterTide
 2022-05-09 01:15:02 -07:00
AnimeGitB
713b2698d0 Fix perm field order consistency on GiveCommand 2022-05-09 01:12:47 -07:00
AnimeGitB
f08a89711c Account permission wildcards 2022-05-09 01:12:47 -07:00
AnimeGitB
80db118f72 Add permissionTargeted to applicable commands 
Change target perm from target.perm to x.perm.others
 2022-05-09 01:12:47 -07:00
Akka
47ea466054 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
Akka
65c93a747c Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Shirakami Ling
056b5b80c8 Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
ImmuState
9869e4368d -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
ImmuState
935bb4b523 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
ImmuState
72e8a976ea Fix invalid translation key. 2022-05-08 15:59:09 -07:00
ImmuState
5f8011f0ec Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
Melledy
06f531fe18 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
KingRainbow44
d43f431506 Add warning for language fallback 2022-05-08 13:19:23 -07:00
KingRainbow44
137ea1e294 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
HotaruYS
9a0a15a462 Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Yazawazi
5d1f49579b feature(task): Implement pause, resume and cancel 
Use as `pauseTask(taskName)`. They return boolean values to tell the developer if a timed task can be paused/resumed/cancelled properly.
A little bit of testing shows that pausing and then resuming may execute the task multiple times.
 2022-05-08 06:28:13 -07:00
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Akka
9ad44f5c10 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
Melledy
55389d3a5c Optimize invoke packet handling 2022-05-08 06:05:50 -07:00
Melledy
2dfdc62743 Implement energy balls (orbs) 2022-05-08 06:05:50 -07:00
Melledy
897f082b12 Implement AbilityManager 2022-05-08 06:05:50 -07:00
Akka
219a850818 Merge remote-tracking branch 'origin/development' into tower 2022-05-08 20:56:50 +08:00
Michaellan
176f3e91f1 fill description 2022-05-08 05:51:13 -07:00
HotaruYS
beea95fdae Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
gentlespoon
d78348522e Update StaminaManager 2022-05-08 04:39:25 -07:00
gentlespoon
a09723f07d Fix: timer is already cancelled. 2022-05-08 04:39:25 -07:00
HotaruYS
7c35c51a6a Override server logging level with environment variable (#653) 
Use `LOG_LEVEL` environment variable to override logging level for `emu.grasscutter` (which also contains all loggers under it). This might help with debugging various issues reported by users. Previously, the only way to override these levels would be to use `-Dlogback.configurationFile`
 2022-05-08 03:48:06 -07:00
Akka
4b6842f006 Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
方块君
3a5503de72 Using annotation key translation 2022-05-08 01:47:26 -07:00
方块君
ef3579da82 add Command description 2022-05-08 01:47:26 -07:00
方块君
a46d58e5f6 Add command description multilingual 2022-05-08 01:47:26 -07:00
芊枫
4c911d6f55 Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
d7a82e1c9f Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
21cd002fbd Fix typo && update zh-CN.json 2022-05-07 23:14:56 -07:00
Mateoust
06564da009 fix issues 646 2022-05-07 23:13:45 -07:00
gentlespoon
94a6a79b4a Fix null reference on stamina timer when paused player disconnects. 2022-05-07 23:13:35 -07:00
KingRainbow44
549471b76e Fix language fallback'ing 2022-05-07 23:44:35 -04:00
Zakhil
50307ea3a9 Added polish locale (#655) 2022-05-07 18:19:24 -07:00
Akka
eb94adb296 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00
gentlespoon
29f9d6506a Make stamina consumption classes public so others can use. 2022-05-07 18:18:20 -07:00
gentlespoon
836e0150b5 Stop stamina consumption on game pause 2022-05-07 18:18:20 -07:00
gentlespoon
8e99cb4f35 More reliable stamina calculation 
by separately handling immediate one-time cost and cost over time.
 2022-05-07 18:18:20 -07:00
Kimi
43c27c4679 Update zh-TW.json 2022-05-07 15:49:22 -07:00
Kimi
88bc5c4c54 another translation patches because i fucked it up 
i hate myself
 2022-05-07 15:49:22 -07:00
KingRainbow44
57cc111350 Simplify the language fallback system 2022-05-07 18:12:53 -04:00
Magix
730c993873 Merge pull request #628 from exzork/development 
PluginManager: Use the same class loader and add getPlugin method
 2022-05-07 17:58:42 -04:00
Magix
84c1cd7aa7 Update PluginManager.java 2022-05-07 17:58:18 -04:00
HotaruYS
ab5131e9fd Respect FrontHTTPS when creating URI for gacha record 2022-05-07 14:54:15 -07:00
Piotr Blecharski
34228dc9cd Command list with descriptions in handbook 2022-05-07 14:45:42 -07:00
zhaodice
e85eb2f48a fix issue 635 
fix #635
 2022-05-07 14:42:25 -07:00
zhaodice
7e5696211c fix issues 629 
fix #629
 2022-05-07 14:39:34 -07:00
Kimi
14da6214d3 Traditional Chinese | Translation Patches 
yeah i fucked up that one line of translation oops
also added two lines of translation too
 2022-05-07 14:37:48 -07:00
Akka
39e8f810d2 Merge pull request #5 from Grasscutters/development 
Development
 2022-05-07 21:49:22 +08:00
Akka
6148ee8742 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 21:47:13 +08:00
muhammadeko
f8bc471d4d PluginManager: Use the same class loader and add getPlugin method 2022-05-07 19:48:51 +07:00
kaitl
dc3c744778 Update zh-CN.json 2022-05-07 00:47:38 -07:00
gentlespoon
6bba3c8477 Kamisato Ayaka and Mona talent moving costs stamina 2022-05-07 00:47:19 -07:00
gentlespoon
9b3ca239c9 Prepare MovementManager.updateStamina() for external calls. 2022-05-07 00:47:19 -07:00
mingjun97
ff52255ac7 Fix gacha mapping generation login 
* Fix `System#out` usage pointed by magix at https://github.com/Grasscutters/Grasscutter/pull/568#pullrequestreview-965271278
* Fix typos for interchange `-` and `_`.
* Fix gacha mapping autogeneration path
 2022-05-06 23:28:07 -07:00
gentlespoon
34df864e1c Flight stamina cost -20% when Amber or Venti in team 
- Reduced stamina not tested in MP.
- Stop MovementManager ticker when player goes offline.
 2022-05-06 23:27:07 -07:00
真心
00d15a5c89 Create zh-CN.json 2022-05-06 23:24:47 -07:00
Secretboy
bf0d01778e Update Language.java 2022-05-06 21:54:07 -07:00
Secretboy
f9b5478c9d Update Config.java 2022-05-06 21:54:07 -07:00
FpguDhk
a9a027bbc6 Fix the Chinese messy code problem. 2022-05-06 21:23:03 -07:00
lhhxxxxx
0690e23116 Handle with undetermined locale language config (#611) 
* Update GiveAllCommand.java

giveall command nomore give arts

* Update Grasscutter.java

* Update Grasscutter.java
 2022-05-06 21:20:44 -07:00
Melledy
af39613d4f Move server profile away from GameConstants 2022-05-06 19:16:36 -07:00
Melledy
759cd6ae37 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 19:12:58 -07:00
Melledy
f894b96edf Fix crash on login if the player didnt have a TowerManager 2022-05-06 19:12:54 -07:00
KingRainbow44
32d2a21153 Merge remote-tracking branch 'origin/development' into development 2022-05-06 21:53:03 -04:00
KingRainbow44
043c731575 Fix for translation errors 2022-05-06 21:52:10 -04:00
Magix
e29c2dc122 Merge branch 'stable' into development 2022-05-06 21:39:30 -04:00
Magix
1ed0511cd7 Update Tools.java 2022-05-06 18:25:35 -07:00
mingjun97
1ee9cc80bb Auto fill name of the event from TextMap 2022-05-06 18:25:35 -07:00
mingjun97
1d6fd52552 Prompt for user language option for the Tools 
* GM Handbook
* Gacha Map
 2022-05-06 18:25:35 -07:00
Magix
711ae2f554 Merge branch 'development' into development 2022-05-06 21:08:19 -04:00
Magix
38fd7bb76a Merge pull request #567 from Grasscutters/localization 
Implement a proper language system
 2022-05-06 21:05:29 -04:00
KingRainbow44
c11e83c48f Bug fixes 2022-05-06 21:04:39 -04:00
KingRainbow44
f1079953c1 Rename en-US locale 2022-05-06 20:18:50 -04:00
Bwly999
79babcc53e roll back to timer 2022-05-07 08:00:31 +08:00
KingRainbow44
aa292b1fef Update Utils.java 2022-05-06 19:47:30 -04:00
KingRainbow44
0d7f58fc25 Merge development into localization 2022-05-06 19:40:32 -04:00
gentlespoon
6d678557ff fix/runningAndDashingStamina 2022-05-06 16:11:51 -07:00
KingRainbow44
362cfe1e7b Ensure we have a fallback for localization 2022-05-06 18:57:49 -04:00
KingRainbow44
f39cc9e01f Add the zh-TW language. 2022-05-06 18:56:19 -04:00
KingRainbow44
647922ff01 Add the en-US language. 2022-05-06 18:50:43 -04:00
KingRainbow44
b3a917007b Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
58cb60299c Fix #593: Accidental death of character 2022-05-06 15:22:00 -07:00
gentlespoon
3f91fdcb71 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -07:00
wulf
542a3cfc9b fix scence block loading bug 2022-05-06 13:43:42 -07:00
Scald
afa3747fad Add config option to change console server's signature, namecard, level and world level (#586) 
* Add files via upload

* Add files via upload

* Update GameConstants.java

* Update Config.java

* Update PacketGetPlayerFriendListRsp.java
 2022-05-06 13:41:29 -07:00
cfuncode
0152b146c5 Improved fault tolerance for json file deserialization (#595) 
* 修复一个Gson发序列化json文件的空值问题

* Improved fault tolerance for json file deserialization
 2022-05-06 13:39:37 -07:00
Melledy
ad84635540 Merge pull request #594 from Akka0/tower 
Tower Dungeons Handoff between levels
 2022-05-06 13:37:30 -07:00
Kinesis
8abd3ace6c Implement Avatar Expedition System 
Co-Authored-By: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Co-Authored-By: KanyeWestc <104547412+KanyeWestc@users.noreply.github.com>
Co-Authored-By: QAQ 天小络 <72185326+XTL676@users.noreply.github.com>
Co-Authored-By: nkxingxh <25559053+nkxingxh@users.noreply.github.com>
Co-Authored-By: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Co-Authored-By: wuwuwu223 <81224214+wuwuwu223@users.noreply.github.com>
Co-Authored-By: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
Co-Authored-By: Sakura <104815797+Sakura@users.noreply.github.com>
Co-Authored-By: NewNeko-2022 <104819344+NewNeko-2022@users.noreply.github.com>
Co-Authored-By: JimWails <30657653+JimWails@users.noreply.github.com>
Co-Authored-By: buttercookies <19878609+ButterCookies@users.noreply.github.com>
 2022-05-06 13:28:26 -07:00
Muhammad Eko Prasetyo
deee32a0a1 add config option to enable cors for dispatchserver (#579) 2022-05-06 13:23:26 -07:00
Akka
f2231349bd a little fix 2022-05-07 00:31:48 +08:00
Akka
c2d2a37fc5 Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
17242a24ed Add some lua functions 2022-05-07 00:15:23 +08:00
Akka
b58bcda0c8 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
Bwly999
6149c6f0e3 Merge branch 'development' of github.com:Grasscutters/Grasscutter into development 2022-05-06 22:38:04 +08:00
4Benj_
3ede7523b0 Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
gentlespoon
2e68578525 The statues will now automatically regen their HP volume over time. 
Max is currently set to 85000 for everyone. Will update after implementing statue levels.
 2022-05-06 03:26:38 -07:00
Bwly999
2d325e1847 fix the problem that the reference of serverHook in Plugin object is null 2022-05-06 18:16:07 +08:00
Melledy
b760fb1b26 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
Melledy
000b10983b Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 01:17:19 -07:00
Melledy
796201e8b7 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
221668570e fix: lower logging level in SotSManager 2022-05-06 00:49:08 -07:00
gentlespoon
198214ec53 Implementes auto HP recovery at the statues. 
- Respects player setting.
- SP + MP.
- Statue has unlimited HP volume (to be updated)
 2022-05-06 00:17:18 -07:00
Akka
2ad6f5934b Add @Transient for temporary team 2022-05-06 00:12:33 -07:00
Akka
c912b8d857 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
f683b222fc Add @Transient for temporary team 2022-05-06 14:46:10 +08:00
gentlespoon
93b3265d72 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
833ea1b791 Merge pull request #1 from Akka0/development 
Updated
 2022-05-06 14:16:44 +08:00
Akka
3d3f36cf56 Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
KingRainbow44
c0b1ec1b9e Convert to the superior language system. (pt. 2) 2022-05-06 00:57:45 -04:00
KingRainbow44
7a084100c6 Convert to the superior language system. (pt. 1) 2022-05-05 23:57:55 -04:00
memetrollsXD
81998b9cf9 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00
Melledy
a045142a41 Kick player if they use an invalid resources folder 2022-05-05 17:17:27 -07:00
gentlespoon
bafde8693d Fixes #529: fixed stamina abnormal. added fall to death. 
Stamina is still WIP.
- Currently stamina consumption is not affected by the use of foods, talents, or the environment.
- Charged attacks do no require stamina yet.
- Will be fixed tomorrow.
 2022-05-05 15:37:15 -07:00
Scirese
128f767002 Update CNLanguage to match with the latest EN version 2022-05-05 09:03:23 -07:00
Akka
3f34aa0460 Support of Enter Room Scene 2022-05-05 09:02:54 -07:00
Benjamin Elsdon
782c9bfb6b No misleading 404 error 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
db1ddd0630 I honestly don't know what happened.... 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
3395c76dbc Removed GCStatic. Cleaned up GachaRecordHandler. 2022-05-05 09:02:10 -07:00
Akka
a21fc116ee Support of Enter Room Scene 2022-05-05 22:00:11 +08:00
Luke H-W
15dca5a04d GiveCommand: fix edge case with unspaced multiple args (#539) 
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-05 15:23:48 +02:00
Melledy
e693612ed1 Fix clear command causing a concurrency error 2022-05-05 02:29:43 -07:00
AnimeGitB
3a28e741d0 Add R# LVL# X# arg syntax to GiveCommand 2022-05-05 00:14:17 -07:00
gentlespoon
7d85c53e68 Restrict to MP prop only. 2022-05-05 00:03:42 -07:00
gentlespoon
5c275c2e3c SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
AnimeGitB
37c2ee5e2c Command Targeting overhaul fixes 2022-05-05 00:03:10 -07:00
AnimeGitB
d8b2e787e5 Commands Targeting rework 2022-05-05 00:03:10 -07:00
AnimeGitB
5aba7da7ef Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
82ec63c4e4 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
hanbao233xD
4e0ebe56a6 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
3f02afb46b Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
fb05a3711d Update CNLanguage.java 2022-05-04 22:57:33 -07:00
Secretboy
a7b9b1f923 Update Config.java 2022-05-04 22:57:06 -07:00
Secretboy
08c01ab15d Update Grasscutter.java 2022-05-04 22:57:06 -07:00
gentlespoon
6fc4065fa0 Add missing PacketOpcodes. 2022-05-04 22:54:52 -07:00
Angda Song
5a2d25e4eb Update teleport docs and allow overriding Y coord when teleporting 2022-05-04 14:50:49 -07:00
BaiSugar
2074933e96 Add the god statue's blood return display and stamina system (#520) 
* Fix announcement display

* Approaching StatuesOfTheSeven will restore all health of the current team

* Added god statue's blood return display and stamina system

* fix error

fix error

* fix file
 2022-05-04 11:45:20 -07:00
ShigemoriHakura
aa06583a45 fix achievement proto (#507) 
* fix achievement proto

TakeAchievementRewardReq tells client the achievements achieved or not and it's progress.

* add import
 2022-05-04 10:06:33 -07:00
Akka
48d1e026ef Add Support of Item Combine (#513) 
* Add Support of Item Combine

* Add Support of Item Combine

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-04 10:06:13 -07:00
Angda Song
06983e9e84 Implement map marking features 
Teleport still exists on fish hook mark.
Added mapMark-related protos.
Map marking data is stored in players collection.
 2022-05-04 10:01:46 -07:00
Scirese
4220b6b88d Fix CNLanguage.java (#505) 
* Fix CNLanguage.java

@Melledy 
Keep an eye on the file encodeing next time,please.

* Update CNLanguage.java

* Fix a little bug
 2022-05-04 16:56:50 +02:00
EtherealAO
5e0e65123e Dungeon challenge success/fail notify should only be triggered once (when server spawned mob more than score) 2022-05-04 01:48:56 -07:00
Melledy
3d52964112 Fix equip swapping 2022-05-04 01:45:41 -07:00
Melledy
787f3fd45e Fix damage number not showing up if it was the killing blow 2022-05-04 01:21:34 -07:00
Melledy
57285885dc Move languages to languages package 2022-05-04 00:44:33 -07:00
Melledy
1b97b4afa0 Fixed dungeon challenge scoreboard and implement dungeon drops 
Also fixed a few dungeon script handlers
 2022-05-03 23:24:43 -07:00
Melledy
ae31e4fd98 Weapons/artifacts should not have a count of more than 1 2022-05-03 23:24:18 -07:00
Melledy
de75b56d6c Fix jline in eclipse 2022-05-03 23:24:02 -07:00
Scirese
09125f8e91 Optimize Chinese Translations (#498) 
* Add Chinese Translation

* Optimize Chinese Translations

* Fix a dumb error
 2022-05-03 23:15:04 -07:00
方块君
09b306f6a0 Modify Chinese language files 2022-05-03 22:17:41 -07:00
方块君
e297a29adb Add some text to language file 2022-05-03 22:17:41 -07:00
方块君
b8f5299995 Optimize multilingualism (using variables) 
Optimize multilingualism (using variables)
 2022-05-03 22:17:41 -07:00
DancingSnow
f6d5fb1945 fix giveart command when times about 200, account will crash 2022-05-03 10:45:11 -07:00
AnimeGitB
29eedb5075 Refactor SetStatsCommand, add target UID and all FightProperty stats 2022-05-03 10:37:32 -07:00
BaiSugar
1288273c12 Approaching StatuesOfTheSeven will restore all health of the current team 2022-05-03 10:24:10 -07:00
mzfqy
c0acf8b1ba fix path 2022-05-03 10:23:29 -07:00
mzfqy
70507c34c9 add zh_cn translate. 2022-05-03 10:23:29 -07:00
Presiareen
050784dfab improve server side command line input (#415) 
* improve server side command line input

* prevent multiline logs from covering typed commands

* reduce text in console

* resolve conflicts caused by multilanguage

Co-authored-by: Magix <kobedo11@gmail.com>
 2022-05-03 14:44:52 +02:00
Melledy
c930c637e4 Add languages folder to config as well 2022-05-03 03:19:43 -07:00
方块君
0eab44f51f Add multilingual support 
Add multilingual support
 2022-05-03 02:38:37 -07:00
xtaodada
86e6eef4e2 Support giftPackage BatchUse 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-03 02:29:04 -07:00
Melledy
a93d7c579f Fix extra skill charges being removed if you teleport 
Close #404
 2022-05-03 02:27:18 -07:00
Melledy
7395a268ef Fix mail not sending to offline players 2022-05-03 02:27:18 -07:00
mingjun97
509f62e7cd Carry to new line for messages in MessageHandler 2022-05-03 02:16:44 -07:00
mingjun97
0421d912fd Enable plugins to hook server message response 
* Add message handler so that the plugin can hook inside the `dropMessage` method for `Player` instance.
 2022-05-03 02:16:44 -07:00
krrr
5b6da38160 avoid compile error caused by encoding 2022-05-02 22:05:21 -07:00
xtaodada
b253e779a2 Implement food heal function 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-02 22:02:11 -07:00
KingRainbow44
765f569e55 Initialize ServerHook 2022-05-02 21:20:24 -04:00
dogdie233
16f77ee520 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
LDA
1d36fd8f2a load photo mode pose and expression fetters 2022-05-02 10:47:27 -07:00
4Benj_
f7b8d9b45f Removed debug message and fixed NullPtrException (#434) 
* Removed a debug message from Auth Handler changes

Kill me

* Also forgot to use the getter :/
 2022-05-02 12:47:29 +02:00
mingjun97
a102613313 Utils for gacha history record subsystem 
* Auto generate mapping files with command `java -jar grasscutter.jar -gachamap`

* Static file provider
  * For gacha record webpage
  * All static files should be stored at `GRASSCUTTER_RESOURCE/gcstatic/`
  * Can benefit other subsystem in future when webpages involved
 2022-05-02 02:53:28 -07:00
BaiSugar
6a20e383f7 Fix announcement display 2022-05-02 02:50:32 -07:00
xtaodada
7b591a2da0 implement shopMail giftPackage function 
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
 2022-05-02 02:50:24 -07:00
Benjamin Elsdon
73fc9fe4cc Custom Authentication Handler 2022-05-02 02:50:14 -07:00
DancingSnow
186c6bcf89 fix World level not in 0-8 2022-05-02 02:26:11 -07:00
Melledy
fba26d2da9 Fix gacha rate for weapons 2022-05-02 02:01:24 -07:00
Melledy
19396a63c7 Move player mail to MailHandler class 
This is so we dont have to save the entire player to the db every time we send mail
 2022-05-02 02:01:01 -07:00
KingRainbow44
afa8fb7a51 Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
mingjun97
98122f3c55 Implement gacha history record subsystem 
* Frontend is not very beautiful yet
* Didn't include too much `some anime game` data in the page to avoid being DMCA'd
 2022-05-01 13:47:17 -07:00
xtaodada
eb703f9f72 Fix goods limit bug 2022-05-01 13:42:01 -07:00
xtaodada
bd560785ba Show shopmall 2022-05-01 13:42:01 -07:00
筱傑
3cc1139aa1 Add /setstats mhp to set Max HP (#407) 
* Fixed `/setstats hp` without changing the max hp.

The Max HP should be modified.

* Add `/setstats mhp` to set Max HP
 2022-05-01 20:22:29 +02:00
JimWails
4adc983832 Fixed can set avatar level more than 90 and cause game to freeze 
Limit the avatar level given by "/givechar" command.
If avatar level >90, the game will freeze if open the character interface.
 2022-05-01 10:05:28 -07:00
coooookies
a8b808ba2e Improve registration methods. 2022-05-01 10:02:57 -07:00
coooookies
dde5a609fb GameServerPacketHandler need to be added a registration interface for plugin developers 2022-05-01 10:02:57 -07:00
Kinesis
677aa2d2c4 fix McoinExchangeHcoinRsp packet structure 2022-05-01 10:02:47 -07:00