From faebcc8290cc79a210085d1c9e75f660b049250d Mon Sep 17 00:00:00 2001 From: Dantestyle Date: Mon, 14 May 2018 04:55:58 +0200 Subject: [PATCH 1/8] ManSea002 now work properly --- src/servers/Scripts/quest/ManSea002.cpp | 25 +- .../quest/subquest/limsa/SubSea001.cpp | 250 ++++++++++++++++++ 2 files changed, 264 insertions(+), 11 deletions(-) create mode 100644 src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp index 9817969a..e8ae6aec 100644 --- a/src/servers/Scripts/quest/ManSea002.cpp +++ b/src/servers/Scripts/quest/ManSea002.cpp @@ -35,23 +35,26 @@ private: void Scene00000( Entity::Player& player ) { - auto callback = [&]( Entity::Player& player, const Event::SceneResult& result ) + player.playScene(getId(), 0, HIDE_HOTBAR, + [&]( Entity::Player& player, const Event::SceneResult& result) { if( result.param2 == 1 ) // accept quest - Scene00050( player ); - }; - - player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback ); + Scene00001( player ); + } ); } void Scene00001( Entity::Player& player ) { - auto callback = [&]( Entity::Player& player, const Event::SceneResult& result ) + player.playScene( getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, + [&](Entity::Player& player, const Event::SceneResult& result) { + // on quest accept + player.updateQuest(getId(), 1); + player.setQuestUI8CH(getId(), 1); // receive key item - }; - - player.playScene( getId(), 1, NONE, callback ); + //player.forceZoneing(128); // teleport to real limsa + //player.playSceneChain(getId(), 2, NONE, bindScene( &ManSea002::Scene00050 ) ); + } ); } void Scene00002( Entity::Player& player ) @@ -128,12 +131,12 @@ private: { auto callback = [&]( Entity::Player& player, const Event::SceneResult& result ) { - // on quest accept + /*// on quest accept player.updateQuest( getId(), 1 ); player.setQuestUI8CH( getId(), 1 ); // receive key item // teleport to real limsa - player.forceZoneing( 128 ); + player.forceZoneing( 128 );*/ }; player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback ); diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp new file mode 100644 index 00000000..51dea5cd --- /dev/null +++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp @@ -0,0 +1,250 @@ +#include