Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 09:32:52 +00:00
Code Issues Projects Releases Wiki Activity
1,590 Commits 7 Branches 22 Tags 136 MiB
f25dc4d2fc
Commit Graph

1227 Commits

Author SHA1 Message Date
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