Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-02 22:10:41 +00:00
Code Issues Projects Releases Wiki Activity
1,145 Commits 7 Branches 22 Tags 136 MiB
e6514f7ad1
Commit Graph

302 Commits

Author SHA1 Message Date
Няшик Няшный
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
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
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
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
tiantian520
5b3c05a9a0 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
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
Melledy
a751e71da9 Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-14 06:35:37 -07:00
muhammadeko
4f553f6694 remove log 2022-05-13 22:12:07 -07:00
muhammadeko
855a098aa7 fix logic and some cleaning 2022-05-13 22:12:07 -07:00
muhammadeko
922359d6e6 add negative permission check 2022-05-13 22:12:07 -07:00
KingRainbow44
3adf0d448c Refactor dispatch (now called HTTP) server (pt. 2) 2022-05-13 23:22:30 -04:00
Melledy
248b655f07 Use scene types instead of hardcoding scene ids for checking enter reason 2022-05-13 16:35:03 -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
Melledy
83f8bec947 Implement QUEST_CONTENT_FINISH_PLOT 2022-05-13 06:33:12 -07:00
Melledy
a227b44c70 Fixed quests not finishing their questline 2022-05-13 06:24:50 -07:00
Melledy
f4770cf20a Merge pull request #816 from Grasscutters/dev-quests 
Implement quests
 2022-05-13 05:36:30 -07:00
AnimeGitB
420801b49e Updated cost logic and default weights 2022-05-13 05:34:14 -07:00
AnimeGitB
736ca85300 Remove debug log from gacha 2022-05-13 05:34:14 -07:00
AnimeGitB
83c46cb9c8 Custom costs for different gacha pulls 2022-05-13 05:34:14 -07:00
AnimeGitB
f83f13204e Gacha rework 
Add fallback stripping and C6 stripping
Converting banner definitions from pity vars to lerp arrays
Properly implement rates and pool smoothing
Also move reusable functions to Utils
 2022-05-13 05:34:14 -07:00
Melledy
cbd46e9215 Add one more quest trigger 2022-05-13 05:33:43 -07:00
Melledy
631a53030c Switch to using quest excels 2022-05-13 03:12:25 -07:00
Akka
00ea35b81f add docs for tower 2022-05-12 14:54:44 -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
b787c70cb0 More usage of payItems 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
AnimeGitB
595234cc84 Add Inventory.payItems() method 2022-05-11 21:56:53 -07:00
gentlespoon
226a29f7c2 Fix logging level 2022-05-11 17:39:45 -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
57c7f7a43b Add gacha details page. 2022-05-11 12:02:45 -07: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
Magix
22cbe74875 Merge pull request #802 from Grasscutters/better-config 
Implement a better config structure
 2022-05-11 01:23:43 -04:00
KingRainbow44
11161227ab Convert to the far superior config system 2022-05-11 00:30:07 -04:00
gentlespoon
54cf45a72e Claymore charged attack stamina cost 2022-05-10 17:25:18 -07:00
Secretboy
ecf028d0c6 add /language command (#780) 
* Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located

* add /language command,each account has their own Locate
 2022-05-10 05:33:45 -07:00
gentlespoon
0f1341512c Reset first tick on new skill 2022-05-10 05:21:29 -07:00