mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Code Activity
6945 commits 10 branches 14 tags 26 MiB
Commit graph

6945 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tahir
75a2fcbb63 reference conditions globally in timeline 
- add PhaseActive and GetAction conditions
- refactor ifrit to use controller
 2024-06-24 22:45:06 +01:00
Tahir
9445bc0260 fix 0 duration timepoints 
- fix BNpcSpawn timepoint
- temp workaround for actions
- fix selectors not working as intended
- todo: rewrite this shit to not abuse copy ctors
 2024-06-24 18:41:18 +01:00
Tahir
8c952540d5 fix timeline advancing, add ifrit normal encounter script 2024-06-23 22:44:51 +01:00
Tahir
2f4efec34d fix some timeline bugs, temporarily disable gambits 2024-06-23 01:30:07 +01:00
Tahir
7b2ea407e9 encounter timeline fix json parsing 2024-06-22 06:13:23 +01:00
Tahir
29c990311b return const ref for Territory::getPlayers 
- timeline cleanup
 2024-06-22 00:28:52 +01:00
Tahir
26534d2a37 refactor timeline stuff, implement selectors 2024-06-22 00:28:52 +01:00
Tahir
7cc3f65571 split encounter timeline stuff into separate files 
- todo: use selector in CastAction timepoint
 2024-06-22 00:28:51 +01:00
Tahir
8fb9846c0b wip: initial target select filter work 
- todo: hook this up to EncounterTimeline
 2024-06-22 00:28:51 +01:00
Tahir
011cf1b6d2 add position offset calcs 2024-06-22 00:28:51 +01:00
Tahir
0e55c62e2d fix missing include in RNGMgr, expose rng engine 2024-06-22 00:28:50 +01:00
Tahir
6f7198bd5a add debug command for actor move 2024-06-22 00:28:50 +01:00
Tahir
8ce3dece5e wip: timeline refactor to use condition's ui assigned id 2024-06-22 00:28:49 +01:00
Tahir
b29971b9a3 wip: timeline refactor to use Territory instead of just InstanceContent (should support overworld now) 2024-06-22 00:28:49 +01:00
Tahir
989e1eeff7 fix build 2024-06-22 00:28:49 +01:00
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