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

Fixing the starting Ul'dah quest by using the new bindSceneReturn api

Browse source
This commit is contained in:
Toofy 2023-01-16 23:57:29 +00:00
parent e75850a164
commit 724dbf367b
1 changed files with 87 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

184
src/scripts/quest/ManWil004.cpp
View file

@ -53,9 +53,17 @@ private:
static constexpr auto Poprange0 = 4110794; static constexpr auto Poprange0 = 4110794;
static constexpr auto Reward0 = 1; static constexpr auto Reward0 = 1;
static constexpr auto Screenimage0 = 14; static constexpr auto Screenimage0 = 14;
static constexpr auto Seq0Actor0Lq = 50;
static constexpr auto Territorytype0 = 130; static constexpr auto Territorytype0 = 130;
static constexpr auto SEQ_0_ACTOR0 = 0;
static constexpr auto SEQ_1_ACTOR1 = 1;
static constexpr auto SEQ_1_ACTOR2 = 2;
static constexpr auto SEQ_1_ACTOR3 = 3;
static constexpr auto SEQ_1_ACTOR4 = 4;
static constexpr auto SEQ_1_ACTOR5 = 5;
static constexpr auto SEQ_1_ACTOR8 = 8;
static constexpr auto SEQ_0_ACTOR0_LQ = 50;
public: public:
ManWil004() : Sapphire::ScriptAPI::QuestScript( 66106 ) ManWil004() : Sapphire::ScriptAPI::QuestScript( 66106 )
{ {
@ -85,13 +93,14 @@ public:
} }
else if( actorId == Aetheryte0 ) else if( actorId == Aetheryte0 )
{ {
eventMgr().eventActionStart( player, 0x050002, 0x13, eventMgr().eventActionStart( player, 0x050002, 0x13,
[ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setRewardFlag( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00001( player ); Scene00051( quest, player );
}, },
nullptr, getId() ); nullptr, getId() );
} }
@ -99,7 +108,8 @@ public:
private: private:
void checkQuestCompletion( Entity::Player& player, uint32_t varIdx ) //varIdx refers to the noticeId
void checkQuestCompletion( World::Quest& quest, Entity::Player& player, uint32_t varIdx )
{ {
if( varIdx == 1 ) if( varIdx == 1 )
{ {
@ -114,141 +124,121 @@ private:
eventMgr().sendEventNotice( player, getId(), 0, 0, 0, 0 ); eventMgr().sendEventNotice( player, getId(), 0, 0, 0, 0 );
} }
auto pQuest = player.getQuest( getId() );
if( !pQuest )
return;
auto QUEST_VAR_ATTUNE = pQuest->getUI8AL(); auto var_attuned = quest.getUI8AL();
auto QUEST_VAR_CLASS = pQuest->getUI8BH(); auto var_class = quest.getUI8BH();
auto QUEST_VAR_TRADE = pQuest->getUI8BL(); auto var_trade = quest.getUI8BL();
if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
if( var_attuned == 1 && var_class == 1 && var_trade == 1 )
{ {
pQuest->setSeq( SeqFinish ); quest.setSeq( SeqFinish );
} }
} }
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
eventMgr().playScene( player, getId(), 0, HIDE_HOTBAR, eventMgr().playQuestScene( player, getId(), SEQ_0_ACTOR0, HIDE_HOTBAR, bindSceneReturn( &ManWil004::Scene00000Return ) );
[ & ]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 ) // accept quest
{
Scene00050( player );
}
} );
} }
void Scene00001( Entity::Player& player ) void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().playScene( player, getId(), 1, HIDE_HOTBAR, if( result.getResult( 0 ) == 1 ) // accept quest
[ & ]( Entity::Player& player, const Event::SceneResult& result ) Scene00050( player );
{ }
Scene00002( player );
} ); void Scene00001( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), SEQ_1_ACTOR1, 0x0EFB, bindSceneReturn( &ManWil004::Scene00001Return ) );
}
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
Scene00002(player);
}
void Scene00051( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestSceneChain( player, getId(), 51, NONE, bindQuestScene( &ManWil004::Scene00001 ) );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
eventMgr().playScene( player, getId(), 2, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, eventMgr().playQuestScene( player, getId(), SEQ_1_ACTOR2, NONE, bindSceneReturn( &ManWil004::Scene00002Return ) );
[ & ]( Entity::Player& player, const Event::SceneResult& result ) }
{
auto pQuest = player.getQuest( getId() );
if( !pQuest )
return;
pQuest->setUI8BL( 1 ); void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
checkQuestCompletion( player, 0 ); {
} ); quest.setUI8BL(1);
checkQuestCompletion( quest, player, 0 );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
eventMgr().playScene( player, getId(), 3, HIDE_HOTBAR, eventMgr().playQuestScene( player, getId(), SEQ_1_ACTOR3, HIDE_HOTBAR, bindSceneReturn( &ManWil004::Scene00003Return ) );
[ & ]( Entity::Player& player, const Event::SceneResult& result ) }
{
auto pQuest = player.getQuest( getId() );
if( !pQuest )
return;
pQuest->setUI8AL( 1 ); void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
checkQuestCompletion( player, 1 ); {
} ); quest.setUI8AL(1);
checkQuestCompletion( quest, player, 1 );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
eventMgr().playScene( player, getId(), 4, HIDE_HOTBAR, eventMgr().playQuestScene( player, getId(), SEQ_1_ACTOR4, HIDE_HOTBAR, bindSceneReturn( &ManWil004::Scene00004Return ) );
[ & ]( Entity::Player& player, const Event::SceneResult& result ) }
{
if( result.getResult( 0 ) == 1 ) void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00005( player ); if(result.getResult(0) == 1)
} {
else Scene00005( player );
return; } else
} ); {
return;
}
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
eventMgr().playScene( player, getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, eventMgr().playQuestScene( player, getId(), SEQ_1_ACTOR5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ManWil004::Scene00005Return ) );
[ & ]( Entity::Player& player, const Event::SceneResult& result )
{
auto pQuest = player.getQuest( getId() );
if( !pQuest )
return;
pQuest->setUI8CH( 0 );
pQuest->setUI8BH( 1 );
checkQuestCompletion( player, 2 );
} );
} }
void Scene00006( Entity::Player& player ) void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().playScene( player, getId(), 6, HIDE_HOTBAR, quest.setUI8CH(0);
[ & ]( Entity::Player& player, const Event::SceneResult& result ) quest.setUI8BH(1);
{ checkQuestCompletion( quest, player, 2 );
} );
}
void Scene00007( Entity::Player& player )
{
eventMgr().playScene( player, getId(), 7, HIDE_HOTBAR,
[ & ]( Entity::Player& player, const Event::SceneResult& result )
{
} );
} }
void Scene00008( Entity::Player& player ) void Scene00008( Entity::Player& player )
{ {
eventMgr().playScene( player, getId(), 8, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, eventMgr().playQuestScene( player, getId(), SEQ_1_ACTOR8, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ManWil004::Scene00008Return ) );
[ & ]( Entity::Player& player, const Event::SceneResult& result )
{ }
if( result.getResult( 0 ) == 1 )
{ void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
player.finishQuest( getId(), result.getResult( 1 ) ); {
} if( result.getResult( 0 ) == 1 )
} ); {
player.finishQuest( getId(), result.getResult( 1 ) );
}
} }
void Scene00050( Entity::Player& player ) void Scene00050( Entity::Player& player )
{ {
eventMgr().playScene( player, getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, eventMgr().playQuestScene( player, getId(), SEQ_0_ACTOR0_LQ, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, bindSceneReturn( &ManWil004::Scene00050Return ) );
[ & ]( Entity::Player& player, const Event::SceneResult& result ) }
{
auto pQuest = player.getQuest( getId() );
if( !pQuest )
return;
// on quest accept
pQuest->setSeq( Seq1 );
pQuest->setUI8CH( 1 ); // receive key item
// teleport to real ul'dah void Scene00050Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
player.forceZoneing( 130 ); {
} ); // on quest accept
quest.setSeq( Seq1 );
quest.setUI8CH( 1 ); // receive key item
// teleport to real Uldah
player.forceZoneing( Territorytype0 );
} }
}; };