Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-28 15:19:20 +00:00
Code Issues Projects Releases Wiki Activity
2,245 Commits 7 Branches 22 Tags 133 MiB
fb0c2dbc84
Commit Graph

1788 Commits

Author SHA1 Message Date
KingRainbow44
396f302eac
Merge changes from hamusuke (#1) 2023-08-26 17:57:46 -04:00
ハムスケ ハム
7dd63e9816
fix: EntityTeam.java (NPE) 2023-08-26 17:54:57 -04:00
ハムスケ ハム
2309b1f469
fix: liney c3 effect 2023-08-26 17:53:40 -04:00
ハムスケ ハム
87d58d2a6f
feat: ability to register new achievements 2023-08-26 17:53:28 -04:00
Nazrin
873d190e46
Make friends by fixing the protos (#2307) 2023-08-24 20:47:58 -04:00
Carl
4b167fc938
Fix the error that the parameter regionCache of class PacketPlayerLoginRsp is null in game only mode (#2297) 2023-08-20 14:52:43 -04:00
github-actions
ec53292e00 Format code [skip actions] 2023-08-20 18:48:59 +00:00
Ceris White
2b0f2f74cb
Update RegionHandler.java (#2295) 
Who decided to regex it like that???
 2023-08-20 14:47:08 -04:00
github-actions
b8fd2e2378 Update languages [skip actions] 2023-08-20 18:46:59 +00:00
laura o3o
7d13847144
Update it-IT.json (#2296) 2023-08-20 14:46:39 -04:00
KingRainbow44
fd44933ec7
Update packet files for packet ID changes 2023-08-19 15:59:07 -04:00
KingRainbow44
55083d4672
Update packet IDs to 4.0 2023-08-19 15:58:44 -04:00
KingRainbow44
ec31289921
Properly add code switches to the region config 2023-08-19 12:42:42 -04:00
KingRainbow44
81e52c364c
Add new default avatar abilities 2023-08-19 12:42:26 -04:00
KingRainbow44
813970945b
Fix BargainRecord 2023-08-18 21:13:10 -04:00
KingRainbow44
e3738ea68e
Add codeSwitch to the custom config 2023-08-18 21:04:49 -04:00
KingRainbow44
70eb0f2b16
Merge branch 'talking' into dev-4.0 2023-08-15 20:46:38 -04:00
KingRainbow44
407c1b3a86
Protocol definition fixes 2023-08-14 23:38:07 -04:00
KingRainbow44
31b9541b66
Add unversioned protocol definitions 2023-08-14 18:57:43 -04:00
KingRainbow44
ceeaf3748a
Add new protocol definitions 2023-08-14 18:57:07 -04:00
KingRainbow44
1bcb79840c
Rename troubleshoot to info to allow for credits placement 2023-08-14 18:55:19 -04:00
KingRainbow44
8cac8d13f4
Run formatter & bump version 2023-08-14 18:53:23 -04:00
KingRainbow44
543749bc9f
Implement DebugLog ability action 2023-08-13 19:40:59 -04:00
KingRainbow44
12ac5b32d3
Implement ServerLuaCall 2023-08-13 19:12:39 -04:00
KingRainbow44
6a421336df
Implement time axis 2023-08-13 19:01:08 -04:00
KingRainbow44
e7410a0be5
Semi-functional require handler implementation 2023-08-13 18:19:42 -04:00
KingRainbow44
0175e207af
Fix errors in chasm 2023-08-13 18:01:41 -04:00
KingRainbow44
f2b81a70c8
Remove deprecated function 2023-08-13 16:22:41 -04:00
KingRainbow44
cfccb2d991
Merge remote-tracking branch 'origin/development' into development 2023-08-13 16:20:11 -04:00
KingRainbow44
e0f8c03e39
Move more logs to debug constants 2023-08-13 15:56:19 -04:00
KingRainbow44
948dd5df59
Optimize content handlers 2023-08-13 15:52:38 -04:00
KingRainbow44
597574ddda
Attempt to implement bargaining (untested) 2023-08-13 12:28:56 -04:00
KingRainbow44
40bbfd90e1
Implement group-based item giving & Add content handler for item giving 2023-08-13 00:32:02 -04:00
KingRainbow44
afc5841596
Add way to toggle certain spam logs 2023-08-12 22:16:41 -04:00
KingRainbow44
70e6d7f334
Merge branch 'development' into talking 2023-08-12 19:33:25 -04:00
KingRainbow44
10c1db2fe1
Add command for listing quests 2023-08-12 19:20:34 -04:00
Phong
bdc4b5af89
Levelup City Implementation (#2281) 
* add statue promo data

* implement levelup city feature

* fix get level city when enter game

* format code

* fix typo, remove some property in the player, add the field cityInfoData to player class
 2023-08-11 23:54:19 -04:00
Nazrin
d0dde1c9e2
Fix dungeons with no finish logic in DungeonManager.java (#2288) 2023-08-10 20:06:55 -04:00
github-actions
bbf0d4dda1 Format code [skip actions] 2023-08-07 22:04:40 +00:00
Nazrin
b9a493d424
fix quest content and condition triggers (#2283) 
* Add param3 to EVENT_GADGET_STATE_CHANGE

* Slight cleanup for DungeonManager

* Fix ContentTriggerFire

* Rework and fix talk content and conditions.

* redo item content and conditions, swap out getItemByGuid with getItemById, and make count handling consistent.

* Don't need to check if checkItem is null

* add this. to DungeonManager.java

* add this to Inventory.java

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

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

* add spaces to ContentCompleteAnyTalk.java

* Update src/main/java/emu/grasscutter/game/quest/content/ContentCompleteAnyTalk.java

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-08-07 18:03:13 -04:00
github-actions
8200607a15 Format code [skip actions] 2023-08-07 04:28:56 +00:00
Nazrin
0b0dcf9b8e
Implement QUEST_EXEC_RANDOM_QUEST_VAR (#2284) 2023-08-07 00:27:13 -04:00
Thoronium
58d2650505
Fix swim stamina cost (#2287) 2023-08-07 00:25:59 -04:00
github-actions
175e7f5f09 Format code [skip actions] 2023-08-01 04:23:23 +00:00
KingRainbow44
665263d9ba
Fix account list subcommand 2023-07-31 17:26:30 -04:00
KingRainbow44
08284bc669
Add extra giving method 2023-07-31 16:03:55 -04:00
KingRainbow44
b82567d9d9
Attempt to implement item giving to NPCs (untested) 2023-07-31 15:42:52 -04:00
github-actions
a4ad781d61 Format code [skip actions] 2023-07-31 16:54:59 +00:00
Nazrin
465582b8da
Handle Dungeons with null config (#2279) 2023-07-31 12:52:42 -04:00
github-actions
4320bc7d29 Format code [skip actions] 2023-07-29 15:40:10 +00:00
Nazrin
98fbc4e512
Improve Platforms (#2275) 
* Improve Platforms

* add this.
 2023-07-29 11:38:34 -04:00
Nazrin
f3277dee9f
Fix Forging (#2278) 2023-07-29 11:37:32 -04:00
github-actions
0005fcf96f Format code [skip actions] 2023-07-23 03:19:10 +00:00
github-actions
f065b2b16f Format code [skip actions] 2023-07-23 03:18:53 +00:00
github-actions
e9d68936f6 Format code [skip actions] 2023-07-23 03:18:29 +00:00
Nazrin
47971dc931
various small bug fixes (#2270) 
* various small bug fixes

* Upgrade warning to error

* A few more state changes to match the others in this pull
 2023-07-22 23:17:59 -04:00
Nazrin
fe169398ec
Gadgets can be picked up too (#2272) 
* Gadgets can be picked up too

* put in a warning
 2023-07-22 23:17:39 -04:00
Nazrin
ddc082fc97
Everything triggers regions (#2271) 
* Everything triggers regions

* hotfix
 2023-07-22 23:17:33 -04:00
Nazrin
0b806e21cf
Fix talks that have a quest id of 4 digits or more (#2268) 2023-07-22 23:17:18 -04:00
Nazrin
49ba0e55e8
make xxGroupVariableValueByGroup the same as xxGroupVariableValue (#2266) 2023-07-22 23:17:11 -04:00
pfyy
ae2ab20b5b
add support for 3.8 teapot binout files (scene 2005, 2204) (#2265) 2023-07-22 23:17:02 -04:00
github-actions
27d495742d Format code [skip actions] 2023-07-15 03:05:16 +00:00
KingRainbow44
f17339f1b6
Send global value packet after the scene host has finished initializing the scene 2023-07-14 23:03:49 -04:00
KingRainbow44
f0775f70f3
Send packet after scene load & Directly send back entity ID to clients 2023-07-14 21:22:45 -04:00
KingRainbow44
fecf83cfa4
Revert AvatarUpgradeRsp 2023-07-14 21:09:57 -04:00
KingRainbow44
dfbe4022f3
Merge remote-tracking branch 'origin/development' into development 2023-07-14 19:47:56 -04:00
KingRainbow44
e859d87ae3
Implement SetEntityServerGlobalValueByEntityId 2023-07-14 19:46:30 -04:00
5idereal
acb3575c77
update zh-TW.json (#2260) 2023-07-14 19:37:54 -04:00
Nazrin
f725d9203d
Fix QUEST_CONTENT_LEAVE_SCENE (#2262) 2023-07-14 19:37:29 -04:00
Nazrin
d62394e35e
Remove obsolete code in ScriptLib.java (#2263) 2023-07-14 19:37:08 -04:00
Nazrin
a4d5de06d1
Fix starting wrong quest for story quests (#2264) 2023-07-14 19:36:50 -04:00
pfyy
0d71d29932
fix first entering teapot failure (#2259) 2023-07-12 22:00:55 -04:00
github-actions
d0a4da8a1f Update languages [skip actions] 2023-07-09 06:04:19 +00:00
laura o3o
d332861ed8
add italian support (italian translation fix) (#2249) 
* Updated IT Readme

* Update it-IT.json

* Update it-IT.json (2)

* fixed a couple errors while reviewing
 2023-07-09 02:03:54 -04:00
y.mi
47186a47b2
It now can bind on correct addr (#2254) 
Now Grasscutter will bind on address specified in config.json (bindAddress), instead of 0.0.0.0
 2023-07-08 12:27:12 -04:00
TotallyNotOndre
5090b17b80
Update ru-RU.json (#2247) 
ty Scaldy for help♥♥♥
 2023-07-03 23:32:15 -04:00
Xotak
5b9508d7a4
Update French translations (#2246) 2023-07-03 23:30:22 -04:00
github-actions
df7941bc1b Format code [skip actions] 2023-07-03 11:03:03 +00:00
Thoronium
9cac0953fa
Add alternate val name (#2245) 2023-07-03 07:01:50 -04:00
KingRainbow44
7cdb774b1f
Merge remote-tracking branch 'origin/development' into development 2023-07-01 01:29:40 -04:00
KingRainbow44
f40cdfd23d
Update protocol definition for AvatarUpgradeRsp 2023-07-01 01:29:30 -04:00
KingRainbow44
4e71a15479
Move unknown condition handler message to debug 2023-07-01 01:29:14 -04:00
github-actions
308686d9e7 Format code [skip actions] 2023-06-27 05:51:09 +00:00
Nazrin
83d447cfc2
Update region logic (#2240) 2023-06-27 01:49:24 -04:00
Nazrin
4ec274f5c5
Set event source for group variable changes to the variable name (#2231) 2023-06-25 10:45:37 -04:00
Nazrin
30d093f348
Update ScriptLib.java (#2227) 2023-06-24 00:37:13 -04:00
Nazrin
9fd5f7665c
Fix unlogging quests (#2226) 2023-06-23 23:03:14 -04:00
github-actions
e706cce802 Format code [skip actions] 2023-06-20 20:38:14 +00:00
Nazrin
b58caf0632
Fix Librarian Story Quest (#2218) 
* Fix Librarian Story Quest

* People die if they are killed

You want to die people instead of remove them so they play their sweet death animations.

* Nope. I take it back. Scriptlib is the wierd one to think removeEntity removes the entity.

* One must stop editing the code directly.

* Update EntityType.java

* Add warnings per Hartie

* Per Hartie, change getEntityType to EntityType
 2023-06-20 16:37:00 -04:00
github-actions
97b28b13fe Format code [skip actions] 2023-06-17 19:58:14 +00:00
dragon
4ebe6fbf63
dungeon drop implementation (#2215) 
* dungeon drop implementation

* Update src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-06-17 15:56:47 -04:00
Magix
06d5bf7098
Temporary fix to scene reference 2023-06-17 11:24:46 -04:00
Nazrin
9d94888da3
Fix race condition with worktops (#2216) 
* Fix race condition with worktops

* Update ScriptLib.java

* Update ScriptLib.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-06-17 11:00:10 -04:00
github-actions
86036682d7 Format code [skip actions] 2023-06-17 03:00:10 +00:00
KingRainbow44
762e7ae301
Fix ContentNotFinishPlot 2023-06-16 22:58:49 -04:00
github-actions
31cef88ef7 Format code [skip actions] 2023-06-16 18:28:59 +00:00
ノエルの犬
c3339de184
Resume the app token exchanger (#2209) 2023-06-16 14:27:14 -04:00
github-actions
e382c6d691 Format code [skip actions] 2023-06-16 18:06:43 +00:00
pfyy
6b3f19e588
fix giveall doesn't give everything (#2210) 
* fix giveall doesn't give everything

* avoid unnecessary failure to add items by catching exception earlier

* switch to use grasscutter logger

* use debug()
 2023-06-16 14:05:33 -04:00
github-actions
47172c995f Format code [skip actions] 2023-06-16 18:05:28 +00:00
Nazrin
6da5343df0
Do not unload groups asked for by quests (#2212) 2023-06-16 14:04:58 -04:00
Nazrin
89376d58bf
Change method of not ticking empty scenes (#2211) 2023-06-16 14:04:16 -04:00
dragon
248af4abfb
Update VisionLevelType.java (#2207) 2023-06-13 11:27:24 -04:00
jie65535
a7f78c7759
Skip invalid plugins (#2206) 2023-06-13 11:24:02 -04:00
github-actions
baac48c4a0 Format code [skip actions] 2023-06-11 20:26:35 +00:00
StartForKiller
6c89998759
Fix KillSelf 2023-06-11 16:24:42 -04:00
StartForKiller
3cc5e6b4e8
Disclaimer 2023-06-11 16:15:15 -04:00
StartForKiller
0f43e18d70
Fix some affixes not working 2023-06-11 16:14:38 -04:00
StartForKiller
1c9f32cbef
Fix a bit of un-researched action handling 2023-06-11 16:12:57 -04:00
github-actions
d933ca6d02 Format code [skip actions] 2023-06-11 03:33:37 +00:00
github-actions
3d62e72aa0 Format code [skip actions] 2023-06-11 03:32:55 +00:00
Nazrin
15699e562a
Fix lock clock (#2201) 
* Fix lock clock

* Update src/main/java/emu/grasscutter/game/world/World.java

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

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java

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

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-06-10 23:32:23 -04:00
Nazrin
2788206934
Almost fully fix Chasing Shadows (#2202) 2023-06-10 23:31:57 -04:00
TomyJan
9dbeb2172d
fix description of command quest and list (#2203) 
* fix description of command `quest` and `list`

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

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>

* Update QuestCommand.java

---------

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>
 2023-06-10 23:31:39 -04:00
iTruth
1ed89598ff
Add option "all" for UnlockMap and change the default behavior for "/prop unlockmap on" (#2196) 
* Do not unlock unnecessary scene points during '/prop unlockmap on'

* Format code [skip actions]

* Backup scenePoints since we might modify it

* Format code [skip actions]

* Add 'all' for UnlockMap

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
 2023-06-09 13:31:11 -04:00
github-actions
4093420c90 Format code [skip actions] 2023-06-09 17:29:36 +00:00
github-actions
a1f75e1537 Format code [skip actions] 2023-06-09 17:29:26 +00:00
Nazrin
e6d32f5599
Make ice dude show up (#2200) 
* Make ice dude show up

* replace contains with equals

Might as well fix this while I'm here.
"leave" and "enter" have the same number of letters, so it works.

* empty strings suck

* Update SceneTrigger.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-06-09 13:28:28 -04:00
Nazrin
b412a24657
Smarter NPC loading (#2199) 2023-06-09 13:27:34 -04:00
jie65535
b4b0b8d2a8
Fix cutscene and sound permissions (#2197) 2023-06-07 11:57:59 -04:00
馬良※チノ
d8d31f3afe
Update AvatarUpgradeRspOuterClass.java (#2193) 2023-06-06 16:39:46 -04:00
github-actions
7fb9913c4f Format code [skip actions] 2023-06-06 03:28:38 +00:00
KingRainbow44
8472c36490
Implement SET_KILLED_STATE 2023-06-05 23:27:14 -04:00
github-actions
ddb76a0c2a Format code [skip actions] 2023-06-04 21:57:29 +00:00
StartForKiller
c40213affc
Action id mapping fix 2023-06-04 17:55:19 -04:00
StartForKiller
f389d2fb28
Handle SetRandomOverrideMapValue 2023-06-04 17:53:48 -04:00
StartForKiller
b5595c3fab
Fix dropType de-serialization 
enum edition
 2023-06-04 17:53:30 -04:00
KingRainbow44
ecb6145e54
Revert "Fix dropType de-serialization" 2023-06-04 17:52:12 -04:00
KingRainbow44
eb17d65330
Revert "Format code [skip actions]" 
This reverts commit 22e953b636.
 2023-06-04 17:50:55 -04:00
github-actions
22e953b636 Format code [skip actions] 2023-06-04 19:56:38 +00:00
KingRainbow44
6080297be9
Fix dropType de-serialization 2023-06-04 15:55:06 -04:00
github-actions
6d6e6a041d Format code [skip actions] 2023-06-04 05:01:54 +00:00
KingRainbow44
b09c0d48bf
Fix ActionGenerateElemBall 2023-06-04 01:00:27 -04:00
github-actions
b050337216 Format code [skip actions] 2023-06-04 04:29:25 +00:00
StartForKiller
ac3ccf93f3
Little fix 2023-06-04 00:27:15 -04:00
StartForKiller
0167709070
Implement GenerateElemBall action 2023-06-04 00:27:01 -04:00
KingRainbow44
63ccff8755
Shut down the game server when Grasscutter is about to shut down 2023-06-04 00:26:06 -04:00
github-actions
494cd3b28c Format code [skip actions] 2023-06-03 19:37:54 +00:00
KingRainbow44
f9dffba27a
Merge remote-tracking branch 'origin/development' into development 2023-06-03 15:36:05 -04:00
KingRainbow44
f85070abdc
Make subfield & drop classes final 2023-06-03 15:36:00 -04:00
KingRainbow44
4de21d4a40
Remove redundant script event calling when changing the time 2023-06-03 15:35:04 -04:00
StartForKiller
56f09e87a1
Fix ore dropping and implement subfields 2023-06-03 15:29:45 -04:00
StartForKiller
9dae3cbcc7
Added localid missing actions (needs testing) 2023-06-03 15:27:02 -04:00
KingRainbow44
d18a8c31a6
Add SystemHintType enum 2023-06-03 15:23:27 -04:00
github-actions
8fc17ede99 Format code [skip actions] 2023-06-03 16:43:21 +00:00
KingRainbow44
73e181df9b
Merge remote-tracking branch 'origin/development' into development 2023-06-03 12:41:51 -04:00
KingRainbow44
5441094e47
Fix NullPointerException when trying to find gadgets in a group suite 2023-06-03 12:41:20 -04:00
github-actions
7fc7b5087c Format code [skip actions] 2023-06-03 14:55:55 +00:00
Nazrin
e28575c80f
Fix battle in front of glowy stag god (#2188) 
* Fix battle in front of glowy stag god

* Don't do a rollback when starting a quest. We're better than that.
 2023-06-03 10:54:46 -04:00
github-actions
853a67d48e Format code [skip actions] 2023-06-03 01:43:44 +00:00