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

style

Browse source
This commit is contained in:
Dantestyle 2018-07-29 15:45:15 +02:00
parent 1ac8bb547a
commit 737ec76e11
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/servers/Scripts/quest/ManSea001.cpp
View file

@ -57,9 +57,9 @@ private:
{ {
player.playScene( getId(), 3, NONE, player.playScene( getId(), 3, NONE,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 1, 0 ); player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 1, 0 );
} ); } );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
@ -76,14 +76,14 @@ private:
{ {
player.playScene( getId(), 6, INVIS_OTHER_PC, player.playScene( getId(), 6, INVIS_OTHER_PC,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param2 == 1 )
{ {
player.updateQuest( getId(), SEQ_FINISH ); if( result.param2 == 1 )
player.prepareZoning( player.getZoneId(), true, 1, 0 ); {
player.changePosition( 9, 40, 14, 2 ); player.updateQuest( getId(), SEQ_FINISH );
} player.prepareZoning( player.getZoneId(), true, 1, 0 );
} ); player.changePosition( 9, 40, 14, 2 );
}
} );
} }
void Scene00007( Entity::Player& player ) void Scene00007( Entity::Player& player )
@ -115,13 +115,13 @@ private:
{ {
player.playScene( getId(), 12, INVIS_OTHER_PC, player.playScene( getId(), 12, INVIS_OTHER_PC,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param2 == 1 ) // finish quest
{ {
if(player.giveQuestRewards( getId(), 0 ) ) if( result.param2 == 1 ) // finish quest
player.finishQuest( getId() ); {
} if(player.giveQuestRewards( getId(), 0 ) )
} ); player.finishQuest( getId() );
}
} );
} }
void Scene00013( Entity::Player& player ) void Scene00013( Entity::Player& player )

10
src/servers/Scripts/quest/ManSea002.cpp
View file

@ -95,7 +95,7 @@ private:
auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId ); auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId );
auto QUEST_VAR_TRADE = player.getQuestUI8BL( questId ); auto QUEST_VAR_TRADE = player.getQuestUI8BL( questId );
if ( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 ) if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
{ {
player.updateQuest( questId, SEQ_FINISH ); player.updateQuest( questId, SEQ_FINISH );
} }
@ -106,9 +106,9 @@ private:
player.playScene( getId(), 0, HIDE_HOTBAR, player.playScene( getId(), 0, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if (result.param2 == 1) if( result.param2 == 1 )
{ {
Scene00001(player); Scene00001( player );
} }
} ); } );
} }
@ -181,9 +181,9 @@ private:
player.playScene( getId(), 7, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0, player.playScene( getId(), 7, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if ( result.param2 == 1 ) if( result.param2 == 1 )
{ {
if (player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ) )
{ {
player.finishQuest( getId() ); player.finishQuest( getId() );
} }