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

Merge pull request #785 from dude22072/FestivalWork

Browse source 
[3.0] Fix some small errors in Valentines 2015
This commit is contained in:
Mordred 2022-02-17 08:07:10 +01:00 • committed by GitHub
commit 48ceeef9b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/quest/festivalquest/FesVlt101.cpp
View file

@ -78,7 +78,7 @@ private:
{ {
if( result.getResult( 0 ) == 1 )// accept quest if( result.getResult( 0 ) == 1 )// accept quest
{ {
Scene00000( quest, player ); Scene00001( quest, player );
} }
} }

14
src/scripts/quest/festivalquest/FesVlt104.cpp
View file

@ -44,8 +44,8 @@ private:
static constexpr auto Actor0 = 1011732;//HORTEFENSE static constexpr auto Actor0 = 1011732;//HORTEFENSE
static constexpr auto Actor1 = 1011735;//House Valentione Emissary (Limsa) static constexpr auto Actor1 = 1011735;//House Valentione Emissary (Limsa)
static constexpr auto Actor2 = 1011743;//Berndan static constexpr auto Actor2 = 1011743;//Berndan
static constexpr auto Actor3 = 1011745; static constexpr auto Actor3 = 1011745;//Philippe?
static constexpr auto Actor4 = 1011747; static constexpr auto Actor4 = 1011747;//Thrydwulf
static constexpr auto Item0 = 2001558; static constexpr auto Item0 = 2001558;
static constexpr auto LocActor0 = 1011742; static constexpr auto LocActor0 = 1011742;
static constexpr auto LocActor1 = 1011796; static constexpr auto LocActor1 = 1011796;
@ -98,10 +98,14 @@ public:
} }
case Actor3: case Actor3:
{ {
if( quest.getSeq() == Seq2 )
Scene00006( quest, player );
break; break;
} }
case Actor4: case Actor4:
{ {
if( quest.getSeq() == Seq2 )
Scene00008( quest, player );
break; break;
} }
} }
@ -211,6 +215,8 @@ private:
void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().sendEventNotice( player, getId(), 1, 0 );
quest.setSeq( SeqFinish );
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
@ -235,8 +241,8 @@ private:
void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.getResult( 0 ) == 1 ) eventMgr().sendEventNotice( player, getId(), 1, 0 );
Scene00010( quest, player ); quest.setSeq( SeqFinish );
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////