Commit Graph

211 Commits

Author SHA1 Message Date
Akka
321a2a3537
Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
6144f47127 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
gentlespoon
0102a3ce1e The statues will now automatically regen their HP volume over time.
Max is currently set to 85000 for everyone. Will update after implementing statue levels.
2022-05-06 03:26:38 -07:00
Melledy
098cf372c9 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
gentlespoon
e319fd751b fix: lower logging level in SotSManager 2022-05-06 00:49:08 -07:00
gentlespoon
39c932b041 Implementes auto HP recovery at the statues.
- Respects player setting.
- SP + MP.
- Statue has unlimited HP volume (to be updated)
2022-05-06 00:17:18 -07:00
Akka
39a49ae964 Add @Transient for temporary team 2022-05-06 00:12:33 -07:00
Akka
696f629080 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
a79e00896c Add @Transient for temporary team 2022-05-06 14:46:10 +08:00
gentlespoon
744aa478a9 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
7d51e0deb5
Merge pull request #1 from Akka0/development
Updated
2022-05-06 14:16:44 +08:00
Akka
d32d4014cd Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
gentlespoon
18b1c50d0a Fixes #529: fixed stamina abnormal. added fall to death.
Stamina is still WIP.
- Currently stamina consumption is not affected by the use of foods, talents, or the environment.
- Charged attacks do no require stamina yet.
- Will be fixed tomorrow.
2022-05-05 15:37:15 -07:00
gentlespoon
94c1de66b9 SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
AnimeGitB
e198907143 Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
bf654ced36 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
Akka
823040be56
Add Support of Item Combine (#513)
* Add Support of Item Combine

* Add Support of Item Combine

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
2022-05-04 10:06:13 -07:00
Angda Song
6943360f4a Implement map marking features
Teleport still exists on fish hook mark.
Added mapMark-related protos.
Map marking data is stored in players collection.
2022-05-04 10:01:46 -07:00
EtherealAO
be4f178b8e Dungeon challenge success/fail notify should only be triggered once (when server spawned mob more than score) 2022-05-04 01:48:56 -07:00
Melledy
f08b8b1e09 Fix equip swapping 2022-05-04 01:45:41 -07:00
Melledy
50a8db213d Fix damage number not showing up if it was the killing blow 2022-05-04 01:21:34 -07:00
Melledy
e7276a75d3 Fixed dungeon challenge scoreboard and implement dungeon drops
Also fixed a few dungeon script handlers
2022-05-03 23:24:43 -07:00
Melledy
bf3e5566c8 Weapons/artifacts should not have a count of more than 1 2022-05-03 23:24:18 -07:00
51a6152afc Support giftPackage BatchUse
Co-authored-by: pris <lilch1022@hotmail.com>
2022-05-03 02:29:04 -07:00
Melledy
90787c659b Fix extra skill charges being removed if you teleport
Close #404
2022-05-03 02:27:18 -07:00
Melledy
5af7b8d2e8 Fix mail not sending to offline players 2022-05-03 02:27:18 -07:00
mingjun97
0adafd6076 Enable plugins to hook server message response
* Add message handler so that the plugin can hook inside the `dropMessage` method for `Player` instance.
2022-05-03 02:16:44 -07:00
70b5124ecf Implement food heal function
Co-authored-by: pris <lilch1022@hotmail.com>
2022-05-02 22:02:11 -07:00
dogdie233
9c358744e7 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
e8aaee6515 implement shopMail giftPackage function
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
2022-05-02 02:50:24 -07:00
Melledy
89bd8a10ef Fix gacha rate for weapons 2022-05-02 02:01:24 -07:00
Melledy
63c7f8d62d Move player mail to MailHandler class
This is so we dont have to save the entire player to the db every time we send mail
2022-05-02 02:01:01 -07:00
KingRainbow44
e60cf79309
Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
mingjun97
8cf4ef59ec Implement gacha history record subsystem
* Frontend is not very beautiful yet
* Didn't include too much `some anime game` data in the page to avoid being DMCA'd
2022-05-01 13:47:17 -07:00
4Benj_
d484ba7ed6
Cleaned up dispatch iOS fixes (#396)
* Attempting to fix crashing on iOS devices

plus I forgot a thing in string.format

* Removed unnecessary things
2022-04-30 23:31:39 -07:00
KingRainbow44
d31695b033
Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04:00
Melledy
dd0f8f8d49 Fix constellations that give an extra charge to skills
Fix #228
2022-04-30 19:34:50 -07:00
KingRainbow44
b703a32544
QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
9902f39306
Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
e8d60c6edf
Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
a1a36dc7a7
Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
a3e22dd7e1
Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
LDA
64930b9ba9 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Aru
dd38814209
Monsters should drop items in world (#373)
* Monsters should drop items in world

fix the typo introduced in f1934c3a47

* Determine whether in dungeon scene
2022-04-30 13:18:09 +02:00
lhhxxxxx
f31fda2e16 Update Account.hasPermission()
Add wildcard characters to permission nodes under the same namespace. (simple implementation)
2022-04-30 01:30:38 -07:00
Melledy
3bdf93f503 Monsters should not drop items inside dungeons 2022-04-30 01:20:44 -07:00
Melledy
b140c7f5bf Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
bea9a76895 Optimize GetOnlinePlayerListRsp 2022-04-30 01:20:44 -07:00
Melledy
d64c26d4f5 Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
KingRainbow44
47cf1e5898
Merge branch 'development' into api
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
2022-04-29 19:31:33 -04:00