1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-31 13:37:45 +00:00

SubFst008 and SubFst041 for testing (rewrite)

This commit is contained in:
Dantestyle 2018-05-27 03:23:25 +02:00
parent affe286bd1
commit 1b79eac452
2 changed files with 42 additions and 51 deletions

View file

@ -42,23 +42,23 @@ class SubFst008 : public EventScript
public: public:
SubFst008() : EventScript( 65568 ) SubFst008() : EventScript( 65568 )
{ }; {};
~SubFst008() ~SubFst008()
{ }; {};
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( actorId ); auto actor = Event::mapEventActorToRealActor( actorId );
if ( actor == SubFst008::Actor0 ) if( actor == SubFst008::Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} }
else if ( actor == SubFst008::Actor1 ) else if( actor == SubFst008::Actor1 )
{ {
Scene00001( player ); Scene00001( player );
} }
else if ( Actor2 == SubFst008::Actor2 ) else if( Actor2 == SubFst008::Actor2 )
{ {
Scene00002( player ); Scene00002( player );
} }
@ -68,29 +68,29 @@ class SubFst008 : public EventScript
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
player.playScene( m_id, 0, 8192, player.playScene( getId(), 0, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if ( result.param2 == 1 ) if( result.param2 == 1 )
{ {
player.updateQuest( m_id, 1 ); player.updateQuest( getId(), 1 );
} }
} ); } );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( m_id, 1, 8192, player.playScene( getId(), 1, 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 );
player.updateQuest( m_id, 255 ); player.updateQuest( getId(), 255 );
} ); } );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
player.playScene( m_id, 2, 8192, player.playScene( getId(), 2, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if ( result.param2 == 1 ) if ( result.param2 == 1 )
@ -106,29 +106,24 @@ class SubFst008 : public EventScript
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playScene( m_id, 99, 8192, player.playScene( getId(), 99, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.playScene( m_id, 99, 0, 0, 0 ); player.playScene( getId(), 99, 0, 0, 0 );
} ); } );
} }
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
{ {
player.playScene( m_id, 100, 8192, player.playScene(getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.sendQuestMessage( m_id, 1, 0, 0, 0 ); if ( player.giveQuestRewards( getId(), 0 ) )
player.setQuestUI8BH( m_id, 0 ); {
player.setQuestUI8AL( m_id, 1 ); player.setQuestUI8BH( getId(), 0 );
player.finishQuest( getId() );
if ( player.getQuestUI8AL( m_id ) == 1 )
{
if ( player.giveQuestRewards( m_id, 0 ) )
player.finishQuest( m_id );
} }
} ); } );
} }
}; };

View file

@ -43,19 +43,19 @@ class SubFst041 : public EventScript
public: public:
SubFst041() : EventScript( 65733 ) SubFst041() : EventScript( 65733 )
{ }; {};
~SubFst041() ~SubFst041()
{ }; {};
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( actorId ); auto actor = Event::mapEventActorToRealActor( actorId );
if ( actor == SubFst041::Actor0 ) if( actor == SubFst041::Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} }
if ( actor == SubFst041::Actor1 ) if( actor == SubFst041::Actor1 )
{ {
Scene00001(player); Scene00001(player);
} }
@ -63,17 +63,17 @@ class SubFst041 : public EventScript
void onMobKill( Entity::Player& player, uint64_t npcId ) void onMobKill( Entity::Player& player, uint64_t npcId )
{ {
if ( npcId != Enemy0 ) if( npcId != Enemy0 )
return; return;
auto currentKC = player.getQuestUI8BH( m_id ) + 1; auto currentKC = player.getQuestUI8BH( getId() ) + 1;
if ( currentKC >= 6 ) if( currentKC >= 6 )
player.updateQuest( m_id, 255 ); player.updateQuest( getId(), 255 );
else else
{ {
player.setQuestUI8BH( m_id, currentKC ); player.setQuestUI8BH( getId(), currentKC );
player.sendQuestMessage( m_id, 0, 2, currentKC, 6 ); player.sendQuestMessage( getId(), 0, 2, currentKC, 6 );
} }
} }
@ -81,19 +81,22 @@ class SubFst041 : public EventScript
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
player.playScene( m_id, 0, 0, player.playScene( getId(), 0, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 )
{
player.updateQuest( getId(), 1 );
}
} ); } );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( m_id, 1, 0, player.playScene( getId(), 1, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if ( result.param2 == 1 ) if( result.param2 == 1 )
{ {
Scene00100( player ); Scene00100( player );
} }
@ -106,31 +109,24 @@ class SubFst041 : public EventScript
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playScene( m_id, 99, 0, player.playScene( getId(), 99, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.playScene( m_id, 99, 0, 0, 0 ); player.playScene( getId(), 99, 0, 0, 0 );
} ); } );
} }
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
{ {
player.playScene( m_id, 100, 0, player.playScene( getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.sendQuestMessage( m_id, 1, 0, 0, 0 ); if( player.giveQuestRewards( getId(), 0 ) )
player.setQuestUI8BH( m_id, 0 );
player.setQuestUI8AL( m_id, 1 );
if ( player.getQuestUI8AL( m_id ) == 1 )
{ {
if ( player.giveQuestRewards( m_id, 0 ) ) player.setQuestUI8BH( getId(), 0 );
{ player.finishQuest( getId() );
player.finishQuest( m_id );
}
} }
} ); } );
} }
}; };