Commit Graph

1633 Commits

Author SHA1 Message Date
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
Dang Hoang Phuc
7dd0c89927 fix: avatar energy transform in proudskill 2022-08-31 02:13:23 -07:00
jie65535
32289e2d80
Add permission clear and list commands (#1715)
* Add permission clear and list commands

* Add Account clear permission
2022-08-27 21:16:27 +09:30
AnimeGitB
656cb79b06 Fix offline account deletion (fixes #1716) 2022-08-27 21:11:18 +09:30
AnimeGitB
6ee6e5c2cc Fix up some japanese references 2022-08-26 23:00:34 +09:30
AnimeGitB
7ececc3d42 add dendro resonance 2022-08-26 22:35:58 +09:30
Kei-Luna
9768fc845a
Jp support (#1712)
Original commits:
* Add files via upload

* Update README_jp-JP.md

* Update README_jp-JP.md

* Update README_jp-JP.md

* Update README_jp-JP.md

* Add files via upload

* Update and rename README_jp-JP.md to README_ja-JP.md

* Update README.md

* Update README_HE.md

* Apply suggestions from code review
2022-08-26 15:28:10 +09:30
Tesutarin
36920cff6e
Update translation (#1711)
* Update translation

* Update README_zh-CN.md
2022-08-26 14:22:29 +09:30
pfyy
c96a1907da fix dungeon 2022-08-26 09:57:52 +08:00
Melledy
79323a05e3
Fix weird conditional in EquipAffixData 2022-08-25 12:03:26 -07:00
pfyy
1c3a6fc837 partial fix of dungeon 2022-08-25 11:52:14 -07:00
Melledy
a25c681274
Update AvatarCostumeData naming 2022-08-25 11:47:22 -07:00
Melledy
0c906aa4ce
Fix ReliquarySetData naming 2022-08-25 11:44:01 -07:00
AnimeGitB
6d65b71512 Show accessAddress in bold yellow on startup
This should make it easier to help people troubleshoot networked setups.
Consider telling people to try connecting to the address with a web browser on the client's machine.
2022-08-25 21:37:49 +09:30
AnimeGitB
f5c8959688 Update SetPropCommand strings, send cmd usage on target fail 2022-08-25 15:15:17 +09:30
AnimeGitB
40eeba9d90 refactor some itemdepot lookups for later 2022-08-25 14:45:57 +09:30
AnimeGitB
5565a13df8 Fix account deletion 2022-08-25 10:52:10 +09:30
AnimeGitB
dd10dcc09b Fix HelpCommand missing aliases 2022-08-25 10:31:15 +09:30
Melledy
466488ca7a
Prevent material type from being null 2022-08-24 17:07:46 -07:00
AnimeGitB
fbf3dbbf77 Move vehicle fightprop hacks 2022-08-25 00:23:00 +09:30
AnimeGitB
9970aeb94d Consolidate random point offsets 2022-08-25 00:22:43 +09:30
AnimeGitB
6098b51e4f De-hardcode ChestBatchUse 2022-08-24 11:47:40 +09:30
Benj
1767833ebe Remove asset names from json and comments 2022-08-24 11:34:26 +09:30
Benj
6949711e09 Actually fix RegionHandler 2022-08-24 11:34:26 +09:30
Benj
ce1f9b2e6a 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
2022-08-24 11:34:26 +09:30
Benj
cc50baf26a versionFix must be >= 50 not == 50 in RegionHandler 2022-08-24 11:34:26 +09:30
Benj
a18a15bdfc Update game version to 3.0.0 2022-08-24 11:34:26 +09:30
Benj
6f7e240482 Add Sumeru expeditions.
Original Commit Message: Add Sumeru expeditions.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
2022-08-24 11:34:26 +09:30
Benj
6aa013d7d8 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>
2022-08-24 11:34:26 +09:30
Benj
d8816911a6 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>
2022-08-24 11:34:26 +09:30
Benj
cb97ac8250 Fixed Gadget Spawning
Original Commit Message: fixed gadget spawning ty MJDerp
Gitea Author: yh0Nathan

Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>
2022-08-24 11:34:26 +09:30
Benj
da06982d5d 3.0 Opcodes 2022-08-24 11:34:26 +09:30
Benj
e8e3fcbc9c Fix RegionHandler versions 2022-08-24 11:34:26 +09:30
Benj
c096d255fd Update classes to match protos 2022-08-24 11:34:26 +09:30
omg-xtao
5db73d2849
Fix QuestEncryptionKeys Path (#1696)
* Fix QuestEncryptionKeys Path

* Load resources QuestEncryptionKeys
2022-08-23 23:29:52 +09:30
AnimeGitB
5aaa1bda2a Avoid potential NPE on WL0 (#1693) 2022-08-23 17:24:17 +09:30
AnimeGitB
36b71d0198 Clean up some Position usage to avoid unneccessary unpacks 2022-08-22 17:08:34 +09:30
Melledy
dbf2b91d03
Fix healing skills being able to heal dead characters 2022-08-21 22:35:05 -07:00
Melledy
513924af7c
Fix null pointer in Avatar if skill level map didnt already contain skill id 2022-08-21 22:20:54 -07:00
Melledy
1e649cd804
Delete quests from the player if there are errors loading them from the db 2022-08-21 22:19:34 -07:00
2y8e9h22
c53697da82
update zh-CN.json (#1684)
* update

* update
2022-08-22 11:05:34 +09:30
Abdul
20692cc4f8 Update ru-RU.json 2022-08-22 09:53:50 +09:30
AnimeGitB
d9f85ba2a7 Allow adding constellations to playerless avatars
Fixes #1682
2022-08-22 01:35:11 +09:30
github-actions
c517b8a2c9 Fix whitespace [skip actions] 2022-08-21 11:33:54 +00:00
AnimeGitB
3fca950050 Make TalentCommand show off new Translate function 2022-08-21 20:53:37 +09:30
AnimeGitB
955004343f Improve translate function
Make commands pass ints and floats instead of manually casting them to string first
2022-08-21 20:53:37 +09:30
AnimeGitB
4b03770ec1 Hide resin from map when disabled 2022-08-21 19:38:38 +09:30
akatatsu27
77f2bcf5bf small quest fixes (#1677)
* small quest fixes

* uncomment hack
2022-08-21 00:08:37 -07:00
赵怡然
abd1e7569e Blossom Implement (#1606)
* Blossom!

* rename

* delete SpawnBlossomEntry.java

* use MAP

* use List

* use LIST

* use List

* useCondensedResin

* useCondensedResin

* fix build

* enhance

* fix bug

* REMOVE BOSS

* fix condensed resin

* fix condensed resin

* use POSITIVE_INFINITY

* use RewardPreviewData

* fix build

* fix resources

* add BLOSSOM_MONSTER_FIGHTING_VOLUME

* edit monster score

* edit monster score

* fix bug

* fix bug

* improve logic

* fix monsters level

* Deleted comment blocks

* nitpick

* Fix compilation problems

* nitpick

* Refactor + nitpick

* Clean up overall diff to develop

* Clean up other usage of condensed resin

* Clean up overall diff to develop

* Lombokify Scene.java

* Missed an odd getter name

* Unhardcode reward previews

* EDIT NAME

* remove leyline 1

* remove leyline 2

* Update BlossomManager.java

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-08-20 23:19:59 -07:00
AnimeGitB
b3a7cde76c Remove crazy high AEXP drops from default chest rewards 2022-08-20 14:06:28 +09:30
AnimeGitB
48d31e45ed Fix talentcommand message key 2022-08-19 16:52:02 +09:30
AnimeGitB
fb1bacb0f8 Refactor avatar skilldepot and constellation/talent changing
Ensures Traveler retains talent levels and constellations on inactive elements when switching elements.
Relevant for any other skillDepot-changing activities like Windtrace too, though keeping those in the db might not be as useful.

Refactor avatar talent upgrade and access
Refactor skillExtraCharges
2022-08-19 16:43:57 +09:30
AnimeGitB
7d523efd41 Avoid allocations on Map::putIfAbsent usage
Map::computeIfAbsent only runs the passed constructors when it needs to
2022-08-19 12:47:50 +09:30
AnimeGitB
0cb75aeb5f Add iterable payItems methods
Shame they could never be fully generic, but oh well
2022-08-18 23:02:26 +09:30
AnimeGitB
efa69c007d Change unlocked scenes from lists to sets 2022-08-18 22:38:55 +09:30
AnimeGitB
c3450e8905 Handbooks: use some sorted maps 2022-08-18 22:06:08 +09:30
AnimeGitB
9e0d6538e9 Lombokify some more getters 2022-08-17 21:11:40 +09:30
AnimeGitB
02deeb2852 Remove erroneous references to excel skilldata instead of avatar skilldata
Refactor team resonances and correct login behaviour and less-than-full-party behaviour
2022-08-17 21:07:29 +09:30
AnimeGitB
48cd9f6be2 Don't use UIDs as initial capacity for chat history 2022-08-17 03:20:06 +09:30
AnimeGitB
fab7e4a461 ChatSystem nitpick 2022-08-17 00:17:41 +09:30
GanyusLeftHorn
dc153572dd Fix chat welcome messages and some slight refactoring. 2022-08-17 00:12:27 +09:30
AnimeGitB
97779fd35a Fix deprecated chat references 2022-08-16 15:13:51 +09:30
2y8e9h22
c115fe1abe update zh-CN.json (#1662)
Original commits:
* .
* Apply suggestions from code review
2022-08-16 10:11:26 +09:30
Luke H-W
dc9cef8ab7 Refactoring (#1660)
* Refactor a couple of iterators

* Use side-effect instead of second iterator

* Make World::onTick return shouldDelete instead of success

* Replace Shop iterator with side effects

* Scene

* Clean up Expeditions

* Refactor Expeditions

* Clean up Expeditions, Player

* Limit Expeditions by AR

* Lombokify props

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-08-15 23:19:13 +09:30
Magix
3ec411b11a Bump config version. 2022-08-14 11:00:29 -04:00
dragon
3bd00fcb07 Update ConfigContainer.java (#1646)
make it more similar to official behavior.
2022-08-11 21:27:45 +09:30
dragon
823980046e make fishhook_tp configurable 2022-08-11 21:21:30 +09:30