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

[ Quest ] Now they work fine

Browse source
This commit is contained in:
Dantestyle 2018-06-12 23:57:36 +02:00
parent f06638a7ed
commit 12ab33d5d1
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/servers/Scripts/quest/ManSea002.cpp
View file

@ -41,7 +41,7 @@ public:
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( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )
{ {
@ -79,11 +79,11 @@ private:
void checkQuestCompletion( Entity::Player& player, uint32_t varIdx ) void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
{ {
if ( varIdx == 1 ) if( varIdx == 1 )
{ {
player.sendQuestMessage( getId(), 1, 0, 0, 0 ); player.sendQuestMessage( getId(), 1, 0, 0, 0 );
} }
else if ( varIdx == 2 ) else if( varIdx == 2 )
{ {
player.sendQuestMessage( getId(), 2, 0, 0, 0 ); player.sendQuestMessage( getId(), 2, 0, 0, 0 );
} }

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

@ -56,7 +56,7 @@ class ManSea003 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == Actor0) if( actor == Actor0)
{ {
@ -124,7 +124,7 @@ class ManSea003 : public EventScript
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) // accept quest if( result.param2 == 1 ) // accept quest
Scene00001( player ); Scene00001( player );
} ); } );
} }

16
src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
View file

@ -56,7 +56,7 @@ public:
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( static_cast< uint32_t >( actorId ) );
auto currentCC = player.getQuestUI8AL( getId() ); auto currentCC = player.getQuestUI8AL( getId() );
if( actor == Actor0 ) if( actor == Actor0 )
@ -83,7 +83,7 @@ public:
{}, {},
eventId ); eventId );
} }
else if(actor == Eobject1) else if(actor == Eobject1 )
{ {
player.eventActionStart( getId(), 0x0E, player.eventActionStart( getId(), 0x0E,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@ -105,7 +105,7 @@ public:
{}, {},
eventId ); eventId );
} }
else if( actor == Eobject3) else if( actor == Eobject3 )
{ {
player.eventActionStart( getId(), 0x0E, player.eventActionStart( getId(), 0x0E,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@ -116,7 +116,7 @@ public:
{}, {},
eventId ); eventId );
} }
else if( actor == Eobject4) else if( actor == Eobject4 )
{ {
player.eventActionStart( getId(), 0x0E, player.eventActionStart( getId(), 0x0E,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@ -127,7 +127,7 @@ public:
{}, {},
eventId ); eventId );
} }
else if( actor == Eobject5) else if( actor == Eobject5 )
{ {
player.eventActionStart( getId(), 0x0E, player.eventActionStart( getId(), 0x0E,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@ -151,6 +151,8 @@ private:
if( currentCC + 1 >= 6 ) if( currentCC + 1 >= 6 )
{ {
player.updateQuest( getId(), SeqFinish ); player.updateQuest( getId(), SeqFinish );
player.setQuestUI8BH(getId(), currentCC + 1);
player.setQuestUI8AL(getId(), currentCC + 1);
} }
else else
{ {
@ -182,7 +184,7 @@ private:
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( player.hasQuest(65644) || player.hasQuest(65645)) if( player.hasQuest( 65644 ) || player.hasQuest( 65645 ) )
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
@ -327,8 +329,6 @@ private:
{ {
Scene00017( player ); Scene00017( player );
} }
else
Scene00015( player );
} ); } );
} }