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,694 Commits 7 Branches 22 Tags 136 MiB
3fca950050
Commit Graph

1207 Commits

Author SHA1 Message Date
AnimeGitB
3fca950050 Make TalentCommand show off new Translate function 2022-08-21 20:53:37 +09:30
AnimeGitB
955004343f Improve translate function 
Make commands pass ints and floats instead of manually casting them to string first
 2022-08-21 20:53:37 +09:30
AnimeGitB
4b03770ec1 Hide resin from map when disabled 2022-08-21 19:38:38 +09:30
akatatsu27
77f2bcf5bf small quest fixes (#1677) 
* small quest fixes

* uncomment hack
 2022-08-21 00:08:37 -07:00
赵怡然
abd1e7569e Blossom Implement (#1606) 
* Blossom!

* rename

* delete SpawnBlossomEntry.java

* use MAP

* use List

* use LIST

* use List

* useCondensedResin

* useCondensedResin

* fix build

* enhance

* fix bug

* REMOVE BOSS

* fix condensed resin

* fix condensed resin

* use POSITIVE_INFINITY

* use RewardPreviewData

* fix build

* fix resources

* add BLOSSOM_MONSTER_FIGHTING_VOLUME

* edit monster score

* edit monster score

* fix bug

* fix bug

* improve logic

* fix monsters level

* Deleted comment blocks

* nitpick

* Fix compilation problems

* nitpick

* Refactor + nitpick

* Clean up overall diff to develop

* Clean up other usage of condensed resin

* Clean up overall diff to develop

* Lombokify Scene.java

* Missed an odd getter name

* Unhardcode reward previews

* EDIT NAME

* remove leyline 1

* remove leyline 2

* Update BlossomManager.java

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-20 23:19:59 -07:00
AnimeGitB
48d31e45ed Fix talentcommand message key 2022-08-19 16:52:02 +09:30
AnimeGitB
fb1bacb0f8 Refactor avatar skilldepot and constellation/talent changing 
Ensures Traveler retains talent levels and constellations on inactive elements when switching elements.
Relevant for any other skillDepot-changing activities like Windtrace too, though keeping those in the db might not be as useful.

Refactor avatar talent upgrade and access
Refactor skillExtraCharges
 2022-08-19 16:43:57 +09:30
AnimeGitB
7d523efd41 Avoid allocations on Map::putIfAbsent usage 
Map::computeIfAbsent only runs the passed constructors when it needs to
 2022-08-19 12:47:50 +09:30
AnimeGitB
0cb75aeb5f Add iterable payItems methods 
Shame they could never be fully generic, but oh well
 2022-08-18 23:02:26 +09:30
AnimeGitB
efa69c007d Change unlocked scenes from lists to sets 2022-08-18 22:38:55 +09:30
AnimeGitB
c3450e8905 Handbooks: use some sorted maps 2022-08-18 22:06:08 +09:30
AnimeGitB
9e0d6538e9 Lombokify some more getters 2022-08-17 21:11:40 +09:30
AnimeGitB
02deeb2852 Remove erroneous references to excel skilldata instead of avatar skilldata 
Refactor team resonances and correct login behaviour and less-than-full-party behaviour
 2022-08-17 21:07:29 +09:30
AnimeGitB
48cd9f6be2 Don't use UIDs as initial capacity for chat history 2022-08-17 03:20:06 +09:30
AnimeGitB
fab7e4a461 ChatSystem nitpick 2022-08-17 00:17:41 +09:30
GanyusLeftHorn
dc153572dd Fix chat welcome messages and some slight refactoring. 2022-08-17 00:12:27 +09:30
AnimeGitB
97779fd35a Fix deprecated chat references 2022-08-16 15:13:51 +09:30
Luke H-W
dc9cef8ab7 Refactoring (#1660) 
* Refactor a couple of iterators

* Use side-effect instead of second iterator

* Make World::onTick return shouldDelete instead of success

* Replace Shop iterator with side effects

* Scene

* Clean up Expeditions

* Refactor Expeditions

* Clean up Expeditions, Player

* Limit Expeditions by AR

* Lombokify props

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-15 23:19:13 +09:30
Magix
3ec411b11a Bump config version. 2022-08-14 11:00:29 -04:00
dragon
3bd00fcb07 Update ConfigContainer.java (#1646) 
make it more similar to official behavior.
 2022-08-11 21:27:45 +09:30
dragon
823980046e make fishhook_tp configurable 2022-08-11 21:21:30 +09:30
AnimeGitB
46223c8976 Refactor Json helper functions to JsonUtils 2022-08-11 17:59:08 +09:30
AnimeGitB
c6323e9759 Funnel all gson calls into helper functions 
Add deprecated getGsonFactory for plugin compat until 3.0
 2022-08-11 17:59:08 +09:30
Luke H-W
76fcbb477b Remove beta message 2022-08-11 16:21:59 +09:30
AnimeGitB
325fe6c44a Fix TalentCommand for Traveler 2022-08-11 16:21:27 +09:30
dragon
edd4c8ca88 fix:command player said to server won't be shown at chat history (#1643) 
Original commits:

* fix:command player said to server won't be shown at chat history

* Update ChatManager.java
 2022-08-11 15:20:08 +09:30
GanyusLeftHorn
04f0fae898 Handle Unlocking of Waypoints and Statues (#1608) 
Original commits:

* Add necessary protos for scene point/area unlocking.

* Rename PlayerOpenStateManager to PlayerProgressManager and move data to Player.

* Handle unlocking of waypoints.

* Add primo rewards for waypoint unlock.

* Statue unlocking.

* Add statue quest on player login.

* I forgor to add an unlock command.

* Give EXP as reward, fire quest trigger, make EXP UI show up.
 2022-08-10 19:33:47 +09:30
AnimeGitB
c624479439 Fix an edge case that breaks embryos if resources are loaded early 2022-08-10 17:00:43 +09:30
Magix
3121e3e67d Introduce a new arguments parser (#1629) 
Original commits:

* Clean-up

* Introduce a new application arguments parser & handler

* Clean-up and deprecate `Tools#getLanguageOption`

* Fix `-debug` and `-debugall` parameters

* found this while debugging, ...why

* Remove deprecated parameters

* Invoke startup argument parser before handbook generation

* Move command map instantiation to `Grasscutter `(prevent making 3 instances on startup)

* Ensure \n at EOF

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-10 11:54:43 +09:30
GanyusLeftHorn
e20b185dc0 Fix Claiming BP Reward Chests (#1634) 
Original commits:

* Fix claiming BP chests.

* Remove logging.
 2022-08-10 11:04:22 +09:30
AnimeGitB
a2cdec02af Make missing languages not throw warnings 2022-08-09 04:57:44 -07:00
AnimeGitB
9c66ba137f Unify gacha mappings generation 2022-08-09 20:59:11 +09:30
AnimeGitB
ef805f26cc Remove vestigial references to gacha_mappings 2022-08-09 20:59:11 +09:30
AnimeGitB
0091fb87ea Remove language hack from handbook generation 2022-08-09 20:59:11 +09:30
AnimeGitB
c1ff7332fe Generate handbooks on every launch, fix html docs 2022-08-09 20:59:11 +09:30
AnimeGitB
e963419956 Refactor handbook generation, remove singular handbook 2022-08-09 20:59:11 +09:30
AnimeGitB
0994417261 Cache used strings from TextMaps 2022-08-09 20:59:11 +09:30
AnimeGitB
4790158ac6 Load in all the textmaps! 2022-08-09 20:59:11 +09:30
KingRainbow44
6ec372e64f Add invoke-level invulnerability for bursts. 2022-08-06 23:35:57 -04:00
KingRainbow44
7df41f616b Invoke AbilityManager#onSkillStart and AbilityManager#onSkillEnd 2022-08-06 23:35:09 -04:00
KingRainbow44
6420428660 Add a method to be invoked on skill perform and end 2022-08-06 23:34:35 -04:00
KingRainbow44
cf2832ae72 Add EntityDamageEvent and implementations 2022-08-04 21:36:00 -04:00
Magix
a3e0f7f5f0 Update HandlerSceneTransToPointReq.java 2022-08-04 13:49:38 -04:00
Magix
d24c10eec5 Update src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:45:02 -04:00
Magix
164baa7251 Update src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:44:56 -04:00
Magix
9cb9fe099c Update src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:44:50 -04:00
KingRainbow44
faeb96927a Add PlayerUseFoodEvent and implementations 2022-08-01 21:32:30 -04:00
KingRainbow44
89575f587e Move PlayerTeleportEvent occurrences into World 2022-08-01 21:25:29 -04:00
KingRainbow44
1de402bd6f Merge branch 'development' into more-events 2022-08-01 21:13:19 -04:00
KingRainbow44
b9b4b6f428 Clean-up the energy manager 2022-08-01 21:12:57 -04:00