mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-07 16:47:44 +00:00
Code Activity

Merge pull request #955 from pinapelz/tp_tix

Browse source 
Implement Aetheryte Tickets
This commit is contained in:
Adam 2024-06-20 18:41:48 +10:00 • committed by GitHub
commit 5189042247
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Common.h
View file

@ -1790,6 +1790,7 @@ namespace Sapphire::Common
{
uint16_t targetAetheryte;
uint16_t cost;
bool useAetheryteTicket{ false };
};
enum EventSceneError : uint8_t

1
src/scripts/action/common/ActionTeleport5.cpp
View file

@ -22,6 +22,7 @@ public:
auto teleportQuery = pPlayer->getTeleportQuery();
if( pPlayer->getCurrency( Common::CurrencyType::Gil ) < teleportQuery.cost ||
teleportQuery.useAetheryteTicket && !pPlayer->removeItem( 7569 ) ||
teleportQuery.targetAetheryte == 0 )
{
action.interrupt();

14
src/scripts/common/aethernet/Aetheryte.cpp
View file

@ -62,10 +62,18 @@ public:
// 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
{

8
src/world/Actor/Player.cpp
View file

@ -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
{

2
src/world/Actor/Player.h
View file

@ -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;

5
src/world/Network/Handlers/PacketCommandHandler.cpp
View file

@ -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