mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 15:47:46 +00:00
Code Activity

wip: encounter timeline actually populate the entry before adding to cache

Browse source
This commit is contained in:
Tahir 2024-05-10 23:39:06 +01:00
parent 43f9254086
commit cf712cb3c8
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/world/Encounter/EncounterTimeline.cpp
View file

@ -591,7 +591,7 @@ namespace Sapphire
} }
} }
EncounterTimeline::TimelinePack EncounterTimeline::buildEncounterTimeline( uint32_t encounterId, bool reload ) EncounterTimeline::TimelinePack EncounterTimeline::getEncounterPack( uint32_t encounterId, bool reload )
{ {
static std::map< uint32_t, TimelinePack > cache = {}; static std::map< uint32_t, TimelinePack > cache = {};
const static std::unordered_map< std::string, ConditionId > conditionIdMap = const static std::unordered_map< std::string, ConditionId > conditionIdMap =
@ -757,6 +757,16 @@ namespace Sapphire
throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::buildEncounterTimeline - no state found by name: %s" ), phaseRef ) ); throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::buildEncounterTimeline - no state found by name: %s" ), phaseRef ) );
} }
} }
for( const auto& actor : actorNameMap )
pack.addTimelineActor( actor.second );
std::string name( "Encounter" );
name += std::to_string( encounterId );
pack.setName( name );
// todo: reload will probably kill the server when CastAction.callbacks are added
if( reload ) if( reload )
cache[ encounterId ] = pack; cache[ encounterId ] = pack;
else else

31
src/world/Encounter/EncounterTimeline.h
View file

@ -532,6 +532,17 @@ namespace Sapphire
uint32_t m_hp{ 0 }; uint32_t m_hp{ 0 };
std::string m_name; std::string m_name;
TimelineActor() { }
TimelineActor( const TimelineActor& rhs ) :
m_layoutId( rhs.m_layoutId ),
m_hp( rhs.m_hp ),
m_name( rhs.m_name ),
m_phaseConditions( rhs.m_phaseConditions ),
m_conditionStates( rhs.m_conditionStates )
{
}
void addPhaseCondition( PhaseConditionPtr pCondition ) void addPhaseCondition( PhaseConditionPtr pCondition )
{ {
m_phaseConditions.push_back( pCondition ); m_phaseConditions.push_back( pCondition );
@ -579,8 +590,26 @@ namespace Sapphire
uint64_t m_startTime{ 0 }; uint64_t m_startTime{ 0 };
public: public:
TimelinePack() { } TimelinePack() { }
TimelinePack( const TimelinePack& rhs ) :
m_type( rhs.m_type ),
m_name( rhs.m_name ),
m_actors( rhs.m_actors ),
m_startTime( 0 )
{
}
TimelinePack( TimelinePackType type ) : m_type( type ) {} TimelinePack( TimelinePackType type ) : m_type( type ) {}
void setName( const std::string& name )
{
m_name = name;
}
void addTimelineActor(const TimelineActor& actor)
{
m_actors.push_back( actor );
}
void setStartTime( uint64_t time ) void setStartTime( uint64_t time )
{ {
m_startTime = time; m_startTime = time;
@ -669,6 +698,6 @@ namespace Sapphire
public: public:
TimelinePack buildEncounterTimeline( uint32_t encounterId, bool reload = false ); TimelinePack getEncounterPack( uint32_t encounterId, bool reload = false );
}; };
}// namespace Sapphire }// namespace Sapphire