Commit Graph

1900 Commits

Author SHA1 Message Date
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
hamusuke
e8930e92e1
Update roomSceneId obfuscated names (#1926) 2022-11-02 18:03:41 +10:30
lilmayofuksu
4ed0b90c27
Add the new keys (3.2 Support) (#1923)
* Add the new keys

* Some improvements to the key loading system & Bump the game version
2022-11-01 23:28:04 +01:00
jie65535
47911aa16e
Fix Mail SendToAll Freeze (#1913)
* Avoid iterating over every offline player

* getAllPlayers by stream

* Use the new method without changing the old signature

* Annotate deprecated `getAllPlayers`
2022-10-30 20:03:30 +10:30
AnimeGitB
855d3182ab Remove deprecated constructor call 2022-10-30 00:40:00 +10:30
BiosNod
43b7d7a383
Debug system (#1894)
* Add build (compile) script: gradlew jar

* Move server and services log levels to ConfigContainer, ability to enable/disable show packet payload and loop packets

* Add some loop packets to known list
2022-10-29 23:31:28 +10:30
sandtechnology
55928d9154
[Security][Bugfix] Fix directory traversal exploit (#1907)
* [Security][Bugfix] Fix directory traversal exploit

1.The first slash will act as root path when resolving local path, so directory traversal is possible
2.Filter the illegal payload to prevent directory traversal
3.This also fix the bug about not loading the files in data folder when querying  `/hk4e/announcement/`

* Fix formatting

* Update src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
2022-10-29 23:19:46 +10:30
RBNXI
6219902e0f
Updated spanish translations (#1911) 2022-10-29 23:06:44 +10:30
AnimeGitB
d7af52f94b Don't override en-us gacha strings with vietnamese 2022-10-29 00:11:44 +10:30
AnimeGitB
c21d216d8d Fix gacha history internal server error 2022-10-29 00:05:29 +10:30
AnimeGitB
f07ce48b24 Remove compilation warning on Language.java 2022-10-28 22:13:13 +10:30
github-actions
a9148e1b66 Update languages [skip actions] 2022-10-26 12:31:30 +00:00
github-actions
d99a50b80f Fix whitespace [skip actions] 2022-10-26 12:31:30 +00:00
AnimeGitB
18360a6231 Remove references to old repo 2022-10-26 12:08:51 +10:30
AnimeGitB
a2c4895c16 Make Player lazyload correct Account (should fix #1900) 2022-10-25 18:31:55 +10:30
AnimeGitB
a5579368bb Lombokify Grasscutter.java some more 2022-10-25 15:49:14 +10:30
TotalyNotOndre
ae51f4c046
Update ru-RU.json (#1895) 2022-10-25 10:54:22 +10:30
natsu
5b6698f583
Extend setConstCommand "all" (#1884)
* Extend give command "talent"

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

Shorten IntStream for getCombatSkills

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Fix setSkillLevel to work during avatar construction
Shortening getCombatSkills

* changeSkillLevel now acts as intermediate operation to fetch skillIds

* setSkillLevel changes to allow out of range levels to be normalized

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

Removing recalcStats since it's redundant

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Major changes and cleanup:
- AvatarSkillDepotData: removed getCombatSkills since it's unused
- TalentCommand: shortened /talent all using getSkillsAndEnergySkill
- GiveCommand: changed changeSkillLevel to setSkillLevel
- Avatar: delete changeSkillLevel and moved the operation inside setSkillLevel,updated skillId to Integer to catch special cases from GiveCommand

* Small cleanup:
Removed the special case from Avatar to be handled inside of GiveCommand

* Added "all" parameter to SetConst

* Changed all to [all] int SetConstCommand usage

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
2022-10-24 14:28:39 +10:30
TotalyNotOndre
496cd671da
add Quest command alias (#1891) 2022-10-24 12:32:35 +10:30
Fish and Chip
fd6ed2f15f
Added zh-CN translaton for non-translated strings (#1890)
Added zh-CN translation for non-translated strings
2022-10-24 10:34:51 +10:30
Penelopeep
ceed05cd15
Updated Polish Translation (#1889) 2022-10-24 10:33:15 +10:30
AnimeGitB
7d1a7b501b Added "s" alias to SpawnCommand (closes #1840) 2022-10-24 10:32:10 +10:30
hamusuke
8b520b3883
fix: unlocking home bgm doesn't work. (#1886)
* fix: unlocking home bgm doesn't work.

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
2022-10-23 15:08:17 +10:30
AnimeGitB
54ad108a14 Fix edge case on FileUtils::getFilenameWithoutPath 2022-10-22 17:15:43 +10:30
jacky14
ccf182d692
Medicine revival&Login white screen (#1883)
* Update InventorySystem.java

-:[fix] Medicine revival

* Update GameMainQuest.java

-:[fix] Login white screen
2022-10-22 16:51:33 +10:30
AnimeGitB
c51f7610b2 Save avatar in forceConstellationLevel (closes #1881) 2022-10-22 12:45:27 +10:30
iTruth
c331a7f288
Fix IllegalStateException when execute toMap (#1879) 2022-10-21 21:49:48 +10:30
iTruth
be8fbcbc02
Fix StackOverFlow when execute /give all (#1878)
* Fix StackOverFlow when execute /give all

* Use more proper code
2022-10-20 20:22:10 +10:30
github-actions
96da4b6117 Fix whitespace [skip actions] 2022-10-18 14:56:26 +00:00
Luke H-W
026ef9c51b
Restore ability to run without jar (#1875)
* Change JAR_FILE_SYSTEM to allow running from IDE without jar

* Just grab /defaults/data

* Restore FileUtils.getPathsFromResource
2022-10-19 01:26:11 +10:30
AnimeGitB
577772831c Avoid NPE on CookingCompoundManager init 2022-10-18 19:47:21 +10:30
natsu
2b08738043
Extend give command "skill level" & shortening /talent all (#1865)
* Extend give command "talent"

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

Shorten IntStream for getCombatSkills

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Fix setSkillLevel to work during avatar construction
Shortening getCombatSkills

* changeSkillLevel now acts as intermediate operation to fetch skillIds

* setSkillLevel changes to allow out of range levels to be normalized

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

Removing recalcStats since it's redundant

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Major changes and cleanup:
- AvatarSkillDepotData: removed getCombatSkills since it's unused
- TalentCommand: shortened /talent all using getSkillsAndEnergySkill
- GiveCommand: changed changeSkillLevel to setSkillLevel
- Avatar: delete changeSkillLevel and moved the operation inside setSkillLevel,updated skillId to Integer to catch special cases from GiveCommand

* Small cleanup:
Removed the special case from Avatar to be handled inside of GiveCommand

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
2022-10-18 19:45:24 +10:30
AnimeGitB
b5940da36b Remove stale item handling code 2022-10-18 17:57:49 +10:30
AnimeGitB
aacf013c06 Fix gacha avatars (fixes #1870) 2022-10-18 15:11:33 +10:30
AnimeGitB
85f44ebdf3 Refactor out some EntrySets 2022-10-17 20:47:52 +10:30
dragon
b5f356ce4f
send CompoundDataNotify on Login;fix spelling mistakes. (#1869) 2022-10-17 20:44:06 +10:30
AnimeGitB
84d02370df Change logging level on item use from info to debug 2022-10-17 19:21:14 +10:30
dragon
cf67c44f22
feat:cooking food ingredient(aka:compound) implementation (#1858)
* feat:cooking food ingredient(aka:compound) implementation

Implement food ingredient(compound) feature.Need a thorough test and still has some work to do.

* small bug fix;implement fish processing

* Update src/main/java/emu/grasscutter/server/packet/send/PacketItemAddHintNotify.java

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Update Inventory.java

* Update Inventory.java

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
2022-10-17 19:18:05 +10:30
AnimeGitB
1ecc3f4390 Remove constellation charge and talent level bonuses from db 2022-10-17 16:13:28 +10:30
AnimeGitB
cbd66a7437 Fix ambiguous command regexes 2022-10-17 13:53:53 +10:30
hamusuke
01e37cce39
feat: set emoji collection in chat screen (#1864) 2022-10-16 22:23:00 +10:30
hamusuke
610a364b9a
feat: set friend enter home option (#1860) 2022-10-15 11:58:45 -04:00
lilmayofuksu
a4747abfc9
Add a dictionary for Encryption public keys (#1862) 2022-10-16 00:36:37 +10:30
AnimeGitB
f3a5bc16a8 Refactor handbook generation to not use naked textmap getter 2022-10-15 23:58:33 +10:30
AnimeGitB
4a5a7bd6bd Accept resource enums of form "1" 2022-10-15 22:18:54 +10:30
TotalyNotOndre
130a01faa4
Update ru-RU.json (#1855) 2022-10-14 03:08:05 +10:30
github-actions
025e5d3c1c Fix whitespace [skip actions] 2022-10-13 13:32:10 +00:00
AnimeGitB
d1d39db56c [BREAKING] Item Usage Overhaul
-De-hardcode elemental orb values
-De-hardcode exp items
-Change ShopChest format (temporary, drop system overhaul will replace it entirely)
-Food healing actually uses Ability data for real HP amounts
2022-10-14 00:00:40 +10:30
atArtyom
5bb43ac074
Updated MAX_FRIENDS (#1852) 2022-10-13 18:32:58 +10:30
AnimeGitB
4e75361ad4 Refactor GameData, remove deprecated getGsonFactory
- Fix day-of-week dungeons
- AvatarSkill max level enforcement from excels
- Partial fix to bonus levels (need packet on talent update)
2022-10-13 18:31:34 +10:30
AnimeGitB
bb342f9114 Lombokify and sort GameData 2022-10-13 14:58:49 +10:30
natsu
953272489d
Extend talent command "all" (#1850)
* Extend talent command "all":
Added talent option to set all talents (n, e, q) at once
Modified error message to cover edge cases when player entered talent level lower than 1

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

some suggested changes

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
2022-10-13 12:46:59 +10:30
hamusuke
ec3cdc040f
fix: Solar Isotoma Elevator doesn't work in multiplayer mode (#1848) 2022-10-12 22:14:25 +10:30
hamusuke
ef55e5515c
fix: ConcurrentModificationError by removing gadget (#1849) 2022-10-12 22:07:53 +10:30
AnimeGitB
558471237a Add DynamicFloat class 2022-10-12 21:58:39 +10:30
hamusuke
bf8ee32382
fix: albedo elevator doesn't work (#1845)
* Packet preparation

* elevator creation

* Make elevator work, scene time, entity removed event.

* Avoid referencing certain character name.
2022-10-12 17:26:45 +10:30
AnimeGitB
f801fe0305 Update GM Handbook with Spincrystal names and Monster strings 2022-10-12 16:01:22 +10:30
hamusuke
4da4c03ecc
feat: unlock homeworld bgm and set homeworld bgm. (#1844)
* will be able to change home bgm.

* feat: unlock homeworld bgm and set homeworld bgm.

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

* Update GameHome.java

* Get default unlocked home bgms from HomeWorldBgmData

* fix: duplicate home items by sending packet
2022-10-11 22:29:43 +10:30
AnimeGitB
98ac42a6c6 Flatten language translation keys in-memory 2022-10-09 12:21:05 +10:30
hamusuke
a4f10208de
feat: set namecards in profile editing. (#1843)
* add: can set name cards in profile editing.

* some changes

* Update src/main/java/emu/grasscutter/game/player/Player.java

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerGetFriendShowNameCardInfoReq.java

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowNameCardListReq.java

* Update src/main/java/emu/grasscutter/server/packet/send/PacketGetFriendShowNameCardInfoRsp.java

* Update src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowNameCardListRsp.java

* Update src/main/java/emu/grasscutter/game/player/Player.java
2022-10-09 11:40:10 +10:30
hamusuke
e23536e7ba
fix costumes are unable to be unlocked. (#1842)
* fix: costumes are able to be unlocked.

* Update AvatarCostumeData
2022-10-09 11:10:42 +10:30
atArtyom
004a765e5b
Fix food decreasing (#1834)
* Update InventorySystem.java

Fix some food didn't reduce after use.

* Update InventorySystem.java
2022-10-08 01:44:29 +10:30
Dang Hoang Phuc
a520bc9416
Fix showing ban message box (#1826)
* fix: getplayertoken ban message popup

* feat: insure no packet handle when banned

* feat: using session state instead of account
2022-10-08 01:37:20 +10:30
AnimeGitB
0b9cab5ad5 Don't need full Java stacktrace on Lua errors 2022-10-07 23:06:26 +10:30
Luke H-W
dd6e1bb8a3
Move Data, Plugin, Script, Packet access from Strings to Paths (#1839)
* Move Data, Plugin, Script, Packet access from Strings to Paths
- No longer dump default Data files to folder on launch
- Allow Scripts to be loaded from Resources zip
- Lay groundwork for Plugins to be loaded from zip
2022-10-07 23:01:08 +10:30
Luke H-W
f6ce7e349d
Add shutdown alias to StopCommand 2022-10-04 01:33:01 +10:30
TomyJan
960318651c
Update Banners.json (#1813)
* Update Banners.json

* Update Banners.json
2022-09-28 21:08:13 +09:30
Luke H-W
c2e620bf7c
[BREAKING] Deobfuscate codex field, slight refactor (#1809)
* Deobfuscate codex field, slight refactor

* Fix relic sets in codex
2022-09-28 16:28:15 +09:30
GanyusLeftHorn
5ffc07cf59
3.1 Support (#1808)
* Update 3.0 protos

* Update classes to match protos

* Fix RegionHandler versions

* 3.0 Opcodes

* Fixed Gadget Spawning

Original Commit Message: fixed gadget spawning ty MJDerp
Gitea Author: yh0Nathan

Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>

* Make PointData compatible with alternative PointData

Original Commit Message: Make PointData compatible with windied scene points.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Add scene tag for Vanarana.

Original Commit Message: Add scene tag for Vanarana.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Add Sumeru expeditions.

Original Commit Message: Add Sumeru expeditions.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>

* Update game version to 3.0.0

* versionFix must be >= 50 not == 50 in RegionHandler

* Add new 3.0 Reliquary and SkillParticleGeneration data

Original Commit Message: Repair 3.0 added Reliquary 3-in-1 on the crafting table. Add skill particle generation info for Tighnari,Collei and Dori
Gitea Author: Roly

* Actually fix RegionHandler

* Remove asset names from json and comments

* Add scene areas for Sumeru desert to /prop um

* Added New MaterialType

* Change version to 3.1.0

* funny welcome message back

* Fix pyramid skill issue.

* Fix pyramid and event scene tags without ugly bruteforce.

* Remove backrooms chat welcome message.

* Incorporate suggestions.

* RoomSceneId and empty list checking.

Co-authored-by: Benj <benjamin7006@gmail.com>
Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>
Co-authored-by: Kokoboy <anushkumar222001@gmail.com>
Co-authored-by: nitro <31241699+nitrog0d@users.noreply.github.com>
Co-authored-by: Vexeone <vexeone@gmail.com>
2022-09-28 04:53:19 +02:00
AnimeGitB
4154229722 refactor HandlerWidgetDoBagReq 2022-09-26 18:41:05 +09:30
Fish and Chip
2f2eb1dba0 Fixed a tons of errors to make the drop system to accord with that in the actual game 2022-09-23 22:48:06 +09:30
AnimeGitB
fbc0219cba Allow loading Resources from zip files
Move Resources loading from String filenames to Paths
Add zip support
2022-09-23 22:25:17 +09:30
Melledy
a90455a7a4
Add -game and -dispatch startup arguments that override the run mode in the config 2022-09-18 20:52:30 -07:00
Melledy
0d64e2e810
Use reflection to map database classes and add missing mapped classes to the dispatch datastore 2022-09-18 20:46:28 -07:00
github-actions
e9f5d98466 Fix whitespace [skip actions] 2022-09-16 17:04:44 +00:00
Alexander Hartmann
08f361954a
Extend spawn command (#1777)
* add missing EntityTypes

* small command refactorings and improvements
* move common command patterns and methods to CommandHelpers
* let the spawn command detect the entityType instead of spawning every entity as EntityVehicle
* add extra options for spawning gadgets for better debuging and testing

* More spawn command additions and cleanups+EntityVehicle changes
* Moved remaining patterns from GiveCommand and ClearCommand to CommandHelpers
* Added patterns for hp, maxhp, atk, def and (monster)ai for the spawn command
* Moved intParam parsing via regex to the CommandHelpers
* Read most of EntityVehicle stats from the ConfigGadget instead of hardcoding them

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-17 02:34:20 +09:30
AnimeGitB
9671a76af2 character and companionship exp gain to party not active character
fixes #1787
2022-09-17 01:33:48 +09:30
Alexander Hartmann
08fdcf6ed4
fixed gadget hp properties and invincibility handling (#1773)
* fixed gadget hp properties and invincibility handling

* Allow killing of hp locked entities, if the damage is higher then the hp

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-15 11:56:20 +09:30
Alexander Hartmann
21ff749dca
Add support for propperly showing activity shops (#1774)
* Add support for propperly showing activity shops

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

Co-authored-by: hartie95 <mail@hartie95.de>
2022-09-14 19:57:16 +09:30
Kawaa
070edd263a
Improve team respawn (#1752)
* Pull request made after merging the latest version

* Update src/main/resources/languages/ja-JP.json

* first commit

* TeamRespawn_BigWorld

* Improving scene Loading

* Final commit

* optimize import

* optimize

* Update TeamManager.java

* Update src/main/java/emu/grasscutter/game/player/TeamManager.java
2022-09-12 23:25:10 +09:30
AnimeGitB
767e598bea Update banners (closes #1760) 2022-09-11 21:05:16 +09:30
2y8e9h22
57bb747118
Update zh-CN.json (#1762)
* Update zh-CN.json

Translate Chinese briefly.

* bring into correspondence with

Same indentation
2022-09-09 22:32:38 +09:30
AnimeGitB
d3bf5b585f Calculate Banner.previewPrefabPath 2022-09-08 22:36:43 +09:30
Kawaa
210e9e9732 Added a directive to fix some minor bugs (#1744)
* Pull request made after merging the latest version

* Update src/main/resources/languages/ja-JP.json
2022-09-05 23:53:40 +09:30
github-actions
3b1b57b76f Update languages [skip actions] 2022-09-03 03:36:52 +00:00
github-actions
6e5d986687 Fix whitespace [skip actions] 2022-09-03 03:36:51 +00:00
TotalyNotOndre
49aed23f3d Plugin Manager localisation
* Confugure Plugin Manager to use localised strings
* Add localisation strings for plugin manager
2022-09-02 20:27:05 -07:00
Abdul
a7317f2f9a Update ru-RU.json 2022-09-02 20:26:56 -07:00
pfyy
f93d998ff0 fix serenitea pot main building 2022-09-02 12:13:02 -07:00
AnimeGitB
735b48edca Add command targeting by account username 2022-09-02 22:20:42 +09:30
AnimeGitB
735f765320 Fix elementless Traveler depotValue 2022-09-02 21:57:02 +09:30
Melledy
4eaedae0b7 Move the remaining HttpUtils function over to Router 2022-09-01 13:20:42 -07:00
Melledy
fee34c515d Clean up http server content types 2022-09-01 13:20:42 -07:00
Benj
a1c31d1779 Replace express with javalin in logger 2022-09-01 13:20:42 -07:00
Benj
b5bed6ceef Update HttpServer & AuthenticationSystem to use Javalin 2022-09-01 13:20:42 -07:00
GanyusLeftHorn
712d17631f
Custom Teams (#1731)
* Add support for creating and deleting custom teams.

* Add support for creating and deleting custom teams.

* Move some logic to TeamInfo::toProto
2022-08-31 17:21:47 -07:00
Kawaa
4f015c1077
Console output player command (#1722)
* Console output player command

* Update CommandMap.java

* Add the Output_player_command option to the config

* Proper formatting for logging commands

* Log account usernames, not player nicknames

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
2022-08-31 03:40:11 -07:00
Melledy
bab6e6845e
Clean up adding extra embryo logic in Avatar::recalcStats 2022-08-31 03:39:41 -07:00
Melledy
45c08c5826
Clean up OpenStateData onLoad logic 2022-08-31 03:38:37 -07:00
loulou310
4a675cc81d
Update default Banners.json (#1719)
* Change default banners.json

* Weapon banner

* Remove banner comments with names from anime game

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
2022-08-31 02:32:49 -07:00
pfyy
96caa7db17
fix serenitea pot (#1726)
* partial fix of serenitea pot

* fix serenitea pot
2022-08-31 02:13:48 -07:00