Commit Graph

2125 Commits

Author SHA1 Message Date
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
KingRainbow44
8291e366b9
Bump to version 1.6.3 2023-08-01 00:27:39 -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