Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 11:26:07 +00:00
Code Issues Projects Releases Wiki Activity
2,370 Commits 7 Branches 22 Tags 133 MiB
3c84d22dc4
Commit Graph

1900 Commits

Author SHA1 Message Date
KingRainbow44
6869008bcc
Add quest debugging commands 2023-04-30 20:53:23 -04:00
KingRainbow44
cf56d032de
Move constant debug spam to trace 2023-04-30 01:28:52 -04:00
KingRainbow44
48dd1685a2
Check current character index 2023-04-30 00:30:03 -04:00
KingRainbow44
9b507a6ec3
Add support for legacy and newer quest excels 2023-04-29 21:35:49 -04:00
KingRainbow44
ed3186a2b2
Fix trial avatar removal 
it is still *sort of* broken when combined with early leaving a domain
 2023-04-29 21:21:58 -04:00
KingRainbow44
b77c75a296
Check if a sub-quest's data exists before invoking it 2023-04-29 20:40:33 -04:00
KingRainbow44
9bbdc11334
Validate EntityAvatar scene before invoking 2023-04-29 20:39:57 -04:00
KingRainbow44
dd2d1dc7e2
Move activity resource loading to debug and warn 2023-04-29 20:38:49 -04:00
KingRainbow44
7a2d5ba11a
Add notes; format; clean-up 2023-04-29 14:07:47 -04:00
KingRainbow44
76251c6718
Fix invalid gadget info for worktops 2023-04-29 14:07:22 -04:00
KingRainbow44
404ff9233a
Fix removing trial avatars 
this prevents exceptions from being thrown. see questing thread for more information.
 2023-04-29 14:05:38 -04:00
KingRainbow44
5f4f220eab
Fix NPEs when player leaves world 2023-04-29 14:04:26 -04:00
KingRainbow44
02653620d4
Implement hack for event source in triggers 2023-04-29 13:01:33 -04:00
KingRainbow44
df1b65b8a8
Check active team size, rather than using a 4 constant 2023-04-29 02:10:14 -04:00
KingRainbow44
5fcfea2b11
Merge remote-tracking branch 'origin/unstable-quests' into unstable-quests 2023-04-29 02:01:20 -04:00
KingRainbow44
391903ac0e
Fix some behavior of trial avatars 
investigation is required on the exceptions thrown
 2023-04-29 02:01:00 -04:00
KingRainbow44
d5f75e1889
Attempt to correct PlayerSetPauseReq 
this is still broken; further investigation is required
 2023-04-29 02:00:13 -04:00
KingRainbow44
7efa6d1b78
Fix potential NPE 
this can occur if the player disconnects before logging in
 2023-04-29 01:59:45 -04:00
