Commit Graph

1996 Commits

Author SHA1 Message Date
github-actions
c517b8a2c9 Fix whitespace [skip actions] 2022-08-21 11:33:54 +00:00
AnimeGitB
a746d11b6f Don't lint src/generated 2022-08-21 21:02:44 +09:30
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
Melledy
a436ae9fe1 Replace protos with generated protos
Protos can still be auto compiled from the `./proto/` folder.
2022-08-21 00:37:36 -07:00
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
Magix
957296fa2d Merge pull request #1680 from 4Benj/development
Remove uncompiled protos from compiled jar
2022-08-20 20:45:22 -07:00
Benj
825517c2ec Remove uncompiled protos from compiled jar 2022-08-21 11:39:21 +08:00
AnimeGitB
b3a7cde76c Remove crazy high AEXP drops from default chest rewards 2022-08-20 14:06:28 +09:30
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
J
78b7fb70ac Add README_fil-PH.md (#1675)
* Add README_fil-PH.md

* Add README_fil-PH.md

* Update README_fil-PH.md

Co-authored-by: J <jcatrdev@gmail.com>
2022-08-19 15:37:02 +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
b3c80db417 Stop vendoring fastutil 2022-08-18 22:05:51 +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
1chanuser
b4a2fe37e3 Add README_ko-KR.md (#1673)
* Add files via upload

Add README_ko-KR.md

* Update README.md

Add ko_KR

* Update README_HE.md

Add ko_KR

* Update README_es-ES.md

Add ko_KR

* Update README_fr-FR.md

Add ko_KR

* Update README_id-ID.md

Add ko_KR

* Update README_pl-PL.md

Add ko_KR

* Update README_ru-RU.md

Add ko_KR

* Update README_zh-CN.md

Add ko_KR

* Update README_zh-TW.md

Add ko_KR

* Update README_ko-KR.md

Add README_ko-KR.md

* Update README_HE.md
2022-08-17 16:20:11 +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
2y8e9h22
c115fe1abe update zh-CN.json (#1662)
Original commits:
* .
* Apply suggestions from code review
2022-08-16 10:11:26 +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
Zxilly
bccf516ca7 chore: typo fix 2022-08-15 22:54:31 +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
dragon
d286f1628e Update install_without_dependencies.sh
adapt to pr #1605 .(because this pr remove '-handbook' and '-gachamap' launch arguments as these are generated on startup)
2022-08-11 14:41:22 +09:30
RBNXI
a2b3033107 Fixed install_without_dependencies.sh script
## Description
Removed auto generation of Handbook since with the new versions GC won't exit when finished generating it, so the script was stuck, and for some reason if you stop GC manually, the script won't continue.
Added a recommendation to generate HB manually.

## Type of changes

- [x] Bug fix
- [ ] New feature 
- [x] Enhancement
- [ ] Documentation

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] My pull request is unique and no other pull requests have been opened for these changes
- [x] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md)
- [x] I am responsible for any copyright issues with my code if it occurs in the future.
2022-08-10 22:24:04 +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
2d48fab799 Stop language linter from fighting the main linter on \n 2022-08-10 17:00:43 +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