Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-15 03:25:16 +08:00
Code Issues Projects Releases Wiki Activity
1,371 Commits 7 Branches 22 Tags 150 MiB
0db12d6e9c
Commit Graph

1044 Commits

Author SHA1 Message Date
line-bear
d2288d4489 Fix starglitter/stardust exchange error (#1108) 2022-05-30 20:06:25 -07:00
Melledy
9e19a5c160 Fix weapon curve excels and camel case relic affix ecels 2022-05-30 20:06:25 -07:00
Melledy
310ac82fa2 Refactor WeaponType and MonsterType into enums 2022-05-30 20:06:25 -07:00
ImmuState
1985ef6f07 Make NA/CA energy not scale with ER. 2022-05-30 20:06:25 -07:00
ImmuState
db2c0c47fd Make sure the hit target is actually a monster. 2022-05-30 20:06:25 -07:00
ImmuState
39b985b37c Add a rough implementation for NA/CA energy generation. 2022-05-30 20:06:25 -07:00
line-bear
f2fe581ff6 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
649d600fd5 Fix enter tower dungeons 2022-05-30 20:06:25 -07:00
Melledy
73fadfb767 Fix map mark issues from updating from 2.6 
Close #1086
 2022-05-30 20:06:25 -07:00
Melledy
0453f387ac Fixed constellation issues from new binout 2022-05-30 20:06:25 -07:00
Melledy
ea980428bf Fixed dungeon entries not working with new binout 2022-05-30 20:06:25 -07:00
Melledy
eaee7cfeb2 Fix quest data parser 2022-05-30 20:06:25 -07:00
Melledy
8ef99db9d3 Rename excel classes 2022-05-30 20:06:25 -07:00
Yazawazi
91f8381fb1 [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
dc1741ce6d
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
71dfaaceb6 Update translation 2022-05-28 21:34:38 -07:00
tester233
d64685b9ec CoopCommand: Fix usage 2022-05-28 21:34:38 -07:00
tester233
8ec55de107 Complement usage 2022-05-28 16:01:21 -07:00
KingRainbow44
0c6e63d889
Merge remote-tracking branch 'origin/development' into development 2022-05-28 18:52:56 -04:00
KingRainbow44
9452adfa1e
Use static reference instead of local 2022-05-28 18:52:47 -04:00
Yazawazi
ce07f56f9d fix(database helper): fix player uid issues 2022-05-28 04:28:36 -07:00
tester233
bcee255554 Update translation keys 2022-05-28 04:22:53 -07:00
Luke H-W
2cb18e2457
Fix setstats command feedback for targeting others (#1079) 
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-28 13:03:31 +02:00
ImmuState
b504866d84 Make sure energy drops are only processed for actual monsters. 2022-05-27 23:48:54 -07:00
KingRainbow44
a0deb2c1f8
Fix OAuth Authenticator 2022-05-27 20:09:13 -04:00
KingRainbow44
16846b46df
[BREAKING] Refactor OAuth handler 2022-05-27 19:58:04 -04:00
Melledy
141b1913cb Refactor accounts to not use a player uid 2022-05-27 00:22:55 -07:00
ProxyismGH
fc687a3bde TeamManager avatar add refactor. 2022-05-26 22:54:36 -07:00
logictc
e152728ddc fix no melee attach and adjust skill particle amount 2022-05-26 15:26:47 -07:00
ImmuState
cb2d6da2c5 Some refactoring. 2022-05-26 03:41:19 -07:00
ImmuState
35ad284c42 Introduce a simpler way to get the original owner of an EntityClientGadget 2022-05-26 03:41:19 -07:00
logictc
24dc2c47a6 remove debug msg 2022-05-25 21:10:10 -07:00
logictc
bdbdbd53b9 change indentation to tab 2022-05-25 21:10:10 -07:00
logictc
a5ab979418 fix indentation 2022-05-25 21:10:10 -07:00
logictc
eb5ff22464 implement skill particle generation 2022-05-25 21:10:10 -07:00
Akka
5d0610b6f2 Fixed excessive memory usage of Spatial Index 2022-05-25 00:42:52 -07:00
Akka
e1770b5a68 Support spawn NPC 2022-05-24 21:43:51 -07:00
ImmuState
ef20177a6b
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
c45dd92ba5 don't take effect if energyUsage is false 2022-05-24 14:43:02 -07:00
logictc
40129ab346 clear energy on death 2022-05-24 14:43:02 -07:00
logictc
8f6f30c813 implement persist energy 2022-05-24 14:43:02 -07:00
tester233
8c45c25da5 Update zh-CN.json 2022-05-24 14:19:24 -07:00
tester233
920891e2bb Fix usage & update zh-CN.json 2022-05-24 14:19:24 -07:00
ShiroSaki
74649f28f6 Fix new account can't load codex datas 2022-05-23 23:55:46 -07:00
ShigemoriHakura
ec7a6aec50 remove unused import 2022-05-23 15:46:21 -07:00
ShiroSaki
0d5dc5ec31 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
862bfa0611 remove unused imports 2022-05-23 15:46:17 -07:00
Akka
57260415b0 refactor the challenge 2022-05-23 15:46:17 -07:00
ShiroSaki
3a39545e34 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
Luke H-W
e433b46ef5
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
0e2fc3850e Traditional Chinese | Translation Patch 2022-05-23 02:44:34 -07:00
ImmuState
4cd6b799d2 Fix EnergyManager indentation. 2022-05-22 12:55:55 -07:00
ImmuState
c9cb13ac3a Make sure offFieldPenalty does not go below 0.1 2022-05-22 12:55:55 -07:00
ImmuState
419b3505e6 Remove debug stuff 2022-05-22 12:55:55 -07:00
ImmuState
bc3021fb20 Fix traveller not being able to gain energy. 2022-05-22 12:55:55 -07:00
ImmuState
42f5a66df7 Move energy-related logic to a new EnergyManager. 2022-05-22 12:55:55 -07:00
ImmuState
8aa0fde1cd Make energy usage configurable, and preserve current behavior as the default. 2022-05-22 12:55:55 -07:00
ImmuState
76880a5bf7 Make sure to use absolute energy to deplete burst. 2022-05-22 12:55:55 -07:00
ImmuState
542f37d0fb Give correct amount of energy for collecting particles/orbs, and consume energy on burst cast. 2022-05-22 12:55:55 -07:00
ImmuState
2f6beda8ff Generate energy particle of the correct element for abilities. 2022-05-22 12:55:55 -07:00
tester233
a254291245 Update translation keys 2022-05-22 12:55:45 -07:00
Luke H-W
afbeaf300c
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
33a6826a3f Traditional Chinese | Translation Patches 2022-05-22 01:01:56 -07:00
Benjamin Elsdon
f7c941d4ff More Web Static Languages 2022-05-20 19:33:29 -07:00
xtaodada
0766ec3805 Fix dataloader not getting path correctly 2022-05-20 19:32:27 -07:00
Benjamin Elsdon
d59e14e383 Attempt to fix untranslated login window 2022-05-20 05:52:15 -07:00
Няшик Няшный
c683effead Added banner start and end time checks 2022-05-20 05:51:44 -07:00
Няшик Няшный
b9eef26d8b Changing how banners work 2022-05-20 05:51:44 -07:00
zrll_
b60596f41f Update FileUtils.java 
fix: Error when checking files & always checking "/default/data" instead of folder
 2022-05-20 05:49:28 -07:00
4Benj_
e2cb56ee28
Server Log Events (#996) 
* Server Log Event

* LogEventAppender Encoder
 2022-05-20 05:48:20 -07:00
ButterCookies
b2a07044e2
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
233b46b2f9 Support Boss Chest 2022-05-19 23:36:13 -07:00
zhaodice
8819cca3e2
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
0dcf28141d Remove outdated text & update zh-CN.json 2022-05-19 08:34:58 -07:00
Melledy
c2bf663554 Add error message in case data files in resources could not be found 2022-05-19 03:06:07 -07:00
Melledy
db8cbd4f83 Add error message in case data files in resources could not be found 2022-05-19 03:05:57 -07:00
Melledy
d418d4e3e6 Fix dataloader not getting path correctly 2022-05-19 03:01:21 -07:00
Melledy
f876470369 Fix dataloader not getting path correctly 2022-05-19 03:00:59 -07:00
Melledy
29941aa8d0 Add area_id to SceneObject 2022-05-19 02:28:46 -07:00
Melledy
5f8cc47e87 Fix bad casting exceptions with scene garbages objects 2022-05-19 02:28:25 -07:00
Melledy
3feb98f08b Fix issue with groups that dont have any suites 2022-05-19 02:19:18 -07:00
Melledy
5e56b49320 Fix dataloader with eclipse 2022-05-19 01:06:20 -07:00
Melledy
4ef3080c62 Move gadget/monster creation events to after they are spawned in scene 2022-05-19 00:36:38 -07:00
Melledy
89454726ac Fix dataloader with eclipse 2022-05-19 00:10:02 -07:00
xtaodada
6a1c19ae13 Autogenerate document files 2022-05-18 23:19:13 -07:00
Akka
8faf8decec optimized the Lua func binding so that the script will not eval again 2022-05-18 20:51:39 -07:00
Melledy
1fef837a97 Move chest rewards to new data format 2022-05-18 15:54:55 -07:00
Melledy
3902a5d744 Merge branch 'development' into dev-world-scripts 2022-05-18 15:54:35 -07:00
2bllw8
a2d5b934df 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
5042db45d7 Fix this does not look like a tar archive error when extract log file 2022-05-18 15:38:26 -07:00
tester233
f4f8104156
Fix punctuation & update zh-CN.json (#976) 
* Fix punctuation & update zh-CN.json

* Fix error
 2022-05-18 13:46:47 -07:00
tester233
bd6bf0e3f9 Improve text & update zh-CN.json 2022-05-18 05:48:17 -07:00
Melledy
2e24d77bc2 Cleanup and remove business_type filter 2022-05-18 05:33:00 -07:00
Melledy
9902ba381a Only load groups that have a business type of 0 2022-05-18 05:10:45 -07:00
Melledy
f53dda0335 Fix errors caused by merge + Refactor chests into GadgetChest 2022-05-18 02:36:50 -07:00
Melledy
73a88b2da2 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into dev-world-scripts 2022-05-18 02:24:00 -07:00
Melledy
17a273387e Implement local specialty spawning 2022-05-18 02:21:34 -07:00
Akka
7c02e6c912 Support Open Chest 2022-05-18 01:07:06 -07:00
AZthemute
a306912d7b General housekeeping and clarification of en-us.json file 2022-05-17 21:11:10 -07:00
YukariChiba
138c436982 Add OAuth in AuthenticationSystem 2022-05-17 12:25:59 -07:00
muhammadeko
e54cd086f4 add CommandResponseEvent 2022-05-17 12:21:17 -07:00
Benjamin Elsdon
b0aa294c26 AuthenticationSystem::verifyUser now returns the user's Account instead of a boolean 2022-05-17 05:30:22 -07:00
YukariChiba
fb93f1517c Do not add default region if there are already regions 2022-05-17 04:30:28 -07:00
tester233
9abe656a46 Add translation key 2022-05-17 04:24:18 -07:00
tester233
3c2b4f355b Modify usage 2022-05-17 04:24:18 -07:00
tester233
f87e459c3f Fix usage & remove outdated text 2022-05-17 04:24:18 -07:00
Benjamin Elsdon
aca3795425 Change BANNED_PACKETS to HashSet instaed of List 2022-05-17 04:24:01 -07:00
Benjamin Elsdon
a1e095bba7 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
c33ac713d8 Permanent fix for version.json stuff (causes 4206) 2022-05-17 04:11:50 -07:00
4Benj_
ead0df336e
"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
e43946e44c Fixed issue with scene groups after merge 2022-05-16 22:09:10 -07:00
Melledy
3f27874765 Merge branch 'development' into dev-world-scripts 2022-05-16 22:08:28 -07:00
xtaodada
003e28e3f8 Enhance the default permissions logic 2022-05-16 21:55:47 -07:00
RDsatan
67380d6f14 fixed 2022-05-16 21:53:16 -07:00
RDsatan
8aaf3c795d Optimize the join and remove commands to team 2022-05-16 21:53:16 -07:00
Akka
c103841a03 optimized the lua serializer 2022-05-16 21:30:04 -07:00
muhammadeko
eeb7c47cb2 add config to enable/disable console 2022-05-16 17:57:14 -07:00
TangHuLuTaiTian
a63ed21213 Some clients Code 4206 Error 2022-05-16 17:49:46 -07:00
Magix
7fba6fefc3
Merge pull request #928 from 6ixfalls/dispatch-fix 
Fix "/" Route
 2022-05-16 12:56:13 -04:00
Elapse
7abe30c33b update opcodes, correct op names, and update relative codes 2022-05-16 06:20:34 -07:00
line-bear
58df221c6d
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
035b0ff8bd fix the dynamic group loading 2022-05-15 12:40:36 -07:00
6ixfalls
f08891a73c
Fix "/" Route 2022-05-15 09:41:10 -07:00
Akka
8a7077dc04
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
82775b4ff9 Implement quest rewards 2022-05-15 03:48:47 -07:00
AnimeGitB
2564fefe02 Fix logic error in remove command 2022-05-15 01:17:26 -07:00
AnimeGitB
9380e9cda4 Fix targeting on Join and Remove commands 2022-05-15 01:17:26 -07:00
muhammadeko
f1af23e8d6 Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -07:00
lsCoding666
722d53c9c2
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
cde76e10b6 fix permission command 2022-05-14 21:06:57 -07:00
Hotaru
213d2883a9 Move gacha files to separate directory and refactor file serving 2022-05-14 20:07:08 -07:00
HotaruYS
0231f26be0
Properly handle static assets for announcements (#891) 2022-05-14 20:05:19 -07:00
tiantian520
f1b12ccf63
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
b04b8eef8e
Update routes 2022-05-14 12:41:49 -04:00
KingRainbow44
6c419f2d20
External authentication 2022-05-14 12:39:21 -04:00
KingRainbow44
457d00211c
Implement PR #657 2022-05-14 12:21:55 -04:00
KingRainbow44
0405cb6718
JavaDoc Fix 2022-05-14 12:13:41 -04:00
KingRainbow44
c8c823b515
Fix errors 2022-05-14 12:10:43 -04:00
KingRainbow44
5c6fe7bb04
Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
Melledy
46f16c6759 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-14 06:35:37 -07:00
lsCoding666
afc2c8bbf2
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_
c3ff2b81ec Fix connot execute quest command in console 2022-05-14 05:28:57 -07:00
luluxiaoyu
383dfda131 Update zh-TW.json 2022-05-13 22:12:14 -07:00
muhammadeko
f2e9845421 remove log 2022-05-13 22:12:07 -07:00
muhammadeko
c0d79aa75b fix logic and some cleaning 2022-05-13 22:12:07 -07:00
muhammadeko
c7849c0462 add negative permission check 2022-05-13 22:12:07 -07:00
KingRainbow44
87bfc25ab8
Refactor dispatch (now called HTTP) server (pt. 2) 2022-05-13 23:22:30 -04:00
ShiroSaki
57a9cae1a4 add support for announcement page 2022-05-13 16:48:37 -07:00
Melledy
ab5e4fcdb4 Use scene types instead of hardcoding scene ids for checking enter reason 2022-05-13 16:35:03 -07:00
tester233
b78e397056 Improve text 2022-05-13 16:33:18 -07:00