1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Commit graph

6912 commits

Author SHA1 Message Date
Alice Ogeda
c8ab6debec more instancecontent work; 2024-06-22 00:28:43 +01:00
Alice Ogeda
a5fdc0b323 fix typos; 2024-06-22 00:28:43 +01:00
Alice Ogeda
25dbd60cdf more duty reset work, respawn players on duty reset; 2024-06-22 00:28:43 +01:00
Alice Ogeda
a10c0cdc0f more work on duty resets; 2024-06-22 00:28:43 +01:00
Alice Ogeda
c1589c1f20 add timers and enrage mechanic; 2024-06-22 00:28:42 +01:00
Alice Ogeda
77089d4083 add encounter to instancecontent; basic status handling; 2024-06-22 00:28:42 +01:00
Alice Ogeda
69b767177e encounter status control; 2024-06-22 00:28:42 +01:00
Alice Ogeda
f8b0cfb05b add EncounterFight, EncounterState; add example ifritnormal; 2024-06-22 00:28:42 +01:00
Alice Ogeda
c3107b8d53 remove scripts for battle; 2024-06-22 00:28:41 +01:00
Alice Ogeda
fc46e5792e ugly prototype of arenascript; 2024-06-22 00:28:41 +01: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
Pinapelz
90354e82f4 implement unlocking orchestrion roll 2024-01-10 20:35:02 -08:00
Leo Carvalho
127a5077c9
Create github.js 2023-10-20 11:23:36 -03:00
Leo Carvalho
364c304d4a
Update login.html 2023-10-20 11:17:57 -03:00
Leo Carvalho
132129aaf1
Create login.js 2023-10-20 11:16:13 -03:00
Mordred
96c1c4c042
Merge pull request #935 from pinapelz/master
SubWil/ManWil MSQ and adding Item Icons to quest notices
2023-05-11 16:43:35 +02:00
Pinapelz
511d227862
Fixed typo 2023-05-10 18:11:03 -07:00
Pinapelz
3b274cd9ae Central Thanalan SubWil MSQ
- SubWil026
- SubWil073
- SubWil080
2023-05-10 16:47:24 -07:00
Pinapelz
99b802c7c2 Added missing HIDE_HOTBAR 2023-05-10 16:46:31 -07:00
Pinapelz
bce9df158f Added ItemIcons to quest notices with multiple vars 2023-05-10 14:59:55 -07:00
Pinapelz
8581a96a40 Central Thanalan SubWil MSQ pt.1 2023-05-10 02:32:19 -07:00
Pinapelz
fe140ab2d6 Added Item Icons to notices in some existing quests
- Miner Job Quest
- White Mage Quest
- MSQ
2023-05-09 17:06:50 -07:00
Pinapelz
6fb07971c7 Added ItemIcons to quest notice, logic fixes, set Bitflag8 for SubsSea quests 2023-05-09 16:35:57 -07:00
Pinapelz
0a70db8686 Underneath the Sultantree quest + questbattle implementation
ManWil005 MSQ. HP values are likely to be wrong
2023-05-07 01:43:22 -07:00
Mordred
4992503308
Merge pull request #933 from collett8192/3.0_master
fix some PlayerCondition flags
2023-05-01 18:14:26 +02:00