From 86eb3ca79c52df3fdc4be8c8d7da504b2c2becec Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Mon, 13 Feb 2023 20:55:37 -0800 Subject: [PATCH 1/3] Fixed cutscene to hide UI --- src/scripts/quest/ManFst005.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/quest/ManFst005.cpp b/src/scripts/quest/ManFst005.cpp index caf33b64..32e2e63e 100644 --- a/src/scripts/quest/ManFst005.cpp +++ b/src/scripts/quest/ManFst005.cpp @@ -113,7 +113,7 @@ private: void Scene00001( World::Quest& quest, Entity::Player& player ) { - eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR | CONDITION_CUTSCENE, bindSceneReturn( &ManFst005::Scene00001Return ) ); + eventMgr().playQuestScene( player, getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, bindSceneReturn( &ManFst005::Scene00001Return ) ); } void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) From 6bdaa2ef6d381c6a67a32db7ba569e65d8307ce3 Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Mon, 13 Feb 2023 14:26:32 -0800 Subject: [PATCH 2/3] Fixed ClsArc002 BNpcNameId and Quest Sequence - Uses getBNpcNameId to check Enemy - Quest was previously not advancing past sequence 3 --- src/scripts/quest/classquest/ARC/ClsArc002.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/scripts/quest/classquest/ARC/ClsArc002.cpp b/src/scripts/quest/classquest/ARC/ClsArc002.cpp index 69d2bd5b..5823fb61 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc002.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc002.cpp @@ -103,13 +103,12 @@ public: void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( bnpc.getLayoutId() != Enemy0 && bnpc.getLayoutId() != Enemy1 ) + if( bnpc.getBNpcNameId() != Enemy0 && bnpc.getBNpcNameId() != Enemy1 ) return; auto currentKC39 = quest.getUI8AL() + 1; auto currentKC12 = quest.getUI8BH() + 1; - - switch( bnpc.getLayoutId() ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { @@ -569,7 +568,7 @@ private: void Scene00026Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - //Empty + quest.setSeq( Seq4 ); } ////////////////////////////////////////////////////////////////////// From af2eed7a4597cb13700882c9afd4cef9c994b6a6 Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Mon, 13 Feb 2023 19:16:41 -0800 Subject: [PATCH 3/3] Fixed ClsArc000 repeated event notice bug Kept sending event notice on bNpcKill even when goal was met --- src/scripts/quest/classquest/ARC/ClsArc000.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/scripts/quest/classquest/ARC/ClsArc000.cpp b/src/scripts/quest/classquest/ARC/ClsArc000.cpp index 2ec1372c..e28ae346 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc000.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc000.cpp @@ -145,18 +145,18 @@ public: private: void checkQuestCompletion( World::Quest& quest, Entity::Player& player, uint32_t varIdx ) { - if( varIdx == 1 ) - eventMgr().sendEventNotice( player, getId(), 1, 0, 0, 0 ); - else if( varIdx == 2 ) - eventMgr().sendEventNotice( player, getId(), 2, 0, 0, 0 ); - else - eventMgr().sendEventNotice( player, getId(), 3, 0, 0, 0 ); - auto QUEST_ONKILL_37 = quest.getUI8AL(); auto QUEST_ONKILL_49 = quest.getUI8BH(); auto QUEST_ONKILL_47 = quest.getUI8BL(); - if( QUEST_ONKILL_37 >= 3 && QUEST_ONKILL_49 >= 3 && QUEST_ONKILL_47 >= 3 ) + if( varIdx == 1 && QUEST_ONKILL_37 <= 3 ) + eventMgr().sendEventNotice( player, getId(), 1, 0, 0, 0 ); + else if( varIdx == 2 && QUEST_ONKILL_49 <= 3 ) + eventMgr().sendEventNotice( player, getId(), 2, 0, 0, 0 ); + else if( varIdx == 3 && QUEST_ONKILL_47 <= 3 ) + eventMgr().sendEventNotice( player, getId(), 3, 0, 0, 0 ); + + if( QUEST_ONKILL_37 + 1 >= 3 && QUEST_ONKILL_49 + 1 >= 3 && QUEST_ONKILL_47 + 1 >= 3 ) { quest.setSeq( SeqFinish ); }