Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-28 19:45:18 +00:00
Code Issues Projects Releases Wiki Activity
2,245 Commits 7 Branches 22 Tags 133 MiB
fb0c2dbc84
Commit Graph

1788 Commits

Author SHA1 Message Date
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
Benj
d575d1ccea Update 3.0 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
AnimeGitB
46223c8976 Refactor Json helper functions to JsonUtils 2022-08-11 17:59:08 +09:30
AnimeGitB
c6323e9759 Funnel all gson calls into helper functions 
Add deprecated getGsonFactory for plugin compat until 3.0
 2022-08-11 17:59:08 +09:30
Luke H-W
76fcbb477b Remove beta message 2022-08-11 16:21:59 +09:30
AnimeGitB
325fe6c44a Fix TalentCommand for Traveler 2022-08-11 16:21:27 +09:30
dragon
edd4c8ca88 fix:command player said to server won't be shown at chat history (#1643) 
Original commits:

* fix:command player said to server won't be shown at chat history

* Update ChatManager.java
 2022-08-11 15:20:08 +09:30
GanyusLeftHorn
04f0fae898 Handle Unlocking of Waypoints and Statues (#1608) 
Original commits:

* Add necessary protos for scene point/area unlocking.

* Rename PlayerOpenStateManager to PlayerProgressManager and move data to Player.

* Handle unlocking of waypoints.

* Add primo rewards for waypoint unlock.

* Statue unlocking.

* Add statue quest on player login.

* I forgor to add an unlock command.

* Give EXP as reward, fire quest trigger, make EXP UI show up.
 2022-08-10 19:33:47 +09:30
AnimeGitB
c624479439 Fix an edge case that breaks embryos if resources are loaded early 2022-08-10 17:00:43 +09:30
Magix
3121e3e67d Introduce a new arguments parser (#1629) 
Original commits:

* Clean-up

* Introduce a new application arguments parser & handler

* Clean-up and deprecate `Tools#getLanguageOption`

* Fix `-debug` and `-debugall` parameters

* found this while debugging, ...why

* Remove deprecated parameters

* Invoke startup argument parser before handbook generation

* Move command map instantiation to `Grasscutter `(prevent making 3 instances on startup)

* Ensure \n at EOF

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-10 11:54:43 +09:30
GanyusLeftHorn
e20b185dc0 Fix Claiming BP Reward Chests (#1634) 
Original commits:

* Fix claiming BP chests.

* Remove logging.
 2022-08-10 11:04:22 +09:30
AnimeGitB
a2cdec02af Make missing languages not throw warnings 2022-08-09 04:57:44 -07:00
AnimeGitB
9c66ba137f Unify gacha mappings generation 2022-08-09 20:59:11 +09:30
AnimeGitB
ef805f26cc Remove vestigial references to gacha_mappings 2022-08-09 20:59:11 +09:30
AnimeGitB
0091fb87ea Remove language hack from handbook generation 2022-08-09 20:59:11 +09:30
AnimeGitB
c1ff7332fe Generate handbooks on every launch, fix html docs 2022-08-09 20:59:11 +09:30
AnimeGitB
e963419956 Refactor handbook generation, remove singular handbook 2022-08-09 20:59:11 +09:30
AnimeGitB
0994417261 Cache used strings from TextMaps 2022-08-09 20:59:11 +09:30
AnimeGitB
4790158ac6 Load in all the textmaps! 2022-08-09 20:59:11 +09:30
KingRainbow44
6ec372e64f Add invoke-level invulnerability for bursts. 2022-08-06 23:35:57 -04:00
KingRainbow44
7df41f616b Invoke AbilityManager#onSkillStart and AbilityManager#onSkillEnd 2022-08-06 23:35:09 -04:00
KingRainbow44
6420428660 Add a method to be invoked on skill perform and end 2022-08-06 23:34:35 -04:00
Kawaa
352aa7d689 Improve some documentation and JSON (#1618) 
Original commits:

* Updated instructions

* 更新说明

* 更新说明

* 更新说明

* 更新说明

* 更新说明

* Updated instructions

* Updated instructions
 2022-08-05 19:05:44 +09:30
KingRainbow44
cf2832ae72 Add EntityDamageEvent and implementations 2022-08-04 21:36:00 -04:00
Magix
d05b3207e5 Add more events 
Merge pull request #1516 from Grasscutters/more-events
 2022-08-04 13:57:00 -04:00
Magix
a3e0f7f5f0 Update HandlerSceneTransToPointReq.java 2022-08-04 13:49:38 -04:00
Magix
d24c10eec5 Update src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneTransToPointReq.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:45:02 -04:00
Magix
164baa7251 Update src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:44:56 -04:00
Magix
9cb9fe099c Update src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java 
Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-08-04 13:44:50 -04:00
Penelopeep
9a104f6f69 Polish README and setConst translation (#1614) 
Original commits:
* setConst translation
* New pl README link
* Polish README
* fix
 2022-08-04 18:02:34 +09:30
Abdul
1a2f25d67b Update ru-RU.json 2022-08-04 18:01:26 +09:30
유여름
1b3963a83a Create ko-KR.json 2022-08-02 22:45:49 +09:30
KingRainbow44
faeb96927a Add PlayerUseFoodEvent and implementations 2022-08-01 21:32:30 -04:00
KingRainbow44
89575f587e Move PlayerTeleportEvent occurrences into World 2022-08-01 21:25:29 -04:00
KingRainbow44
1de402bd6f Merge branch 'development' into more-events 2022-08-01 21:13:19 -04:00
KingRainbow44
b9b4b6f428 Clean-up the energy manager 2022-08-01 21:12:57 -04:00
Magix
f25fb62942 Explicitly declare the charset of a FileReader in ConfigContainer 
Changed charset of FileReader in ConfigContainer from default to utf-8.
Merge pull request #1600 from Someone999/development
 2022-07-31 07:17:46 -04:00
millet6
5df46dab86 Update zh-CN.json 
修正 用户登录提示
 2022-07-30 13:57:27 +09:30
Someone999
f3baa0b8e7 Changed charset of FileReader in ConfigContainer from default to utf-8. 2022-07-29 19:08:07 +08:00
RBNXI
66dadece8a Add files via upload 2022-07-28 21:07:17 +09:30
AnimeGitB
cb8b21d03d Auto language lint 2022-07-28 04:23:58 -07:00
AnimeGitB
b80126fdda Add lock function to SetStatsCommand 2022-07-28 04:23:58 -07:00
AnimeGitB
0fa3d0e8d1 Improve message formatting to clients 
Replaces tab indents with an extra linebreak.
Also adds / to the start of command usage.
Neither of these changes affect messages to the server console log.
 2022-07-28 00:16:41 -07:00
Magix
24dfac65b2 Update zh-CN.json 
Merge pull request #1584 from millet6/patch-1
 2022-07-27 13:33:40 -04:00
Magix
f25dc4d2fc Update zh-CN.json 2022-07-27 13:32:11 -04:00
AnimeGitB
0d9116225c Suppress stacktrace on missing questkeys file 2022-07-27 21:10:32 +09:30
Magix
6ba4846e58 Change loading quest keys from info to debug. 
Please for the love of god use `debug` for information not important to the enduser when starting the server.
 2022-07-26 14:49:45 -04:00
millet6
d8f8aed816 Update zh-CN.json 
更新汉化内容
Update Chinese content
 2022-07-27 01:38:24 +08:00
Magix
9781d5e6c9 Fix an NPE in EntityGadget when draft_id isn't set 
Merge pull request #1579 from Hartie95/nullfix
 2022-07-26 12:14:08 -04:00
Magix
107111d3fc SceneScriptManager fix nullPointer error 
Merge pull request #1581 from akatatsu27/development
 2022-07-26 12:02:14 -04:00
Melledy
7600f706b5 Move QuestEncryptionKeys to resources/ 2022-07-26 08:22:27 -07:00
Kimi
2fe6bcf2cf Traditional Chinese | Translation Patches 
Added missing some commands translation, and fixing up another mainlander's CHS = CHT mindset.
 2022-07-27 00:28:44 +09:30
akatatsu27
7ca947b05f fix nullPointer error 2022-07-26 17:58:28 +03:00
ah
964e73f0f6 small nullpointer fix in EntityGadget, in case meta gadget is not set 2022-07-26 16:09:52 +02:00
Abdul
bb8ae4c443 Update ru-RU.json 
- Add unlockall translations
 2022-07-26 06:29:57 -07:00
RBNXI
5a3dfcd4b4 Add spanish translation for constellation commands 2022-07-26 22:56:36 +09:30
akatatsu27
8bdcfb8908 token fix 2022-07-26 14:28:39 +03:00
akatatsu27
92aeb79ac3 Merge branch 'development' into questing 2022-07-26 14:17:42 +03:00
Abdul
1c5c3633d1 Update ru-RU.json 2022-07-26 18:58:15 +09:30
AnimeGitB
883b6f1fcc [Bug] New avatars always created with C0 constellation 
Fixes #1552
 2022-07-26 17:56:49 +09:30
hartie95
ffeff92dd6 2.7+ prerendered cutscene support 2022-07-26 16:55:53 +09:30
hartie95
938b54c2ee two small activity/event fixes 
* fixed GetAcitivityInfoReq proto
* added draft to gadget Scene gatget, to let the client know the propper minigame for some entities
 2022-07-26 16:49:52 +09:30
lactose
59a412cc83 Set Constellation Command (#1565) 
Original commits:

* create `SetConstCommand` class and translations

* (partially) functional `setconst` command

* fixed punctuation

* added success message

* implemented `SetConstCommand`

* added translation keys

* update keys

* refactor + automatic reload

* Nitpick (Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>)
 2022-07-26 16:44:17 +09:30
loulou310
63fd4dfe3a Update French translation 2022-07-26 10:35:05 +09:30
KingRainbow44
c35705010a Fix remaining traces of Player#getPos 2022-07-24 13:27:43 -04:00
KingRainbow44
41ec2316e4 Attempt to fix the teleport command. 2022-07-24 13:23:51 -04:00
KingRainbow44
818bfb8c5b Add PlayerTeamDeathEvent and implementations 2022-07-24 13:20:58 -04:00
KingRainbow44
886c2e2f43 Add EntityDeathEvent and implementations 2022-07-24 13:20:42 -04:00
KingRainbow44
a13725b1cb Add a Location class (Scene + Position) 2022-07-24 12:17:38 -04:00
KingRainbow44
7397c7f300 Remove deprecated class 2022-07-24 12:08:59 -04:00
KingRainbow44
90cded16d9 Merge branch 'development' into more-events 2022-07-24 12:05:35 -04:00
akatatsu27
44d8a6482e call deregisterRegion appropriately 2022-07-24 13:33:48 +03:00
akatatsu27
29bdb7f3f6 Merge branch 'development' into questing 2022-07-24 12:16:22 +03:00
GanyusLeftHorn
d0edd39465 Read Open States from Excels (#1557) 
* Make sure we never access PlayerOpenStateManager::map directly.

* Read OpenStates from excels.

* Add defaultState

* Replace hardcoded open states with the ones read from excels.

* Don't send change notify when unlocking on login.

* Add open state blacklist for default unlocks.

* Add a way to temporarily set open states for dev

* Remove old OpenState.java

* Fix UnlockAllCommand

* Change condType to an enum.
 2022-07-24 00:12:07 -07:00
akatatsu27
8050f0cc07 and misc bug fixes 2022-07-23 12:28:49 +03:00
akatatsu27
02a56fcec4 Major questing improvements 2022-07-23 12:27:14 +03:00
KingRainbow44
956d4023c7 Merge branch 'development' into more-events 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
#	src/main/java/emu/grasscutter/game/entity/GameEntity.java
#	src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
 2022-07-22 17:52:58 -04:00
RBNXI
89717f3c15 Translated new changes in languages files to Spanish 
Just realized that some commits have changed the language files to add some new things, so this is the Spanish translation of those... things.
 2022-07-23 03:01:58 +09:30
Melledy
e5ff253624 Add unlockall command to unlock all openstates 2022-07-22 09:26:00 -07:00
Melledy
705bee0595 Fix battle pass manager saving with 0 id 2022-07-22 08:35:37 -07:00
Melledy
7254fe1612 Set setChooseAvatarGuid properly 2022-07-22 08:30:11 -07:00
Melledy
0d17c4a088 Implement food buffs 2022-07-22 03:46:59 -07:00
AnimeGitB
e9a95b89cf Use sorted containers for commands & aliases 2022-07-22 19:08:26 +09:30
AnimeGitB
104e04f70a Change commands to use new usage message method. 2022-07-22 19:08:26 +09:30
AnimeGitB
2cfbe78184 Refactor Command usage and description strings 2022-07-22 19:08:26 +09:30
Miralyn
e9464784bb Updated Russian localization (#1543) 
* updated russian localization

* Update ru-RU.json
 2022-07-22 02:17:58 -07:00
Melledy
f15262dd3e Refactor excel datas (Mainly item data) 2022-07-22 00:53:12 -07:00
Melledy
c0418067d6 Add kcpInterval to the config 2022-07-21 18:39:39 -07:00
Melledy
8651cdd12b Rename hasSentAvatarDataNotify() to hasSentLoginPackets() 2022-07-21 16:27:43 -07:00
Melledy
b505b0825a Fix host team size not changing when a player joins their world for the first time 2022-07-21 16:24:04 -07:00
Melledy
62e54010ad Lower kcp interval to 20 2022-07-21 16:23:59 -07:00
Melledy
c9c45e4c32 Partial fix for player attacks in co-op not working 2022-07-21 03:42:16 -07:00
Melledy
5e041b333b Forgot to remove extra player var from TeamManager 2022-07-21 01:19:28 -07:00
Melledy
7189e3701d Use getOpenStateMap() in PlayerOpenStateManager 2022-07-21 01:06:17 -07:00
github-actions
f87088f4f4 Update languages [skip actions] 2022-07-21 00:22:26 -07:00
github-actions
ae2d1fe438 Fix whitespace [skip actions] 2022-07-21 00:22:26 -07:00
Melledy
510d564bcb Dont use discriminator for PlayerCollectionRecords 2022-07-21 00:21:00 -07:00
Melledy
bc701cfad0 Add missing scene load state to PacketPlayerEnterSceneNotify 2022-07-21 00:21:00 -07:00
Melledy
b9b0f00232 Move PlayerManagers and GameServerSystems around 2022-07-21 00:21:00 -07:00
Melledy
8b4212ffb9 Refactor PacketOpcodesUtil to be more... useful 2022-07-21 00:21:00 -07:00
Melledy
52ee229e96 Split config debugLevel into logPackets (Game) and logRequests (Dispatch) 2022-07-21 00:21:00 -07:00
Melledy
408fa90728 Move config java files to their own package 2022-07-21 00:21:00 -07:00
Melledy
55541fa1da Add a loadReader helper function to DataLoader 
Also minor name changing on a few DataLoader methods
 2022-07-21 00:21:00 -07:00
Melledy
f22b92b08f Add a save() function to player managers 2022-07-21 00:21:00 -07:00
Melledy
abccec785b Delete AccountManager.java 
This file was never used by anyone. RIP.
 2022-07-21 00:21:00 -07:00
Melledy
fc16f9d694 Refactor out InsectCaptureManager 2022-07-21 00:21:00 -07:00
Melledy
f020cefd80 Set default player position to be the starting position 2022-07-21 00:21:00 -07:00
Melledy
5feabc8f9a Add Entity::OnInteract 2022-07-21 00:21:00 -07:00
Melledy
1a2f7fb5a7 Forgot to remove extra player variable from AbilityManager 2022-07-21 00:21:00 -07:00
Melledy
cc5b292bc3 Refactor Player::GetPos() -> Player::GetPosition() 2022-07-21 00:21:00 -07:00
Melledy
2e19e70fe1 Refactor game server managers to systems 2022-07-21 00:21:00 -07:00
Melledy
d20e9d1f72 Refactor player managers 2022-07-21 00:21:00 -07:00
AnimeGitB
3957616b6c Fix 2.8 banners, readd Beginner's banner 2022-07-18 22:29:00 -07:00
AZthemute
3eb85b82a7 Updated banners for 2.8, added comments to the banners and removed beginner's banner (it was breaking things) 2022-07-18 13:40:58 -07:00
GanyusLeftHorn
b266854c72 Handle existing players who might already have passed a level. 2022-07-18 11:20:33 -07:00
GanyusLeftHorn
af7bbdaadd Set certain OpenStates on level-up. 2022-07-18 11:20:33 -07:00
zhaodice
6c49fab137 Block loader (sort and merge gadgets into different blocks) (#1517) 
Original commits:

* block loader
* fix
* fix
* fix foolish bug
* add scales
* rename
* set to 600
* nitpick

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-07-18 19:43:55 +09:30
Melledy
7f898417b0 Fix a few null pointer issues. 2022-07-18 02:33:13 -07:00
Melledy
2e85834e9c Update OpenState protos and rework OpenStateManager 
OpenState map no longer contains default openstates, they should not be saved in the database for efficiency reasons.
 2022-07-18 02:28:38 -07:00
akatatsu27
b5a4ab7524 Open state framework (#1483) 
* Added more server debug options

* made server debug code prettier

* fixed initialization bug

* Enables logging of packets contained in UnionCmdNotify, when debug level is WHITELIST or BLACKLIST

* Fully Implement OpenState Framework

* added devOpenStates

* Commented out newPlayerOpenStates

* Removed OPEN_STATE_NONE from devOpenStates
 2022-07-18 01:33:57 -07:00
Yazawazi
ae8b5e30ac Full support for both parties 2022-07-17 13:43:45 +09:30
真心
0a557ccfcd Update GameConstants.java 2022-07-17 13:43:45 +09:30
AnimeGitB
591ca4805a Some proto name changes 2022-07-17 13:43:45 +09:30
AnimeGitB
bc2c5deb48 Add Dispatch Password authentication 2022-07-17 13:43:45 +09:30
AnimeGitB
413f11d504 PacketOpcodes 2022-07-17 13:43:45 +09:30
AnimeGitB
e14d1cedde Hack for GAA unlock 2022-07-17 13:43:45 +09:30
AnimeGitB
4103558272 Bump game version 2022-07-17 13:43:45 +09:30
kyoko
80f9346983 Fix the chat history not correctly showing. 2022-07-17 13:43:45 +09:30
AnimeGitB
d7742d94db Add dispatch keys 2022-07-17 13:43:45 +09:30
KingRainbow44
f6b4016f1b Add PlayerTeleportEvent 2022-07-15 16:18:46 -04:00
KingRainbow44
02ca5cf23c Update to support PlayerMoveEvent 2022-07-15 16:12:22 -04:00
KingRainbow44
1b8df002d1 Remove Cancellable from PlayerMoveEvent 2022-07-15 12:48:55 -04:00
KingRainbow44
80e75fd023 Implement PlayerMoveEvent 2022-07-15 12:43:49 -04:00
Luke H-W
8843276c41 Language linting (#1382) 2022-07-11 16:21:05 +02:00
AnimeGitB
bb84432b4c Add maximum level/refinement/rank to clear command 2022-07-11 23:45:24 +09:30
GanyusLeftHorn
fbf80e7156 Fix crafting for mystic enhancement ores. 2022-07-11 16:07:19 +02:00
GanyusLeftHorn
4cbd3c7bde Add missing dungeons for dungeon drops. 2022-07-10 18:16:49 +09:30
Akka
910008216f quest fix & personal line impl 2022-07-10 17:52:47 +09:30
Tesutarin
7bae35f51b Update translation & bug fix (#1472) 
Original commits:

* Update translation

* Bug fix

* Update translation

* Update Announcement.json
 2022-07-09 23:09:40 +09:30
akatatsu27
c79ca3028f Added more server debug options (#1444) 
Original commits:

* Added more server debug options

* made server debug code prettier

* fixed initialization bug

* Enables logging of packets contained in UnionCmdNotify, when debug level is WHITELIST or BLACKLIST
 2022-07-09 03:01:29 +09:30
dragon
0196231c7e Merge branch 'Grasscutters:development' into development 2022-07-08 12:53:52 +08:00
dragon
a96f7f4de1 Update DatabaseHelper.java 
fix account delete
 2022-07-08 12:37:40 +08:00
shädam
a4a87fe75b Don't send success upon failure 2022-07-07 22:40:58 +09:30
Typhoon
730d112a0f Update ro-RO.json 
A couple small errors
 2022-07-07 20:02:39 +09:30
RBNXI
2923187b0b Fix some typos in spanish translations (#1456) 
Original commits:

* Fix some typos and fixes from original Readme

* Fix some typos
 2022-07-07 20:02:14 +09:30
Luke H-W
ad02dacdfd Apply suggestions from code review 2022-07-07 16:43:09 +09:30
haxxorer
1f62792074 Create ro-RO.json 2022-07-07 16:43:09 +09:30
GanyusLeftHorn
6338c17189 Add reliquary decomposition (aka strongbox). 2022-07-05 22:59:19 -07:00
loulou310
952448220d Update translation (#1438) 
Original commits:
* Update translation

* Update traslation

* Fix typo
 2022-07-05 11:08:27 +09:30
AnimeGitB
c848db607f Add beginner banner to default banners 2022-07-04 15:22:46 +09:30
AnimeGitB
e8371677bd Add gachaTimesLimit for beginner banner 
Also add some more return codes
 2022-07-04 15:22:46 +09:30
Someone999
fe50a42a3c Added permission information to help command (#1427) 
Original commits:
* Added command CommandPermissionCommand. Added permission information in HelpCommand.

* Removed command CommandPermissionCommand

* Display permission for single command when use help.

* Display permission targeted when use help.
 2022-07-04 13:51:41 +09:30
Akka
b92cc6a882 fix some region errors 2022-07-03 11:40:09 -07:00
Akka
4cd31af011 fix announcement interval 2022-07-03 19:27:23 +09:30
Akka
9bafc2c5d5 Implement server announcement (#1420) 
* implement server announcement

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

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

* Added arg numbers check

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-07-02 06:43:22 -07:00
AnimeGitB
a80302cdcd Fix commands in party chat, re-add optional positional item quantity to give command, error out and print usage if excess arguments given to give command 2022-07-02 06:41:56 -07:00
GanyusLeftHorn
13a7f08665 Add character's specialty food. 2022-07-01 23:14:36 -07:00
GanyusLeftHorn
d95a30a1a5 Cooking and unlocking recipies. 2022-07-01 23:14:36 -07:00
GanyusLeftHorn
a957b8c5b8 Notify client of unlocked recipies on login. 2022-07-01 23:14:36 -07:00
GanyusLeftHorn
8484a535f4 Load recipe excels. 2022-07-01 23:14:36 -07:00
Akka
9951bec6b7 optimize npc group load & fix some NPE in suite 2022-07-01 23:13:26 -07:00
Magix
bd40ecee2a Add the es-ES language 
By: `Blue#7596` or `<@470933959929364481>`
 2022-07-01 18:17:23 -04:00
zhaodice
f90b65120a Fix no static gadget in the map,example: no tree but a fruit in the air (#1415) 
* fixGadget

* fixGadget

* add gadgetObject

* fix bug
 2022-07-01 11:41:53 -07:00
loulou310
b703201598 Update translation 2022-07-01 23:58:59 +09:30
zhaodice
efd30593a1 Fireworks support (#1393) 
* Firework Implement

* add legacy function

* remove obfusucated names

* remove obfusucated names

* remove obfusucated names

* remove obfusucated names

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-29 14:33:21 -07:00
Tesutarin
8267d796db Update translation 2022-06-30 00:54:57 +09:30
Akka
a8690ef720 fix bug 2022-06-29 05:23:02 -07:00
Akka
12146ff09c implement the music game 2022-06-29 05:23:02 -07:00
Akka
977f1ca2ea implement the activity system 2022-06-29 05:23:02 -07:00
Melledy
5d35cb49b4 Change -debug to only output grasscutter debug info 
The old -debug flag is now -debugall
 2022-06-29 05:02:49 -07:00
zhaodice
2462da2ede Big World Resources Collection Implement (#1368) 
* init

* init

* init

* revoke

* fix error

* mining support

* mining support

* Roks endurance support

* Roks endurance support

* Timed refresh

* upgrade resource data

* Timed refresh support

* remove null gadget

* Coordination

* full synchronized

* oh no, my math teacher will hit me!

* synchronized onInteract

* remove break;

* supply re-spawn time , thanks to @wl23333

* Clean up and integrate collection spawns into SpawnDataEntries

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-29 04:53:50 -07:00
GanyusLeftHorn
17fb19ebc9 Add BP login trigger to daily reset. 2022-06-28 04:04:35 -07:00
GanyusLeftHorn
54c4f60abb Fix next sunday. 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
7cb4c9fee2 Remove comments 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
0c8db8f00e Remove comments 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
b0d19e54db Implement selection chests for BP rewards. 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
8104378b95 Add daily and weekly mission reset. 2022-06-26 21:38:35 -07:00
GanyusLeftHorn
814d4819d4 Unlock Gnostic Hymn 2022-06-26 21:38:35 -07:00
KingRainbow44
422e25e0e4 Enable complete debugging info with -debug 2022-06-26 13:07:43 -04:00
KingRainbow44
f5bc750150 Clean up the server's logger. 2022-06-26 13:03:10 -04:00
KingRainbow44
f86b4bec11 Reformat 2022-06-26 13:00:23 -04:00
KingRainbow44
269149bb1f Formatting changes 2022-06-26 12:50:58 -04:00
KingRainbow44
163c6bf47d Move drop data loading to debug 2022-06-26 12:42:37 -04:00
KingRainbow44
7e0c19021c Move expedition rewards loading to debug 2022-06-26 12:42:14 -04:00
KingRainbow44
e842c23539 Move registering packet handlers to debug 2022-06-26 12:40:34 -04:00
KingRainbow44
a896928e61 Move energy data loading to debug 2022-06-26 12:36:17 -04:00
KingRainbow44
286d6289b2 Move banner loading to debug 2022-06-26 12:34:56 -04:00
KingRainbow44
5895439a3f Move shop data messages to debug 2022-06-26 12:34:03 -04:00
KingRainbow44
19d81463bc Merge remote-tracking branch 'origin/development' into development 2022-06-26 12:33:03 -04:00
KingRainbow44
71b118dd9f Add a start and finish message to resource loading 2022-06-26 12:31:09 -04:00
KingRainbow44
2dcdb839c4 Move resource loading messages to the debug level 2022-06-26 12:26:39 -04:00
KingRainbow44
091d8c69a3 Add a debug flag for the logger 2022-06-26 12:23:07 -04:00
KingRainbow44
447360594d Log script messages to debug instead of info. 2022-06-26 12:20:48 -04:00
Paimon2022
46916b8216 Fix healing abilities for Q skill of Hu Tao 2022-06-26 22:29:06 +08:00
zhaodice
541c38b74c Avoid disconnection notification 2022-06-26 02:34:45 -07:00
xingluo233
b5fd8c1acd Update TowerSchedule.json 2022-06-26 02:34:24 -07:00
zhaodice
d5866dd36d Update HandlerPlayerForceExitReq.java 2022-06-25 22:39:32 -07:00
zhaodice
6e90067101 Logout immediately 2022-06-25 22:39:32 -07:00
Paimon2022
57e0f7ba40 Fix healing abilities for Q skill of Kokomi, Qiqi and Barbara. 2022-06-25 22:20:26 -07:00
zhaodice
0144e55d3a Lunch Support (#1373) 
* PacketSetUpLunchBoxWidgetRsp

* HandlerSetUpLunchBoxWidgetReq
 2022-06-25 22:19:59 -07:00
AnimeGitB
9425f672e0 Remove BPLevel, GodMode, NoStamina, SetWorldLevel, UnlimitEnergy, UnlockTower commands 2022-06-25 22:19:29 -07:00
AnimeGitB
fc9acf42c2 PlayerProperty Refactor 2022-06-25 22:19:29 -07:00
AnimeGitB
baafb4104c Remove GiveAll, GiveArt, GiveChar commands 2022-06-25 22:19:29 -07:00
AnimeGitB
6fd1ce813c Remove Drop, ChangeScene, Restart, Broadcast commands 2022-06-25 22:19:29 -07:00
AnimeGitB
bb37201105 Small putItem refactor 2022-06-25 22:19:29 -07:00
AnimeGitB
bcc20c2d03 Allow PermissionCommand to target offline players again 2022-06-25 02:12:33 -07:00
AnimeGitB
f00db7b7b2 Allow offline Player objects to return their Account 2022-06-25 02:12:33 -07:00
AnimeGitB
a3b4a11863 Add permission to BanCommand, rework its targeting 2022-06-25 02:12:33 -07:00
GanyusLeftHorn
1ba415c66a Remove logging. 2022-06-24 17:51:30 -07:00
GanyusLeftHorn
3ec2c4e21e Reset forge points every day to enable crafting of enhancement ores. 2022-06-24 17:51:30 -07:00
GanyusLeftHorn
2cdfea1fb2 Move worldlevel for World to Player::setWorldLevel 2022-06-24 17:51:30 -07:00
AnimeGitB
088b3dbbcc Add initializers to GameServer 2022-06-25 00:58:09 +09:30
Melledy
cdc23a0647 Random cleanups in the gameserver and player 2022-06-24 07:43:43 -07:00
Melledy
a16bc72101 Implement weekly points for the battle pass 2022-06-24 07:34:24 -07:00
Melledy
5eb1d34b14 Implement battle pass triggers/rewards 2022-06-24 01:12:52 -07:00
KingRainbow44
34f7c6e780 Formatting changes 2022-06-24 01:22:18 -04:00
KingRainbow44
95df9a3162 Hardcode EventType.GAME for ServerLogEvent 2022-06-24 01:22:11 -04:00
KingRainbow44
52da2c235d Add & implement EntityMoveEvent 2022-06-24 01:21:41 -04:00
KingRainbow44
47f3353342 Add entity event base class 2022-06-24 01:21:06 -04:00
KingRainbow44
20b2554e39 Merge remote-tracking branch 'origin/development' into development 2022-06-24 01:06:57 -04:00
KingRainbow44
a16812551a Replace CommandResponseEvent with ReceiveCommandFeedbackEvent 2022-06-24 01:06:19 -04:00
Tesutarin
52c1d2f540 Update translation 2022-06-23 21:23:27 -07:00
GanyusLeftHorn
3a2ebd1edd Set world level automatically on level up. 2022-06-23 21:23:14 -07:00
Luke H-W
f04035da34 Merge branch 'development' into Weather 2022-06-24 00:47:14 +09:30
Magix
1c9a9599be Change plugin manager logic 
Merge pull request #1346 from Grasscutters/plugin-priority
 2022-06-23 11:13:15 -04:00
@Roly
74151c204c Fix chest types 2022-06-23 05:38:38 -07:00
Akka
67ac0d700d add region entity 2022-06-23 03:14:38 -07:00
Akka
1c6c581399 fix gadget infinity create 2022-06-22 22:39:54 -07:00
KingRainbow44
b796372042 Merge remote-tracking branch 'origin/development' into development 2022-06-23 00:28:35 -04:00
KingRainbow44
f4ba460de1 Fix PlayerCreationEvent to match expected logic 2022-06-23 00:28:13 -04:00
Magix
3585fd597b Merge branch 'development' into plugin-priority 2022-06-23 00:06:31 -04:00
AnimeGitB
b2e620553a Tweak messages 2022-06-23 02:38:04 +09:30
AnimeGitB
c9363ef5e5 Move weather from Scene to Player 2022-06-23 02:32:38 +09:30
Magix
ed7ffa74da Enable development repository for artifacts 
Uploading dev builds to 4Benj Repo via Jenkins for plugin developers.
 2022-06-22 11:08:55 -04:00
Luke H-W
aa835ecac7 Update src/main/resources/languages/en-US.json 
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
 2022-06-22 23:41:14 +09:30
AnimeGitB
371acb9ba5 Deduplicate some translation keys 2022-06-22 23:20:16 +09:30
AnimeGitB
dcd3c696ea Add default Climates per weather 2022-06-22 22:41:07 +09:30
14eyes
4df068bba0 Add missing lua constants (#1342) 
* Add missing script constants

* Fix formating
 2022-06-22 05:00:22 -07:00
Magix
1b58ba254e Revert deprecation of registerCommand 
i was going to make commands plugin specific but then decided against it
 2022-06-22 02:59:45 -04:00
KingRainbow44
c76f0c0e70 Fix event 2022-06-22 00:48:04 -04:00
KingRainbow44
0cb490605e Re-implement scheduler system (check #1321) 2022-06-22 00:46:34 -04:00
KingRainbow44
3c361b432f Fix method of loading dependant plugins 2022-06-22 00:22:51 -04:00
KingRainbow44
5a8b76d97b Update EventHandler with new register syntax 2022-06-22 00:22:50 -04:00
KingRainbow44
6175e957b5 Fix issue when exiting server when plugin manager hasn't loaded 2022-06-22 00:22:49 -04:00
KingRainbow44
91d232d625 Fix Player on this branch 2022-06-22 00:22:23 -04:00
KingRainbow44
eed59e0d77 Fix filenames issue (pt. 2) 2022-06-22 00:21:46 -04:00
KingRainbow44
74cbad261d Fix filenames issue 2022-06-22 00:21:43 -04:00