Merge pull request #955 from pinapelz/tp_tix

Implement Aetheryte Tickets
SapphireServer · Jun 20, 2024 · 5189042 · 5189042
2 parents 80b11c7 + 2ef9df6
commit 5189042
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/src/common/Common.h b/src/common/Common.h
@@ -1790,6 +1790,7 @@ namespace Sapphire::Common
   {
     uint16_t targetAetheryte;
     uint16_t cost;
+    bool useAetheryteTicket{ false };
   };
 
   enum EventSceneError : uint8_t

diff --git a/src/scripts/action/common/ActionTeleport5.cpp b/src/scripts/action/common/ActionTeleport5.cpp
@@ -22,6 +22,7 @@ class ActionTeleport5 : public Sapphire::ScriptAPI::ActionScript
     auto teleportQuery = pPlayer->getTeleportQuery();
 
     if( pPlayer->getCurrency( Common::CurrencyType::Gil ) < teleportQuery.cost ||
+        teleportQuery.useAetheryteTicket && !pPlayer->removeItem( 7569 ) ||
         teleportQuery.targetAetheryte == 0 )
     {
       action.interrupt();

diff --git a/src/scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp
@@ -62,10 +62,18 @@ class Aetheryte :
       // eventParam4 (or params[1] if using EventPlay8, which is actually used on retail) anything bigger than 1 will show select instance menu item
       eventMgr().playScene( player, eventId, 0, 1, { 1, 2 }, [ this ]( Entity::Player& player, const Event::SceneResult& result )
       {
-        if( result.numOfResults == 1 ) // set homepoint
+        if( result.numOfResults == 1 )
         {
-          player.setHomepoint( result.eventId & 0xFFFF );
-          eventMgr().sendEventNotice( player, result.eventId, 2, 0xEA, 0, 0 );
+          auto cmd = result.getResult( 0 );
+          if( cmd == 1 ) // set homepoint
+          {
+            player.setHomepoint( result.eventId & 0xFFFF );
+            eventMgr().sendEventNotice( player, result.eventId, 2, 0xEA, 0, 0 );
+          }
+          else if( cmd == 5 )
+          {
+            //TODO: Housing teleport selection
+          }
         }
         else if( result.numOfResults == 2 ) // aethernet access
         {

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
@@ -1367,7 +1367,7 @@ bool Player::isDirectorInitialized() const
   return m_directorInitialized;
 }
 
-void Player::teleportQuery( uint16_t aetheryteId )
+void Player::teleportQuery( uint16_t aetheryteId, bool useAetheryteTicket )
 {
   auto& exdData = Common::Service< Data::ExdData >::ref();
   // TODO: only register this action if enough gil is in possession
@@ -1378,8 +1378,9 @@ void Player::teleportQuery( uint16_t aetheryteId )
 
   auto fromAetheryte = exdData.getRow< Excel::Aetheryte >( exdData.getRow< Excel::TerritoryType >( getTerritoryTypeId() )->data().Aetheryte );
 
-  // calculate cost - does not apply for favorite points or homepoints neither checks for aether tickets
-  auto cost = static_cast< uint16_t > (
+  // calculate cost - does not apply for favorite points or homepoints
+  // if using aetheryte ticket, cost is 0
+  auto cost = useAetheryteTicket ? 0 : static_cast< uint16_t > (
     ( std::sqrt( std::pow( fromAetheryte->data().CostPosX - targetAetheryte->data().CostPosX, 2 ) +
                  std::pow( fromAetheryte->data().CostPosY - targetAetheryte->data().CostPosY, 2 ) ) / 2 ) + 100 );
 
@@ -1393,6 +1394,7 @@ void Player::teleportQuery( uint16_t aetheryteId )
   {
     m_teleportQuery.targetAetheryte = aetheryteId;
     m_teleportQuery.cost = cost;
+    m_teleportQuery.useAetheryteTicket = useAetheryteTicket;
   }
   else
   {

diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
@@ -339,7 +339,7 @@ namespace Sapphire::Entity
     uint64_t getFullOnlineStatusMask() const;
 
     /*! query teleport of a specified type */
-    void teleportQuery( uint16_t aetheryteId );
+    void teleportQuery( uint16_t aetheryteId, bool useAetheryteTicket );
 
     Common::PlayerTeleportQuery getTeleportQuery() const;
 

diff --git a/src/world/Network/Handlers/PacketCommandHandler.cpp b/src/world/Network/Handlers/PacketCommandHandler.cpp
@@ -607,8 +607,9 @@ void Sapphire::Network::GameConnection::commandHandler( const Packets::FFXIVARR_
     }
     case PacketCommand::TELEPO_INQUIRY: // Teleport
     {
-
-      player.teleportQuery( static_cast< uint16_t >( data.Arg0 ) );
+      // data.Arg0 = aetheryte id
+      // data.Arg1 = confirm or cancel if using aetheryte ticket
+      player.teleportQuery( static_cast< uint16_t >( data.Arg0 ), data.Arg1 == 1 );
       break;
     }
     case PacketCommand::DYE_ITEM: // Dye item