Commit Graph

117 Commits

Author SHA1 Message Date
KingRainbow44
f7b25df91c Handle ClientLockGameTimeNotify over sending it 2023-05-09 17:09:42 -04:00
KingRainbow44
061782f555 Revert "Move time lock check"
This reverts commit acc69a33cc.
2023-05-09 01:42:16 -04:00
KingRainbow44
13d95c5c84 Remove setting the dungeon ID
dungeon ID and dungeon enter will break things
2023-05-09 01:41:13 -04:00
KingRainbow44
acc69a33cc Move time lock check 2023-05-08 02:25:57 -04:00
KingRainbow44
0b2e471f9b Fix time locking 2023-05-08 02:24:05 -04:00
KingRainbow44
a4f5d3286d Implement game time locking
implement for quests
2023-05-08 00:11:29 -04:00
KingRainbow44
d32f6982be Run spotlessApply
also set line endings to native, no more line conflict errors!
2023-05-07 22:53:55 -04:00
KingRainbow44
4f1136ce2d Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests 2023-05-07 17:57:24 -04:00
KingRainbow44
24ad6bf478 Add the dungeon ID to the transfer scene packet 2023-05-07 02:57:06 -04:00
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
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
a579243e51 Use config over newScene#getScriptManager 2023-05-01 22:53:07 -04:00
scooterboo
62f7fa639a Remove cause of threadlock on first dragon fight (#2137) 2023-05-01 10:08:10 -04:00
KingRainbow44
cf56d032de Move constant debug spam to trace 2023-04-30 01:28:52 -04:00
scooterboo
4109cb0625 Remove garbages from Scene.java (#2131) 2023-04-24 21:00:34 -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
ee298235c2 Run spotlessApply 2023-04-18 17:17:55 -04:00
KingRainbow44
f2019aa88a Fix drop system error 2023-04-15 00:50:03 -04:00
dragon
f71b29c00a Implement a new item drops system (#2112)
* 1

* Delete .gitattributes

* implement

* Update PacketDropHintNotify.java

* Update PacketWorldChestOpenNotify.java

* Update FileUtils.java

* Update PacketDropHintNotify.java

* Update WorldDataSystem.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-04-13 22:28:54 -04:00
KingRainbow44
60eb62fa42 Spawn the player at the scene's start position when sent to a dungeon 2023-04-12 02:34:13 -04:00
KingRainbow44
990b36cbce Move scripting-related logger messages to debug 2023-04-11 02:05:12 -04:00
KingRainbow44
06cbae31fa Fix player fields not being set
line seps r weird
2023-04-10 22:46:19 -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
8b4471ee54 Check if the scene has a config 2023-04-02 20:42:12 -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
hamusuke
220c23b960 feat: change game time (#2061)
* feat: change game time

* Update proto names
2023-02-23 23:21:44 -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
1ceda2a455 Remove LinkedList usage
https://twitter.com/joshbloch/status/583813919019573248
2022-11-05 17:04:15 +10:30
github-actions
025e5d3c1c Fix whitespace [skip actions] 2022-10-13 13:32:10 +00:00
hamusuke
bf8ee32382 fix: albedo elevator doesn't work (#1845)
* Packet preparation

* elevator creation

* Make elevator work, scene time, entity removed event.

* Avoid referencing certain character name.
2022-10-12 17:26:45 +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
9970aeb94d Consolidate random point offsets 2022-08-25 00:22:43 +09:30
github-actions
c517b8a2c9 Fix whitespace [skip actions] 2022-08-21 11:33:54 +00: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
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
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
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
KingRainbow44
89575f587e Move PlayerTeleportEvent occurrences into World 2022-08-01 21:25:29 -04:00