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

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
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
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
more instancecontent work;
  • Loading branch information
hkAlice authored and takhlaq committed Jun 21, 2024
commit c8ab6debec363c7ba3b5ebde79df6483fc15ef01
6 changes: 3 additions & 3 deletions src/world/Encounter/InstanceContent/IfritNormal.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Sapphire

void init() override
{
Logger::info( "ifrit FAN CLUB GEOcities <blink>EUNUCH ONLY</blink>" );
Logger::info( "stage 2 init" );
}

void update( uint64_t deltaTime ) override
Expand Down Expand Up @@ -55,7 +55,7 @@ namespace Sapphire

void init() override
{
Logger::info( "ifrit FAN CLUB GEOcities <blink>EUNUCH ONLY</blink>" );
Logger::info( "stage 1 init" );
}

void update( uint64_t deltaTime ) override
Expand All @@ -76,7 +76,7 @@ namespace Sapphire
m_pEncounter->addState( ifritTwoState );
}

if( timeElapsedMs > 10000 )
if( timeElapsedMs > 12000 )
{
pIfrit->hateListGetHighest()->die();
}
Expand Down
3 changes: 1 addition & 2 deletions src/world/Network/PacketWrappers/MoveActorPacket.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
{

/**
* @brief The Client UI Initialization packet. This must be sent to the client
* once upon connection to configure the UI.
* @brief The MoveActor packet for updating an actor's position.
*/
class MoveActorPacket : public ZoneChannelPacket< FFXIVIpcActorMove >
{
Expand Down
5 changes: 3 additions & 2 deletions src/world/Territory/InstanceContent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
// todo: revive players if trial/enclosed raid arena, add reset timer
if( m_instanceResetTime == 0 )
{
//sendDutyReset();
sendDutyReset();
m_instanceResetTime = tickCount + 3000;

return;
Expand All @@ -187,7 +187,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )

if( m_instanceResetFinishTime == 0 )
{
m_instanceResetFinishTime = tickCount + 3000;
m_instanceResetFinishTime = tickCount + 5000;
m_pEncounter->reset();

auto& server = Common::Service< World::WorldServer >::ref();
Expand All @@ -202,6 +202,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
movePlayerToEntrance( *pPlayer );
auto zoneInPacket = makeActorControlSelf( pPlayer->getId(), Appear, 0x3, 0, 0, 0 );
auto setStatusPacket = makeActorControl( pPlayer->getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );


server.queueForPlayer( pPlayer->getCharacterId(), zoneInPacket );
server.queueForPlayers( pPlayer->getInRangePlayerIds( true ), setStatusPacket );
Expand Down