KingRainbow44
c2e9bdd261
Fix new account time 2023-04-29 01:59:18 -04:00
scooterboo
be2eef410a
fix /give avatars - currentTalentLevel cannot be negative (#2132) 2023-04-26 23:15:35 -04:00
scooterboo
4109cb0625
Remove garbages from Scene.java (#2131) 2023-04-24 21:00:34 -04:00
KingRainbow44
34c3c6229f
Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
 2023-04-24 21:00:03 -04:00
KingRainbow44
18124bd053
Merge branch 'development' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
 2023-04-24 20:58:14 -04:00
KingRainbow44
52ac9cd75e
Remove obsolete code 2023-04-24 20:56:20 -04:00
Moistcrafter
60e8106b01
use intstream instead of silly list in prop cmd (#2128) 2023-04-24 20:55:08 -04:00
KingRainbow44
3e6b38c407
Catch LuaError when loading scene groups 2023-04-24 03:11:47 -04:00
KingRainbow44
9c77ddc42e
Move cache hit to trace 2023-04-24 03:11:26 -04:00
KingRainbow44
66b0e6f3c6
Fix issue with serialized GridPositions 2023-04-24 03:11:09 -04:00
KingRainbow44
25c72a19e0
Fix main quest data loading issue 2023-04-24 03:10:22 -04:00
KingRainbow44
486582b81c
Revert previous; fix data parsing issue 2023-04-24 02:26:00 -04:00
KingRainbow44
fb686b2afc
Add sub-quest data only in BinOutput 
could fix things sometimes
 2023-04-24 02:01:17 -04:00
KingRainbow44
1a8d7e901a
Apply additional data from specific main quest lines 2023-04-24 01:44:58 -04:00
KingRainbow44
0d680a6310
Fix quest domains not showing up 2023-04-24 00:09:59 -04:00
KingRainbow44
40b23ec4a4
Add new protocol definitions 2023-04-23 23:12:20 -04:00
KingRainbow44
e85d269518
Run spotlessApply on previous commit 2023-04-23 23:12:01 -04:00
KingRainbow44
c9d6225194
Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests) 2023-04-23 22:51:08 -04:00
KingRainbow44
375bb77abe
Attempt to keep parity with Grasscutter-Quests & Fix add trial avatar issue 2023-04-20 00:58:23 -04:00
KingRainbow44
ae45177ed5
Fixing the starting world time 
the proper start time should be 9 game hours
 2023-04-20 00:40:13 -04:00
KingRainbow44
84c5a76e5d
Fix quests always showing dungeon IDs 2023-04-20 00:26:35 -04:00
KingRainbow44
a53328346a
Fix avatar trial status being saved to the database 2023-04-20 00:22:29 -04:00
KingRainbow44
de19116191
Check for custom server resources 2023-04-18 17:43:10 -04:00
KingRainbow44
ee298235c2
Run spotlessApply 2023-04-18 17:17:55 -04:00
KingRainbow44
75f163f704
Fix avatar type values 2023-04-18 16:01:29 -04:00
KingRainbow44
de0217f435
Send avatar type to client 
also switch to lambda reference
 2023-04-18 15:56:19 -04:00
KingRainbow44
361620de6d
Merge branch 'development' into unstable-quests 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
 2023-04-18 15:36:29 -04:00
KingRainbow44
c11b8a53a3
Merge branch 'development' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
 2023-04-18 15:32:50 -04:00
FlourishingWorld
8c6b166a42
fix co-op mode avatar animation interrupt (#2124) 2023-04-18 15:19:34 -04:00
dragon
0dd41f9350
implement getCachePath (#2121) 
* implement getCachePath

for further use like grids cache.

* Update src/main/java/emu/grasscutter/utils/FileUtils.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-04-18 15:19:29 -04:00
Moistcrafter
abcabc9861
Parse dungeon entry info req from payload instead of player scene (#2122) 2023-04-17 01:08:08 -04:00
KingRainbow44
6989d49080
Remove the first area from being auto-unlocked when questing is enabled 2023-04-15 13:33:30 -04:00
KingRainbow44
c672a2d9cb
Move gadget controller loaded message to debug 2023-04-15 13:17:09 -04:00
KingRainbow44
d8f90b26cf
Fix entity controllers not loading 
elemental monuments should now work
 2023-04-15 01:41:19 -04:00
KingRainbow44
2b4feba86f
Fix issue with Amber not being added 
the field for an item's `useOnGain` was final!
 2023-04-15 01:23:32 -04:00
KingRainbow44
f2019aa88a
Fix drop system error 2023-04-15 00:50:03 -04:00
KingRainbow44
f08ba95071
Remove forEach on group replacements 2023-04-14 23:56:42 -04:00
KingRainbow44
55118c802d
Load custom server resources 2023-04-14 23:27:08 -04:00
KingRainbow44
a8a78547a1
Fix level entity data loading 2023-04-14 22:59:57 -04:00
KingRainbow44
6b492656a1
Set dungeon manager when entering a dungeon 2023-04-14 22:44:59 -04:00
KingRainbow44
e93175621b
Use the player's selected main character when setOwner is called 2023-04-14 22:01:09 -04:00
KingRainbow44
7bdcf4e0d2
Merge packet handlers from quests/quests 2023-04-14 21:59:15 -04:00
KingRainbow44
c08633aa46
Fix issue with trial teams 2023-04-14 02:37:15 -04:00
KingRainbow44
ae56b33265
Fix avatar skill behavior when changing elements 2023-04-14 01:54:43 -04:00
KingRainbow44
3224bbeb4f
Fix setOrFetch on 0 values 2023-04-14 01:02:11 -04:00
KingRainbow44
2a5c7bf75c
Temporarily fix issue with all quests being added at once 2023-04-14 00:35:16 -04:00
KingRainbow44
6c1cff38b4
Fix default Traveler 2023-04-14 00:31:46 -04:00
KingRainbow44
8687e60b92
Merge branch 'development' into unstable 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
 2023-04-13 22:45:15 -04:00
KingRainbow44
af01282594
Add data for new drop system 2023-04-13 22:44:50 -04:00
dragon
f71b29c00a
Implement a new item drops system (#2112) 
* 1

* Delete .gitattributes

* implement

* Update PacketDropHintNotify.java

* Update PacketWorldChestOpenNotify.java

* Update FileUtils.java

* Update PacketDropHintNotify.java

* Update WorldDataSystem.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-04-13 22:28:54 -04:00
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
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
68561369f3
Move services loggers to 'debug-all' 2023-04-11 17:58:57 -04:00
ghjbvvgh
d1686bd4db
Fix fields (#2102) 2023-04-11 16:55:22 -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
92afa64629
Merge remote-tracking branch 'origin/unstable' into unstable 2023-04-10 22:23: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
KingRainbow44
559261963d
Merge branch 'development' into unstable 
# Conflicts:
#	src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
#	src/main/java/emu/grasscutter/utils/Crypto.java
 2023-04-10 22:11:51 -04:00
github-actions
3d87ba7f09 Lint Code [skip actions] 2023-04-11 02:08:02 +00:00
KingRainbow44
a96506ccf9
Merge remote-tracking branch 'origin/unstable' into unstable 2023-04-10 22:07:19 -04:00
KingRainbow44
ff2e74de68
Implement give item (frontend) 2023-04-10 22:05:06 -04:00
KingRainbow44
1661c42def
Implement give item & Implement configurable handbook endpoints 2023-04-10 22:04:47 -04:00
KingRainbow44
eff01b6cea
Move illegal/invalid item IDs to GameConstants 2023-04-10 22:03:27 -04:00
tamilpp25
3c60f792ca
reject clients on version mismatch (#2106) 2023-04-10 20:05:11 -04:00
github-actions
afce31e53b Lint Code [skip actions] 2023-04-10 07:24:16 +00:00
KingRainbow44
8cc725e45c
Implement handbook SDK for commands (avatars) 2023-04-10 03:23:07 -04:00
KingRainbow44
2bd992592d
Implement server API for handbook controls (avatar) 2023-04-10 03:22:48 -04:00
KingRainbow44
62fd82fa54
Add packet for WindSeedClientNotify 
still a blacklisted packet however
 2023-04-10 02:15:08 -04:00
KingRainbow44
c66b920068
Merge remote-tracking branch 'origin/unstable' into unstable 2023-04-10 01:50:55 -04:00
KingRainbow44
7ad6c892ce
Merge branch 'development' into unstable 
# 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/packet/send/PacketResinChangeNotify.java
 2023-04-10 01:49:12 -04:00
github-actions
d348146928 Lint Code [skip actions] 2023-04-10 05:44:09 +00:00
Moistcrafter
c905d493af
Add co-op lyre support (#2105) 2023-04-10 01:43:26 -04:00
KingRainbow44
18c143e12f
Fix base route navigation 2023-04-10 01:16:53 -04:00
github-actions
5ac93645e4 Lint Code [skip actions] 2023-04-10 05:06:53 +00:00
KingRainbow44
65532ffd90
Merge remote-tracking branch 'origin/unstable' into unstable 
# Conflicts:
#	src/handbook/src/backend/types.ts
#	src/handbook/src/ui/pages/ItemsPage.tsx
#	src/handbook/src/ui/widgets/MiniCard.tsx
 2023-04-10 01:06:06 -04:00
KingRainbow44
5d90dd2827
Add a dumper for entity info 2023-04-10 00:59:31 -04:00
KingRainbow44
16875e85ac
Implement the entities page 2023-04-10 00:59:01 -04:00
github-actions
1239bc05b2 Lint Code [skip actions] 2023-04-10 00:59:40 +00:00
KingRainbow44
127d45f21f
Implement the scenes page 2023-04-09 20:58:03 -04:00
KingRainbow44
e5efe00285
Parse scene info 2023-04-09 20:38:19 -04:00
KingRainbow44
a8289b782f
Add a dumper for scene info 2023-04-09 20:34:04 -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
faadffda21
Fix homepage disclaimer 2023-04-09 19:45:29 -04:00
KingRainbow44
efcf124003
Fix descriptions on cards 2023-04-09 19:27:42 -04:00
KingRainbow44
d4936abb37
Remove testing/CN items from the item dump 2023-04-09 18:51:54 -04:00
KingRainbow44
3557981b4a
Add 'Add to Inventory' item card widget 2023-04-09 18:50:32 -04:00
KingRainbow44
bc3310ae29
Add card for item information 2023-04-09 17:47:56 -04:00
KingRainbow44
219d9f28e1
Add spot to input game UID 2023-04-09 17:46:29 -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
4231b26eea
Fix route -> page binding 2023-04-08 23:52:54 -04:00
KingRainbow44
8f74168a23
Fix issue with default 1080p 100% scaling 
we need an autoscaler!
 2023-04-08 23:50:55 -04:00
github-actions
25d38344b0 Lint Code [skip actions] 2023-04-09 03:48:05 +00:00
KingRainbow44
f483fb6ea8
Remove duplicate item entries 
This filters items by name and ID.
 2023-04-08 23:46:54 -04:00
KingRainbow44
32f11e29b1
Load items faster 2023-04-08 23:35:20 -04:00
KingRainbow44
6c2f66fa2d
Fix item icons to be more accurate 
Project Amber is now the primary icon source!
 2023-04-08 21:58:46 -04:00
KingRainbow44
2a5abc1dcb
Add icons to item data 2023-04-08 21:56:51 -04:00
KingRainbow44
a27f7e0373
Implement part of the items page 2023-04-08 01:19:35 -04:00
KingRainbow44
b2f15066be
Add more TypeScript aliases 2023-04-08 00:18:21 -04:00
KingRainbow44
181eb56471
Sort item data 2023-04-08 00:18:06 -04:00
KingRainbow44
74cff61824
Add "react-virtualized" 
automatically patch it to remove unnecessary import
 2023-04-08 00:17:23 -04:00
github-actions
b683f75cfa Lint Code [skip actions] 2023-04-07 04:17:07 +00:00
KingRainbow44
155e5be8a7
Create basic items page 2023-04-07 00:09:29 -04:00
KingRainbow44
f594e8918b
Center avatar labels 2023-04-06 23:59:45 -04:00
KingRainbow44
757d682cd6
Implement avatars/characters page 
Handle edge-cases for avatar image rendering
 2023-04-06 23:54:15 -04:00
KingRainbow44
1f27f83616
Merge remote-tracking branch 'origin/unstable' into unstable 2023-04-06 22:34:25 -04:00
KingRainbow44
0a26de7136
Fix linting script 
(forgot that actions are in `src/handbook` already)
 2023-04-06 22:34:19 -04:00
KingRainbow44
845c7cb457
Implement the commands page 
additionally, clean-up imports
 2023-04-06 22:31:13 -04:00
KingRainbow44
db8aa3f6f1
Add override for the scrollbar 2023-04-06 22:30:49 -04:00
KingRainbow44
ce27b005f8
Add function for getting a list of commands 2023-04-06 22:30:34 -04:00
KingRainbow44
44b90612f2
Fix data parsing with CSVs 2023-04-06 18:55:10 -04:00
KingRainbow44
5fe304d2e8
Change avatar data to a CSV file 2023-04-06 18:45:47 -04:00
KingRainbow44
bb20d0fd80
Add linter script 
Fix issue with running `cd src/handbook` while in the handbook directory for building
 2023-04-06 18:42:38 -04:00
Magix
4664a21fab Parse data into types 2023-04-06 22:13:17 +00:00
Magix
a12bcef065 Go home when title is clicked 2023-04-06 22:03:16 +00:00
KingRainbow44
12898f6228
Implement loading dumped data for the handbook 2023-04-06 04:54:10 -04:00
KingRainbow44
7c4186f5df
Create initial handbook data dumpers 
these can be accessed by using `-dump=commands,en-us` or `-dump=avatars/items,EN` (all languages supported)
 2023-04-05 22:43:19 -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
KingRainbow44
ac7b4d1238
Format updated protocol classes 2023-04-05 21:25:44 -04:00
KingRainbow44
4345a0dffa
Merge branch 'development' into unstable 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeRspOuterClass.java
 2023-04-05 21:21:18 -04:00
KingRainbow44
6e3e770f79
Add basis of commands page 2023-04-05 21:20:48 -04:00
Thoronium
7254f55762
Fix switched fields (#2098) 2023-04-05 21:19:04 -04:00
KingRainbow44
c86d538597
Add character widget 2023-04-04 23:42:35 -04:00
KingRainbow44
b17f97def6
Fix initial issues with navigation system 2023-04-04 22:44:17 -04:00
KingRainbow44
e0b1f275dd
Implement navigation and the page system 2023-04-04 22:30:49 -04:00
KingRainbow44
30c8d01c9e
Implement handbook sidebar 
only works on desktops atm, mobile support is non-existant
 2023-04-04 21:42:24 -04:00
KingRainbow44
1d03100dcc
Add building for handbook 
also implement linting, ci for handbook, and change `.editorconfig` to do 2-line for .yml
 2023-04-04 21:41:06 -04:00
KingRainbow44
a4c3f90388
Add credits section to home page 2023-04-04 20:33:41 -04:00
KingRainbow44
b78f7f393e
Add more home buttons & Add content disclaimer 
i added a place to add credits; will do next probs
 2023-04-04 19:36:32 -04:00
KingRainbow44
8f468ed0c9
Add basis of the content panel 
- Home buttons
- Implement sidebar
- Add home title
 2023-04-03 23:39:45 -04:00
KingRainbow44
9bb87ff60d
Scaffold class-based React + Tailwind project 
now configured with TypeScript aliases!
 2023-04-03 22:33:53 -04:00
KingRainbow44
c0c60b5e4e
Scaffold vite-react project 2023-04-03 22:23:03 -04:00
KingRainbow44
a3970f8e43
Format code 2023-04-02 21:34:07 -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
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
KingRainbow44
8b4471ee54
Check if the scene has a config 2023-04-02 20:42:12 -04:00
ハムスケ ハム
ddafeb9ed3 fix: mail 2023-04-03 00:18:48 +09:00
KingRainbow44
9fbb7fb3be
Continue updating/refactoring classes 
Most code is matched from `Grasscutter-Quests`.
 2023-04-01 22:17:10 -04:00
KingRainbow44
772532515e
Comment-out unknown packet handlers/encoders 
These are mostly related to the teapot, music game, and custom teams
 2023-04-01 20:00:08 -04:00
KingRainbow44
3e6aa79eb8
Add additional protocol classes 
Using `gc-quest-fix`
 2023-04-01 19:54:11 -04:00
KingRainbow44
29956421f0
Fix existing protocol classes 
Using `gc-quest-fix`
 2023-04-01 19:53:46 -04:00
KingRainbow44
daa51e53b7
Copy some files from Grasscutter-Quests 
NOT completely finished, nor is it completely done. Protocol issues remain! (including lack of packet IDs)
 2023-04-01 18:06:30 -04:00
KingRainbow44
262ee38ded
Create files from Grasscutter-Quests 
these files are NOT directly compatible with Grasscutter, and require additional modifications to the codebase to work.
 2023-03-31 23:58:12 -04:00
KingRainbow44
e636fda14f
Run Spotless on src/test 2023-03-31 22:34:19 -04:00
KingRainbow44
6d9a81ba1c
Run Spotless on src/generated 2023-03-31 22:32:25 -04:00
KingRainbow44
fc05602128
Run Spotless on src/main 2023-03-31 22:30:45 -04:00
KingRainbow44
877937bfbb
Create a basic test for Grasscutter's HTTP server 2023-03-31 22:15:28 -04:00
KingRainbow44
bbe51fb945
Add support for unit testing 
- Add argument `-testing`, which allows for a threaded console
 2023-03-31 22:13:58 -04:00
KingRainbow44
15e2f3ca34
Run IntelliJ IDEA code formatter 2023-03-31 17:19:26 -04:00
Colleiflower
516e5975e1
Add support for v3.5.0 (#2090) 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
 2023-03-31 15:13:32 -04:00
yzr
cf4cd80010
Fix delombok package not exists error with proto generated files (#2083) 
Fix javadoc & suppress no comments warning
Fix terminal interaction in IDEA
Update lombok onMethod to JDK8 version
Some code reformat
 2023-03-31 02:16:32 -04:00
Xotak
5f011b477b
Update fr-FR.json (#2084) 2023-03-26 20:10:59 -04:00
TotallyNotOndre
8d09b8833c
Update ru-RU.json (#2081) 2023-03-12 21:10:01 -04:00
rwx9032
fdaa487b2a
Add support for the Chinese client (#2076) 
* Add CNREL support

* Improve logic

* Maintain spacing

* Remove language keys & switch to debug

* Improve Format
 2023-03-12 00:51:21 -05:00
hamusuke
3ab3d5bc04
Simply implement achievement system and add achievement command (#2068) 
* Implement achievement system

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

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

* fix: redundant codes

* fix: redundant codes

* Update language files

---------

Co-authored-by: Der Chien <b03902015@ntu.edu.tw>
 2023-02-26 00:14:27 -05:00
hamusuke
51479e2abd
fix: incorrect Japanese word order (#2072) 2023-02-26 00:11:26 -05:00
Thoronium
b209d91947
Add home resource gain (#2064) 2023-02-23 23:22:25 -05:00
hamusuke
220c23b960
feat: change game time (#2061) 
* feat: change game time

* Update proto names
 2023-02-23 23:21:44 -05:00
Thoronium
a078b5ae28
Fix particle generation (#2066) 2023-02-23 23:20:57 -05:00
Thoronium
9a67f93ee8
Update missed files (#2060) 2023-02-20 13:46:32 -05:00
yeyeye
71a1e31d37
update gc 3.4 (#2041) 
* update 3.4

* update3.4

* update 3.4

* update 3.4

* Add files via upload

* Delete SetPropCommand.java

* update 3.4 area id

* update version

* exchange cmdid

* exchange cmdid

* exchange cmdid

* my fault

* update AiSyncInfo
 2023-02-18 22:18:27 -05:00
ERthereal
39b4aa1387
Fix in-game display text (#2049) 2023-02-15 19:33:32 -05:00
Thoronium
1b2210f5a7
Improved satiation (#2055) 
* Natural satiation decreasing
Graphic showing satiation when eating (usually)

* Reworking values to match original

* Little fixes

* Satiation bar matches real values
Revival correctly updates bar

* Greatly simplify handling
Some fixes

* Inline variables
Add TODO for bug

* Satiation works correctly
Finally it all works as intended

* Remove unnecessary packets

* Improve satiation reduction handling
 2023-02-15 19:32:59 -05:00
Thoronium
b4b8f1ec38
Fix climb jump stamina (#2056) 
* Fix climb jump stamina

* Update StaminaManager.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-02-15 19:32:11 -05:00
Thoronium
d1c7ced0ef
Fix load order (#2057) 2023-02-15 19:31:33 -05:00
Lemon_miaow
11351d9866
Fixed only the issue about "BOOLEAN" occurring when importing resources. (#2028) 
* Only Fix 'Exception in thread 'main' com.google.gson.JsonSyntaxException: java.io.IOException: Invalid DynamicFloat definition - BOOLEAN' problem.

* Update ResourceLoader.java

* Modify code indentation and optimization.

* Update JsonUtils.java

* Update JsonUtils.java

* Update DynamicFloat.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-02-15 19:31:09 -05:00
Thoronium
1a50cccb38
Fix goal (#2052) 2023-02-09 17:12:01 +01:00
ZanyRain
3b29ba032e
Some fix about scene script and quest (#2029) 
* [ScriptLib] Query player when not get entity from scene

* Fix NPE when doing quests

* Add QUEST_CONTENT_SKILL trigger

Q353 need it

* Add some missing fields that contain in scene scripts

* Add a lua table serializer implement with jackson

This do not replace the original one,it is useful when debug

* Fix point_array type error

* feat: fix space
 2023-02-09 17:10:07 +01:00
Thoronium
ab5b49b7c5
Teapot Implementations & Fixes (#2032) 
* Add realm switching
Fix realm unlock items

* Implement exiting teapot

* Implement home level rewards

* Fix small issues

* Fix call issue

* Add 'seen unlock' packets

* Fix Sumeru Main House bricking accounts
This is only for the house, not the full realm

* Fixed realm 5

Main house needs to be placed manually for Sumeru realm (module 5) as the resources for defaults in Sumeru realm are missing. Sumeru main house cannot be exited from the door, issue due to the same missing res.

* Fix Grass main house bricking accounts

* Remove references

* Formatting change (web editor)

* Whitespace & Formatting

* Whitespace

* Make 'seen' status persistent

* Fix misnamed field

* Revert "Fix misnamed field"

This reverts commit 21ef404e14.

* Implement gaining trust (realm exp)

Add gaining trust by crafting
Add gaining trust via `/give`
Show trust in djinn menu

* Interior check for prevScene

* Correct positions & rotations

Return to front of main house when exiting from inside

* Update HandlerBackMyWorldReq.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
 2023-02-09 17:00:16 +01:00
Thoronium
0fc578a243
Fix Cooking Compound Retrieval (#2039) 
* Fix misnamed field

* Fix getter name
 2023-02-02 14:48:42 +01:00
ghjbvvgh
8a5a6ab83e
Unlock hidden points (#2016) 2023-01-11 00:28:00 +01:00
KingRainbow44
668461a6f1
Clean-Up Startup Sequence 
hey i like it clean ok.. dont judge..
 2022-12-30 20:31:27 -05:00
ZanyRain
fe80290bed
Output the handbook based off the client language (#1993) 2022-12-26 20:09:21 +01:00
Simplxs
92fbaa8670
Update gc to 3.3 (#1981) 
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
 2022-12-23 22:12:02 +01:00
유여름
8b83dbf58c
Update Korean translation (#1977) 
* updated ko-KR.json

Update Korean translation

* Update ko-KR.json
 2022-12-11 01:22:34 +10:30
Tesutarin
e73984bd41
Update CHS translation (#1965) 2022-12-02 10:25:15 +10:30
AnimeGitB
553e22ead8 Add more explicit NoSuchFileException message for excels 2022-11-28 21:04:39 +10:30
AnimeGitB
5878cb6f8d Accidentally left recent banner on test string 2022-11-26 16:50:56 +10:30
AnimeGitB
100d08ec5d Fix up pity tallies for new BannerTypes 
Also fixes Beginner banner using Standard pity.
 2022-11-26 02:03:11 +10:30
AnimeGitB
83b84408a1 Bake banner defaults into BannerType enum, and add every historic banner 2022-11-25 23:25:22 +10:30
AnimeGitB
da3981089d Add Position JsonAdapter for [x,y,z] format 
Also add serializers for existing JsonAdapters
 2022-11-25 00:29:26 +10:30
AnimeGitB
ad502a8568 Finally enforce deprecation of ancient Banners.json fields 
Also add costItemId10 column so people know it exists, and removeC6FromPool column because it's a cool setting nobody knows about.
 2022-11-24 23:56:13 +10:30
AnimeGitB
f6c84fdfbf Forgot about a 5star character that was added to the standard pool 2022-11-24 23:17:10 +10:30
AnimeGitB
1c4d263dd2 Add Data TSJ loading, replace and update Banners 2022-11-24 23:09:55 +10:30
AnimeGitB
35962542af Fix oversight on EnumTypeAdapterFactory 2022-11-24 01:36:58 +10:30
Luke H-W
0b5329514b
TSJ and TSV parsing (#1962) 
* Deserialization support for tsv files

* Benchmarking

* Apparently moving the setter out of the lambda fixed the setAccessible issue

* Thread it

* Use AllArgsConstructor instead of field reflection

* Clean up AllArgsConstructor TSV deserialization

* Refactor TsvUtils

* Remove AllArgsConstructors from Excels

* Set field accessible

* [WIP] TSJ improvements

* [WIP] More TSV stuff

* [WIP] More TSV stuff

* Working TSV parser (slow)

* Load Excels in TSJ > JSON > TSV priority
 2022-11-24 00:18:57 +10:30
Xotak
46b0c7cf93
Work on French localization (#1958) 
* Work on French localization

* Apply suggestions from code review
 2022-11-22 20:48:39 +10:30
Sinon
1e932ce144
added IT redeirect on all ReadME and typo fix (#1954) 
* Added it-IT translaton

* added Italian readme

* readme redirect

add "it-IT" redirect on all readme

* added "it-IT" redirect on README.md

* Add files via upload

* added it to jp readme

* fix

* fix whitspasces

(vscode)
 2022-11-20 22:45:43 +10:30
Xiaorunyu2541
b1a9ed0226
Update DeforestationManager.java (#1955) 
* Update DeforestationManager.java

* Update src/main/java/emu/grasscutter/game/managers/deforestation/DeforestationManager.java
 2022-11-20 18:25:36 +10:30
Sinon
676ed32a12
Added it-IT translaton (#1946) 
* Added it-IT translaton

* added Italian readme
 2022-11-14 11:19:35 +10:30
Jeez
05fe62b49a
[FIX] Language es-ES (spanish) (#1941) 2022-11-08 14:54:15 +10:30
github-actions
e2b59fbd8d Update languages [skip actions] 2022-11-05 12:49:35 +00:00
github-actions
84bf783243 Fix whitespace [skip actions] 2022-11-05 12:49:35 +00:00
AnimeGitB
4d8caf5a8c Refactor Entity data 2022-11-05 23:18:33 +10:30
AnimeGitB
a30f16b0e1 Clean up excels 2022-11-05 23:12:03 +10:30
AnimeGitB
65915b7666 Make PlayerBuffManager::removeBuff actually remove buff 2022-11-05 17:26:20 +10:30
AnimeGitB
1ceda2a455 Remove LinkedList usage 
https://twitter.com/joshbloch/status/583813919019573248
 2022-11-05 17:04:15 +10:30
AnimeGitB
09f392bb5b Add FIGHT_PROP_CUR_DEFENSE alias to setstats (closes #1929) 2022-11-05 15:36:52 +10:30
AnimeGitB
dc7b8d8ca6 Add warnings to ancient deprecated Banners.json fields 
Will probably turn these into runtime errors in 1.5.0, people need to stop sharing configs with dead fields and especially stop making PRs with them.
 2022-11-05 14:22:17 +10:30
AnimeGitB
9f00ea3573 3.2 First Half Banners 
(closes #1932)
 2022-11-05 13:56:27 +10:30
AnimeGitB
12316b36b1 Reimplement namecard claiming (fixes #1882) 2022-11-04 15:05:51 +10:30
AnimeGitB
0fb7d50acd Kill console on IOError 2022-11-04 13:55:39 +10:30
AnimeGitB
c926fe326c Refactor command kwarg parsing 2022-11-04 13:55:39 +10:30