Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-13 15:34:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,299 Commits 7 Branches 22 Tags
f1c1a846834f31e75141525e8d53362f032358b3
Commit Graph

808 Commits

Author SHA1 Message Date
hamusuke
f1c1a84683 fix: NPE related to teapot when player logs in. (#2429) 
* fix: NPE related to home when player logs in.

* fix: NPE related to home when player logs in.

* forgot to save player after fixing module id
 2023-11-09 21:56:21 -05:00
github-actions
2bcbd41026 Format code [skip actions] 2023-11-09 02:16:38 +00:00
longfruit
0bbeaf254b Fix tower mob level and hp scaling (#2430) 2023-11-08 21:15:10 -05:00
github-actions
1fac319eb2 Format code [skip actions] 2023-11-05 19:58:28 +00:00
longfruit
d224178a64 Only deduct energy when elemental burst actually fires (#2424) 2023-11-05 14:57:17 -05:00
github-actions
d461ee2eb3 Format code [skip actions] 2023-11-03 02:02:24 +00:00
longfruit
24874e7fba Implement abyss defense objective (#2422) 2023-11-02 22:00:05 -04:00
github-actions
583a41ab2c Format code [skip actions] 2023-11-01 01:54:08 +00:00
longfruit
cf6fb275be Add events to support scene group substitution (#2413) 
* Add events to support scene group substitution

* make event members private with getter/setter

* delete stray unused var
 2023-10-31 21:52:01 -04:00
github-actions
9b4ce34f4a Format code [skip actions] 2023-10-26 02:29:17 +00:00
longfruit
f86259a430 Fix some revives; improve dungeon exit flow (#2409) 2023-10-25 22:27:48 -04:00
github-actions
837e30e04b Format code [skip actions] 2023-10-19 13:19:46 +00:00
longfruit
f5703e5964 Fix mirror tower stages; fix tower time challenge and star scoring (#2406) 2023-10-19 09:18:12 -04:00
github-actions
bc8e7c21ce Format code [skip actions] 2023-10-17 05:42:17 +00:00
longfruit
770cd62370 Fix daily dungeon flow (#2398) 
* Fix dungeon entry, daily changes, replay flow; fix Mond's weapon mats domain unlock

* add note to DungeonEntryToBeExploreNotify
 2023-10-17 01:41:04 -04:00
longfruit
fd75ba7b9b Fix triggered Monster Tide spawn; fix Tower dungeon handoff (#2397) 
* Abyss: Fix monster tide trigger; fix dungeon handoff

* back out unrelated changes
 2023-10-14 12:08:49 -04:00
github-actions
453dc9717d Format code [skip actions] 2023-10-02 14:58:22 +00:00
Nazrin
582d7af9c4 Send QUEST_COND_STATE_NOT_EQUAL and QUEST_COND_STATE_EQUAL on login (#2394) 2023-10-02 10:56:09 -04:00
Nazrin
cab3bfb5a7 Fix bug in quest cond state not equal (#2393) 
* Fix bug in ConditionStateNotEqual.java

* Do the same fix for ConditionStateEqual.java
 2023-10-02 03:25:35 -04:00
github-actions
cf574e99cb Format code [skip actions] 2023-10-01 05:41:41 +00:00
KingRainbow44
6e309b6fee Merge remote-tracking branch 'origin/development' into development 2023-09-30 23:15:50 -04:00
KingRainbow44
a3fd10c3be Fix NullPointerException when refilling an avatar with no skill depot 2023-09-30 18:09:40 -04:00
Nazrin
b6e7d69949 Send QUEST_COND_NONE on every login (#2386) 
For players that enabled questing late
 2023-09-25 19:30:33 -04:00
github-actions
5faf39d359 Format code [skip actions] 2023-09-23 17:45:57 +00:00
Nazrin
0dd95450b1 Bare-bones Hangouts implementation (#2384) 2023-09-23 13:44:31 -04:00
hamusuke
5ee4812ac5 fix: login too slow (#2380) 2023-09-20 21:23:08 -04:00
github-actions
ec2bfffdd1 Format code [skip actions] 2023-09-18 01:03:10 +00:00
jie65535
43db7eba8f tp to move directly in the same scene (#2375) 2023-09-17 21:01:21 -04:00
github-actions
88315ec712 Format code [skip actions] 2023-09-17 02:57:38 +00:00
jie65535
5f5e6c38b1 Add rotation to /spawn (#2372) 2023-09-16 22:55:25 -04:00
github-actions
92bd09eeed Format code [skip actions] 2023-09-16 23:00:20 +00:00
KingRainbow44
65eaaa96f2 Apply changes from #2310 2023-09-16 18:58:36 -04:00
KingRainbow44
43467ebc85 Factor fight properties into healing calculation 2023-09-16 18:32:01 -04:00
Simplxs
fb0c2dbc84 Merge pull request #2341 
* enableRandomEncryptSeed

* update config version

* Merge branch 'Grasscutters:development' into random-seed

* make the codes more beautiful

* move KahnsSort to algorithms

* rename variables

* Merge branch 'development' into random-seed
 2023-09-16 14:38:39 -07:00
github-actions
b8f7aea168 Format code [skip actions] 2023-09-16 21:33:36 +00:00
Thoronium
0e44d18ae9 Better SceneTags (#2361) 
* Add scene tag handling

* Move warns to debug

* Move to PlayerProgressManager

* Add success message

* Inline check

* Improve per-scene handling

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

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

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

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

* Fix types

* Small fix

* Update ScriptLib.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-16 17:31:59 -04:00
github-actions
ad62b6b11d Format code [skip actions] 2023-09-16 00:53:28 +00:00
github-actions
c9a43a5e98 Format code [skip actions] 2023-09-16 00:52:37 +00:00
hamusuke
5458d36102 fix: HomeModuleManager isnt ticked unless player changes module (#2365) 2023-09-15 20:51:16 -04:00
Nazrin
c4dbb6851b Implement passJumpDungeon. Make dungeons kick you out to the correct scene (#2366) 2023-09-15 20:50:56 -04:00
github-actions
2643c6b3b7 Format code [skip actions] 2023-09-15 00:45:41 +00:00
Nazrin
84e1371499 Fixes for alchemy dude's quest part 2 (#2362) 
* Make platforms able to reset

platforms apparently are able to run again once reaching the last point. As well, canceling a timer seems to return a 0, not a 1

* Fix Seelies

Added HandlerClientScriptEventNotify (shoutouts to Hartie!) and cleaned up the platform stuff in ScriptLib.

There is a problem with HandlerClientScriptEventNotify where the client seems to only pass 0 into param1 instead of the configId. I coded in a workaround, but someone with greater access to things should check up on what is going on
 2023-09-14 20:44:30 -04:00
Nazrin
f955bb1e16 Little update to item giving handling (#2363) 
* Little update to HandlerItemGivingReq.java

GIVING_METHOD_GROUP is used in cooking girl's quest

* Send the giving packet at the start of relogs, even if encountered before.

* Make item checking not exact

You can have more items in your inventory than what you are submitting.
 2023-09-14 20:44:08 -04:00
hamusuke
2b64814534 fix: home worlds are ticked twice (#2360) 2023-09-14 01:22:29 -04:00
Thoronium
5fd31aece8 Fix home nulls (#2355) 
* Add null checking

* Sanity check for moduleManager
 2023-09-12 01:07:17 -04:00
github-actions
8de281d4da Format code [skip actions] 2023-09-10 23:21:44 +00:00
Nazrin
fbe2b138ee Fixes for alchemy dude's quest (#2352) 
* Add drops for gadgets

Gadgets only have drop_id when they are not chests (chest_drop_id). When drop_id is not set (0), handleChestDrop quickly exits

* Implement QUEST_COND_ITEM_GIVING_FINISHED

Took the oppertunity to Rename ContentFinishGivingItem to ItemGiving

* Store accept conditions like fail and finish content are

Took the oppertunity to clean up some old code as well

conditions are stored in QuestManager

* Update src/main/java/emu/grasscutter/game/quest/QuestManager.java

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

* Update ConditionItemGivingFinished.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-10 19:20:28 -04:00
github-actions
cdcdf924bd Format code [skip actions] 2023-09-08 03:35:28 +00:00
hamusuke
fc42f665a7 feat: implement teapot suite (#2344) 
* feat: implement teapot suite

* fix: home animals, check respawn, etc

* fix: NPE and cancel summon events

* fix: forgot to send eventId also
 2023-09-07 23:34:03 -04:00
github-actions
8db1f597ce Format code [skip actions] 2023-09-02 23:51:35 +00:00