From dc806e6e3ff690b771a51184e1ce57588a2bffc0 Mon Sep 17 00:00:00 2001 From: Dantestyle Date: Mon, 14 May 2018 05:13:10 +0200 Subject: [PATCH] First rev. --- src/servers/Scripts/quest/ManSea002.cpp | 68 +++++----------- .../quest/subquest/limsa/SubSea001.cpp | 81 +++++++++---------- 2 files changed, 62 insertions(+), 87 deletions(-) diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp index e8ae6aec..9fbd929b 100644 --- a/src/servers/Scripts/quest/ManSea002.cpp +++ b/src/servers/Scripts/quest/ManSea002.cpp @@ -33,10 +33,27 @@ private: static constexpr auto SCREENIMAGE0 = 14; static constexpr auto UNLOCK_DESION = 14; +public: + ManSea002() : EventScript( 65644 ) + {} + ~ManSea002() + {}; + + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto actor = Event::mapEventActorToRealActor( static_cast( actorId ) ); + + // todo: this doesn't actually play a cutscene after accepting the quest + if ( actor == ACTOR0 ) + Scene00000( player ); + } + +private: + void Scene00000( Entity::Player& player ) { - player.playScene(getId(), 0, HIDE_HOTBAR, - [&]( 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 Scene00001( player ); @@ -46,14 +63,11 @@ private: void Scene00001( Entity::Player& player ) { player.playScene( getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { // on quest accept - player.updateQuest(getId(), 1); - player.setQuestUI8CH(getId(), 1); // receive key item - - //player.forceZoneing(128); // teleport to real limsa - //player.playSceneChain(getId(), 2, NONE, bindScene( &ManSea002::Scene00050 ) ); + player.updateQuest( getId(), 1 ); + player.setQuestUI8CH( getId(), 1 ); // receive key item } ); } @@ -116,42 +130,4 @@ private: player.playScene( getId(), 7, NONE, callback ); } - - void Scene00008( Entity::Player& player ) - { - auto callback = [&]( Entity::Player& player, const Event::SceneResult& result ) - { - - }; - - player.playScene( getId(), 8, NONE, callback ); - } - - void Scene00050( Entity::Player& player ) - { - auto callback = [&]( Entity::Player& player, const Event::SceneResult& result ) - { - /*// on quest accept - player.updateQuest( getId(), 1 ); - player.setQuestUI8CH( getId(), 1 ); // receive key item - - // teleport to real limsa - player.forceZoneing( 128 );*/ - }; - - player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback ); - } - -public: - ManSea002() : EventScript( 65644 ) - {} - - void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override - { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); - - // todo: this doesn't actually play a cutscene after accepting the quest - if( actor == ACTOR0 ) - Scene00000( player ); - } }; \ No newline at end of file diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp index 51dea5cd..311f1d11 100644 --- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp +++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp @@ -66,7 +66,7 @@ class SubSea001 : public EventScript { Scene00002( player ); } - else if (actor == SubSea001::Actor2) + else if ( actor == SubSea001::Actor2 ) { Scene00016( player ); } @@ -77,7 +77,7 @@ class SubSea001 : public EventScript void Scene00000( Entity::Player& player ) { player.playScene( getId(), 0, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { if (result.param2 == 1) player.updateQuest( getId(), 1); @@ -98,7 +98,7 @@ class SubSea001 : public EventScript player.playScene( getId(), 2, 8192, [&]( Entity::Player& player, const Event::SceneResult& result ) { - if ( result.param2 == 1 && player.hasQuest( 65644 ) ) + if( result.param2 == 1 && player.hasQuest( 65644 ) ) { player.updateQuest( getId(), 2); player.prepareZoning( 129, true, 1, 0 ); // teleport to real limsa @@ -111,139 +111,138 @@ class SubSea001 : public EventScript player.updateQuest( getId(), 255 ); } } - else - return; - }); + else return; + } ); } void Scene00003( Entity::Player& player ) { player.playScene( getId(), 3, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00004( Entity::Player& player ) { player.playScene( getId(), 4, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00005( Entity::Player& player ) { player.playScene( getId(), 5, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00006( Entity::Player& player ) { player.playScene( getId(), 6, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00007( Entity::Player& player ) { player.playScene( getId(), 7, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00008( Entity::Player& player ) { player.playScene( getId(), 8, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00009( Entity::Player& player ) { player.playScene( getId(), 9, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00010( Entity::Player& player ) { player.playScene( getId(), 10, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00011( Entity::Player& player ) { player.playScene( getId(), 11, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00012( Entity::Player& player ) { player.playScene( getId(), 12, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00013( Entity::Player& player ) { player.playScene( getId(), 13, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00014( Entity::Player& player ) { player.playScene( getId(), 14, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00015( Entity::Player& player ) { player.playScene( getId(), 15, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - }); + } ); } void Scene00016( Entity::Player& player ) { player.playScene( getId(), 16, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - if (result.param2 == 1) + if( result.param2 == 1 ) { - Scene00017(player); + Scene00017( player ); } else return; - }); + } ); } void Scene00017( Entity::Player& player ) { player.playScene( getId(), 17, 8192, - [&](Entity::Player& player, const Event::SceneResult& result) + [&]( Entity::Player& player, const Event::SceneResult& result ) { - player.setQuestUI8BH(getId(), 0); + player.setQuestUI8BH( getId(), 0 ); - if (player.giveQuestRewards(getId(), 0)) - player.finishQuest(getId()); - }); + if (player.giveQuestRewards( getId(), 0 ) ) + player.finishQuest( getId() ); + } ); } };