mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-12 10:27:46 +00:00
Code Activity

Remove unnecessary eventStart and Sastasha seq fix

Browse source
This commit is contained in:
Rushi 2022-02-17 08:19:52 +01:00
parent 50102e0ff0
commit b151906f17
3 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/scripts/common/FcTalk.cpp
View file

@ -41,15 +41,7 @@ public:
if( talkEvent == 0 ) if( talkEvent == 0 )
return; return;
eventMgr().eventStart( player, actorId, eventId, Event::EventHandler::EventType::Talk, 0, 0 ); eventMgr().playScene( player, talkEvent, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, { 0 }, nullptr );
eventMgr().eventStart( player, actorId, talkEvent, Event::EventHandler::EventType::Nest, 0, 5 );
eventMgr().playScene( player, talkEvent, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, { 0 },
[ & ]( Entity::Player& player, const Event::SceneResult& result )
{
eventMgr().eventFinish( player, talkEvent, 1 );
eventMgr().eventFinish( player, eventId, 1 );
} );
} }
}; };

8
src/scripts/common/SmallTalk.cpp
View file

@ -14,13 +14,7 @@ public:
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
eventMgr().eventStart( player, actorId, eventId, Event::EventHandler::EventType::Talk, 0, 0 ); eventMgr().playScene( player, eventId, 0, HIDE_HOTBAR, { 0 }, nullptr );
eventMgr().playScene( player, eventId, 0, HIDE_HOTBAR, { 0 },
[ & ]( Entity::Player& player, const Event::SceneResult& result )
{
eventMgr().eventFinish( player, eventId, 1 );
} );
} }
}; };

14
src/scripts/instances/dungeons/Sastasha.cpp
View file

@ -29,8 +29,7 @@ private:
enum Variables : uint8_t enum Variables : uint8_t
{ {
Coral, Coral
ObtainedKey
}; };
enum Sequence : uint8_t enum Sequence : uint8_t
@ -38,7 +37,8 @@ private:
Seq1 = 1, Seq1 = 1,
Seq2 = 3, Seq2 = 3,
Seq3 = 7, Seq3 = 7,
Seq4 = 15, Seq4 = 23,
Seq5 = 31,
SeqFinish = 255 SeqFinish = 255
}; };
@ -210,7 +210,7 @@ public:
[ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
eobj.setPermissionInvisibility( 1 ); eobj.setPermissionInvisibility( 1 );
instance.setCustomVar( ObtainedKey, true ); instance.setVar( 0, Seq4 );
instance.sendEventLogMessage( player, instance, 2031, { 2000512 } ); instance.sendEventLogMessage( player, instance, 2031, { 2000512 } );
}, },
nullptr, getId() ); nullptr, getId() );
@ -223,7 +223,7 @@ public:
[ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
eobj.setPermissionInvisibility( 1 ); eobj.setPermissionInvisibility( 1 );
instance.setVar( 0, Seq4 ); instance.setVar( 0, Seq5 );
instance.sendEventLogMessage( player, instance, 2031, { 2000513 } ); instance.sendEventLogMessage( player, instance, 2031, { 2000513 } );
denn = instance.createBNpcFromInstanceId( 3978771, 1000, Common::BNpcType::Enemy ); denn = instance.createBNpcFromInstanceId( 3978771, 1000, Common::BNpcType::Enemy );
}, },
@ -231,8 +231,8 @@ public:
} }
// Open the door if the right key has been obtained // Open the door if the right key has been obtained
if( ( eobj.getName() == "Captainsquarters" && instance.getCustomVar( ObtainedKey ) ) || if( ( eobj.getName() == "Captainsquarters" && instance.getDirectorVar( 0 ) == Seq4 ) ||
( eobj.getName() == "WaveriderGate" && instance.getDirectorVar( 0 ) == Seq4 ) ) ( eobj.getName() == "WaveriderGate" && instance.getDirectorVar( 0 ) == Seq5 ) )
{ {
eventMgr().playScene( player, eventId, 1, HIDE_HOTBAR, { 1 }, eventMgr().playScene( player, eventId, 1, HIDE_HOTBAR, { 1 },
[ & ]( Entity::Player& player, const Event::SceneResult& result ) [ & ]( Entity::Player& player, const Event::SceneResult& result )