1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 20:27:46 +00:00

Subquest 4 typo

This commit is contained in:
Dantestyle 2018-05-01 04:39:57 +02:00
parent 00f53d8cdb
commit 52fc8e1baf

View file

@ -43,62 +43,53 @@ class SubFst004 : public EventScript
static constexpr auto Seq2Actor2Npctradeok = 100;
public:
SubFst004( ) : EventScript( 65563 )
SubFst004() : EventScript( 65563 )
{ };
~SubFst004( )
~SubFst004()
{ };
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( actorId );
auto questId = m_id;
auto QUEST_TOOLBOX = player.getQuestUI8AL(questId);
if (actor == SubFst004::Actor0)
if ( actor == SubFst004::Actor0 )
{
Scene00000(player);
Scene00000( player );
}
else if (actor == SubFst004::Actor1)
else if ( actor == SubFst004::Actor1 )
{
Scene00001(player);
Scene00001( player );
}
else if (actor == SubFst004::Actor2 && player.getQuestUI8AL(m_id) == 1)
else if ( actor == SubFst004::Actor2 && player.getQuestUI8AL( m_id ) == 1 )
{
Scene00002(player);
Scene00002( player );
}
}
private:
void checkQuestCompletion(Entity::Player& player, uint32_t varIdx)
void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
{
if ( varIdx == 0 )
{
if (varIdx == 0)
{
player.setQuestUI8AL(m_id, 1);
//player.setQuestUI8BH(m_id, 1);
player.sendQuestMessage(m_id, 1, 0, 21002, 0);
}
else if (varIdx == 1)
{
player.sendQuestMessage(m_id, 1, 0, 0, 0);
player.setQuestUI8BH(m_id, 1);
player.setQuestUI8AL(m_id, 0);
}
/*if (QUEST_TOOLBOX == 1)
{
player.updateQuest(questId, SeqFinish);
}*/
player.setQuestUI8AL( m_id, 1 );
player.sendQuestMessage( m_id, 1, 0, 21002, 0 );
}
else if (varIdx == 1)
{
player.sendQuestMessage( m_id, 1, 0, 0, 0 );
player.setQuestUI8BH( m_id, 1 );
player.setQuestUI8AL( m_id, 0 );
}
}
void Scene00000( Entity::Player& player )
{
player.playScene(m_id, 0, 8192,
[&](Entity::Player& player, const Event::SceneResult& result)
player.playScene( m_id, 0, 8192,
[&]( Entity::Player& player, const Event::SceneResult& result )
{
if (result.param2 == 1) // accept quest
player.updateQuest(m_id, 1);
if ( result.param2 == 1 ) // accept quest
player.updateQuest( m_id, 1 );
} );
}
@ -107,52 +98,52 @@ class SubFst004 : public EventScript
player.playScene( m_id, 1, 8192,
[&]( Entity::Player& player, const Event::SceneResult& result )
{
player.setQuestUI8BH(m_id, 1);
checkQuestCompletion(player, 0);
player.updateQuest(m_id, 255);
player.setQuestUI8BH( m_id, 1 );
checkQuestCompletion( player, 0 );
player.updateQuest( m_id, 255 );
} );
}
void Scene00002( Entity::Player& player )
{
player.playScene(m_id, 2, 8192,
[&](Entity::Player& player, const Event::SceneResult& result)
player.playScene( m_id, 2, 8192,
[&]( Entity::Player& player, const Event::SceneResult& result )
{
if (result.param2 == 1)
if ( result.param2 == 1 )
{
Scene00100(player);
Scene00100( player );
}
else
{
Scene00099(player);
Scene00099( player );
}
});
} );
}
void Scene00099( Entity::Player& player )
{
player.playScene(m_id, 99, 8192,
player.playScene( m_id, 99, 8192,
[&]( Entity::Player& player, const Event::SceneResult& result )
{
Scene00002(player);
Scene00002( player );
} );
}
void Scene00100( Entity::Player& player )
{
player.playScene(m_id, 100, 8192,
[&](Entity::Player& player, const Event::SceneResult& result)
player.playScene( m_id, 100, 8192,
[&]( Entity::Player& player, const Event::SceneResult& result )
{
checkQuestCompletion(player, 1);
checkQuestCompletion( player, 1 );
if (player.getQuestUI8BH(m_id) == 1)
if ( player.getQuestUI8BH( m_id ) == 1 )
{
if (player.giveQuestRewards(m_id, 0))
if ( player.giveQuestRewards( m_id, 0 ) )
{
player.finishQuest(m_id);
player.finishQuest( m_id );
}
}
});
} );
}
};