Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 18:05:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,426 Commits 7 Branches 22 Tags
f00c54cb95d8b66f1033fbab2f0fe41d5e0ba8c9
Commit Graph

1700 Commits

Author SHA1 Message Date
Magix
f00c54cb95 Implement a proper ability system (#2166) 
* Apply fix `21dec2fe`

* Apply fix `89d01d5f`

* Apply fix `d900f154`

this one was already implemented; updated to use call from previous commit

* Ability changing commit

TODO: change info to debug

* Remove use of deprecated methods/fields

* Temp commit v2
(Adding LoseHP and some fixes)

* Oopsie

* Probably fix monster battle

* Fix issue with reflecting into fields

* Fix some things

* Fix ability names for 3.6 resources

* Improve logging

---------

Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
 2023-05-30 02:40:02 -04:00
Nazrin
9b58105120 Fully fix fairy clock for real this time (#2167) 
* Fully fix fairy clock For real this time

* Make it so relogging keeps the time lock state.

* Refactor out questLockTime

* Per Hartie, the client packet needs to be changed too

* 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

* Remove all code not needed to get clock working

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-05-30 02:39:34 -04:00
github-actions
911993084e Format code [skip actions] 2023-05-30 05:53:50 +00:00
KingRainbow44
ec1a6881ce Fix merge import 2023-05-30 01:34:32 -04:00
KingRainbow44
2b13ea2a82 Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-30 00:58:53 -04:00
KingRainbow44
d6b16f2111 Merge branch 'development' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/data/GameData.java
#	src/main/java/emu/grasscutter/data/excels/monster/MonsterData.java
#	src/main/java/emu/grasscutter/data/excels/monster/MonsterDescribeData.java
#	src/main/java/emu/grasscutter/game/entity/EntityMonster.java
 2023-05-30 00:58:41 -04:00
Nazrin
7b3419b1d2 Implement some lua variables for less console spam (#2172) 
* Implement some lua variables for less console spam

* Add GetHostQuestState

This fixes some chapter 3 stuff.
 2023-05-30 00:57:45 -04:00
github-actions
43a09ace2b Format code [skip actions] 2023-05-29 07:50:43 +00:00
KingRainbow44
be9fc452fa Fix protocol definitions 2023-05-29 03:45:55 -04:00
KingRainbow44
4fd617cebd Remove outdated packet 2023-05-29 03:08:37 -04:00
Moistcrafter
7f4fb20773 Fix boss names in boss bar (#2169) 
* Boss bar fix

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

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

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

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

* Update src/main/java/emu/grasscutter/data/excels/MonsterData.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-05-27 16:23:52 -04:00
KingRainbow44
980905817b Run spotlessApply 2023-05-27 00:40:07 -04:00
KingRainbow44
d0dde9bc2f Update to REL3.7 2023-05-27 00:34:42 -04:00
Magix
71f6198361 Upgrade to REL3.7 (#2164) 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
 2023-05-27 00:29:02 -04:00
KingRainbow44
d1f774892c Fix event calling & canceling 2023-05-26 23:26:49 -04:00
KingRainbow44
d35777d969 Implement fetching a player across servers & Add a chainable JsonObject 
useful for plugins! might be used in grasscutter eventually
 2023-05-26 14:52:22 -04:00
Nazrin
883dcef054 instantiate personalLineList (#2165) 2023-05-25 10:19:21 -04:00
github-actions
a4ef130923 Format code [skip actions] 2023-05-23 23:38:49 +00:00
KingRainbow44
c0ad1bf75b Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-23 19:35:51 -04:00
KingRainbow44
f1baaf5869 Add dumper for world areas 2023-05-23 19:35:05 -04:00
Nazrin
1d884dd05e Don't overdefine variables in extended classes (#2163) 2023-05-23 07:47:15 -07:00
github-actions
6cf9e03ead Format code [skip actions] 2023-05-22 08:26:39 +00:00
KingRainbow44
9f393916e8 Add world areas to the textmap cache 2023-05-22 04:23:57 -04:00
Nazrin
a48bc24aae Remove manual autofinish for main quests. (#2162) 2023-05-22 03:58:47 -04:00
github-actions
4ca172bf42 Format code [skip actions] 2023-05-22 07:47:38 +00:00
KingRainbow44
1de1f42abc Fix event invokes 2023-05-22 03:44:04 -04:00
KingRainbow44
4c0ce8e20e Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-22 03:15:18 -04:00
KingRainbow44
acf56fc432 Optimize event calls 2023-05-22 03:15:05 -04:00
KingRainbow44
d8ad10e22d Add PlayerEnterAreaEvent 2023-05-22 02:57:59 -04:00
KingRainbow44
a190536149 Remove deprecated fields from GetShopRsp 2023-05-21 22:45:47 -04:00
KingRainbow44
49483dd607 Make more fields in excels accessible 2023-05-21 21:32:48 -04:00
KingRainbow44
0cad9a90c0 Enable debug mode for plugin loggers if enabled for the primary logger 2023-05-20 23:13:01 -04:00
github-actions
e05a29ecf1 Format code [skip actions] 2023-05-21 02:02:00 +00:00
KingRainbow44
b88b3717c3 Add initial startup message 
this is so the server appears like its preparing to start
 2023-05-20 21:08:59 -04:00
KingRainbow44
43ab558735 Add EntityCreationEvent 2023-05-20 21:08:35 -04:00
KingRainbow44
1515d62aa6 Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-20 21:05:54 -04:00
KingRainbow44
80dabd08d3 Disable SNI for the HTTPS server 2023-05-20 17:23:11 -04:00
github-actions
6d845e1cc6 Format code [skip actions] 2023-05-20 15:45:17 +00:00
Nazrin
4e8726d29e Partially fix Chasing Shadows (#2159) 
* Partially fix Chasing Shadows

* Go ahead and move it before the return before Magix tells me to.
 2023-05-20 11:42:26 -04:00
github-actions
9b83ea9072 Format code [skip actions] 2023-05-20 08:05:42 +00:00
Nazrin
9eddd87095 fix NPC talk triggering main quest in 46101 (#2158) 
Make it so that only talks where the param matches the talkId are checked.
 2023-05-20 04:03:00 -04:00
github-actions
bbd201c90e Format code [skip actions] 2023-05-20 07:47:53 +00:00
KingRainbow44
d5de603d76 Fix changing target UID when talking to the server 2023-05-20 03:03:13 -04:00
KingRainbow44
cad6e90c90 Revert Multi-threaded resource loading 2023-05-20 02:55:33 -04:00
KingRainbow44
1a6fa43367 Clean up .utils 2023-05-20 02:25:49 -04:00
KingRainbow44
51c5cb5c62 Add defaults to Position 2023-05-19 19:52:55 -04:00
KingRainbow44
858c512f22 Add PlayerChatEvent 2023-05-19 19:49:29 -04:00
KingRainbow44
a2400541b5 Remove legacy documentation from PlayerMoveEvent 2023-05-19 19:38:06 -04:00
KingRainbow44
d89517f58e Add PlayerEnterDungeonEvent 2023-05-19 19:37:53 -04:00
KingRainbow44
c5c2db96f8 Add static methods to register an event handler 2023-05-19 19:32:32 -04:00