Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 11:24:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,282 Commits 7 Branches 22 Tags
bc8e7c21ceb5474399abbe12515eaea83c596521
Commit Graph

795 Commits

Author SHA1 Message Date
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
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
github-actions
0005fcf96f Format code [skip actions] 2023-07-23 03:19:10 +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
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
dfbe4022f3 Merge remote-tracking branch 'origin/development' into development 2023-07-14 19:47:56 -04:00
Nazrin
f725d9203d Fix QUEST_CONTENT_LEAVE_SCENE (#2262) 2023-07-14 19:37:29 -04:00
KingRainbow44
7cdb774b1f Merge remote-tracking branch 'origin/development' into development 2023-07-01 01:29:40 -04:00
KingRainbow44
4e71a15479 Move unknown condition handler message to debug 2023-07-01 01:29: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
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
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
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
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
github-actions
a1f75e1537 Format code [skip actions] 2023-06-09 17:29:26 +00:00
Nazrin
b412a24657 Smarter NPC loading (#2199) 2023-06-09 13:27:34 -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