Commit Graph

185 Commits

Author SHA1 Message Date
KingRainbow44
9fbb7fb3be
Continue updating/refactoring classes
Most code is matched from `Grasscutter-Quests`.
2023-04-01 22:17:10 -04:00
KingRainbow44
daa51e53b7
Copy some files from Grasscutter-Quests
NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)
2023-04-01 18:06:30 -04:00
KingRainbow44
262ee38ded
Create files from Grasscutter-Quests
these files are NOT directly compatible with Grasscutter, and require additional modifications to the codebase to work.
2023-03-31 23:58:12 -04:00
KingRainbow44
fc05602128
Run Spotless on src/main 2023-03-31 22:30:45 -04:00
KingRainbow44
15e2f3ca34
Run IntelliJ IDEA code formatter 2023-03-31 17:19:26 -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
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
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
0fc578a243
Fix Cooking Compound Retrieval (#2039)
* Fix misnamed field

* Fix getter name
2023-02-02 14:48:42 +01:00
KingRainbow44
668461a6f1
Clean-Up Startup Sequence
hey i like it clean ok.. dont judge..
2022-12-30 20:31:27 -05: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
1c4d263dd2 Add Data TSJ loading, replace and update Banners 2022-11-24 23:09:55 +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
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
hamusuke
e8930e92e1
Update roomSceneId obfuscated names (#1926) 2022-11-02 18:03:41 +10:30
github-actions
96da4b6117 Fix whitespace [skip actions] 2022-10-18 14:56:26 +00:00
AnimeGitB
aacf013c06 Fix gacha avatars (fixes #1870) 2022-10-18 15:11:33 +10:30
dragon
cf67c44f22
feat:cooking food ingredient(aka:compound) implementation (#1858)
* feat:cooking food ingredient(aka:compound) implementation

Implement food ingredient(compound) feature.Need a thorough test and still has some work to do.

* small bug fix;implement fish processing

* Update src/main/java/emu/grasscutter/server/packet/send/PacketItemAddHintNotify.java

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Update Inventory.java

* Update Inventory.java

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
2022-10-17 19:18:05 +10:30
AnimeGitB
1ecc3f4390 Remove constellation charge and talent level bonuses from db 2022-10-17 16:13:28 +10:30
github-actions
025e5d3c1c Fix whitespace [skip actions] 2022-10-13 13:32:10 +00:00
AnimeGitB
d1d39db56c [BREAKING] Item Usage Overhaul
-De-hardcode elemental orb values
-De-hardcode exp items
-Change ShopChest format (temporary, drop system overhaul will replace it entirely)
-Food healing actually uses Ability data for real HP amounts
2022-10-14 00:00:40 +10:30
AnimeGitB
4e75361ad4 Refactor GameData, remove deprecated getGsonFactory
- Fix day-of-week dungeons
- AvatarSkill max level enforcement from excels
- Partial fix to bonus levels (need packet on talent update)
2022-10-13 18:31:34 +10:30
AnimeGitB
bb342f9114 Lombokify and sort GameData 2022-10-13 14:58:49 +10:30
AnimeGitB
558471237a Add DynamicFloat class 2022-10-12 21:58:39 +10:30
hamusuke
4da4c03ecc
feat: unlock homeworld bgm and set homeworld bgm. (#1844)
* will be able to change home bgm.

* feat: unlock homeworld bgm and set homeworld bgm.

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

* Update GameHome.java

* Get default unlocked home bgms from HomeWorldBgmData

* fix: duplicate home items by sending packet
2022-10-11 22:29:43 +10:30
hamusuke
e23536e7ba
fix costumes are unable to be unlocked. (#1842)
* fix: costumes are able to be unlocked.

* Update AvatarCostumeData
2022-10-09 11:10:42 +10:30
Luke H-W
dd6e1bb8a3
Move Data, Plugin, Script, Packet access from Strings to Paths (#1839)
* Move Data, Plugin, Script, Packet access from Strings to Paths
- No longer dump default Data files to folder on launch
- Allow Scripts to be loaded from Resources zip
- Lay groundwork for Plugins to be loaded from zip
2022-10-07 23:01:08 +10:30
Luke H-W
c2e620bf7c
[BREAKING] Deobfuscate codex field, slight refactor (#1809)
* Deobfuscate codex field, slight refactor

* Fix relic sets in codex
2022-09-28 16:28:15 +09:30
GanyusLeftHorn
5ffc07cf59
3.1 Support (#1808)
* Update 3.0 protos

* Update classes to match protos

* Fix RegionHandler versions

* 3.0 Opcodes

* Fixed Gadget Spawning

Original Commit Message: fixed gadget spawning ty MJDerp
Gitea Author: yh0Nathan

Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>

* Make PointData compatible with alternative PointData

Original Commit Message: Make PointData compatible with windied scene points.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Add scene tag for Vanarana.

Original Commit Message: Add scene tag for Vanarana.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Add Sumeru expeditions.

Original Commit Message: Add Sumeru expeditions.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Update game version to 3.0.0

* versionFix must be >= 50 not == 50 in RegionHandler

* Add new 3.0 Reliquary and SkillParticleGeneration data

Original Commit Message: Repair 3.0 added Reliquary 3-in-1 on the crafting table. Add skill particle generation info for Tighnari,Collei and Dori
Gitea Author: Roly

* Actually fix RegionHandler

* Remove asset names from json and comments

* Add scene areas for Sumeru desert to /prop um

* Added New MaterialType

* Change version to 3.1.0

* funny welcome message back

* Fix pyramid skill issue.

* Fix pyramid and event scene tags without ugly bruteforce.

* Remove backrooms chat welcome message.

* Incorporate suggestions.

* RoomSceneId and empty list checking.

Co-authored-by: Benj <benjamin7006@gmail.com>
Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>
Co-authored-by: Kokoboy <anushkumar222001@gmail.com>
Co-authored-by: nitro <31241699+nitrog0d@users.noreply.github.com>
Co-authored-by: Vexeone <vexeone@gmail.com>
2022-09-28 04:53:19 +02:00
AnimeGitB
fbc0219cba Allow loading Resources from zip files
Move Resources loading from String filenames to Paths
Add zip support
2022-09-23 22:25:17 +09:30
Alexander Hartmann
08fdcf6ed4
fixed gadget hp properties and invincibility handling (#1773)
* fixed gadget hp properties and invincibility handling

* Allow killing of hp locked entities, if the damage is higher then the hp

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-15 11:56:20 +09:30
Alexander Hartmann
21ff749dca
Add support for propperly showing activity shops (#1774)
* Add support for propperly showing activity shops

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

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-14 19:57:16 +09:30
github-actions
6e5d986687 Fix whitespace [skip actions] 2022-09-03 03:36:51 +00:00
pfyy
f93d998ff0 fix serenitea pot main building 2022-09-02 12:13:02 -07:00
Melledy
45c08c5826
Clean up OpenStateData onLoad logic 2022-08-31 03:38:37 -07:00
pfyy
96caa7db17
fix serenitea pot (#1726)
* partial fix of serenitea pot

* fix serenitea pot
2022-08-31 02:13:48 -07:00
Dang Hoang Phuc
7dd0c89927 fix: avatar energy transform in proudskill 2022-08-31 02:13:23 -07:00
Melledy
79323a05e3
Fix weird conditional in EquipAffixData 2022-08-25 12:03:26 -07:00
Melledy
a25c681274
Update AvatarCostumeData naming 2022-08-25 11:47:22 -07:00
Melledy
0c906aa4ce
Fix ReliquarySetData naming 2022-08-25 11:44:01 -07:00
Melledy
466488ca7a
Prevent material type from being null 2022-08-24 17:07:46 -07:00
Benj
d8816911a6 Make PointData compatible with alternative PointData
Original Commit Message: Make PointData compatible with windied scene points.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
2022-08-24 11:34:26 +09:30
omg-xtao
5db73d2849
Fix QuestEncryptionKeys Path (#1696)
* Fix QuestEncryptionKeys Path

* Load resources QuestEncryptionKeys
2022-08-23 23:29:52 +09:30
github-actions
c517b8a2c9 Fix whitespace [skip actions] 2022-08-21 11:33:54 +00:00
AnimeGitB
3fca950050 Make TalentCommand show off new Translate function 2022-08-21 20:53:37 +09:30
赵怡然
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
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