diff --git a/src/common/Common.h b/src/common/Common.h index a2d59028..5965228f 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -983,6 +983,7 @@ namespace Sapphire::Common SingleTarget = 1, CircularAOE = 2, RectangularAOE = 4, + CircularAoEPlaced = 7 }; using PlayerStateFlagList = std::vector< PlayerStateFlag >; diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index d00e4cc4..c7c7790f 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -100,7 +100,7 @@ bool Sapphire::Action::Action::init() m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->costType ); m_primaryCost = m_actionData->cost; - if( !m_actionData->targetArea ) + /*if( !m_actionData->targetArea ) { // override pos to target position // todo: this is kinda dirty @@ -112,7 +112,7 @@ bool Sapphire::Action::Action::init() break; } } - } + }*/ // todo: add missing rows for secondaryCostType/secondaryCostType and rename the current rows to primaryCostX diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp index aa02bb4d..1f03d840 100644 --- a/src/world/Manager/ActionMgr.cpp +++ b/src/world/Manager/ActionMgr.cpp @@ -17,8 +17,8 @@ World::Manager::ActionMgr::ActionMgr( Sapphire::FrameworkPtr pFw ) : } -void World::Manager::ActionMgr::handleAoEPlayerAction( Entity::Player& player, uint32_t actionId, - Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos ) +void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId, + Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos ) { player.sendDebug( "got aoe act: {0}", actionData->name ); diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h index 67d2ea5f..e3ab37d3 100644 --- a/src/world/Manager/ActionMgr.h +++ b/src/world/Manager/ActionMgr.h @@ -23,8 +23,8 @@ namespace Sapphire::World::Manager void handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId, Data::ActionPtr actionData, uint64_t targetId ); - void handleAoEPlayerAction( Entity::Player& player, uint32_t actionId, - Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos ); + void handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId, + Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos ); void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData, uint16_t itemSourceSlot, uint16_t itemSourceContainer ); diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp index 1f16ae03..799835bb 100644 --- a/src/world/Network/GameConnection.cpp +++ b/src/world/Network/GameConnection.cpp @@ -73,7 +73,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH setZoneHandler( ClientZoneIpcType::DiscoveryHandler, "DiscoveryHandler", &GameConnection::discoveryHandler ); setZoneHandler( ClientZoneIpcType::SkillHandler, "ActionHandler", &GameConnection::actionHandler ); - setZoneHandler( ClientZoneIpcType::AoESkillHandler, "AoESkillHandler", &GameConnection::aoeActionHandler ); + setZoneHandler( ClientZoneIpcType::AoESkillHandler, "AoESkillHandler", &GameConnection::placedActionHandler ); setZoneHandler( ClientZoneIpcType::GMCommand1, "GMCommand1", &GameConnection::gm1Handler ); setZoneHandler( ClientZoneIpcType::GMCommand2, "GMCommand2", &GameConnection::gm2Handler ); diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h index a83735e5..61be56c5 100644 --- a/src/world/Network/GameConnection.h +++ b/src/world/Network/GameConnection.h @@ -157,8 +157,8 @@ namespace Sapphire::Network DECLARE_HANDLER( cfDutyAccepted ); DECLARE_HANDLER( actionHandler ); - - DECLARE_HANDLER( aoeActionHandler ); + + DECLARE_HANDLER( placedActionHandler ); DECLARE_HANDLER( gm1Handler ); diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp index 367f46e9..460c294a 100644 --- a/src/world/Network/Handlers/ActionHandler.cpp +++ b/src/world/Network/Handlers/ActionHandler.cpp @@ -27,7 +27,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw, const auto itemSourceSlot = packet.data().itemSourceSlot; const auto itemSourceContainer = packet.data().itemSourceContainer; -// player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId ); + player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId ); auto exdData = m_pFw->get< Data::ExdDataGenerated >(); assert( exdData ); @@ -81,9 +81,9 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw, } -void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw, - const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw, + const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket ); @@ -99,8 +99,8 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw, return; } -// player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}", -// type, sequence, actionId, pos.x, pos.y, pos.z ); + player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}", + type, sequence, actionId, pos.x, pos.y, pos.z ); auto exdData = m_pFw->get< Data::ExdDataGenerated >(); assert( exdData ); @@ -112,5 +112,5 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw, return; auto actionMgr = pFw->get< World::Manager::ActionMgr >(); - actionMgr->handleAoEPlayerAction( player, actionId, action, pos ); + actionMgr->handlePlacedPlayerAction( player, actionId, action, pos ); }