mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 11:07:45 +00:00
Code Activity

minor updates picked up from the_movie

Browse source
This commit is contained in:
collett 2020-11-09 20:06:08 +09:00
parent 8ca1a07748
commit 2d788bce66
3 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -415,6 +415,14 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId, float x, float y, float z, float r, bool showZoneName ) void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId, float x, float y, float z, float r, bool showZoneName )
{ {
if( zoneId == 0 )
{
zoneId = getCurrentTerritory()->getTerritoryTypeId();
x = m_pos.x;
y = m_pos.y;
z = m_pos.z;
r = m_rot;
}
Common::FFXIVARR_POSITION3 pos { x, y, z }; Common::FFXIVARR_POSITION3 pos { x, y, z };
m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, pos, Util::getTimeMs(), r ); m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, pos, Util::getTimeMs(), r );
prepareZoning( showZoneName ? zoneId : 0, true, 1, 0 ); prepareZoning( showZoneName ? zoneId : 0, true, 1, 0 );

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

@ -501,7 +501,7 @@ namespace Sapphire::Entity
/*! gets the players territoryTypeId */ /*! gets the players territoryTypeId */
uint32_t getTerritoryTypeId() const; uint32_t getTerritoryTypeId() const;
void forceZoneing( uint32_t zoneId, float x = 0, float y = 0, float z = 0, float r = 0, bool showZoneName = false ); void forceZoneing( uint32_t zoneId = 0, float x = 0, float y = 0, float z = 0, float r = 0, bool showZoneName = false );
/*! return player to preset homepoint */ /*! return player to preset homepoint */
void returnToHomepoint(); void returnToHomepoint();

32
src/world/Manager/TerritoryMgr.cpp
View file

@ -689,16 +689,40 @@ void Sapphire::World::Manager::TerritoryMgr::createAndJoinQuestBattle( Entity::P
std::unordered_map< uint32_t, Sapphire::World::Manager::TerritoryMgr::InstanceSpawnInfo > Sapphire::World::Manager::TerritoryMgr::instanceSpawnInfo = std::unordered_map< uint32_t, Sapphire::World::Manager::TerritoryMgr::InstanceSpawnInfo > Sapphire::World::Manager::TerritoryMgr::instanceSpawnInfo =
{ {
{ 210, { { 0, -0.2f, 8 }, -3.1416 } }, { 212, { { 30, 1, 0 }, -3.1416 } },
{ 198, { { 0, 1.605f, 0 }, -3.1516 } }, { 210, { { 0, -0.2, 8 }, -3.1416 } },
{ 204, { { 0, 0.5, 0 }, -3.1516 } }, { 198, { { 0, 1.605, 0 }, -3.1416 } },
{ 204, { { 0, 0.5, 0 }, -3.1416 } },
{ 205, { { 31, 1.6, 25.5 }, -2.68533 } }, { 205, { { 31, 1.6, 25.5 }, -2.68533 } },
{ 331, { { -102.31, 3.9, -33.8 }, 1.568 } },
{ 335, { { -555.5, -3.21, -344.4 }, 0.715 } },
{ 351, { { -0, -2, 25 }, 3.1416 } },
{ 395, { { -4, 0, 9 }, -3.1416 } },
{ 433, { { 0, 0, 10 }, -3.1416 } },
{ 428, { { 0, 0, 8 }, -3.1416 } },
{ 462, { { 0, 0, 0 }, 0 } },
{ 463, { { 11.7, 37.43, -20.4 }, 0.2 } },
{ 507, { { -0.7, 0, 11.5 }, 3.1415 } },
{ 636, { { 0, 0, 8 }, -3.1416 } },
{ 680, { { 0, 16.35, -16.46 }, 0 } },
}; };
std::unordered_map< uint32_t, uint32_t > Sapphire::World::Manager::TerritoryMgr::instanceExitEvent = std::unordered_map< uint32_t, uint32_t > Sapphire::World::Manager::TerritoryMgr::instanceExitEvent =
{ {
//{ 131091, 212 }, scripted
{ 131085, 210 }, { 131085, 210 },
{ 131123, 198 }, { 131123, 198 },
{ 131075, 204 }, { 131075, 204 },
{ 131076, 205 }, { 131076, 205 },
{ 131138, 331 },
//{ 0, 335 }, no exit
{ 131145, 351 },
{ 131167, 395 },
{ 131195, 433 },
{ 131194, 428 },
{ 131206, 462 },
{ 131202, 463 },
{ 131213, 507 },
{ 131247, 636 },
{ 131274, 680 },
}; };