diff --git a/src/scripts/instances/dungeons/Sastasha.cpp b/src/scripts/instances/dungeons/Sastasha.cpp index ffc6869d..40fe8e96 100644 --- a/src/scripts/instances/dungeons/Sastasha.cpp +++ b/src/scripts/instances/dungeons/Sastasha.cpp @@ -3,6 +3,7 @@ #include #include #include +#include using namespace Sapphire; @@ -165,7 +166,7 @@ public: nullptr, getId() ); } - // TODO: set Seq3 + // TODO: set Seq3 and SeqFinish // Pick up key and progress duty if( eobj.getName() == "Captainsquarterskey" ) @@ -212,6 +213,10 @@ public: void onLeaveTerritory( InstanceContent& instance, Entity::Player& player ) override { + // TODO: Set seq properly once bosses work + if( instance.getDirectorVar( 0 ) == Seq4 ) + instance.setVar( 0, SeqFinish ); + if( instance.getDirectorVar( 0 ) != SeqFinish ) return; diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp index f3e0226a..1fa31a89 100644 --- a/src/world/Territory/InstanceContent.cpp +++ b/src/world/Territory/InstanceContent.cpp @@ -469,7 +469,10 @@ void Sapphire::InstanceContent::onBeforePlayerZoneIn( Sapphire::Entity::Player& if( m_pEntranceEObj != nullptr ) { - player.setRot( m_pEntranceEObj->getRot() ); + if( rect ) + player.setRot( Util::eulerToDirection( { rect->header.transform.rotation.x, rect->header.transform.rotation.y, rect->header.transform.rotation.z } ) ); + else + player.setRot( PI ); player.setPos( m_pEntranceEObj->getPos() ); } else if( rect )