Commit Graph

225 Commits

Author SHA1 Message Date
scooterboo
c832c1cac0 Revert final's added by 15e2f3ca34 (#2144)
* Revert final's added by 15e2f3ca34

* Apply suggestions from code review

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

* Apply suggestions from code review

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-05-07 02:39:16 -04:00
KingRainbow44
48e233eb9b Update game time changing (triggers quests and updates properly) 2023-05-04 21:41:41 -04:00
KingRainbow44
8bb7ae22d0 Fix changing time + Trigger time change condition 2023-05-04 01:05:03 -04:00
KingRainbow44
3df5f79ebf Revert "Run spotlessApply"
This reverts commit d67e2d0c5e.
2023-05-03 10:48:00 -04:00
KingRainbow44
d67e2d0c5e Run spotlessApply 2023-05-02 23:21:17 -04:00
KingRainbow44
fb78df0caa Attempt to fix region issue 2023-05-02 22:44:13 -04:00
KingRainbow44
fdd6820a8f Merge pull request Grasscutter-Quests#53
'Updated with how talks are handle' by `mjolsic`
2023-05-02 20:16:55 -04:00
KingRainbow44
864298f3b1 Fix NullPointerException with Player#playerProgress 2023-05-01 22:54:00 -04:00
KingRainbow44
1786169782 Mark dungeons as completed and trigger the event
the event & completion were moved to the same location
2023-05-01 19:42:12 -04:00
scooterboo
60afba7e15 Fix typo in last commit (#2138) 2023-05-01 10:07:51 -04:00
KingRainbow44
916db0f408 Implement dungeon completion 2023-05-01 01:10:15 -04:00
KingRainbow44
aadbc05061 Fix issue with resetting team with a full party 2023-05-01 01:09:55 -04:00
KingRainbow44
d01ba08f26 Fix double adding of avatar entities 2023-04-30 20:58:31 -04:00
KingRainbow44
48dd1685a2 Check current character index 2023-04-30 00:30:03 -04:00
KingRainbow44
9b507a6ec3 Add support for legacy and newer quest excels 2023-04-29 21:35:49 -04:00
KingRainbow44
ed3186a2b2 Fix trial avatar removal
it is still *sort of* broken when combined with early leaving a domain
2023-04-29 21:21:58 -04:00
KingRainbow44
404ff9233a Fix removing trial avatars
this prevents exceptions from being thrown. see questing thread for more information.
2023-04-29 14:05:38 -04:00
KingRainbow44
df1b65b8a8 Check active team size, rather than using a 4 constant 2023-04-29 02:10:14 -04:00
KingRainbow44
391903ac0e Fix some behavior of trial avatars
investigation is required on the exceptions thrown
2023-04-29 02:01:00 -04:00
KingRainbow44
c2e9bdd261 Fix new account time 2023-04-29 01:59:18 -04:00
KingRainbow44
52ac9cd75e Remove obsolete code 2023-04-24 20:56:20 -04:00
KingRainbow44
e85d269518 Run spotlessApply on previous commit 2023-04-23 23:12:01 -04:00
KingRainbow44
c9d6225194 Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests) 2023-04-23 22:51:08 -04:00
KingRainbow44
375bb77abe Attempt to keep parity with Grasscutter-Quests & Fix add trial avatar issue 2023-04-20 00:58:23 -04:00
KingRainbow44
ae45177ed5 Fixing the starting world time
the proper start time should be 9 game hours
2023-04-20 00:40:13 -04:00
KingRainbow44
de0217f435 Send avatar type to client
also switch to lambda reference
2023-04-18 15:56:19 -04:00
KingRainbow44
6989d49080 Remove the first area from being auto-unlocked when questing is enabled 2023-04-15 13:33:30 -04:00
KingRainbow44
a8a78547a1 Fix level entity data loading 2023-04-14 22:59:57 -04:00
KingRainbow44
3224bbeb4f Fix setOrFetch on 0 values 2023-04-14 01:02:11 -04:00
KingRainbow44
6c1cff38b4 Fix default Traveler 2023-04-14 00:31:46 -04:00
KingRainbow44
64eb6ee325 Add correct player defaults when questing is enabled 2023-04-13 17:55:47 -04:00
KingRainbow44
06cbae31fa Fix player fields not being set
line seps r weird
2023-04-10 22:46:19 -04:00
KingRainbow44
5e56b5e3a8 Merge branch 'development' into unstable-quests
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/managers/ResinManager.java
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
#	src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
#	src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
#	src/main/java/emu/grasscutter/utils/Crypto.java
2023-04-10 22:13:50 -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
KingRainbow44
e20c7c151b Lint code 2023-04-09 14:50:59 -04:00
KingRainbow44
644f1b3ab9 Continue merging quests (pt. 2) 2023-04-09 14:35:45 -04:00
KingRainbow44
97ee71bcf4 Continue merging quests (pt. 1)
Finished last at: `World.java`, line `player.setAvatarsAbilityForScene(newScene);`
2023-04-09 13:25:16 -04:00
KingRainbow44
a3970f8e43 Format code 2023-04-02 21:34:07 -04:00
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
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
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
d1c7ced0ef Fix load order (#2057) 2023-02-15 19:31:33 -05: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
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