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

6930 commits

Author SHA1 Message Date
Tahir
e4024a677b wip: timeline shit
- add BattleTalk handling including packets
- add LogMessage handling
- add SetCondition handling (allow conditions to toggle others on/off)
- handle Director ops
- add basic CastAction (prolly doesnt work)
- add SpawnBNpc
2024-06-22 00:28:49 +01:00
Tahir
a4d712f32c wip: encounter timeline oops 2024-06-22 00:28:48 +01:00
Tahir
cf712cb3c8 wip: encounter timeline actually populate the entry before adding to cache 2024-06-22 00:28:48 +01:00
Tahir
43f9254086 wip: refactor encounter timeline stuff to only modify state objects, cache should now work as intended
- tldr: fast as fuck boi
2024-06-22 00:28:48 +01:00
Tahir
025f57ce9b wip: more encounter timeline stuff 2024-06-22 00:28:48 +01:00
Tahir
576930dcfc wip: encounter timeline use InstanceContentPtr instead of EncounterFightPtr 2024-06-22 00:28:47 +01:00
Tahir
f96c633c6c wip: encounter timepoint separate update from execute
- todo: implement conditions and timepoint parsing for remaining types
- todo: test lmao
2024-06-22 00:28:47 +01:00
Tahir
daf906d2ae wip: add encounter combat state parsing 2024-06-22 00:28:47 +01:00
Tahir
959df68b63 fix build 2024-06-22 00:28:46 +01:00
Tahir
342c30aa43 wip: refactor some encounter timeline stuff
- todo: test if any of this actually works
2024-06-22 00:28:46 +01:00
Tahir
05f9feb6ed wip: reorganise some timeline stuff 2024-06-22 00:28:46 +01:00
Tahir
6c5df82306 more encounter timeline work 2024-06-22 00:28:45 +01:00
Tahir
41ac3b88a6 fix build 2024-06-22 00:28:45 +01:00
Tahir
9331fa3dd1 wip: encounter timeline parsing
- todo: parse the json into usable data objects
2024-06-22 00:28:45 +01:00
Alice Ogeda
fd768eb18f fix crash on bnpc fsm nullptr; 2024-06-22 00:28:45 +01:00
Alice Ogeda
6bd8dee22d EncounterFight and state refactor; 2024-06-22 00:28:44 +01:00
Alice Ogeda
9d49139a0c return spaced player name in case of player not found in db; 2024-06-22 00:28:44 +01:00
Alice Ogeda
9035d44c55 rezone player; wait for all players to unlock zone entrance; 2024-06-22 00:28:44 +01:00
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