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

Merge branch 'quest_scripts' of https://github.com/AussieGlenn/Sapphire into quest_scripts

Browse source
This commit is contained in:
AussieGlenn 2019-02-03 15:07:49 +10:00
commit d9f09cd85e
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/scripts/quest/subquest/limsa/SubSea012.cpp
View file

@ -46,10 +46,6 @@ public:
{ {
}; };
~SubSea012()
{
};
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto pEventMgr = m_framework->get< World::Manager::EventMgr >(); auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
@ -77,13 +73,12 @@ public:
auto currentKC = player.getQuestUI8AL( getId() ) + 1; auto currentKC = player.getQuestUI8AL( getId() ) + 1;
player.setQuestUI8BH( getId(), currentKC ); player.setQuestUI8BH( getId(), currentKC );
player.setQuestUI8AL( getId(), currentKC ); player.setQuestUI8AL( getId(), currentKC );
if( currentKC >= 4 ) if( currentKC >= 4 )
player.updateQuest( getId(), SeqFinish ); player.updateQuest( getId(), SeqFinish );
else else
{
player.sendQuestMessage( getId(), 1, 2, currentKC, 4 ); player.sendQuestMessage( getId(), 1, 2, currentKC, 4 );
} }
}
private: private:
@ -99,10 +94,7 @@ private:
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId(), 0, HIDE_HOTBAR, player.playScene( getId(), 0, HIDE_HOTBAR, nullptr );
[&]( Entity::Player& player, const Event::SceneResult& result )
{
});
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
@ -130,10 +122,12 @@ private:
[ & ]( 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() );
} }
}
}); });
} }