KingRainbow44
eda5e8c5e0
Fix #2114 (metaMonster can be null)
2023-04-13 21:47:47 -04:00
KingRainbow44
55a7c0314d
Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests
2023-04-13 21:34:55 -04:00
KingRainbow44
22fd7ab619
Fix potential NPR
2023-04-13 21:22:21 -04:00
dragon
b9a2694ea7
Fix Lua exec call ( #2115 )
...
* Fix Lua exec call
## Description
fix 352 should not have any slime spawns, its 353 and 351 has a single slime spawn
Please carefully read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md ) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md ) before making any pull requests.
## Issues fixed by this PR
<!--- Put the links of issues that may be fixed by this PR here (if any). -->
## Type of changes
<!--- Put an `x` in all the boxes that apply your changes. -->
- [x] Bug fix
- [ ] New feature
- [ ] Enhancement
- [ ] Documentation
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] My pull request is unique and no other pull requests have been opened for these changes
- [x] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md ) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md )
- [x] I am responsible for any copyright issues with my code if it occurs in the future.
* Update ExecNotifyGroupLua.java
* Update ExecNotifyGroupLua.java
* Update ExecNotifyGroupLua.java
* new ScriptArgs(groupId, eventType, quest.getSubQuestId()) .setEventSource(String.valueOf(quest.getSubQuestId()));
2023-04-13 21:21:43 -04:00
KingRainbow44
c71386c69e
Implement quest data field: gainItems
2023-04-13 20:33:31 -04:00
KingRainbow44
29501bcd81
Add flyable status to /prop
2023-04-13 18:06:35 -04:00
KingRainbow44
47cdfe5c14
Handle quest execute which sets the player's flying state
2023-04-13 18:00:25 -04:00
KingRainbow44
64eb6ee325
Add correct player defaults when questing is enabled
2023-04-13 17:55:47 -04:00
KingRainbow44
38ba9771ec
Remove default Anemo skill depot from a Traveler when questing is enabled
2023-04-13 17:53:18 -04:00
KingRainbow44
ecd0ea7a8c
Auto-enable questing in the config
2023-04-13 17:37:32 -04:00
KingRainbow44
d6efaaea86
Call Player#onPlayerBorn when the player is created
2023-04-13 17:34:04 -04:00
KingRainbow44
41be058509
Update documentation to match current state of codebase
2023-04-13 17:21:00 -04:00
KingRainbow44
55b61a93c6
Convert prologue table to a markdown table
2023-04-13 17:02:49 -04:00
KingRainbow44
6819ef6bdc
line separators??
2023-04-13 15:49:38 -04:00
KingRainbow44
349f76b7d8
Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests
2023-04-13 15:47:32 -04:00
dragon
4251b53d75
Fix boss name display. ( #2111 )
2023-04-13 00:59:40 -04:00
KingRainbow44
b42d8b67ed
Fix quest progression when entering a domain
2023-04-12 02:59:44 -04:00
KingRainbow44
60eb62fa42
Spawn the player at the scene's start position when sent to a dungeon
2023-04-12 02:34:13 -04:00
KingRainbow44
0de69cd1fa
Show available story dungeons to the player
2023-04-12 02:01:22 -04:00
KingRainbow44
b0ab0c68ad
Fix hanging on scene creation
...
Invoke `SceneScriptManager#init` in a thread.
2023-04-11 23:11:23 -04:00
KingRainbow44
7bac95098a
Optimize 71a8ca2a
2023-04-11 21:09:52 -04:00
KingRainbow44
97f74d9d55
Move persistant logger calls to trace
2023-04-11 21:07:50 -04:00
KingRainbow44
71a8ca2a8a
Implement scripting: SetEntityServerGlobalValueByConfigId
...
w/ help from: Moistcrafter#9172
2023-04-11 21:07:29 -04:00
KingRainbow44
c1ea2b04ec
Add wiki content from Grasscutter-Quests to documentation
2023-04-11 18:13:35 -04:00
KingRainbow44
68561369f3
Move services loggers to 'debug-all'
2023-04-11 17:58:57 -04:00
KingRainbow44
5851761d59
Enable 'big world scripts' by default
...
this uses significantly more system resources, but in turn allows for the *quest* system to work!
2023-04-11 02:12:33 -04:00
KingRainbow44
76be70d4a8
Fix grid parsing
...
now compatiable with Yukki's resources!
2023-04-11 02:05:38 -04:00
KingRainbow44
990b36cbce
Move scripting-related logger messages to debug
2023-04-11 02:05:12 -04:00
KingRainbow44
54b7d1251e
Fix order of logging scene group loading errors
2023-04-10 23:44:22 -04:00
KingRainbow44
06cbae31fa
Fix player fields not being set
...
line seps r weird
2023-04-10 22:46:19 -04:00
KingRainbow44
5e56b5e3a8
Merge branch 'development' into unstable-quests
...
# Conflicts:
# src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
# src/main/java/emu/grasscutter/game/managers/ResinManager.java
# src/main/java/emu/grasscutter/game/player/Player.java
# src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseAddItem.java
# src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
# src/main/java/emu/grasscutter/server/packet/send/PacketResinChangeNotify.java
# src/main/java/emu/grasscutter/utils/Crypto.java
2023-04-10 22:13:50 -04:00
tamilpp25
3c60f792ca
reject clients on version mismatch ( #2106 )
2023-04-10 20:05:11 -04:00
Moistcrafter
c905d493af
Add co-op lyre support ( #2105 )
2023-04-10 01:43:26 -04:00
Colleiflower
9dbca6dc1b
Remove outdated and grammatically incorrect instructions from PR template ( #2100 )
2023-04-10 00:14:21 -04:00
hamusuke
caf9521013
feat: add ability to buy resin with primogems ( #2104 )
...
* feat: add ability to buy resin with primogems
* ResinManager#buy returns RetCode value
2023-04-09 20:20:12 -04:00
KingRainbow44
e20c7c151b
Lint code
2023-04-09 14:50:59 -04:00
KingRainbow44
bb6569b736
Add language keys for new commands
2023-04-09 14:46:55 -04:00
KingRainbow44
644f1b3ab9
Continue merging quests (pt. 2)
2023-04-09 14:35:45 -04:00
KingRainbow44
97ee71bcf4
Continue merging quests (pt. 1)
...
Finished last at: `World.java`, line `player.setAvatarsAbilityForScene(newScene);`
2023-04-09 13:25:16 -04:00
KingRainbow44
c64cc7d5e2
Merge branch 'development' into unstable-quests
...
# Conflicts:
# src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeRspOuterClass.java
2023-04-05 21:28:52 -04:00
KingRainbow44
c40908c5eb
Format updated protocol classes
2023-04-05 21:27:35 -04:00
Thoronium
ea91bf9eb7
Fix switched fields ( #2098 )
2023-04-05 21:27:24 -04:00
Thoronium
7254f55762
Fix switched fields ( #2098 )
2023-04-05 21:19:04 -04:00
KingRainbow44
a3970f8e43
Format code
2023-04-02 21:34:07 -04:00
KingRainbow44
b03870ab48
Merge branch 'development' into unstable-quests
...
# Conflicts:
# src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
# src/main/java/emu/grasscutter/utils/Utils.java
2023-04-02 21:33:33 -04:00
hamusuke
9181d1cbfd
fix: mail system ( #2096 )
...
* fix: mail
* Simplify the mail handler
---------
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
2023-04-02 21:32:30 -04:00
KingRainbow44
b2c9e8de3e
Merge branch 'unstable' into unstable-quests
2023-04-02 21:31:39 -04:00
KingRainbow44
d77ded560a
Merge branch 'development' into unstable
2023-04-02 21:31:00 -04:00
KingRainbow44
95e1d77b65
Merge branch 'fixmail' into unstable
...
# Conflicts:
# src/main/java/emu/grasscutter/game/mail/Mail.java
# src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
# src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java
# src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
# src/main/java/emu/grasscutter/utils/Utils.java
2023-04-02 21:30:52 -04:00
KingRainbow44
90fb606f68
Simplify the mail handler
2023-04-02 21:23:02 -04:00
