1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-19 17:56:51 +00:00
Commit graph

6926 commits

Author SHA1 Message Date
Mordred
bf3368224a
Merge pull request #973 from arieshi255/fix-mapmgr
[3.x] Update map icons on quest completion
2025-01-17 23:31:27 +01:00
Rushi
a2c8ee1845 Update map icons on quest completion 2025-01-17 23:22:45 +01:00
Mordred
6739d8634c
Merge pull request #972 from arieshi255/fixup-cf
[3.x] wip: Fix Duty Finder to work again
2025-01-17 21:17:34 +01:00
Rushi
bb17030c68 Add an enum for content flags instead of using magic numbers 2025-01-17 21:16:58 +01:00
Rushi
a5919cbbd2 [3.x] wip: Fix Duty Finder to work again 2025-01-17 19:20:21 +01:00
Mordred
c50f4e04f3
Merge pull request #971 from arieshi255/fix-mapmgr
[3.x] Fix some MapMgr issues
2025-01-17 09:12:17 +01:00
Rushi
db0798b423 [3.x] Fix some MapMgr issues 2025-01-16 23:40:19 +01:00
Mordred
952391ae4f Song learn functions moved 2025-01-02 16:06:47 +01:00
Mordred
495f651bce levelup logic moved to playerMgr 2025-01-02 13:25:18 +01:00
Mordred
8a3d8775fe Removed old gainExp function in player 2025-01-02 09:55:21 +01:00
Mordred
78b800e36e exitInstance moved to playerMgr 2025-01-02 09:48:51 +01:00
Mordred
168cfb1a36 Cleanups in player 2025-01-02 09:22:10 +01:00
hkAlice
4a46b3dd80
Merge pull request #965 from hkAlice/i-need-speed
[3.x] cache eobj/enpc exd; fix server crash on aoe skills; !add unlockall (0xff unlock bitmask);
2024-08-09 20:07:37 -03:00
hkAlice
c1fdf38587
Merge pull request #967 from Miralqir/master
Fix building on Gentoo
2024-08-09 20:06:50 -03:00
Miralqir
66dca3e04d Remove distribution specific code in FindMySQL.cmake 2024-08-09 14:31:08 +03:00
Miralqir
967d8b1422 Make FindMySQL.cmake work on Gentoo 2024-08-09 05:06:18 +03:00
Miralqir
086dfb7133 Fix CMake Policy CMP0153 warning 2024-08-09 04:44:13 +03:00
Miralqir
2e353fd473 Remove pre-C++17 Filesystem library support 2024-08-09 04:17:28 +03:00
Alice Ogeda
42174f19df cache eobj/enpc exd; fix crash on aoe skills; add unlockall; 2024-07-27 22:37:09 -03:00
Mordred
2a0e423051
Merge pull request #963 from arieshi255/fix-lut
[3.x] Throw exception if duplicate definitions of actions are found
2024-06-27 13:43:32 +02:00
Rushi
e2e6b3e15d Throw exception if duplicate definitions of actions are found 2024-06-27 13:39:00 +02:00
hkAlice
88ae073089
Merge pull request #962 from arieshi255/actions-fixup
[3.x] Fix StatusEffect flag application from exd and add isFacingTarget function
2024-06-26 16:09:56 -03:00
Rushi
0acff69b46 Add isFacingTarget and helper functions 2024-06-26 20:50:12 +02:00
Rushi
5dd893a0c7 Fix StatusEffect flags 2024-06-22 07:31:50 +02:00
Mordred
52dfd3a2f6
Merge pull request #959 from arieshi255/actions-fixup
[3.x] WIP: Cleanup of initial action implementation
2024-06-21 22:09:35 +02:00
Rushi
2965d8a03a Add function to remove multiple statuseffects by id 2024-06-21 16:12:33 +02:00
Rushi
6b72992b9f Change StatusEffect to return const-ref in modifier getters 2024-06-21 12:33:38 +02:00
Rushi
0ac79362cd Change size() > 0 checks to !empty() 2024-06-21 12:33:31 +02:00
Rushi
d8ffb010a3 Change StatusEntry duration to unsigned int 2024-06-21 12:33:26 +02:00
Rushi
241ac491ef Avoid copying modifiers to applyStatusEffect 2024-06-21 12:33:18 +02:00
Rushi
b4dd70b98e Remove unnecessary bit field in exd 2024-06-21 12:33:12 +02:00
Mimi
7bfd9538c9
[3.x] WIP: Initial Action and StatusEffect implementation (#958)
* Check statuses to determine valid lut entry

* Add duration field to statuses

* Rename buildEffects to make more sense

* Add basic generic handler for applying statuseffects

* Add more modifiers

* Add basic modifier impl for Chara

* Apply/remove modifiers for statuseffects

* Add some example statuses to lut

* Fix windows build error

* Don't clear tick effect

* Add status entry for Maim

* Apply status effects properly for self when having a target

* Fix hasStatusEffect to prevent duplicates

* Basic dot/hot ticks implemented

* Update HP on tick effects

* Apply effect to correct target

* Add method to simplify applying statuses to self

* Add job actions for warrior

* Add some actions and statuses for war

* Add even more modifiers

* Add statuseffect cost type

* Add option to not send statusremove order

* Change delModifier assert to return early instead

* Add option for scripts to enable the generic/lut handler

* Add enums for common action values

* fix indentation

* Fix modifier name for Defiance

* Remove status tick logging

* Move modifiers to statuseffect

* Add ParryPercent modifier

* Remove wrath when Defiance ends

* Apply modifiers in applyStatus

* Remove unused method

* Persistence for cross-class skills

* Add flags to StatusEffects

* Some exd struct fixes

* Some aoe work

* Add flags to lut

* Add missing changeclass

* Add SET_STATUS_ME to ActionIntegrity

* Improve offensive action check

* Add flag to overloaded applyStatusEffectSelf

* indentation fix

* Some calculation work

* Null-check ActionResultBuilder

---------

Co-authored-by: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Co-authored-by: Mordred <30826167+SapphireMordred@users.noreply.github.com>
2024-06-21 12:27:01 +10:00
Adam
5189042247
Merge pull request #955 from pinapelz/tp_tix
Implement Aetheryte Tickets
2024-06-20 18:41:48 +10:00
Adam
80b11c75c8
Merge pull request #957 from arieshi255/fix-clang-and-launcher
[3.x] Fix clang compilation and launcher script
2024-06-20 18:41:19 +10:00
Rushi
fb7dd04f67 Revert "Update login.html"
This reverts commit 364c304d4a.
2024-06-19 18:28:42 +02:00
Rushi
43da39dee8 Fix building on clang 2024-06-19 18:28:32 +02:00
Pinapelz
2ef9df61f8 fix styling 2024-05-18 12:35:34 -07:00
Pinapelz
825f07accc fix: seperate set homepoint and housing options from aetheryte menu 2024-05-17 18:44:14 -07:00
Pinapelz
66707a02c2 implement teleportation via aetheryte ticket 2024-05-17 16:44:44 -07:00
Adam
989630b2ea
Merge pull request #953 from T00fy/wip
Fixed up json object and added lobbyPort for api response
2024-05-13 23:32:20 +10:00
Adam
2866e67a4c
Merge pull request #954 from pinapelz/quest_work
CNJ and SubFst Quests and EventMgr Fixes
2024-05-13 23:31:23 +10:00
Pinapelz
4679420d84 fix infinite loop trying to return from Event
Scene00099 doesn't do anything and causes server to infinitely attempt to return from it
2024-05-12 12:01:21 -07:00
Pinapelz
3008404c22 add remove condition casting in EventMgr
fixes issue where using EventItemAction during quests makes the player stuck casting
2024-05-12 11:57:14 -07:00
Pinapelz
8f408c4e5e Add condition to increment currentKC in SubFst011
Prevents repeated excess quest progress event notices if Enemy0 is killed after kill count is already reached
2024-05-10 16:13:45 -07:00
Toofy
3bf03c54f4 Fixed up json object and added lobbyPort for api response 2024-01-23 23:54:22 +00:00
Pinapelz
3d1c8b0c2c
Merge branch 'SapphireServer:master' into quest_work 2024-01-17 20:55:53 -08:00
Pinapelz
cfb9408b2e implement initial CNJ job quests
- ClsCnj998
- ClsCnj999
2024-01-17 20:51:17 -08:00
Mordred
072562bc4a
Merge pull request #950 from Sveimoldr/master
Login.html refactored
2024-01-12 10:21:34 +01:00
Mordred
48c0127fa8
Merge pull request #952 from pinapelz/master
Minor ItemAction and Player Title fixes
2024-01-12 10:21:01 +01:00
Pinapelz
22b4ed3c5a fix: allow player to remove title after being set
- index 0 is None in-game removing the currently equipped title
2024-01-10 20:36:08 -08:00