Commit Graph

1430 Commits

Author SHA1 Message Date
Moistcrafter
7f4fb20773 Fix boss names in boss bar (#2169)
* Boss bar fix

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-05-27 16:23:52 -04:00
Magix
71f6198361 Upgrade to REL3.7 (#2164)
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
2023-05-27 00:29:02 -04:00
Magix
c4f1208f45 Add support for game version 3.6 (#2110)
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
2023-04-30 22:08:54 -04:00
Moistcrafter
60e8106b01 use intstream instead of silly list in prop cmd (#2128) 2023-04-24 20:55:08 -04:00
FlourishingWorld
8c6b166a42 fix co-op mode avatar animation interrupt (#2124) 2023-04-18 15:19:34 -04:00
Moistcrafter
abcabc9861 Parse dungeon entry info req from payload instead of player scene (#2122) 2023-04-17 01:08:08 -04:00
tamilpp25
3c60f792ca reject clients on version mismatch (#2106) 2023-04-10 20:05:11 -04:00
Moistcrafter
c905d493af Add co-op lyre support (#2105) 2023-04-10 01:43:26 -04:00
hamusuke
caf9521013 feat: add ability to buy resin with primogems (#2104)
* feat: add ability to buy resin with primogems

* ResinManager#buy returns RetCode value
2023-04-09 20:20:12 -04:00
hamusuke
9181d1cbfd fix: mail system (#2096)
* fix: mail

* Simplify the mail handler

---------

Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
2023-04-02 21:32:30 -04:00
Colleiflower
516e5975e1 Add support for v3.5.0 (#2090)
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
2023-03-31 15:13:32 -04:00
yzr
cf4cd80010 Fix delombok package not exists error with proto generated files (#2083)
Fix javadoc & suppress no comments warning
Fix terminal interaction in IDEA
Update lombok onMethod to JDK8 version
Some code reformat
2023-03-31 02:16:32 -04:00
rwx9032
fdaa487b2a Add support for the Chinese client (#2076)
* Add CNREL support

* Improve logic

* Maintain spacing

* Remove language keys & switch to debug

* Improve Format
2023-03-12 00:51:21 -05:00
hamusuke
3ab3d5bc04 Simply implement achievement system and add achievement command (#2068)
* Implement achievement system

* Update src/main/java/emu/grasscutter/command/commands/AchievementCommand.java

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>

* fix: redundant codes

* fix: redundant codes

* Update language files

---------

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>
2023-02-26 00:14:27 -05:00
Thoronium
b209d91947 Add home resource gain (#2064) 2023-02-23 23:22:25 -05:00
hamusuke
220c23b960 feat: change game time (#2061)
* feat: change game time

* Update proto names
2023-02-23 23:21:44 -05:00
yeyeye
71a1e31d37 update gc 3.4 (#2041)
* update 3.4

* update3.4

* update 3.4

* update 3.4

* Add files via upload

* Delete SetPropCommand.java

* update 3.4 area id

* update version

* exchange cmdid

* exchange cmdid

* exchange cmdid

* my fault

* update AiSyncInfo
2023-02-18 22:18:27 -05:00
Thoronium
1b2210f5a7 Improved satiation (#2055)
* Natural satiation decreasing
Graphic showing satiation when eating (usually)

* Reworking values to match original

* Little fixes

* Satiation bar matches real values
Revival correctly updates bar

* Greatly simplify handling
Some fixes

* Inline variables
Add TODO for bug

* Satiation works correctly
Finally it all works as intended

* Remove unnecessary packets

* Improve satiation reduction handling
2023-02-15 19:32:59 -05:00
Thoronium
b4b8f1ec38 Fix climb jump stamina (#2056)
* Fix climb jump stamina

* Update StaminaManager.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-02-15 19:32:11 -05:00
Thoronium
d1c7ced0ef Fix load order (#2057) 2023-02-15 19:31:33 -05:00
Lemon_miaow
11351d9866 Fixed only the issue about "BOOLEAN" occurring when importing resources. (#2028)
* Only Fix 'Exception in thread 'main' com.google.gson.JsonSyntaxException: java.io.IOException: Invalid DynamicFloat definition - BOOLEAN' problem.

* Update ResourceLoader.java

* Modify code indentation and optimization.

* Update JsonUtils.java

* Update JsonUtils.java

* Update DynamicFloat.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-02-15 19:31:09 -05:00
Thoronium
1a50cccb38 Fix goal (#2052) 2023-02-09 17:12:01 +01:00
ZanyRain
3b29ba032e Some fix about scene script and quest (#2029)
* [ScriptLib] Query player when not get entity from scene

* Fix NPE when doing quests

* Add QUEST_CONTENT_SKILL trigger

Q353 need it

* Add some missing fields that contain in scene scripts

* Add a lua table serializer implement with jackson

This do not replace the original one,it is useful when debug

* Fix point_array type error

* feat: fix space
2023-02-09 17:10:07 +01:00
Thoronium
ab5b49b7c5 Teapot Implementations & Fixes (#2032)
* Add realm switching
Fix realm unlock items

* Implement exiting teapot

* Implement home level rewards

* Fix small issues

* Fix call issue

* Add 'seen unlock' packets

* Fix Sumeru Main House bricking accounts
This is only for the house, not the full realm

* Fixed realm 5

Main house needs to be placed manually for Sumeru realm (module 5) as the resources for defaults in Sumeru realm are missing. Sumeru main house cannot be exited from the door, issue due to the same missing res.

* Fix Grass main house bricking accounts

* Remove references

* Formatting change (web editor)

* Whitespace & Formatting

* Whitespace

* Make 'seen' status persistent

* Fix misnamed field

* Revert "Fix misnamed field"

This reverts commit 21ef404e14.

* Implement gaining trust (realm exp)

Add gaining trust by crafting
Add gaining trust via `/give`
Show trust in djinn menu

* Interior check for prevScene

* Correct positions & rotations

Return to front of main house when exiting from inside

* Update HandlerBackMyWorldReq.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
2023-02-09 17:00:16 +01:00
Thoronium
0fc578a243 Fix Cooking Compound Retrieval (#2039)
* Fix misnamed field

* Fix getter name
2023-02-02 14:48:42 +01:00
ghjbvvgh
8a5a6ab83e Unlock hidden points (#2016) 2023-01-11 00:28:00 +01:00
KingRainbow44
668461a6f1 Clean-Up Startup Sequence
hey i like it clean ok.. dont judge..
2022-12-30 20:31:27 -05:00
ZanyRain
fe80290bed Output the handbook based off the client language (#1993) 2022-12-26 20:09:21 +01:00
Simplxs
92fbaa8670 Update gc to 3.3 (#1981)
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
2022-12-23 22:12:02 +01:00
AnimeGitB
553e22ead8 Add more explicit NoSuchFileException message for excels 2022-11-28 21:04:39 +10:30
AnimeGitB
100d08ec5d Fix up pity tallies for new BannerTypes
Also fixes Beginner banner using Standard pity.
2022-11-26 02:03:11 +10:30
AnimeGitB
83b84408a1 Bake banner defaults into BannerType enum, and add every historic banner 2022-11-25 23:25:22 +10:30
AnimeGitB
da3981089d Add Position JsonAdapter for [x,y,z] format
Also add serializers for existing JsonAdapters
2022-11-25 00:29:26 +10:30
AnimeGitB
ad502a8568 Finally enforce deprecation of ancient Banners.json fields
Also add costItemId10 column so people know it exists, and removeC6FromPool column because it's a cool setting nobody knows about.
2022-11-24 23:56:13 +10:30
AnimeGitB
f6c84fdfbf Forgot about a 5star character that was added to the standard pool 2022-11-24 23:17:10 +10:30
AnimeGitB
1c4d263dd2 Add Data TSJ loading, replace and update Banners 2022-11-24 23:09:55 +10:30
AnimeGitB
35962542af Fix oversight on EnumTypeAdapterFactory 2022-11-24 01:36:58 +10:30
Luke H-W
0b5329514b TSJ and TSV parsing (#1962)
* Deserialization support for tsv files

* Benchmarking

* Apparently moving the setter out of the lambda fixed the setAccessible issue

* Thread it

* Use AllArgsConstructor instead of field reflection

* Clean up AllArgsConstructor TSV deserialization

* Refactor TsvUtils

* Remove AllArgsConstructors from Excels

* Set field accessible

* [WIP] TSJ improvements

* [WIP] More TSV stuff

* [WIP] More TSV stuff

* Working TSV parser (slow)

* Load Excels in TSJ > JSON > TSV priority
2022-11-24 00:18:57 +10:30
Xiaorunyu2541
b1a9ed0226 Update DeforestationManager.java (#1955)
* Update DeforestationManager.java

* Update src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java
2022-11-20 18:25:36 +10:30
github-actions
84bf783243 Fix whitespace [skip actions] 2022-11-05 12:49:35 +00:00
AnimeGitB
4d8caf5a8c Refactor Entity data 2022-11-05 23:18:33 +10:30
AnimeGitB
a30f16b0e1 Clean up excels 2022-11-05 23:12:03 +10:30
AnimeGitB
65915b7666 Make PlayerBuffManager::removeBuff actually remove buff 2022-11-05 17:26:20 +10:30
AnimeGitB
1ceda2a455 Remove LinkedList usage
https://twitter.com/joshbloch/status/583813919019573248
2022-11-05 17:04:15 +10:30
AnimeGitB
09f392bb5b Add FIGHT_PROP_CUR_DEFENSE alias to setstats (closes #1929) 2022-11-05 15:36:52 +10:30
AnimeGitB
dc7b8d8ca6 Add warnings to ancient deprecated Banners.json fields
Will probably turn these into runtime errors in 1.5.0, people need to stop sharing configs with dead fields and especially stop making PRs with them.
2022-11-05 14:22:17 +10:30
AnimeGitB
12316b36b1 Reimplement namecard claiming (fixes #1882) 2022-11-04 15:05:51 +10:30
AnimeGitB
0fb7d50acd Kill console on IOError 2022-11-04 13:55:39 +10:30
AnimeGitB
c926fe326c Refactor command kwarg parsing 2022-11-04 13:55:39 +10:30
hamusuke
e8930e92e1 Update roomSceneId obfuscated names (#1926) 2022-11-02 18:03:41 +10:30