1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-01 22:07:45 +00:00
This commit is contained in:
Dantestyle 2018-07-09 20:27:24 +02:00
parent d71450ccfa
commit f61cc56ff8
3 changed files with 13 additions and 13 deletions

View file

@ -70,7 +70,7 @@ class ClsArc000 : public EventScript
void onMobKill( Entity::Player& player, uint64_t npcId ) void onMobKill( Entity::Player& player, uint64_t npcId )
{ {
if( npcId != Enemy0 || Enemy1 || Enemy2 ) if( npcId != Enemy0 || npcId != Enemy1 || npcId != Enemy2 )
return; return;
auto currentKC37 = player.getQuestUI8AL( getId() ) + 1; auto currentKC37 = player.getQuestUI8AL( getId() ) + 1;
@ -92,18 +92,18 @@ class ClsArc000 : public EventScript
else if( currentKC37 < 6 ) else if( currentKC37 < 6 )
{ {
player.setQuestUI8AL( getId() , currentKC37 ); player.setQuestUI8AL( getId(), currentKC37 );
player.sendQuestMessage( getId() , 0, 2, currentKC37, 6 ); player.sendQuestMessage( getId(), 0, 2, currentKC37, 6 );
} }
else if( currentKC49 < 6 ) else if( currentKC49 < 6 )
{ {
player.setQuestUI8BH( getId() , currentKC49 ); player.setQuestUI8BH( getId(), currentKC49 );
player.sendQuestMessage( getId() , 0, 2, currentKC49, 6 ); player.sendQuestMessage( getId(), 0, 2, currentKC49, 6 );
} }
else if( currentKC47 < 6 ) else if( currentKC47 < 6 )
{ {
player.setQuestUI8BL( getId() , currentKC47 ); player.setQuestUI8BL( getId(), currentKC47 );
player.sendQuestMessage( getId() , 0, 2, currentKC47, 6 ); player.sendQuestMessage( getId(), 0, 2, currentKC47, 6 );
} }
} }
@ -138,7 +138,7 @@ class ClsArc000 : public EventScript
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
player.playScene( getId() , 0, HIDE_HOTBAR, 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 )
@ -150,7 +150,7 @@ class ClsArc000 : public EventScript
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId() , 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 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 )
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
@ -163,7 +163,7 @@ class ClsArc000 : public EventScript
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
player.playScene( getId() , 2, HIDE_HOTBAR, 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 )

View file

@ -147,7 +147,7 @@ class ClsArc001 : public EventScript
void onMobKill( Entity::Player& player, uint64_t npcId ) void onMobKill( Entity::Player& player, uint64_t npcId )
{ {
if( npcId != Enemy0 || Enemy1 ) if( npcId != Enemy0 || npcId != Enemy1 )
return; return;
auto currentKC5 = player.getQuestUI8AL( getId() ) + 1; auto currentKC5 = player.getQuestUI8AL( getId() ) + 1;
@ -202,7 +202,7 @@ class ClsArc001 : public EventScript
if( QUEST_ONKILL_5 == 8 && QUEST_ONKILL_32 == 8 ) if( QUEST_ONKILL_5 == 8 && QUEST_ONKILL_32 == 8 )
{ {
player.updateQuest( getId() , SeqFinish ); player.updateQuest( getId(), SeqFinish );
} }
} }
} }

View file

@ -161,7 +161,7 @@ class ClsArc002 : public EventScript
void onMobKill( Entity::Player& player, uint64_t npcId ) void onMobKill( Entity::Player& player, uint64_t npcId )
{ {
if( npcId != Enemy0 || Enemy1 ) if( npcId != Enemy0 || npcId != Enemy1 )
return; return;
auto currentKC39 = player.getQuestUI8AL( getId() ) + 1; auto currentKC39 = player.getQuestUI8AL( getId() ) + 1;