Merge pull request #792 from Skyliegirl33/contentfinder

[3.x] CF commence and undersized implemented

src/world/ContentFinder/ContentFinder.cpp

@@ -6,9 +6,15 @@
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/UpdateFindContentPacket.h"
+#include "Network/PacketWrappers/UpdateContentPacket.h"
 #include "Network/PacketWrappers/NotifyFindContentPacket.h"
 
+#include "Territory/Territory.h"
+#include "Territory/InstanceContent.h"
+
 #include "Manager/PlayerMgr.h"
+#include "Manager/TerritoryMgr.h"
+#include "Manager/WarpMgr.h"
 
 #include <WorldServer.h>
 
@@ -46,6 +52,11 @@ void Sapphire::World::ContentFinder::update()
           uint32_t inProgress = 0; // 0x01 - in progress
           uint32_t dutyProgress = 0;
           uint32_t flags = 0; // 0x20 freerole, 0x40 ownrequest, 0x100 random
+
+          // Undersized
+          if( content->m_flags & 0x01 )
+            flags |= 0x20;
+
           auto updatePacket = makeUpdateFindContent( queuedPlayer->getEntityId(), contentInfo->data().TerritoryType,
                                                      SetResultMatched, inProgress, queuedPlayer->m_classJob, dutyProgress, flags );
           server.queueForPlayer( queuedPlayer->getCharacterId(), updatePacket );
@@ -58,7 +69,34 @@ void Sapphire::World::ContentFinder::update()
       case WaitingForAccept:
         break;
       case Accepted:
+      {
+        auto& terriMgr = Service< TerritoryMgr >::ref();
+        auto& warpMgr = Common::Service< WarpMgr >::ref();
+        auto contentInfo = exdData.getRow< Excel::InstanceContent >( content->getContentId() );
+        if( auto instance = terriMgr.createInstanceContent( content->getContentId() ) )
+        {
+          auto pInstanceContent = instance->getAsInstanceContent();
+
+          for( auto& queuedPlayer : content->m_players )
+          {
+            auto updatePacket = makeUpdateFindContent( queuedPlayer->getEntityId(), 0x06,
+                                                       SetResultReadyToEnter, 0, queuedPlayer->m_classJob, 0 );
+            server.queueForPlayer( queuedPlayer->getCharacterId(), updatePacket );
+
+            pInstanceContent->bindPlayer( queuedPlayer->getEntityId() );
+            warpMgr.requestMoveTerritory( *server.getPlayer( queuedPlayer->getEntityId() ), WarpType::WARP_TYPE_INSTANCE_CONTENT, pInstanceContent->getGuId(), { 0.f, 0.f, 0.f }, 0.f );
+          
+            auto zonePacket = makeUpdateContent( queuedPlayer->getEntityId(), contentInfo->data().TerritoryType,
+                                                 0, pInstanceContent->getGuId() );
+            auto zonePacket2 = makeUpdateContent( queuedPlayer->getEntityId(), contentInfo->data().TerritoryType, content->m_partyMemberCount );
+            server.queueForPlayer( queuedPlayer->getCharacterId(), zonePacket );
+            server.queueForPlayer( queuedPlayer->getCharacterId(), zonePacket2 );
+          }
+        }
+
+        content->setState( InProgress );
         break;
+      }
       case InProgress:
         break;
       case InProgressRefill:
@@ -73,10 +111,6 @@ void Sapphire::World::ContentFinder::update()
         }
         break;
     }
-
-
-
-
   }
 
 }
@@ -87,10 +121,10 @@ void Sapphire::World::ContentFinder::registerContentsRequest( Sapphire::Entity::
   completeRegistration( player );
 }
 
-void Sapphire::World::ContentFinder::registerContentRequest( Sapphire::Entity::Player &player, uint32_t contentId )
+void Sapphire::World::ContentFinder::registerContentRequest( Sapphire::Entity::Player &player, uint32_t contentId, uint8_t flags )
 {
   queueForContent( player, { contentId } );
-  completeRegistration( player );
+  completeRegistration( player, flags );
 }
 
 void Sapphire::World::ContentFinder::registerRandomContentRequest( Sapphire::Entity::Player &player, uint32_t randomContentTypeId )
