From 2b57b734715b92ce109ca2228ffa52eb221cf9f9 Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Fri, 10 Feb 2023 12:11:11 -0300 Subject: [PATCH] first batch of moving packet/logic out of player to playermgr; --- .../quest/subquest/mordhona/GaiUsc605.cpp | 10 +- src/world/Action/Action.cpp | 14 +-- src/world/Action/EffectResult.cpp | 5 +- src/world/Action/EventAction.cpp | 14 ++- src/world/Action/MountAction.cpp | 13 +-- src/world/Actor/Player.cpp | 89 +++-------------- src/world/Actor/Player.h | 21 ++-- src/world/Manager/DebugCommandMgr.cpp | 4 +- src/world/Manager/EventMgr.cpp | 8 +- src/world/Manager/PlayerMgr.cpp | 99 +++++++++++++++++-- src/world/Manager/PlayerMgr.h | 6 ++ .../Network/Handlers/GMCommandHandlers.cpp | 8 +- .../Network/Handlers/PacketCommandHandler.cpp | 6 +- src/world/Territory/InstanceContent.cpp | 4 +- 14 files changed, 170 insertions(+), 131 deletions(-) diff --git a/src/scripts/quest/subquest/mordhona/GaiUsc605.cpp b/src/scripts/quest/subquest/mordhona/GaiUsc605.cpp index 243bc6f7..8bd58dbf 100644 --- a/src/scripts/quest/subquest/mordhona/GaiUsc605.cpp +++ b/src/scripts/quest/subquest/mordhona/GaiUsc605.cpp @@ -396,7 +396,7 @@ private: { eventMgr().sendEventNotice( player, getId(), 3, 0 ); quest.setSeq( Seq5 ); - player.setMount( Mount0 ); + playerMgr().onMountUpdate( player, Mount0 ); } ////////////////////////////////////////////////////////////////////// @@ -490,7 +490,7 @@ private: void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - player.setMount( Mount0 ); + playerMgr().onMountUpdate( player, Mount0 ); } ////////////////////////////////////////////////////////////////////// @@ -562,7 +562,7 @@ private: void Scene00023Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - player.setMount( Mount0 ); + playerMgr().onMountUpdate( player, Mount0 ); } ////////////////////////////////////////////////////////////////////// @@ -611,7 +611,7 @@ private: { eventMgr().sendEventNotice( player, getId(), 6, 0 ); quest.setSeq( Seq8 ); - player.setMount( 0 ); + playerMgr().onMountUpdate( player, 0 ); } } @@ -646,7 +646,7 @@ private: void Scene00030Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - player.setMount( Mount0 ); + playerMgr().onMountUpdate( player, Mount0 ); } ////////////////////////////////////////////////////////////////////// diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 5a26c0f6..ca9762b2 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -320,7 +320,7 @@ void Action::Action::start() if( player ) { - player->setStateFlag( PlayerStateFlag::Casting ); + Service< World::Manager::PlayerMgr >::ref().onSendStateFlags( *player, PlayerStateFlag::Casting ); } } @@ -368,14 +368,14 @@ void Action::Action::interrupt() // things that aren't players don't care about cooldowns and state flags if( m_pSource->isPlayer() ) { - auto player = m_pSource->getAsPlayer(); + auto pPlayer = m_pSource->getAsPlayer(); // todo: reset cooldown for actual player // reset state flag //player->unsetStateFlag( PlayerStateFlag::Occupied1 ); - player->setLastActionTick( 0 ); - player->unsetStateFlag( PlayerStateFlag::Casting ); + pPlayer->setLastActionTick( 0 ); + Service< World::Manager::PlayerMgr >::ref().onUnsetStateFlag( *pPlayer, PlayerStateFlag::Casting ); } if( hasCastTime() ) @@ -424,10 +424,10 @@ void Action::Action::execute() 0x219, m_id, m_id, m_id, m_id ); m_pSource->sendToInRangeSet( control, true );*/ - if( auto player = m_pSource->getAsPlayer() ) + if( auto pPlayer = m_pSource->getAsPlayer(); pPlayer ) { - player->setLastActionTick( 0 ); - player->unsetStateFlag( PlayerStateFlag::Casting ); + pPlayer->setLastActionTick( 0 ); + Service< World::Manager::PlayerMgr >::ref().onUnsetStateFlag( *pPlayer, PlayerStateFlag::Casting ); } } diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp index d32c92fd..7d69febf 100644 --- a/src/world/Action/EffectResult.cpp +++ b/src/world/Action/EffectResult.cpp @@ -2,6 +2,9 @@ #include +#include +#include + #include "Actor/Chara.h" #include "Actor/Player.h" @@ -133,7 +136,7 @@ void EffectResult::execute() case Common::ActionEffectType::CALC_RESULT_TYPE_MOUNT: { auto pPlayer = m_target->getAsPlayer(); - pPlayer->setMount( m_value ); + Common::Service< World::Manager::PlayerMgr >::ref().onMountUpdate( *pPlayer, m_value ); break; } diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp index 7c7e6249..94708b0e 100644 --- a/src/world/Action/EventAction.cpp +++ b/src/world/Action/EventAction.cpp @@ -4,9 +4,12 @@ #include #include +#include +#include -#include "Network/PacketWrappers/ActorControlPacket.h" -#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include +#include +#include #include "Actor/Player.h" @@ -14,7 +17,6 @@ #include "WorldServer.h" #include "Session.h" #include "Network/GameConnection.h" -#include "Manager/EventMgr.h" #include "EventAction.h" @@ -54,9 +56,11 @@ void Action::EventAction::start() if( m_pSource->isPlayer() ) { + auto pPlayer = m_pSource->getAsPlayer(); + m_pSource->sendToInRangeSet( control, true ); - if( m_pSource->getAsPlayer()->hasStateFlag( PlayerStateFlag::InNpcEvent ) ) - m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::InNpcEvent ); + if( pPlayer->hasStateFlag( PlayerStateFlag::InNpcEvent ) ) + Service< World::Manager::PlayerMgr >::ref().onUnsetStateFlag( *pPlayer, PlayerStateFlag::InNpcEvent ); } else m_pSource->sendToInRangeSet( control ); diff --git a/src/world/Action/MountAction.cpp b/src/world/Action/MountAction.cpp index 757de387..c5276d46 100644 --- a/src/world/Action/MountAction.cpp +++ b/src/world/Action/MountAction.cpp @@ -2,17 +2,19 @@ #include -#include "Actor/Player.h" +#include +#include + +#include #include -#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include #include #include #include "WorldServer.h" #include "Session.h" -#include "Network/GameConnection.h" using namespace Sapphire; using namespace Sapphire::Network::Packets; @@ -59,20 +61,19 @@ void MountAction::start() m_pSource->sendToInRangeSet( castPacket, true ); - player->setStateFlag( Common::PlayerStateFlag::Casting ); + Common::Service< World::Manager::PlayerMgr >::ref().onSetStateFlag( *player, Common::PlayerStateFlag::Casting ); auto actionStartPkt = makeActorControlSelf( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(), m_recastTimeMs / 10 ); auto& server = Common::Service< World::WorldServer >::ref(); server.queueForPlayer( m_pSource->getAsPlayer()->getCharacterId(), actionStartPkt ); - } void MountAction::execute() { assert( m_pSource ); - m_pSource->getAsPlayer()->unsetStateFlag( Common::PlayerStateFlag::Casting ); + Common::Service< World::Manager::PlayerMgr >::ref().onUnsetStateFlag( *m_pSource->getAsPlayer(), Common::PlayerStateFlag::Casting ); m_effectBuilder->mount( m_pSource, m_mountId ); m_effectBuilder->buildAndSendPackets( { m_pSource } ); } \ No newline at end of file diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index b29d3cfd..9a752446 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -670,8 +670,6 @@ void Player::learnSong( uint8_t songId, uint32_t itemId ) Util::valueToFlagByteIndexValue( songId, value, index ); m_orchestrion[ index ] |= value; - - Service< World::Manager::PlayerMgr >::ref().onUnlockOrchestrion( *this, songId, itemId ); } bool Player::hasReward( Common::UnlockEntry unlockId ) const @@ -955,7 +953,6 @@ bool Player::hasStateFlag( Common::PlayerStateFlag flag ) const void Player::setStateFlag( Common::PlayerStateFlag flag ) { - auto prevOnlineStatus = getOnlineStatus(); auto iFlag = static_cast< int32_t >( flag ); uint16_t index; @@ -963,22 +960,6 @@ void Player::setStateFlag( Common::PlayerStateFlag flag ) Util::valueToFlagByteIndexValue( iFlag, value, index ); m_stateFlags[ index ] |= value; - - auto newOnlineStatus = getOnlineStatus(); - sendStateFlags( prevOnlineStatus != newOnlineStatus ); -} - -void Player::setStateFlags( std::vector< Common::PlayerStateFlag > flags ) -{ - for( const auto& flag : flags ) - { - setStateFlag( flag ); - } -} - -void Player::sendStateFlags( bool updateInRange ) -{ - Service< World::Manager::PlayerMgr >::ref().onSendStateFlags( *this, updateInRange ); } void Player::unsetStateFlag( Common::PlayerStateFlag flag ) @@ -986,8 +967,6 @@ void Player::unsetStateFlag( Common::PlayerStateFlag flag ) if( !hasStateFlag( flag ) ) return; - auto prevOnlineStatus = getOnlineStatus(); - auto iFlag = static_cast< int32_t >( flag ); uint16_t index; @@ -995,60 +974,21 @@ void Player::unsetStateFlag( Common::PlayerStateFlag flag ) Util::valueToFlagByteIndexValue( iFlag, value, index ); m_stateFlags[ index ] ^= value; - - auto newOnlineStatus = getOnlineStatus(); - sendStateFlags( prevOnlineStatus != newOnlineStatus ); } void Player::update( uint64_t tickCount ) { - if( m_hp <= 0 && m_status != ActorStatus::Dead ) - { - die(); - Service< World::Manager::PlayerMgr >::ref().onDeath( *this ); - } - - if( !isAlive() ) - return; - - m_lastUpdate = tickCount; - - if( !checkAction() ) - { - if( m_targetId && m_currentStance == Common::Stance::Active && isAutoattackOn() ) - { - auto mainWeap = getItemAt( Common::GearSet0, Common::GearSetSlot::MainHand ); - - // @TODO i dislike this, iterating over all in range actors when you already know the id of the actor you need... - for( const auto& actor : m_inRangeActor ) - { - if( actor->getId() == m_targetId && actor->getAsChara()->isAlive() && mainWeap ) - { - auto chara = actor->getAsChara(); - - // default autoattack range - float range = 3.f + chara->getRadius() + getRadius() * 0.5f; - - // default autoattack range for ranged classes - if( getClass() == ClassJob::Machinist || getClass() == ClassJob::Bard || getClass() == ClassJob::Archer ) - range = 25.f + chara->getRadius() + getRadius() * 0.5f; - - if( Util::distance( getPos(), actor->getPos() ) <= range ) - { - if( ( tickCount - m_lastAttack ) > mainWeap->getDelay() ) - { - m_lastAttack = tickCount; - autoAttack( actor->getAsChara() ); - } - } - } - } - } - } + // todo: better way to handle this override chara update + Service< World::Manager::PlayerMgr >::ref().onUpdate( *this, tickCount ); Chara::update( tickCount ); } +uint64_t Player::getLastAttack() const +{ + return m_lastAttack; +} + void Player::setLastAttack( uint64_t tickCount ) { m_lastAttack = tickCount; @@ -1112,6 +1052,11 @@ const Player::OrchestrionList& Player::getOrchestrionBitmask() const return m_orchestrion; } +void Player::setOrchestrionBitmask( const Player::OrchestrionList& orchestrion ) +{ + m_orchestrion = orchestrion; +} + void Player::unlockMount( uint32_t mountId ) { auto& exdData = Common::Service< Data::ExdData >::ref(); @@ -1373,21 +1318,11 @@ uint8_t Player::getEquipDisplayFlags() const void Player::setMount( uint32_t mountId ) { m_mount = mountId; - - Service< World::Manager::PlayerMgr >::ref().onMountUpdate( *this, m_mount ); } void Player::setCompanion( uint8_t id ) { - auto& exdData = Common::Service< Data::ExdData >::ref(); - - auto companion = exdData.getRow< Excel::Companion >( id ); - if( !id ) - return; - m_companionId = id; - - Service< World::Manager::PlayerMgr >::ref().onCompanionUpdate( *this, m_companionId ); } uint8_t Player::getCurrentCompanion() const diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h index b5261d1a..fbb5ebab 100644 --- a/src/world/Actor/Player.h +++ b/src/world/Actor/Player.h @@ -83,6 +83,10 @@ namespace Sapphire::Entity /*! Event called on every session iteration */ void update( uint64_t tickCount ) override; + /*! get last attack tick for player */ + uint64_t getLastAttack() const; + + /*! set last attack tick for player */ void setLastAttack( uint64_t tickCount ); // Quest @@ -418,7 +422,7 @@ namespace Sapphire::Entity /*! check if aetheryte is already registered */ bool isAetheryteRegistered( uint8_t aetheryteId ) const; - /*! return a const pointer to the aetheryte unlock bitmask array */ + /*! return aetheryte mask */ uint8_t getAetheryteMaskAt( uint8_t index ) const; /*! return a pointer to the aetheryte unlock bitmask array */ @@ -433,13 +437,13 @@ namespace Sapphire::Entity /*! discover subarea subid fo map map_id, also send udpate packet */ void discover( int16_t map_id, int16_t sub_id ); - /*! return a pointer to the discovery bitmask array */ + /*! return a reference to the discovery bitmask array */ Discovery& getDiscoveryBitmask(); /*! helper/debug function to reset all discovered areas */ void resetDiscovery(); - /*! get a pointer to the howto bitmask array */ + /*! get a reference to the howto bitmask array */ HowToList& getHowToArray(); /*! update bitmask for how-to's seen */ @@ -454,22 +458,25 @@ namespace Sapphire::Entity /*! check if an action is already unlocked in the bitmask. */ bool hasReward( Common::UnlockEntry unlockId ) const; - /*! return a const pointer to the unlock bitmask array */ + /*! return a const reference to the unlock bitmask array */ const UnlockList& getUnlockBitmask() const; - /*! return a const pointer to the orchestrion bitmask array */ + /*! return a const reference to the orchestrion bitmask array */ const OrchestrionList& getOrchestrionBitmask() const; + /*! set orchestrion bitmask array */ + void setOrchestrionBitmask( const OrchestrionList& orchestrion ); + /*! unlock a mount */ void unlockMount( uint32_t mountId ); /*! unlock a companion */ void unlockCompanion( uint32_t companionId ); - /*! return a const pointer to the minion guide bitmask array */ + /*! return a reference to the minion guide bitmask array */ MinionList& getMinionGuideBitmask(); - /*! return a const pointer to the setMount guide bitmask array */ + /*! return a reference to the setMount guide bitmask array */ MountList& getMountGuideBitmask(); bool checkAction() override; diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index d6a30186..2061f715 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -269,8 +269,8 @@ void DebugCommandMgr::set( char* data, Entity::Player& player, std::shared_ptr< int32_t id; sscanf( params.c_str(), "%d", &id ); - player.setMount( 0 ); - player.setMount( static_cast< uint32_t >( id )); + Common::Service< World::Manager::PlayerMgr >::ref().onMountUpdate( player, 0 ); + Common::Service< World::Manager::PlayerMgr >::ref().onMountUpdate( player, id ); } else if( subCommand == "weatheroverride" || subCommand == "wo" ) { diff --git a/src/world/Manager/EventMgr.cpp b/src/world/Manager/EventMgr.cpp index 5f52d7f6..1241e74b 100644 --- a/src/world/Manager/EventMgr.cpp +++ b/src/world/Manager/EventMgr.cpp @@ -555,12 +555,12 @@ void EventMgr::eventFinish( Sapphire::Entity::Player& player, uint32_t eventId, } if( player.hasStateFlag( Common::PlayerStateFlag::WatchingCutscene ) ) - player.unsetStateFlag( Common::PlayerStateFlag::WatchingCutscene ); + Common::Service< World::Manager::PlayerMgr >::ref().onUnsetStateFlag( player, Common::PlayerStateFlag::WatchingCutscene ); player.removeEvent( pEvent->getId() ); if( freePlayer == 1 ) - player.unsetStateFlag( Common::PlayerStateFlag::InNpcEvent ); + Common::Service< World::Manager::PlayerMgr >::ref().onUnsetStateFlag( player, Common::PlayerStateFlag::InNpcEvent ); } void EventMgr::eventStart( Entity::Player& player, uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventType, uint8_t eventParam1, @@ -571,7 +571,7 @@ void EventMgr::eventStart( Entity::Player& player, uint64_t actorId, uint32_t ev newEvent->setEventFinishCallback( std::move( callback ) ); player.addEvent( newEvent ); - player.setStateFlag( Common::PlayerStateFlag::InNpcEvent ); + Common::Service< World::Manager::PlayerMgr >::ref().onSetStateFlag( player, Common::PlayerStateFlag::InNpcEvent ); server.queueForPlayer( player.getCharacterId(), std::make_shared< EventStartPacket >( player.getId(), actorId, eventId, eventType, eventParam1, eventParam2 ) ); @@ -836,7 +836,7 @@ Sapphire::Event::EventHandlerPtr EventMgr::bootstrapSceneEvent( Entity::Player& } if( flags & CONDITION_CUTSCENE ) - player.setStateFlag( Common::PlayerStateFlag::WatchingCutscene ); + Common::Service< World::Manager::PlayerMgr >::ref().onSetStateFlag( player, Common::PlayerStateFlag::WatchingCutscene ); return pEvent; } diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp index 060ce7ed..4ae175d4 100644 --- a/src/world/Manager/PlayerMgr.cpp +++ b/src/world/Manager/PlayerMgr.cpp @@ -13,8 +13,8 @@ #include #include -#include "Script/ScriptMgr.h" -#include "WorldServer.h" +#include