Commit Graph

512 Commits

Author SHA1 Message Date
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
aba4080b0e feat(ban): Implementing ban.
Rough code, not based on permission.
2022-06-17 19:42:42 -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
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
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
ImmuState
ebab89d433 Don't show internal server error on gacha with full inventory. 2022-06-14 18:09:02 -07:00
ImmuState
0db1472195 Adapt protocol for clearing energy. 2022-06-14 18:08:55 -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
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
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
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
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
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
Melledy
aaf7777020 Fix players not setting their nickname properly after the opening cutscene 2022-05-31 02:06:40 -07:00
ImmuState
febdb99855 Add a rough implementation for NA/CA energy generation. 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
KingRainbow44
05527fcb7c Use static reference instead of local 2022-05-28 18:52:47 -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
Akka
d95708ec03 Support spawn NPC 2022-05-24 21:43:51 -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
ImmuState
28323fed66 Move energy-related logic to a new EnergyManager. 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
Benjamin Elsdon
5bd88d596b More Web Static Languages 2022-05-20 19:33:29 -07:00
Benjamin Elsdon
d1775b130f Attempt to fix untranslated login window 2022-05-20 05:52:15 -07:00
Няшик Няшный
1662278586 Changing how banners work 2022-05-20 05:51:44 -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
xtaodada
7fb26c3843 Autogenerate document files 2022-05-18 23:19:13 -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
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
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
YukariChiba
cc98c56916 Do not add default region if there are already regions 2022-05-17 04:30:28 -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
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
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
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
muhammadeko
05e13d81ad Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -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
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
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
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
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
Melledy
83f8bec947 Implement QUEST_CONTENT_FINISH_PLOT 2022-05-13 06:33:12 -07:00
Melledy
f4770cf20a Merge pull request #816 from Grasscutters/dev-quests
Implement quests
2022-05-13 05:36:30 -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
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
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
b4d457d78a Add some usage of Inventory.payItems()
And add quantity to it
2022-05-11 21:56:53 -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
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
Benjamin Elsdon
c932f9c7e5 Add verifyUser to AuthenticationHandler 2022-05-11 11:51:11 -07:00
ayy lmao
3c0d85621e Fix InRouting on dispatch server 2022-05-11 17:35:52 +03: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
coooookies
7e3bfed003 Show server status to three-party game launcher 2022-05-11 02:45:21 -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
KingRainbow44
11161227ab Convert to the far superior config system 2022-05-11 00:30:07 -04: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
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
hatsune-miku
f5509d1e7d Disable falling damage for godmode 2022-05-09 13:44:16 -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
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 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
gentlespoon
d78348522e Update StaminaManager 2022-05-08 04:39:25 -07:00
Akka
4b6842f006 Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
Akka
eb94adb296 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -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
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
gentlespoon
6bba3c8477 Kamisato Ayaka and Mona talent moving costs stamina 2022-05-07 00:47:19 -07:00
Melledy
af39613d4f Move server profile away from GameConstants 2022-05-06 19:16:36 -07:00
KingRainbow44
043c731575 Fix for translation errors 2022-05-06 21:52:10 -04:00
Magix
711ae2f554 Merge branch 'development' into development 2022-05-06 21:08:19 -04:00
KingRainbow44
c11e83c48f Bug fixes 2022-05-06 21:04:39 -04:00
Bwly999
79babcc53e roll back to timer 2022-05-07 08:00:31 +08:00
KingRainbow44
0d7f58fc25 Merge development into localization 2022-05-06 19:40:32 -04:00
KingRainbow44
b3a917007b Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
3f91fdcb71 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -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
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
c2d2a37fc5 Merge branch 'tower' into development 2022-05-07 00:19:51 +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