@@ -113,7 +147,7 @@ void Sapphire::World::ContentFinder::registerRandomContentRequest( Sapphire::Ent
   completeRegistration( player );
 }
 
-void Sapphire::World::ContentFinder::completeRegistration( const Sapphire::Entity::Player &player )
+void Sapphire::World::ContentFinder::completeRegistration( const Sapphire::Entity::Player &player, uint8_t flags )
 {
 
   auto& server = Service< WorldServer >::ref();
@@ -122,16 +156,29 @@ void Sapphire::World::ContentFinder::completeRegistration( const Sapphire::Entit
   auto& exdData = Service< Data::ExdData >::ref();
   auto content = exdData.getRow< Excel::InstanceContent >( queuedContent->getContentId() );
 
-  auto updatePacket = makeUpdateFindContent( player.getId(), content->data().TerritoryType,
-                                             CompleteRegistration, 1, static_cast< uint32_t >( player.getClass() ) );
-  server.queueForPlayer( player.getCharacterId(), updatePacket );
-
-  auto statusPacket = makeNotifyFindContentStatus( player.getId(), content->data().TerritoryType, 3, queuedContent->m_attackerCount + queuedContent->m_rangeCount,
-                                                   queuedContent->m_healerCount, queuedContent->m_tankCount, 0xff );
-
-  for( auto& queuedPlayer : queuedContent->m_players )
+  // Undersized
+  if( flags & 0x01 )
   {
-    server.queueForPlayer( queuedPlayer->getCharacterId(), statusPacket );
+    auto updatePacket = makeUpdateFindContent( player.getId(), content->data().TerritoryType,
+                                               CompleteRegistration, 0x20, static_cast< uint32_t >( player.getClass() ) );
+    server.queueForPlayer( player.getCharacterId(), updatePacket );
+
+    queuedContent->m_flags = flags;
+    queuedContent->setState( MatchingComplete );
+  }
+  else
+  {
+    auto updatePacket = makeUpdateFindContent( player.getId(), content->data().TerritoryType,
+                                               CompleteRegistration, 1, static_cast< uint32_t >( player.getClass() ) );
+    server.queueForPlayer( player.getCharacterId(), updatePacket );
+
+    auto statusPacket = makeNotifyFindContentStatus( player.getId(), content->data().TerritoryType, 3, queuedContent->m_attackerCount + queuedContent->m_rangeCount,
+                                                     queuedContent->m_healerCount, queuedContent->m_tankCount, 0xff );
+
+    for( auto& queuedPlayer : queuedContent->m_players )
+    {
+      server.queueForPlayer( queuedPlayer->getCharacterId(), statusPacket );
+    }
   }
 }
 
@@ -310,6 +357,53 @@ Sapphire::World::ContentFinder::QueuedContentPtrList Sapphire::World::ContentFin
   return outVec;
 }
 
