Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.x] (WIP) EncounterFight and state refactor; #928

Merged
merged 134 commits into from
Jan 4, 2025
Merged
Changes from 1 commit
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
8591cb8
Remove extra qualification
pinapelz Mar 6, 2023
819f284
Merge pull request #910 from pinapelz/fix_linux_build
SapphireMordred Mar 6, 2023
ca002da
Renamed the Util::Player namespace to Util::Packet. More cleanups and…
SapphireMordred Mar 7, 2023
fb7be50
Some more packet cleanup.
SapphireMordred Mar 7, 2023
4bee448
Syntax error which snuck in fixed.
SapphireMordred Mar 7, 2023
859f232
Another big batch of refactoring for readability.
SapphireMordred Mar 8, 2023
0def789
Refactoring of action logic, ongoing.
SapphireMordred Mar 9, 2023
5d353de
Action logic rework #1
SapphireMordred Mar 10, 2023
72f06fb
Status effect rework for actionintegrity.
SapphireMordred Mar 10, 2023
54ba2b5
Fixed another bug with self target actions.
SapphireMordred Mar 10, 2023
7c4a053
further simplified the action builder.
SapphireMordred Mar 10, 2023
5cc7b0c
Converted autoattacks to the action system
SapphireMordred Mar 11, 2023
d6918a8
Basic gambit work, still needs cleanup and improvements
SapphireMordred Mar 12, 2023
31557f5
Fixe for target and statuseffect issues, cleanup of gambits
SapphireMordred Mar 12, 2023
0edff5a
Statuseffect fix #2
SapphireMordred Mar 12, 2023
b98f63e
Statuseffect fix #3
SapphireMordred Mar 12, 2023
09db0ee
There is now an applyStatusEffectSelf for status effects which same s…
SapphireMordred Mar 13, 2023
f1cd218
Include Common::ActionResultFlag::EffectOnSource on source status eff…
SapphireMordred Mar 13, 2023
658d2fa
minor cleanup of actionResultBuilder
SapphireMordred Mar 13, 2023
5fb62b7
support 3.x crit damage and remove direct hit
collett8192 Mar 14, 2023
123dad2
update rng to RandGenerator
collett8192 Mar 14, 2023
9ba263d
Merge pull request #923 from collett8192/3.0_master
SapphireMordred Mar 14, 2023
aafb77e
Use attack type for action hit effect, further simply action code.
SapphireMordred Mar 14, 2023
33463f4
More cleanup of actions
SapphireMordred Mar 15, 2023
fe9a2ef
Cleanup cleanup cleanup
SapphireMordred Mar 16, 2023
e72fe53
Added the framework for a fsm for future use on bnpcs.
SapphireMordred Mar 17, 2023
c7b50ca
Keep cells active for 20 seconds even after all players left.
SapphireMordred Mar 17, 2023
c97a67f
Implementation of the state machine for bnpcs, missing hp recovering …
SapphireMordred Mar 20, 2023
4f3f866
Fill Bnpc link info in spawn packet if available
SapphireMordred Mar 20, 2023
d5c4739
use cache in getterritorydetail; remove unused bgpath; avoid throwing…
hkAlice Mar 24, 2023
09d0469
emplace_back for in-place move const for shared ptr;
hkAlice Mar 24, 2023
f6ce820
switchy;
hkAlice Mar 24, 2023
dedf66f
add getRows to exd; optimize iterative exd calls further; split names…
hkAlice Mar 24, 2023
631abf4
remove extra call;
hkAlice Mar 24, 2023
9287293
Gambit packs added. Basic timelines for bnpc actions can be defined.
SapphireMordred Mar 24, 2023
a65b237
Merge pull request #927 from hkAlice/faster-but-not-enough
SapphireMordred Mar 25, 2023
d4d8c3c
Moving around level up logic to make gm level up command behave 'norm…
T00fy Apr 18, 2023
f0e1990
Some bug fixes
T00fy Apr 18, 2023
b3e86d3
Formatting
T00fy Apr 23, 2023
e7cfe87
Merge pull request #930 from T00fy/master
SapphireMordred Apr 25, 2023
78b860d
fix some PlayerCondition flags
collett8192 Apr 30, 2023
4992503
Merge pull request #933 from collett8192/3.0_master
SapphireMordred May 1, 2023
0a70db8
Underneath the Sultantree quest + questbattle implementation
pinapelz May 7, 2023
6fb0797
Added ItemIcons to quest notice, logic fixes, set Bitflag8 for SubsS…
pinapelz May 9, 2023
fe140ab
Added Item Icons to notices in some existing quests
pinapelz May 10, 2023
8581a96
Central Thanalan SubWil MSQ pt.1
pinapelz May 10, 2023
bce9df1
Added ItemIcons to quest notices with multiple vars
pinapelz May 10, 2023
99b802c
Added missing HIDE_HOTBAR
pinapelz May 10, 2023
3b274cd
Central Thanalan SubWil MSQ
pinapelz May 10, 2023
511d227
Fixed typo
pinapelz May 11, 2023
96c1c4c
Merge pull request #935 from pinapelz/master
SapphireMordred May 11, 2023
132129a
Create login.js
Sveimoldr Oct 20, 2023
364c304
Update login.html
Sveimoldr Oct 20, 2023
127a507
Create github.js
Sveimoldr Oct 20, 2023
90354e8
implement unlocking orchestrion roll
pinapelz Jan 11, 2024
22b4ed3
fix: allow player to remove title after being set
pinapelz Jan 11, 2024
48c0127
Merge pull request #952 from pinapelz/master
SapphireMordred Jan 12, 2024
072562b
Merge pull request #950 from Sveimoldr/master
SapphireMordred Jan 12, 2024
cfb9408
implement initial CNJ job quests
pinapelz Jan 18, 2024
3d1c8b0
Merge branch 'SapphireServer:master' into quest_work
pinapelz Jan 18, 2024
3bf03c5
Fixed up json object and added lobbyPort for api response
T00fy Jan 23, 2024
8f408c4
Add condition to increment currentKC in SubFst011
pinapelz May 10, 2024
3008404
add remove condition casting in EventMgr
pinapelz May 12, 2024
4679420
fix infinite loop trying to return from Event
pinapelz May 12, 2024
2866e67
Merge pull request #954 from pinapelz/quest_work
NotAdam May 13, 2024
989630b
Merge pull request #953 from T00fy/wip
NotAdam May 13, 2024
66707a0
implement teleportation via aetheryte ticket
pinapelz May 17, 2024
825f07a
fix: seperate set homepoint and housing options from aetheryte menu
pinapelz May 18, 2024
2ef9df6
fix styling
pinapelz May 18, 2024
43da39d
Fix building on clang
arieshi255 Jan 16, 2024
fb7dd04
Revert "Update login.html"
arieshi255 Jan 16, 2024
80b11c7
Merge pull request #957 from arieshi255/fix-clang-and-launcher
NotAdam Jun 20, 2024
5189042
Merge pull request #955 from pinapelz/tp_tix
NotAdam Jun 20, 2024
7bfd953
[3.x] WIP: Initial Action and StatusEffect implementation (#958)
arieshi255 Jun 21, 2024
b4dd70b
Remove unnecessary bit field in exd
arieshi255 Jun 21, 2024
241ac49
Avoid copying modifiers to applyStatusEffect
arieshi255 Jun 21, 2024
d8ffb01
Change StatusEntry duration to unsigned int
arieshi255 Jun 21, 2024
0ac7936
Change size() > 0 checks to !empty()
arieshi255 Jun 21, 2024
6b72992
Change StatusEffect to return const-ref in modifier getters
arieshi255 Jun 21, 2024
2965d8a
Add function to remove multiple statuseffects by id
arieshi255 Jun 21, 2024
52dfd3a
Merge pull request #959 from arieshi255/actions-fixup
SapphireMordred Jun 21, 2024
fc46e57
ugly prototype of arenascript;
hkAlice Mar 7, 2023
c3107b8
remove scripts for battle;
hkAlice Mar 8, 2023
f8b0cfb
add EncounterFight, EncounterState; add example ifritnormal;
hkAlice Mar 8, 2023
69b7671
encounter status control;
hkAlice Mar 8, 2023
77089d4
add encounter to instancecontent; basic status handling;
hkAlice Mar 8, 2023
c1589c1
add timers and enrage mechanic;
hkAlice Mar 8, 2023
a10c0cd
more work on duty resets;
hkAlice Mar 8, 2023
25dbd60
more duty reset work, respawn players on duty reset;
hkAlice Mar 8, 2023
a5fdc0b
fix typos;
hkAlice Mar 8, 2023
c8ab6de
more instancecontent work;
hkAlice Mar 8, 2023
9035d44
rezone player; wait for all players to unlock zone entrance;
hkAlice Mar 9, 2023
9d49139
return spaced player name in case of player not found in db;
hkAlice Mar 24, 2023
6bd8dee
EncounterFight and state refactor;
hkAlice Mar 24, 2023
fd768eb
fix crash on bnpc fsm nullptr;
hkAlice Mar 24, 2023
9331fa3
wip: encounter timeline parsing
takhlaq Apr 29, 2024
41ac3b8
fix build
takhlaq May 5, 2024
6c5df82
more encounter timeline work
takhlaq May 6, 2024
05f9feb
wip: reorganise some timeline stuff
takhlaq May 6, 2024
342c30a
wip: refactor some encounter timeline stuff
takhlaq May 9, 2024
959df68
fix build
takhlaq May 9, 2024
daf906d
wip: add encounter combat state parsing
takhlaq May 9, 2024
f96c633
wip: encounter timepoint separate update from execute
takhlaq May 10, 2024
576930d
wip: encounter timeline use InstanceContentPtr instead of EncounterFi…
takhlaq May 10, 2024
025f57c
wip: more encounter timeline stuff
takhlaq May 10, 2024
43f9254
wip: refactor encounter timeline stuff to only modify state objects, …
takhlaq May 10, 2024
cf712cb
wip: encounter timeline actually populate the entry before adding to …
takhlaq May 10, 2024
a4d712f
wip: encounter timeline oops
takhlaq May 10, 2024
e4024a6
wip: timeline shit
takhlaq May 23, 2024
989e1ee
fix build
takhlaq May 23, 2024
b29971b
wip: timeline refactor to use Territory instead of just InstanceConte…
takhlaq May 27, 2024
8ce3dec
wip: timeline refactor to use condition's ui assigned id
takhlaq May 28, 2024
6f7198b
add debug command for actor move
takhlaq Jun 15, 2024
0e55c62
fix missing include in RNGMgr, expose rng engine
takhlaq Jun 19, 2024
011cf1b
add position offset calcs
takhlaq Jun 19, 2024
8fb9846
wip: initial target select filter work
takhlaq Jun 19, 2024
7cc3f65
split encounter timeline stuff into separate files
takhlaq Jun 20, 2024
26534d2
refactor timeline stuff, implement selectors
takhlaq Jun 21, 2024
29c9903
return const ref for Territory::getPlayers
takhlaq Jun 21, 2024
7b2ea40
encounter timeline fix json parsing
takhlaq Jun 22, 2024
2f4efec
fix some timeline bugs, temporarily disable gambits
takhlaq Jun 23, 2024
8c95254
fix timeline advancing, add ifrit normal encounter script
takhlaq Jun 23, 2024
9445bc0
fix 0 duration timepoints
takhlaq Jun 24, 2024
75a2fcb
reference conditions globally in timeline
takhlaq Jun 24, 2024
cf2d610
fick director bgm;
hkAlice Jun 25, 2024
34fc49f
added cbt;
hkAlice Jun 25, 2024
b38afc0
add left/right to nudge command
takhlaq Jun 25, 2024
e794df5
Merge branch 'bs-stuff' of https://github.com/hkAlice/Sapphire into b…
takhlaq Jun 25, 2024
3727306
add chara dirty flag, move bnpc position updates to tick
takhlaq Jun 25, 2024
73094fb
fix incorrect radius for bnpc
takhlaq Jun 26, 2024
ee72f2e
fix crash on mobkills due to misuse of classjob index;
hkAlice Jan 3, 2025
f2805e9
myerge squashy;
hkAlice Jan 3, 2025
62fa2a4
fix crash on HW+ skills related; aligned action struct a tiny bit more;
hkAlice Jan 3, 2025
75edbdb
myerge;
hkAlice Jan 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix build
  • Loading branch information
takhlaq committed Jun 21, 2024
commit 989e1eeff766a2ea445d55224ba6c1bce1a39aa9
8 changes: 4 additions & 4 deletions src/world/Encounter/EncounterTimeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ namespace Sapphire
{
auto dataJ = json.at( "data" );
auto hateSrcJ = dataJ.at( "hateSrc" );
auto actorRef = dataJ.at( "spawnActor" );
auto actorRef = dataJ.at( "spawnActor" ).get< std::string >();
auto flags = dataJ.at( "flags" ).get< uint32_t >();

// todo: hateSrc
Expand All @@ -739,15 +739,15 @@ namespace Sapphire
if( auto it = actors.find( actorRef ); it != actors.end() )
layoutId = it->second.m_layoutId;
else
throw std::runtime_error( fmt::format( "EncounterTimeline::Timepoint::from_json: SpawnBNpc invalid actor ref: %s", actorRef ) );
throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::Timepoint::from_json: SpawnBNpc invalid actor ref: %s" ), actorRef ) );

m_pData = std::make_shared< TimepointDataSpawnBNpc >( layoutId, flags );
}
break;
case TimepointDataType::SetBNpcFlags:
{
auto dataJ = json.at( "data" );
auto actorRef = dataJ.at( "spawnActor" );
auto actorRef = dataJ.at( "spawnActor" ).get< std::string >();
auto flags = dataJ.at( "flags" ).get< uint32_t >();

// todo: hateSrc
Expand All @@ -756,7 +756,7 @@ namespace Sapphire
if( auto it = actors.find( actorRef ); it != actors.end() )
layoutId = it->second.m_layoutId;
else
throw std::runtime_error( fmt::format( "EncounterTimeline::Timepoint::from_json: SetBNpcFlags invalid actor ref: %s", actorRef ) );
throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::Timepoint::from_json: SetBNpcFlags invalid actor ref: %s" ), actorRef ) );

m_pData = std::make_shared< TimepointDataBNpcFlags >( layoutId, flags );
// todo: SetBNpcFlags
Expand Down