Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 07:36:30 +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
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
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
筱傑
b9e27828b8 Fixed can set talent level to 16 bug (#408) 
Level should be **lower than 16**
 2022-05-01 16:42:02 +02:00
4Benj_
0d262e2d07 Cleaned up dispatch iOS fixes (#396) 
* Attempting to fix crashing on iOS devices

plus I forgot a thing in string.format

* Removed unnecessary things
 2022-04-30 23:31:39 -07:00
KingRainbow44
72b5ec210c Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04:00
mingjun97
049086b21a Should fix all crashes when login for iOS client 2022-04-30 23:03:47 -07:00
mingjun97
d3ac090daa Fix crash and revise route 
* Fix another point which will trigger iOS client to crash
* Revise `compareProtocolVersion` route to handle all method
 2022-04-30 23:03:47 -07:00
Melledy
10bfb6976d Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Melledy
eac82f3c01 Fix possible exploit with mcoin exchange 2022-04-30 22:51:21 -07:00
Kinesis
da3eb3d26c implement McoinExchange packet Handler 2022-04-30 22:03:44 -07:00
mingjun97
fb547c17ca Revert changes for debugging purpose 2022-04-30 21:43:46 -07:00
mingjun97
8b8777e932 Fix crash when login 
* Prevent email to be `null` to avoid crash in certain client setup.
 2022-04-30 21:43:46 -07:00
Melledy
3169e87c60 Fix constellations that give an extra charge to skills 
Fix #228
 2022-04-30 19:34:50 -07:00
KingRainbow44
e898384532 QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
a044448af7 Implement a handler for logging routes 2022-04-30 20:38:18 -04:00
muhammadeko
80659f27a8 Add getter for innerclass RegionData 2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo
55793867d3 Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388) 2022-05-01 00:43:50 +02:00
Magix
be507310a5 Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Magix
a62520f922 Merge pull request #381 from Coooookies/development 
Show the player's UID with the `/list` command
 2022-04-30 16:16:18 -04:00
Magix
8ce79ed3ca Forgot to add to null execution 2022-04-30 16:15:39 -04:00
Magix
f4de4a6aeb Change to () and add space 2022-04-30 16:14:40 -04:00
KingRainbow44
86b8f4549f Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
b5c277234c Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
63d41fd79e Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
f73a713fac Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
coooookies
ba97dfe7d9 Uids will not be showed until the parameter <uid> is added, 
like this: /list uid
 2022-05-01 03:43:41 +08:00
LDA
d133e55666 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Benjamin Elsdon
28025a8198 Small fix 2022-05-01 00:51:09 +08:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
coooookies
c0b7859f93 List command should show player uid 2022-05-01 00:17:08 +08:00
赤座あかり
eac9c04e4e Give Artifact: Fix error & Rename alias (#370) 
* Give Artifact: Fix error & Rename alias

* Update README.md
 2022-04-30 13:19:22 +02:00
Aru
d6fa05915f Monsters should drop items in world (#373) 
* Monsters should drop items in world

fix the typo introduced in f1934c3a47

* Determine whether in dungeon scene
 2022-04-30 13:18:09 +02:00
筱傑
7b991d7b4e Update Welcome Mail Items Type (#369) 2022-04-30 11:46:23 +02:00
Scirese
fb991d845e Add Android Client fix by @BaiSugar (#105) 2022-04-30 11:45:24 +02:00
omg-xtao
23800745e2 Merge branch 'development' into tp 2022-04-30 16:48:24 +08:00
lhhxxxxx
eef216aea8 Update Account.hasPermission() 
Add wildcard characters to permission nodes under the same namespace. (simple implementation)
 2022-04-30 01:30:38 -07:00
Melledy
286ab545e9 Monsters should not drop items inside dungeons 2022-04-30 01:20:44 -07:00
Melledy
7e377dff59 Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
1ed46df6e8 Move script constants to globals 2022-04-30 01:20:44 -07:00
Melledy
3f76ac4cac Temporary fix for scripts that call require 2022-04-30 01:20:44 -07:00
Melledy
f8f4d89cd0 Optimize GetOnlinePlayerListRsp 2022-04-30 01:20:44 -07:00
Melledy
66c2743d6e Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
lhhxxxxx
c2b8a20e03 Update GiveAllCommand.java 
giveall command nomore give arts
 2022-04-30 01:04:10 -07:00
筱傑
d8e458cd33 Fix Give Command Promote Level Bug 
Should be <=40, just change the order
 2022-04-30 01:02:39 -07:00
muhammadeko
8a9dab7d74 Give Artifact: Clear random props first before adding all picked props 2022-04-29 17:11:12 -07:00
KingRainbow44
4db1724d06 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
 2022-04-29 19:31:33 -04:00
lilmayofuksu
59ff79e23a Limit the amount of vehicles that a player can spawn (#340) 2022-04-29 21:01:07 +02:00
BaiSugar
7e6b20de1a Added interface display for multiplayer games (#360) 2022-04-29 18:20:46 +02:00
赤座あかり
79165aa402 Add command to get reliquary with specific props (#300) 2022-04-29 16:31:22 +02:00
omg-xtao
7fdf74986c Merge branch 'development' into tp 2022-04-29 21:38:45 +08:00
真心
48aea3f5e4 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
d0ccc48642 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
9892cd8480 Delete GiveWeaponCommand.java 2022-04-29 15:20:28 +02:00
真心
2d04758f1c Add GiveWeaponCommand 2022-04-29 15:20:28 +02:00
xtaodada
eaed1aa038 Change NickName to ServerNickname 2022-04-29 19:37:51 +08:00
yangjiahao
e1c0b4a955 改进了clear命令的逻辑，使他在不输入uid时默认为当前玩家。 2022-04-29 13:07:30 +02:00
memetrollsXD
352801b8a3 Merge pull request #344 from BaiSugar/development 
Command giveall to remove useless items
 2022-04-29 13:04:25 +02:00
LDA
c67e324a2e Fix sitting in chairs 2022-04-29 12:59:50 +02:00
xtaodada
62f0be4966 Support custom server in-game nickname 2022-04-29 18:59:24 +08:00
memetrollsXD
2f39aff4a6 Merge pull request #355 from Grasscutters/dungeon-scripts 
Implemented Dungeon Support
 2022-04-29 12:58:01 +02:00
Melledy
6d98743025 Prevent console error spam when attacking gadgets 2022-04-29 03:33:14 -07:00
Melledy
d877d7eebc Remove player from challenge if they are leaving the scene 2022-04-29 03:24:36 -07:00
Melledy
cb15a5dec9 Deregister scenes if no one is in them instead of deregistering when no entities are in them 2022-04-29 03:09:17 -07:00
Melledy
ffc1f801e6 Implement spawning monsters by suite 2022-04-29 03:06:33 -07:00
xtaodada
0136425628 Support custom server avatar 2022-04-29 18:04:20 +08:00
xtaodada
74ad63573a Support Teleport from console 2022-04-29 17:53:42 +08:00
Melledy
ae3d9a4dc1 Add a few more functions for the script engine to call 2022-04-29 02:38:25 -07:00
muhammadeko
789e5f57b8 skip loading module-info.class 2022-04-29 02:32:35 -07:00
Melledy
1a5d4cf466 Implement lazy loading of scripts when they enter a new block 2022-04-29 02:07:25 -07:00
Melledy
3af5d20473 Prevent weird crashing if there was an error loading scripts 2022-04-29 01:15:40 -07:00
Melledy
14b6d3ce55 Fix monster levels in dungeons 2022-04-29 01:03:16 -07:00
Melledy
d690590ecf Implement AddExtraGroupSuite 2022-04-29 00:52:40 -07:00
Melledy
72e9a21ce3 Allow the player to finish dungeons 2022-04-29 00:49:05 -07:00
Melledy
8ab2b446cd Clean script events 2022-04-29 00:00:23 -07:00
BaiSugar
1bd8d871bb remove useless items 2022-04-29 14:18:32 +08:00
BaiSugar
76098cdb71 remove useless items 2022-04-29 14:13:09 +08:00
Melledy
30886da0ad Fix compile error caused by merge 2022-04-28 23:09:07 -07:00
Melledy
60cfa40d7f Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07:00
Melledy
d71b7abfc3 Implement script support needed for dungeons 
Only a few are supported right now
You will need certain script files in ./resources/Scripts
 2022-04-28 22:19:14 -07:00
KingRainbow44
d359e5111a Player events + mail receive event 2022-04-28 22:21:55 -04:00
KingRainbow44
d701613831 Formatting changes 2022-04-28 22:21:30 -04:00
KingRainbow44
e666dede7e Move events (imports) 2022-04-28 22:13:19 -04:00
KingRainbow44
68cc386baa Move events 2022-04-28 22:12:57 -04:00
KingRainbow44
9d9c6566ed Player join & quit event 2022-04-28 22:12:41 -04:00
KingRainbow44
dc26f9e232 Add plugin data folders 2022-04-28 22:01:40 -04:00
KingRainbow44
91a2a55ed9 Bug fixes & class updates 2022-04-28 21:54:51 -04:00
KingRainbow44
694b5c1548 Merge branch 'development' into api 2022-04-28 21:53:58 -04:00
memetrollsXD
31764fe5d9 Merge branch 'development' into startMail 2022-04-28 22:45:23 +02:00
memetrollsXD
5c02fee7e2 Customisable welcome mail 2022-04-28 22:42:59 +02:00
Kengxxiao
fcb4894387 fix shop config issue 2022-04-28 13:30:50 -07:00