Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-14 16:04:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,239 Commits 7 Branches 22 Tags
c9a43a5e985c831494142c20f3f821cd29ceb87c
Commit Graph

771 Commits

Author SHA1 Message Date
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
KingRainbow44
c08ab19d84 Various removals of '&' for Javadoc to be happy 2023-09-02 19:49:38 -04:00
github-actions
88d7be86da Format code [skip actions] 2023-09-02 23:06:00 +00:00
hamusuke
1894296ed4 fix: home transfer (#2327) 
* fix: home transfer

* Update HomeSceneItem.java
 2023-09-02 19:04:02 -04:00
github-actions
f8fb6732de Format code [skip actions] 2023-09-02 15:55:11 +00:00
hamusuke
ed97201473 fix: arrangement of main house is duplicated even if player changes module (#2325) 
* fix: arrangement of main house is duplicated even if player change module

* removeIf

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

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-02 11:52:56 -04:00
github-actions
decf494234 Format code [skip actions] 2023-09-02 05:49:00 +00:00
github-actions
9c25060c78 Format code [skip actions] 2023-09-02 05:48:12 +00:00
hamusuke
a49f37edb3 feat: finish home avatar talk (#2328) 2023-09-02 01:47:06 -04:00
hamusuke
97138d8c84 feat: implement home animals (#2329) 2023-09-02 01:46:58 -04:00
github-actions
717a358636 Format code [skip actions] 2023-09-02 00:33:12 +00:00
hamusuke
0db69882a3 fix: sync home avatar costume (#2326) 2023-09-01 20:31:55 -04:00
KingRainbow44
e04df0526a Run formatter & update protocol 2023-08-31 23:46:55 -04:00
KingRainbow44
541433c01b Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0 
# Conflicts:
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/player/TeamManager.java
#	src/main/java/emu/grasscutter/game/world/Scene.java
 2023-08-31 21:06:13 -04:00
KingRainbow44
9295d79bc2 Reflections change & Start HTTP before game server 2023-08-31 20:59:38 -04:00
KingRainbow44
58b3570f27 De-obfuscate definitions & run formatter 2023-08-31 19:29:31 -04:00
KingRainbow44
d43e5ca608 Compile scripts to replace require with script content 2023-08-31 01:09:53 -04:00
KingRainbow44
67c0e82dfb Logging changes (move levels down & add toString for some objects) 2023-08-30 23:28:54 -04:00
KingRainbow44
aad4529b0e Run formatter & 'protogen' 2023-08-30 19:36:58 -04:00
hamusuke
e8f4949836 feat: add more home mark point (#2323) 2023-08-30 19:32:47 -04:00
KingRainbow44
1ca451559c Add PlayerNpcTalkEvent 2023-08-29 23:54:34 -04:00
KingRainbow44
dbc45f36f0 Add PlayerSwitchAvatarEvent 2023-08-29 23:48:51 -04:00
KingRainbow44
e3f15bca47 Add PlayerLevelStatueEvent & PlayerUseSkillEvent 2023-08-29 23:35:58 -04:00
hamusuke
7049cfdb58 fix: player profile changes are not reflected cuz Java is object-oriented (#2322) 
* fix: player profile changes are not reflected.
fix: deob FriendBrief.proto

* fix: tentatively sync profile when log out

* fix: allow offline player

* Update src/main/java/emu/grasscutter/game/friends/PlayerProfile.java

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

* Update src/main/java/emu/grasscutter/game/player/Player.java

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

* Update src/main/java/emu/grasscutter/game/player/Player.java

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

* fix: server friend

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-08-29 23:23:46 -04:00
hamusuke
8563d4b574 feat: support multiplayer mode in teapot (#2317) 2023-08-29 21:12:21 -04:00
KingRainbow44
48439e7e5d Add PlayerPropertyChangeEvent 2023-08-29 17:25:48 -04:00
hamusuke
667008ecf1 fix: sync team avatar changes (#2320) 2023-08-29 12:20:17 -04:00
Thoronium
f54432a89a Bug fixes (#2314) 
* Match resources names

* Fix loading with no skill

* Stop overriding common command alias

* Fix discord link in version check popup

* Forgot to add rotation fix

* Remove unnecessary set
 2023-08-29 12:15:19 -04:00
KingRainbow44
4f2d3f9b30 Run formatter on wish event 2023-08-28 19:34:30 -04:00
KingRainbow44
3436e0a3a8 Add PlayerFinishBattlePassMission 2023-08-28 19:34:04 -04:00
KingRainbow44
ee33fed721 Add PlayerWishEvent 2023-08-28 13:59:30 -04:00
KingRainbow44
b7855c3487 Run formatter on previous changes 2023-08-28 11:30:04 -04:00
KingRainbow44
8c0032fc75 Run formatter on new events 2023-08-27 23:36:41 -04:00
KingRainbow44
0ad8eb443b Add PlayerObtainItemEvent 2023-08-27 23:29:21 -04:00
KingRainbow44
9c8a29c864 Add PlayerObtainAvatarEvent 2023-08-27 23:27:33 -04:00
KingRainbow44
76b27df622 Add PlayerLevelItemEvent 2023-08-27 23:26:51 -04:00
KingRainbow44
314b90e936 Add PlayerLevelAvatarEvent 2023-08-27 23:26:01 -04:00
KingRainbow44
154ace3d7e Run formatter on code 2023-08-27 23:23:01 -04:00