+void Sapphire::World::ContentFinder::accept( Entity::Player& player )
+{
+  auto& server = Service< WorldServer >::ref();
+  auto& exdData = Service< Data::ExdData >::ref();
+
+  auto queuedPlayer = m_queuedPlayer[ player.getId() ];
+  auto queuedContent = m_queuedContent[ queuedPlayer->getActiveRegisterId() ];
+
+  auto content = exdData.getRow< Excel::InstanceContent >( queuedContent->getContentId() );
+
+  // Something has gone quite wrong..
+  if( queuedContent->getState() != WaitingForAccept )
+    return;
+
+  switch( queuedPlayer->getRole() )
+  {
+    case Role::Tank:
+      ++queuedContent->m_tankAccepted;
+      break;
+    case Role::Healer:
+      ++queuedContent->m_healerAccepted;
+      break;
+    case Role::Melee:
+    case Role::RangedMagical:
+    case Role::RangedPhysical:
+      ++queuedContent->m_dpsAccepted;
+      break;
+  }
+
+  Logger::info( "[{2}][ContentFinder] Content accepted, contentId#{0} registerId#{1}",
+                queuedContent->getContentId(), queuedContent->getRegisterId(), player.getId() );
+
+  auto statusPacket = makeNotifyFindContentStatus( player.getId(), content->data().TerritoryType, 4, queuedContent->m_dpsAccepted,
+                                                   queuedContent->m_healerAccepted, queuedContent->m_tankAccepted, 0x01 );
+
+  for( auto& pPlayer : queuedContent->m_players )
+  {
+    if( pPlayer->getActiveRegisterId() != queuedContent->getRegisterId() )
+      continue;
+
+    server.queueForPlayer( pPlayer->getCharacterId(), statusPacket );
+  }
+
+  if( ( queuedContent->m_tankAccepted + queuedContent->m_healerAccepted + queuedContent->m_dpsAccepted ) == queuedContent->m_partyMemberCount )
+    queuedContent->setState( Accepted );
+}
+
 void Sapphire::World::ContentFinder::withdraw( Entity::Player& player )
 {
   auto& server = Service< WorldServer >::ref();

src/world/ContentFinder/ContentFinder.h

@@ -88,6 +88,12 @@ namespace Sapphire::World
     uint8_t m_attackerCount{};
     uint8_t m_rangeCount{};
 
+    uint8_t m_tankAccepted{};
+    uint8_t m_healerAccepted{};
+    uint8_t m_dpsAccepted{};
+
+    uint8_t m_flags{};
+
     QueuedContentState m_state;
 
     bool m_isInProgress{ false };
@@ -108,12 +114,13 @@ namespace Sapphire::World
 
     void update();
 
-    void registerContentRequest( Entity::Player& player, uint32_t contentId );
+    void registerContentRequest( Entity::Player& player, uint32_t contentId, uint8_t flags );
     void registerContentsRequest( Entity::Player& player, const std::vector< uint32_t >& contentIds );
     void registerRandomContentRequest( Entity::Player& player, uint32_t randomContentTypeId );
 
     QueuedContentPtrList getMatchingContentList( Sapphire::Entity::Player &player, uint32_t contentId );
 
+    void accept( Entity::Player& player );
     void withdraw( Entity::Player& player );
 
     uint32_t getNextRegisterId();
@@ -128,7 +135,7 @@ namespace Sapphire::World
 
     void queueForContent( Entity::Player &player, const std::vector< uint32_t >& contentIds );
 
-    void completeRegistration( const Entity::Player &player );
+    void completeRegistration( const Entity::Player &player, uint8_t flags = 0 );
   };
 
 

src/world/Network/Handlers/CFHandlers.cpp

@@ -56,7 +56,7 @@ void Sapphire::Network::GameConnection::findContent( const Packets::FFXIVARR_PAC
   if( contentId == 0 )
     return;
 
-  contentFinder.registerContentRequest( player, contentId );
+  contentFinder.registerContentRequest( player, contentId, packet.data().flags );
 
 }
 
@@ -121,6 +121,8 @@ void Sapphire::Network::GameConnection::acceptContent( const Packets::FFXIVARR_P
                         packet.data().accept, packet.data().territoryId, packet.data().territoryType );
   auto& contentFinder = Common::Service< World::ContentFinder >::ref();
 
- if( packet.data().accept == 0 )
-   contentFinder.withdraw( player );
+  if( packet.data().accept )
+    contentFinder.accept( player ); 
+  else
+    contentFinder.withdraw( player );
 }

src/world/Network/PacketWrappers/UpdateContentPacket.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Network/GamePacket.h>
+#include "Actor/Player.h"
+#include "Forwards.h"
+
+namespace Sapphire::Network::Packets::WorldPackets::Server
+{
+
+  /**
+  * @brief Packet to display a quest specific info message.
+  */
+  class UpdateContentPacket : public ZoneChannelPacket< FFXIVIpcUpdateContent >
+  {
+  public:
+    UpdateContentPacket( uint32_t playerId, uint16_t terriId, uint32_t kind, uint32_t value1 = 0, uint32_t value2 = 0 ) :
+      ZoneChannelPacket< FFXIVIpcUpdateContent >( playerId, playerId )
+    {
+      initialize( terriId, kind, value1, value2 );
+    };
+
+  private:
+    void initialize( uint16_t terriId, uint32_t kind, uint32_t value1, uint32_t value2 )
+    {
+      m_data.territoryType = terriId;
+      m_data.kind = kind;
+      m_data.value1 = value1;
+      m_data.value2 = value2;
+    };
+  };
+
+  template< typename... Args >
+  std::shared_ptr< UpdateContentPacket > makeUpdateContent( Args... args )
+  {
+    return std::make_shared< UpdateContentPacket >( args... );
+  }
+}