Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-12 17:21:19 +00:00
Code Issues Projects Releases Wiki Activity
1,314 Commits 7 Branches 22 Tags 136 MiB
247412b17e
Commit Graph

933 Commits

Author SHA1 Message Date
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
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
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
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
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
86dee4bae7 Fix dataloader not getting path correctly 2022-05-19 03:01:21 -07:00
Melledy
a088ea9b6b Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
xtaodada
7fb26c3843 Autogenerate document files 2022-05-18 23:19:13 -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
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
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
muhammadeko
5ddf67d9e5 add config to enable/disable console 2022-05-16 17:57:14 -07:00
Magix
3e2ff211ec Merge pull request #928 from 6ixfalls/dispatch-fix 
Fix "/" Route
 2022-05-16 12:56:13 -04:00