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

[Quest] ManFst004 fixed + ManFst003 typo

Browse source
This commit is contained in:
Dantestyle 2018-07-27 15:46:54 +02:00
parent 82ab19faae
commit 148f904492
2 changed files with 33 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/servers/Scripts/quest/ManFst003.cpp
View file

@ -128,7 +128,7 @@ class ManFst003 : public EventScript
if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 ) if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
{ {
player.updateQuest( questId, 255 ); player.updateQuest( questId, SeqFinish );
} }
} }
@ -209,7 +209,7 @@ class ManFst003 : public EventScript
player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.updateQuest( getId(), 1 ); player.updateQuest( getId(), Seq1 );
player.setQuestUI8CH( getId(), 1 ); player.setQuestUI8CH( getId(), 1 );
player.forceZoneing( 132 ); player.forceZoneing( 132 );
} ); } );

65
src/servers/Scripts/quest/ManFst004.cpp
View file

@ -19,8 +19,6 @@ private:
// GetQuestUI8BL // GetQuestUI8BL
// GetQuestUI8CH // GetQuestUI8CH
// Steps in this quest ( 0 is before accepting,
// 1 is first, 255 means ready for turning it in
enum Sequence : uint8_t enum Sequence : uint8_t
{ {
Seq0 = 0, Seq0 = 0,
@ -74,8 +72,6 @@ public:
~ManFst004() ~ManFst004()
{ }; { };
//////////////////////////////////////////////////////////////////////
// Event Handlers
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 actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
@ -97,9 +93,7 @@ public:
player.learnAction( 1 ); player.learnAction( 1 );
Scene00051( player ); Scene00051( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId);
{ },
eventId );
} }
else if( actor == ManFst004::Actor2 ) else if( actor == ManFst004::Actor2 )
{ {
@ -121,16 +115,18 @@ private:
{ {
if( varIdx == 3 ) if( varIdx == 3 )
{ {
player.sendQuestMessage( m_id, 1, 0, 0, 0 ); player.sendQuestMessage( getId(), 1, 0, 0, 0 );
} else if( varIdx == 2 ) }
else if( varIdx == 2 )
{ {
player.sendQuestMessage( m_id, 2, 0, 0, 0 ); player.sendQuestMessage( getId(), 2, 0, 0, 0 );
} else }
else
{ {
player.sendQuestMessage( m_id, 0, 0, 0, 0 ); player.sendQuestMessage( getId(), 0, 0, 0, 0 );
} }
auto questId = m_id; auto questId = getId();
auto QUEST_VAR_ATTUNE = player.getQuestUI8AL( questId ); auto QUEST_VAR_ATTUNE = player.getQuestUI8AL( questId );
auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId ); auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId );
@ -142,11 +138,9 @@ private:
} }
} }
//////////////////////////////////////////////////////////////////////
// Available Scenes in this quest, not necessarly all are used
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
player.playScene( m_id, 0, 0x2000, player.playScene( getId(), 0, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) // accept quest if( result.param2 == 1 ) // accept quest
@ -158,27 +152,27 @@ private:
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( m_id, 1, 0, player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setQuestUI8AL( m_id, 1 ); player.setQuestUI8AL( getId(), 1 );
checkQuestCompletion( player, 0 ); checkQuestCompletion( player, 0 );
} ); } );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
player.playScene( m_id, 2, 0, player.playScene( getId(), 2, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setQuestUI8BH( m_id, 1 ); player.setQuestUI8BH( getId(), 1 );
checkQuestCompletion( player, 3 ); checkQuestCompletion( player, 3 );
} ); } );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
player.playScene( m_id, 3, 0, player.playScene( getId(), 3, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
@ -193,19 +187,23 @@ private:
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
player.playScene( m_id, 4, 0, 0, 0 ); player.playScene( getId(), 4, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result )
{
player.playScene( getId(), 4, 0, 0, 0 );
} );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
player.playScene( m_id, 5, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, player.playScene( getId(), 5, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( m_id, 0 ) ) if( player.giveQuestRewards( getId(), 0 ) )
{ {
player.finishQuest( m_id ); player.finishQuest( getId() );
} }
} }
} ); } );
@ -213,12 +211,12 @@ private:
void Scene00050( Entity::Player& player ) void Scene00050( Entity::Player& player )
{ {
player.playScene( m_id, 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0/*unk*/, 0/*unk*/, player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0/*unk*/, 0/*unk*/,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
// accepting quest "close to home" // accepting quest "close to home"
player.updateQuest( m_id, 1 ); player.updateQuest( getId(), 1 );
player.setQuestUI8CH( m_id, 1 ); // receive key item player.setQuestUI8CH( getId(), 1 ); // receive key item
// event is done, need to teleport to real zone. // event is done, need to teleport to real zone.
player.setZone( 132 ); player.setZone( 132 );
//player.setZone(183); back to starting griania for debug purpose //player.setZone(183); back to starting griania for debug purpose
@ -227,7 +225,7 @@ private:
void Scene00051( Entity::Player& player ) void Scene00051( Entity::Player& player )
{ {
player.playScene( m_id, 51, NONE, player.playScene( getId(), 51, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00001( player ); Scene00001( player );
@ -236,7 +234,7 @@ private:
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playScene( m_id, 99, NONE, player.playScene( getId(), 99, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00004( player ); Scene00004( player );
@ -245,13 +243,12 @@ private:
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
{ {
player.playScene( m_id, 100, NONE, player.playScene( getId(), 100, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it player.setQuestUI8CH( getId(), 0 ); // remove key item, since we have just traded it
player.setQuestUI8BL( m_id, 1 ); player.setQuestUI8BL( getId(), 1 );
checkQuestCompletion( player, 2 ); checkQuestCompletion( player, 2 );
} ); } );
} }
}; };