Commit Graph

1069 Commits

Author SHA1 Message Date
诗音澄鸢 镜苑芳依
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
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
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
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
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
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
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
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
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
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
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
Benjamin Elsdon
5bd88d596b More Web Static Languages 2022-05-20 19:33:29 -07:00
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
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