From fc5cdd671c9dd5e79bc1a5ecdb6f71911f7da2db Mon Sep 17 00:00:00 2001 From: collett Date: Wed, 17 Jun 2020 02:19:34 +0900 Subject: [PATCH 01/13] prevent empty quest reward slot (id == 0) being added as items --- src/world/Actor/PlayerQuest.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp index fc1ff9ac..6eaafc91 100644 --- a/src/world/Actor/PlayerQuest.cpp +++ b/src/world/Actor/PlayerQuest.cpp @@ -1065,7 +1065,11 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti { for( uint32_t i = 0; i < rewardItemCount; i++ ) { - addItem( questInfo->itemReward0.at( i ), questInfo->itemCountReward0.at( i ), false, false, true, true ); + auto itemId = questInfo->itemReward0.at( i ); + if( itemId > 0 ) + { + addItem( itemId, questInfo->itemCountReward0.at( i ), false, false, true, true ); + } } } @@ -1074,7 +1078,7 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti for( uint32_t i = 0; i < optionalItemCount; i++ ) { auto itemId = questInfo->itemReward1.at( i ); - if( itemId == optionalChoice ) + if( itemId > 0 && itemId == optionalChoice ) { addItem( itemId, questInfo->itemCountReward1.at( i ), false, false, true, true ); break; From 90abb29259f699a38e605a1a8cec20fddbe29456 Mon Sep 17 00:00:00 2001 From: collett Date: Wed, 17 Jun 2020 02:28:39 +0900 Subject: [PATCH 02/13] add id check in addItem as well --- src/world/Actor/PlayerInventory.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp index fbff6d66..ccb4847b 100644 --- a/src/world/Actor/PlayerInventory.cpp +++ b/src/world/Actor/PlayerInventory.cpp @@ -694,6 +694,8 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge, bool sendLootMessage ) { + if( catalogId == 0 ) + return false; auto item = createItem( catalogId, quantity ); item->setHq( isHq ); return addItem( item, silent, canMerge, sendLootMessage ); From f1c6fe50067fee91540765b70b943dbb2528aa48 Mon Sep 17 00:00:00 2001 From: collett Date: Wed, 17 Jun 2020 02:30:44 +0900 Subject: [PATCH 03/13] typo --- src/world/Actor/PlayerInventory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp index ccb4847b..9d5c3656 100644 --- a/src/world/Actor/PlayerInventory.cpp +++ b/src/world/Actor/PlayerInventory.cpp @@ -695,7 +695,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge, bool sendLootMessage ) { if( catalogId == 0 ) - return false; + return nullptr; auto item = createItem( catalogId, quantity ); item->setHq( isHq ); return addItem( item, silent, canMerge, sendLootMessage ); From ce1d375c10d67d67d4c7c8ac0a57174326612573 Mon Sep 17 00:00:00 2001 From: DantestyleXD Date: Sat, 20 Jun 2020 02:11:20 +0200 Subject: [PATCH 04/13] [ Class Quest ] ClsArc000 fixed --- .../quest/classquest/ARC/ClsArc000.cpp | 190 ++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 src/scripts/quest/classquest/ARC/ClsArc000.cpp diff --git a/src/scripts/quest/classquest/ARC/ClsArc000.cpp b/src/scripts/quest/classquest/ARC/ClsArc000.cpp new file mode 100644 index 00000000..533b12e3 --- /dev/null +++ b/src/scripts/quest/classquest/ARC/ClsArc000.cpp @@ -0,0 +1,190 @@ +#include +#include "Manager/EventMgr.h" +#include +#include + +using namespace Sapphire; + +// Quest Script: ClsArc000_00021 +// Quest Name: Way of the Archer +// Quest ID: 65557 +// Start NPC: 1000197 +// End NPC: 1000200 + +class ClsArc000 : public Sapphire::ScriptAPI::EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestUI8AL + // GetQuestUI8BH + // GetQuestUI8BL + + // Steps in this quest ( 0 is before accepting, + // 1 is first, 255 means ready for turning it in + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + Seq2 = 2, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardItem = 4657; + static constexpr auto RewardItemCount = 5; + + // Entities found in the script data of the quest + static constexpr auto Actor0 = 1000197; + static constexpr auto Actor1 = 1000200; + static constexpr auto Enemy0 = 37; + static constexpr auto Enemy1 = 49; + static constexpr auto Enemy2 = 47; + static constexpr auto LocFace0 = 604; + static constexpr auto LocFace1 = 605; + static constexpr auto LogmessageMonsterNotePageUnlock = 1008; + static constexpr auto Seq0Actor0 = 0; + static constexpr auto Seq1Actor1 = 1; + static constexpr auto Seq3Actor1 = 2; + static constexpr auto UnlockImageMonsterNote = 32; + + public: + ClsArc000() : Sapphire::ScriptAPI::EventScript( 65557 ){}; + ~ClsArc000(){}; + + ////////////////////////////////////////////////////////////////////// + // Event Handlers + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); + + if( actor == Actor0 ) + Scene00000( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 ) + Scene00001( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00002( player ); + } + + void onBNpcKill( uint32_t npcId, Entity::Player& player ) override + { + if( npcId != Enemy0 && npcId != Enemy1 && npcId != Enemy2 ) + return; + + if ( npcId == Enemy0 ) + { + auto currentKC37 = player.getQuestUI8AL( getId() ); + + if ( currentKC37 + 1 >= 3 ) + { + checkQuestCompletion( player, 1 ); + player.setQuestUI8AL( getId(), currentKC37 + 1 ); + } + else + { + player.setQuestUI8AL( getId(), currentKC37 + 1 ); + player.sendQuestMessage( getId(), 1, 2, currentKC37 + 1, 3 ); + } + } + + if ( npcId == Enemy1 ) + { + auto currentKC49 = player.getQuestUI8BH( getId() ); + + if ( currentKC49 + 1 >= 3 ) + { + checkQuestCompletion( player, 2 ); + player.setQuestUI8BH( getId(), currentKC49 + 1 ); + } + else + { + player.setQuestUI8BH( getId(), currentKC49 + 1 ); + player.sendQuestMessage( getId(), 2, 2, currentKC49 + 1, 3 ); + } + } + + if ( npcId == Enemy2 ) + { + auto currentKC47 = player.getQuestUI8BL( getId() ); + + if ( currentKC47 + 1 >= 3 ) + { + checkQuestCompletion( player, 3 ); + player.setQuestUI8BL( getId(), currentKC47 + 1 ); + } + else + { + player.setQuestUI8BL( getId(), currentKC47 + 1 ); + player.sendQuestMessage( getId(), 3, 2, currentKC47 + 1, 3 ); + } + } + } + + private: + + void checkQuestCompletion( Entity::Player& player, uint32_t varIdx ) + { + if( varIdx == 1 ) + player.sendQuestMessage( getId(), 1, 0, 0, 0 ); + else if( varIdx == 2 ) + player.sendQuestMessage( getId(), 2, 0, 0, 0 ); + else + player.sendQuestMessage( getId(), 3, 0, 0, 0 ); + + auto questId = getId(); + + auto QUEST_ONKILL_37 = player.getQuestUI8AL( questId ); + auto QUEST_ONKILL_49 = player.getQuestUI8BH( questId ); + auto QUEST_ONKILL_47 = player.getQuestUI8BL( questId ); + + if( QUEST_ONKILL_37 >= 3 && QUEST_ONKILL_49 >= 3 && QUEST_ONKILL_47 >= 3 ) + { + player.updateQuest( questId, SeqFinish ); + } + } + + void Scene00000( Entity::Player& player ) + { + player.playScene( getId(), 0, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), Seq1 ); + } + } ); + } + + void Scene00001( Entity::Player& player ) + { + player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.sendQuestMessage( getId(), 0, 0, 0, 0 ); + player.updateQuest( getId(), Seq2 ); + } + } ); + } + + void Scene00002( Entity::Player& player ) + { + player.playScene( getId(), 2, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + if( player.giveQuestRewards( getId(), 0 ) ) + { + player.learnAction( 21 ); + player.finishQuest( getId() ); + } + } + } ); + } +}; + +EXPOSE_SCRIPT( ClsArc000 ); \ No newline at end of file From dd18c453c76420df1e884459088da2bdfbd74e48 Mon Sep 17 00:00:00 2001 From: DantestyleXD Date: Sat, 20 Jun 2020 02:13:09 +0200 Subject: [PATCH 05/13] [ Class Quest ] ClsArc001 fixed --- .../quest/classquest/ARC/ClsArc001.cpp | 456 ++++++++++++++++++ 1 file changed, 456 insertions(+) create mode 100644 src/scripts/quest/classquest/ARC/ClsArc001.cpp diff --git a/src/scripts/quest/classquest/ARC/ClsArc001.cpp b/src/scripts/quest/classquest/ARC/ClsArc001.cpp new file mode 100644 index 00000000..8f3b86c5 --- /dev/null +++ b/src/scripts/quest/classquest/ARC/ClsArc001.cpp @@ -0,0 +1,456 @@ +#include +#include "Manager/EventMgr.h" +#include +#include + +using namespace Sapphire; + +// Quest Script: ClsArc001_00046 +// Quest Name: A Matter of Perspective +// Quest ID: 65582 +// Start NPC: 1000200 +// End NPC: 1000200 + +class ClsArc001 : public Sapphire::ScriptAPI::EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestBitFlag8 + // GetQuestUI8AL + // GetQuestUI8BH + + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + Seq2 = 2, + Seq3 = 3, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardItem = 1891; + static constexpr auto RewardItemCount = 1; + uint16_t RewardItemOptional[5] = { 3003, 2653, 3530, 4305, 5823 }; + uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 5 }; + + // Entities found in the script data of the quest + static constexpr auto Action0 = 97; + static constexpr auto Actor0 = 1000200; + static constexpr auto CutScene01 = 10; + static constexpr auto Enemy0 = 5; + static constexpr auto Enemy1 = 32; + static constexpr auto Eobject0 = 2000925; + static constexpr auto Eobject1 = 2000926; + static constexpr auto Eobject2 = 2000927; + static constexpr auto Eobject3 = 2000928; + static constexpr auto Eobject4 = 2000929; + static constexpr auto Eobject5 = 2000930; + static constexpr auto Eobject6 = 2000931; + static constexpr auto Eobject7 = 2000934; + + public: + ClsArc001() : Sapphire::ScriptAPI::EventScript( 65582 ){}; + ~ClsArc001(){}; + + ////////////////////////////////////////////////////////////////////// + // Event Handlers + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + if( actor == Actor0 && !player.hasQuest( getId() ) ) + Scene00000( player ); + if( actor == Actor0 && player.getQuestSeq( getId() ) == Seq2 ) + Scene00025( player ); + if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00028( player ); + } + + void onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId ) + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + //Eobjects + // eventActionStart let crash world.exe + // eventStart is hardcode fix + if ( actor == Eobject0 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00001( player ); + } + else if (actor == Eobject1) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00002( player ); + } + else if ( actor == Eobject2 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00003( player ); + } + else if ( actor == Eobject3 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00004( player ); + } + else if ( actor == Eobject4 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00005( player ); + } + else if ( actor == Eobject5 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00006( player ); + } + else if ( actor == Eobject6 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00007( player ); + } + else if ( actor == Eobject7 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00008( player ); + } + } + + void onBNpcKill( uint32_t npcId, Entity::Player& player ) + { + if( npcId != Enemy0 && npcId != Enemy1 ) + return; + // PALESEMENTE SBAGLIATO + auto currentKC5 = player.getQuestUI8AL( getId() ) + 1; + auto currentKC32 = player.getQuestUI8BH( getId() ) + 1; + + if ( npcId == Enemy0 ) + { + if ( currentKC5 >= 8 ) + { + player.setQuestUI8AL( getId(), currentKC5 ); + checkQuestCompletion( player, 2 ); + player.sendQuestMessage( getId(), 2, 2, currentKC5, 8 ); + } + else if ( currentKC5 < 8 ) + { + player.setQuestUI8AL( getId(), currentKC5 ); + player.sendQuestMessage( getId(), 2, 2, currentKC5, 8 ); + } + } + if ( npcId == Enemy1 ) + { + if ( currentKC32 >= 8 ) + { + player.setQuestUI8BH( getId(), currentKC32 ); + checkQuestCompletion( player, 2 ); + player.sendQuestMessage( getId(), 3, 2, currentKC32, 8 ); + } + else if ( currentKC32 < 8 ) + { + player.setQuestUI8BH( getId(), currentKC32 ); + player.sendQuestMessage( getId(), 3, 2, currentKC32, 8 ); + } + } + } + + private: + + void checkQuestCompletion( Entity::Player& player, uint32_t varIdx ) + { + if( varIdx == 1 ) + { + auto currentCC = player.getQuestUI8AL( getId() ); + + player.sendQuestMessage( getId(), 0, 2, currentCC + 1, 6 ); + player.setQuestUI8AL( getId(), currentCC + 1 ); + + if( currentCC + 1 >= 6 ) + { + player.updateQuest( getId(), Seq2 ); + player.setQuestUI8AL( getId(), 0 ); + } + else + { + player.setQuestUI8AL( getId(), currentCC + 1 ); + } + } + else if(varIdx == 2) + { + auto QUEST_ONKILL_5 = player.getQuestUI8AL( getId() ); + auto QUEST_ONKILL_32 = player.getQuestUI8BH( getId() ); + + if( QUEST_ONKILL_5 == 8 && QUEST_ONKILL_32 == 8 ) + { + player.updateQuest( getId(), SeqFinish ); + } + } + } + + void Scene00000( Entity::Player& player ) + { + player.playScene( getId(), 0, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), Seq1 ); + } + } ); + } + + void Scene00001( Entity::Player& player ) + { + player.playScene( getId(), 1, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 1, true ); + } ); + } + + void Scene00002( Entity::Player& player ) + { + player.playScene( getId(), 2, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 2, true ); + } ); + } + + void Scene00003( Entity::Player& player ) + { + player.playScene( getId(), 3, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 3, true ); + } ); + } + + void Scene00004( Entity::Player& player ) + { + player.playScene( getId(), 4, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 4, true ); + } ); + } + + void Scene00005( Entity::Player& player ) + { + player.playScene( getId(), 5, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 5, true ); + } ); + } + + void Scene00006( Entity::Player& player ) + { + player.playScene( getId(), 6, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 6, true ); + } ); + } + + void Scene00007( Entity::Player& player ) + { + player.playScene( getId(), 7, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 7, true ); + } ); + } + + void Scene00008( Entity::Player& player ) + { + player.playScene( getId(), 8, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 8, true ); + } ); + } + + void Scene00009( Entity::Player& player ) + { + player.playScene( getId(), 9, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00010( Entity::Player& player ) + { + player.playScene( getId(), 10, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00011( Entity::Player& player ) + { + player.playScene( getId(), 11, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00012( Entity::Player& player ) + { + player.playScene( getId(), 12, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00013( Entity::Player& player ) + { + player.playScene( getId(), 13, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00014( Entity::Player& player ) + { + player.playScene( getId(), 14, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00015( Entity::Player& player ) + { + player.playScene( getId(), 15, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00016( Entity::Player& player ) + { + player.playScene( getId(), 16, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00017( Entity::Player& player ) + { + player.playScene( getId(), 17, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00018( Entity::Player& player ) + { + player.playScene( getId(), 18, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00019( Entity::Player& player ) + { + player.playScene( getId(), 19, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00020( Entity::Player& player ) + { + player.playScene( getId(), 20, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00021( Entity::Player& player ) + { + player.playScene( getId(), 21, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00022( Entity::Player& player ) + { + player.playScene( getId(), 22, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00023( Entity::Player& player ) + { + player.playScene( getId(), 23, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00024( Entity::Player& player ) + { + player.playScene( getId(), 24, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00025( Entity::Player& player ) + { + player.playScene( getId(), 25, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 1, 2, 0, 0 ); + player.updateQuest( getId(), Seq3 ); + } ); + } + + void Scene00026( Entity::Player& player ) + { + player.playScene( getId(), 26, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00027( Entity::Player& player ) + { + player.playScene( getId(), 27, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00028( Entity::Player& player ) + { + player.playScene( getId(), 28, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + if( player.giveQuestRewards( getId(), result.param3 ) ) + { + player.finishQuest( getId() ); + } + } + } ); + } +}; + +EXPOSE_SCRIPT(ClsArc001); \ No newline at end of file From aa2dcfedabf50baa9e69c31a90b5ae3ff330fcd2 Mon Sep 17 00:00:00 2001 From: DantestyleXD Date: Sat, 20 Jun 2020 02:20:22 +0200 Subject: [PATCH 06/13] [ Class Quest ] ClsArc002 is Fixed --- .../quest/classquest/ARC/ClsArc002.cpp | 488 ++++++++++++++++++ 1 file changed, 488 insertions(+) create mode 100644 src/scripts/quest/classquest/ARC/ClsArc002.cpp diff --git a/src/scripts/quest/classquest/ARC/ClsArc002.cpp b/src/scripts/quest/classquest/ARC/ClsArc002.cpp new file mode 100644 index 00000000..075e2a5d --- /dev/null +++ b/src/scripts/quest/classquest/ARC/ClsArc002.cpp @@ -0,0 +1,488 @@ +#include +#include "Manager/EventMgr.h" +#include +#include + +using namespace Sapphire; + +// Quest Script: ClsArc002_00067 +// Quest Name: School of Hard Nocks +// Quest ID: 65603 +// Start NPC: 1000200 +// End NPC: 1000200 + +class ClsArc002 : public Sapphire::ScriptAPI::EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestBitFlag8 + // GetQuestUI8AL + // GetQuestUI8BH + + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + Seq2 = 2, + Seq3 = 3, + Seq4 = 4, + Seq5 = 5, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardItem = 1893; + static constexpr auto RewardItemCount = 1; + uint16_t RewardItemOptional[5] = { 3016, 2662, 3539, 3772, 5824 }; + uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 2 }; + + // Entities found in the script data of the quest + static constexpr auto Action0 = 97; + static constexpr auto Actor0 = 1000200; + static constexpr auto Actor1 = 1000199; + static constexpr auto Actor2 = 1000204; + static constexpr auto Enemy0 = 39; + static constexpr auto Enemy1 = 12; + static constexpr auto Eobject0 = 2000936; + static constexpr auto Eobject1 = 2000937; + static constexpr auto Eobject2 = 2000938; + static constexpr auto Eobject3 = 2000939; + static constexpr auto Eobject4 = 2000940; + static constexpr auto Eobject5 = 2001171; + static constexpr auto Eobject6 = 2001173; + static constexpr auto Eobject7 = 2001174; + static constexpr auto UnlockCheckClassStart = 6; + static constexpr auto UnlockImageClassCange = 22; + static constexpr auto UnlockImageGearSet = 29; + + public: + ClsArc002() : Sapphire::ScriptAPI::EventScript( 65603 ){}; + ~ClsArc002(){}; + + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor(static_cast(actorId)); + + if( actor == Actor0 && !player.hasQuest( getId() ) ) + Scene00000( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 ) + Scene00001( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq3 ) + Scene00026( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq5 ) + Scene00029( player ); + if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00030( player ); + } + + void onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId ) + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + //Eobjects + // eventActionStart let crash world.exe + // eventStart is hardcode fix + if ( actor == Eobject0 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00002( player ); + } + else if ( actor == Eobject1 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00003( player ); + } + else if ( actor == Eobject2 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00004( player ); + } + else if ( actor == Eobject3 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00005( player ); + } + else if ( actor == Eobject4 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00006( player ); + } + else if ( actor == Eobject5 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00007( player ); + } + else if ( actor == Eobject6 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00008( player ); + } + else if ( actor == Eobject7 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00009( player ); + } + } + + void onBNpcKill( uint32_t npcId, Entity::Player& player ) override + { + if( npcId != Enemy0 && npcId != Enemy1 ) + return; + + auto currentKC39 = player.getQuestUI8AL( getId() ) + 1; + auto currentKC12 = player.getQuestUI8BH( getId() ) + 1; + + if ( npcId == Enemy0 ) + { + if ( currentKC39 >= 8 ) + { + player.setQuestUI8AL( getId(), currentKC39 ); + checkQuestCompletion( player, 2 ); + player.sendQuestMessage( getId(), 3, 2, currentKC39, 8 ); + } + else if ( currentKC39 < 8 ) + { + player.setQuestUI8AL( getId(), currentKC39 ); + player.sendQuestMessage( getId(), 3, 2, currentKC39, 8 ); + } + } + + if( npcId == Enemy1 ) + { + if ( currentKC12 >= 8 ) + { + player.setQuestUI8BH( getId(), currentKC12 ); + checkQuestCompletion( player, 2 ); + player.sendQuestMessage( getId(), 4, 2, currentKC12, 8 ); + } + else if ( currentKC12 < 8 ) + { + player.setQuestUI8BH( getId(), currentKC12 ); + player.sendQuestMessage( getId(), 4, 2, currentKC12, 8 ); + } + } + } + + private: + + void checkQuestCompletion( Entity::Player& player, uint32_t varIdx ) + { + if( varIdx == 1 ) + { + auto currentCC = player.getQuestUI8AL( getId() ); + + player.sendQuestMessage( getId(), 1, 2, currentCC + 1, 6 ); + + if( currentCC + 1 >= 6 ) + { + player.updateQuest( getId(), Seq3 ); + player.setQuestUI8AL( getId(), 0 ); + player.setQuestUI8BH( getId(), 0 ); + } + else + { + player.setQuestUI8AL( getId(), currentCC + 1 ); + } + } + else if( varIdx == 2 ) + { + auto QUEST_ONKILL_39 = player.getQuestUI8AL( getId() ); + auto QUEST_ONKILL_12 = player.getQuestUI8BH( getId() ); + + if( QUEST_ONKILL_39 == 8 && QUEST_ONKILL_12 == 8 ) + { + player.setQuestUI8AL( getId(), 0 ); + player.setQuestUI8BH( getId(), 0 ); + player.updateQuest( getId(), Seq5 ); + } + } + } + + void Scene00000( Entity::Player& player ) + { + player.playScene( getId(), 0, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), Seq1 ); + } + } ); + } + + void Scene00001( Entity::Player& player ) + { + player.playScene( getId(), 1, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.updateQuest( getId(), Seq2 ); + player.sendQuestMessage( getId(), 0, 2, 0, 0 ); + } ); + } + + void Scene00002( Entity::Player& player ) + { + player.playScene( getId(), 2, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 1, true ); + } ); + } + + void Scene00003( Entity::Player& player ) + { + player.playScene( getId(), 3, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 2, true ); + } ); + } + + void Scene00004( Entity::Player& player ) + { + player.playScene( getId(), 4, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 3, true ); + } ); + } + + void Scene00005( Entity::Player& player ) + { + player.playScene( getId(), 5, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 4, true ); + } ); + } + + void Scene00006( Entity::Player& player ) + { + player.playScene( getId(), 6, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 5, true ); + } ); + } + + void Scene00007( Entity::Player& player ) + { + player.playScene( getId(), 7, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 6, true ); + } ); + } + + void Scene00008( Entity::Player& player ) + { + player.playScene( getId(), 8, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 7, true ); + } ); + } + + void Scene00009( Entity::Player& player ) + { + player.playScene( getId(), 9, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player, 1 ); + player.setQuestBitFlag8( getId(), 8, true ); + } ); + } + + void Scene00010( Entity::Player& player ) + { + player.playScene( getId(), 10, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00011( Entity::Player& player ) + { + player.playScene( getId(), 11, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00012( Entity::Player& player ) + { + player.playScene( getId(), 12, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00013( Entity::Player& player ) + { + player.playScene( getId(), 13, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00014( Entity::Player& player ) + { + player.playScene( getId(), 14, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00015( Entity::Player& player ) + { + player.playScene( getId(), 15, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00016( Entity::Player& player ) + { + player.playScene( getId(), 16, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00017( Entity::Player& player ) + { + player.playScene( getId(), 17, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00018( Entity::Player& player ) + { + player.playScene( getId(), 18, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00019( Entity::Player& player ) + { + player.playScene( getId(), 19, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00020( Entity::Player& player ) + { + player.playScene( getId(), 20, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00021( Entity::Player& player ) + { + player.playScene( getId(), 21, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00022( Entity::Player& player ) + { + player.playScene( getId(), 22, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00023( Entity::Player& player ) + { + player.playScene( getId(), 23, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00024( Entity::Player& player ) + { + player.playScene( getId(), 24, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00025( Entity::Player& player ) + { + player.playScene( getId(), 25, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00026( Entity::Player& player ) + { + player.playScene( getId(), 26, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 2, 2, 0, 0 ); + player.updateQuest( getId(), Seq4 ); + } ); + } + + void Scene00027( Entity::Player& player ) + { + player.playScene( getId(), 27, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00028( Entity::Player& player ) + { + player.playScene( getId(), 28, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00029( Entity::Player& player ) + { + player.playScene( getId(), 29, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 5, 2, 0, 0 ); + player.updateQuest( getId(), SeqFinish ); + } ); + } + + void Scene00030( Entity::Player& player ) + { + player.playScene( getId(), 30, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if ( result.param2 == 1 ) + { + if ( player.giveQuestRewards( getId(), result.param3 ) ) + { + player.finishQuest( getId() ); + } + } + else return; + } ); + } +}; + +EXPOSE_SCRIPT( ClsArc002 ); \ No newline at end of file From 4b9354d0335da6f5f4e4a4c5e7e7a3c5677d132a Mon Sep 17 00:00:00 2001 From: DantestyleXD Date: Sat, 20 Jun 2020 03:23:48 +0200 Subject: [PATCH 07/13] [ Class Quest ] ClsArc003 is Fixed (Will need a revision) --- .../quest/classquest/ARC/ClsArc003.cpp | 460 ++++++++++++++++++ 1 file changed, 460 insertions(+) create mode 100644 src/scripts/quest/classquest/ARC/ClsArc003.cpp diff --git a/src/scripts/quest/classquest/ARC/ClsArc003.cpp b/src/scripts/quest/classquest/ARC/ClsArc003.cpp new file mode 100644 index 00000000..86c5050d --- /dev/null +++ b/src/scripts/quest/classquest/ARC/ClsArc003.cpp @@ -0,0 +1,460 @@ +#include +#include "Manager/EventMgr.h" +#include "Manager/TerritoryMgr.h" +#include +#include + +using namespace Sapphire; + +// Quest Script: ClsArc003_00068 +// Quest Name: Violators Will Be Shot +// Quest ID: 65604 +// Start NPC: 1000200 +// End NPC: 1000200 + +class ClsArc003 : public Sapphire::ScriptAPI::EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestBitFlag8 + // GetQuestUI8AL + + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + Seq2 = 2, + Seq3 = 3, + Seq4 = 4, + Seq5 = 5, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardAction = 112; + static constexpr auto RewardItem = 1895; + static constexpr auto RewardItemCount = 1; + uint16_t RewardItemOptional[5] = { 3028, 2677, 3546, 3780, 5824 }; + uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 3 }; + + // Entities found in the script data of the quest + static constexpr auto Action0 = 97; + static constexpr auto Actor0 = 1000200; + static constexpr auto Actor1 = 1000204; + static constexpr auto Actor2 = 1000199; + static constexpr auto Eobject0 = 2000941; + static constexpr auto Eobject1 = 2000942; + static constexpr auto Eobject2 = 2000943; + static constexpr auto Eobject3 = 2000944; + static constexpr auto Eobject4 = 2000945; + static constexpr auto Eobject5 = 2000946; + static constexpr auto Eobject6 = 2001179; + static constexpr auto Eobject7 = 2001180; + static constexpr auto Eobject8 = 2000962; + static constexpr auto EventActionWaiting2Middle = 12; + static constexpr auto EventMotZephyr = 366; + static constexpr auto LocAction0 = 995; + static constexpr auto LocVfx = 241; + static constexpr auto LocWs = 112; + static constexpr auto Questbattle0 = 6; + static constexpr auto Territorytype0 = 228; + + public: + ClsArc003() : Sapphire::ScriptAPI::EventScript( 65604 ){}; + ~ClsArc003(){}; + + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + if( actor == Actor0 && !player.hasQuest( getId() ) ) + Scene00000( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 ) + Scene00001( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq3 ) + Scene00026( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq5 ) + Scene00030( player ); + if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00031( player ); + } + + void onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId ) + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + //Eobjects + // eventActionStart let crash world.exe + // eventStart is hardcode fix + if ( actor == Eobject0 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00002( player ); + } + else if ( actor == Eobject1 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00003( player ); + } + else if ( actor == Eobject2 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00004( player ); + } + else if ( actor == Eobject3 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00005( player ); + } + else if ( actor == Eobject4 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00006( player ); + } + else if ( actor == Eobject5 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00007( player ); + } + else if ( actor == Eobject6 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00008( player ); + } + else if ( actor == Eobject7 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00009( player ); + } + else if ( actor == Eobject8 ) + { + player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 ); + Scene00027( player ); + } + } + + private: + + void checkQuestCompletion( Entity::Player& player ) + { + auto currentCC = player.getQuestUI8AL( getId() ); + + player.sendQuestMessage( getId(), 1, 2, currentCC + 1, 6 ); + + if( currentCC + 1 >= 6 ) + { + player.setQuestUI8AL( getId(), 0 ); + player.updateQuest( getId(), Seq3 ); + } + else + { + player.setQuestUI8AL( getId(), currentCC + 1 ); + } + } + + void Scene00000( Entity::Player& player ) + { + player.playScene( getId(), 0, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), Seq1 ); + } + } ); + } + + void Scene00001( Entity::Player& player ) + { + player.playScene( getId(), 1, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 0, 2, 0, 0 ); + player.updateQuest( getId(), Seq2 ); + } ); + } + + void Scene00002( Entity::Player& player ) + { + player.playScene( getId(), 2, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 1, true ); + } ); + } + + void Scene00003( Entity::Player& player ) + { + player.playScene( getId(), 3, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 2, true ); + } ); + } + + void Scene00004( Entity::Player& player ) + { + player.playScene( getId(), 4, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 3, true ); + } ); + } + + void Scene00005( Entity::Player& player ) + { + player.playScene( getId(), 5, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 4, true ); + } ); + } + + void Scene00006( Entity::Player& player ) + { + player.playScene( getId(), 6, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 5, true ); + } ); + } + + void Scene00007( Entity::Player& player ) + { + player.playScene( getId(), 7, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 6, true ); + } ); + } + + void Scene00008( Entity::Player& player ) + { + player.playScene( getId(), 8, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 7, true ); + } ); + } + + void Scene00009( Entity::Player& player ) + { + player.playScene( getId(), 9, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + checkQuestCompletion( player ); + player.setQuestBitFlag8( getId(), 8, true ); + } ); + } + + void Scene00010( Entity::Player& player ) + { + player.playScene( getId(), 10, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00011( Entity::Player& player ) + { + player.playScene( getId(), 11, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00012( Entity::Player& player ) + { + player.playScene( getId(), 12, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00013( Entity::Player& player ) + { + player.playScene( getId(), 13, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00014( Entity::Player& player ) + { + player.playScene( getId(), 14, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00015( Entity::Player& player ) + { + player.playScene( getId(), 15, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00016( Entity::Player& player ) + { + player.playScene( getId(), 16, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00017( Entity::Player& player ) + { + player.playScene( getId(), 17, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00018( Entity::Player& player ) + { + player.playScene( getId(), 18, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00019( Entity::Player& player ) + { + player.playScene( getId(), 19, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00020( Entity::Player& player ) + { + player.playScene( getId(), 20, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00021( Entity::Player& player ) + { + player.playScene( getId(), 21, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00022( Entity::Player& player ) + { + player.playScene( getId(), 22, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00023( Entity::Player& player ) + { + player.playScene( getId(), 23, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00024( Entity::Player& player ) + { + player.playScene( getId(), 24, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00025( Entity::Player& player ) + { + player.playScene( getId(), 25, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00026( Entity::Player& player ) + { + player.playScene( getId(), 26, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.setQuestUI8AL( getId(), 0 ); + player.sendQuestMessage( getId(), 2, 2, 0, 0 ); + player.updateQuest( getId(), Seq4 ); + } ); + } + + void Scene00027( Entity::Player& player ) + { + player.playScene( getId(), 27, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + Scene00028( player ); + } ); + } + + void Scene00028( Entity::Player& player ) + { + player.playScene( getId(), 28, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), Seq5 ); + // QuestBattle doesn't work + /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); + + player.eventFinish( result.eventId, 0 ); + pTeriMgr.createAndJoinQuestBattle( player, Questbattle0 );*/ + } + } ); + } + + void Scene00029( Entity::Player& player ) + { + player.playScene( getId(), 29, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00030( Entity::Player& player ) + { + player.playScene( getId(), 30, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 4, 2, 0, 0 ); + player.updateQuest( getId(), SeqFinish ); + } ); + } + + void Scene00031( Entity::Player& player ) + { + player.playScene( getId(), 31, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + if( player.giveQuestRewards( getId(), result.param3 ) ) + { + player.finishQuest( getId() ); + } + } + } ); + } +}; + +EXPOSE_SCRIPT(ClsArc003); \ No newline at end of file From c9c9ba1a2daadc96307754d4c56081f4c7ad59ca Mon Sep 17 00:00:00 2001 From: DantestyleXD Date: Sat, 20 Jun 2020 03:24:20 +0200 Subject: [PATCH 08/13] [ Class Quest ] ClsArc004 is Fixed ( Will need a revision ) --- .../quest/classquest/ARC/ClsArc004.cpp | 349 ++++++++++++++++++ 1 file changed, 349 insertions(+) create mode 100644 src/scripts/quest/classquest/ARC/ClsArc004.cpp diff --git a/src/scripts/quest/classquest/ARC/ClsArc004.cpp b/src/scripts/quest/classquest/ARC/ClsArc004.cpp new file mode 100644 index 00000000..12cab011 --- /dev/null +++ b/src/scripts/quest/classquest/ARC/ClsArc004.cpp @@ -0,0 +1,349 @@ +#include +#include "Manager/EventMgr.h" +#include +#include + +using namespace Sapphire; + +// Quest Script: ClsArc004_00070 +// Quest Name: To Catch a Poacher +// Quest ID: 65606 +// Start NPC: 1000200 +// End NPC: 1000200 + +class ClsArc004 : public Sapphire::ScriptAPI::EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestBitFlag8 + // GetQuestUI8AL + + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + Seq2 = 2, + Seq3 = 3, + Seq4 = 4, + Seq5 = 5, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardItem = 1899; + static constexpr auto RewardItemCount = 1; + uint16_t RewardItemOptional[5] = { 3043, 2708, 3559, 3791, 5824 }; + uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 5 }; + + // Entities found in the script data of the quest + static constexpr auto Actor0 = 1000200; + static constexpr auto Actor1 = 1000590; + static constexpr auto Actor2 = 1000731; + static constexpr auto Actor3 = 1000732; + static constexpr auto Actor4 = 1000199; + static constexpr auto Actor5 = 1000204; + static constexpr auto Eobject0 = 2000947; + static constexpr auto Eobject1 = 2000948; + static constexpr auto Eobject2 = 2000949; + static constexpr auto Eobject3 = 2001105; + static constexpr auto Eobject4 = 2000136; + static constexpr auto EventActionGatherMiddle = 7; + static constexpr auto EventActionSearch = 1; + static constexpr auto EventActionWaiting = 10; + static constexpr auto LocPosActor5 = 3875531; + static constexpr auto Questbattle0 = 5; + static constexpr auto Seq0Actor0Lq = 90; + static constexpr auto Territorytype0 = 229; + + public: + ClsArc004() : Sapphire::ScriptAPI::EventScript( 65606 ){}; + ~ClsArc004(){}; + + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + if( actor == Actor0 && !player.hasQuest( getId() ) ) + Scene00000( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 ) + Scene00002( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq5 ) // <- Player can't talk with NPC... idk + Scene00018( player ); + if( actor == Actor3 && player.getQuestSeq( getId() ) == Seq5 ) + Scene00019( player ); + if( actor == Actor2 && player.getQuestSeq( getId() ) == Seq5 ) + Scene00020( player ); + if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00021( player ); + //Eobjects + else if( actor == Eobject0 ) + player.eventActionStart( getId(), 0x07, + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + Scene00003( player ); + }, + nullptr, eventId ); + else if( actor == Eobject1 ) + player.eventActionStart( getId(), 0x07, + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + Scene00004( player ); + }, + nullptr, eventId ); + else if( actor == Eobject2 ) + player.eventActionStart( getId(), 0x07, + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + Scene00005( player ); + }, + nullptr, eventId ); + else if( actor == Eobject3 ) + player.eventActionStart( getId(), 0x0A, + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + Scene00013( player ); + player.sendQuestMessage( getId(), 2, 2, 0, 0 ); + }, + nullptr, eventId ); + else if( actor == Eobject4 ) + player.eventActionStart( getId(), 0x01, + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + Scene00015( player ); + }, + nullptr, eventId ); + } + + private: + + void checkQuestCompletion( Entity::Player& player ) + { + auto currentCC = player.getQuestUI8AL( getId() ); + + player.sendQuestMessage( getId(), 1, 2, currentCC + 1, 3 ); + + if( currentCC + 1 >= 3 ) + { + player.updateQuest( getId(), Seq3 ); + player.setQuestUI8AL( getId(), 0 ); + } + else + { + player.setQuestUI8AL( getId(), currentCC + 1 ); + } + } + + void Scene00000( Entity::Player& player ) + { + player.playScene( getId(), 0, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + Scene00001( player ); + } + } ); + } + + void Scene00001( Entity::Player& player ) + { + player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.updateQuest( getId(), Seq1 ); + } ); + } + + void Scene00002( Entity::Player& player ) + { + player.playScene( getId(), 2, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 0, 2, 0, 0 ); + player.updateQuest( getId(), Seq2 ); + } ); + } + + void Scene00003( Entity::Player& player ) + { + player.playScene( getId(), 3, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.setQuestBitFlag8( getId(), 1, true ); + checkQuestCompletion( player ); + } ); + } + + void Scene00004( Entity::Player& player ) + { + player.playScene( getId(), 4, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.setQuestBitFlag8(getId(), 2, true); + checkQuestCompletion( player ); + } ); + } + + void Scene00005( Entity::Player& player ) + { + player.playScene( getId(), 5, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.setQuestBitFlag8(getId(), 3, true); + checkQuestCompletion( player ); + } ); + } + + void Scene00006( Entity::Player& player ) + { + player.playScene( getId(), 6, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00007( Entity::Player& player ) + { + player.playScene( getId(), 7, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00008( Entity::Player& player ) + { + player.playScene( getId(), 8, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00009( Entity::Player& player ) + { + player.playScene( getId(), 9, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00010( Entity::Player& player ) + { + player.playScene( getId(), 10, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00011( Entity::Player& player ) + { + player.playScene( getId(), 11, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00012( Entity::Player& player ) + { + player.playScene( getId(), 12, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00013( Entity::Player& player ) + { + player.playScene( getId(), 13, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.updateQuest( getId(), Seq4 ); + } ); + } + + void Scene00014( Entity::Player& player ) + { + player.playScene( getId(), 14, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00015( Entity::Player& player ) + { + player.playScene( getId(), 15, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + Scene00016( player ); + } ); + } + + void Scene00016( Entity::Player& player ) + { + player.playScene( getId(), 16, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), Seq5 ); + // QuestBattle doesn't work + /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); + + player.eventFinish(result.eventId, 0); + pTeriMgr.createAndJoinQuestBattle(player, Questbattle0);*/ + } + } ); + } + + void Scene00017( Entity::Player& player ) + { + player.playScene( getId(), 17, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00018( Entity::Player& player ) + { + player.playScene( getId(), 18, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 4, 2, 0, 0 ); + player.updateQuest( getId(), SeqFinish ); + } ); + } + + void Scene00019( Entity::Player& player ) + { + player.playScene( getId(), 19, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00020( Entity::Player& player ) + { + player.playScene( getId(), 20, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00021( Entity::Player& player ) + { + player.playScene( getId(), 21, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + if( player.giveQuestRewards( getId(), result.param3 ) ) + { + player.finishQuest( getId() ); + } + } + } ); + } +}; + +EXPOSE_SCRIPT(ClsArc004); \ No newline at end of file From 40d488cd0a88e078a7b72d0a83411427c9c0e420 Mon Sep 17 00:00:00 2001 From: DantestyleXD Date: Sat, 20 Jun 2020 03:24:54 +0200 Subject: [PATCH 09/13] [ Class Quest ] ClsArc005 is Fixed ( Will need a revision ) --- .../quest/classquest/ARC/ClsArc005.cpp | 206 ++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 src/scripts/quest/classquest/ARC/ClsArc005.cpp diff --git a/src/scripts/quest/classquest/ARC/ClsArc005.cpp b/src/scripts/quest/classquest/ARC/ClsArc005.cpp new file mode 100644 index 00000000..c24a77e0 --- /dev/null +++ b/src/scripts/quest/classquest/ARC/ClsArc005.cpp @@ -0,0 +1,206 @@ +#include +#include "Manager/EventMgr.h" +#include +#include + +using namespace Sapphire; + +// Quest Script: ClsArc005_00071 +// Quest Name: Homecoming +// Quest ID: 65607 +// Start NPC: 1000200 +// End NPC: 1000200 + +class ClsArc005 : public Sapphire::ScriptAPI::EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestBitFlag8 + // GetQuestUI8AL + + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + Seq2 = 2, + Seq3 = 3, + Seq4 = 4, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardItem = 1905; + static constexpr auto RewardItemCount = 1; + uint16_t RewardItemOptional[5] = { 3066, 2729, 3576, 3808, 5825 }; + uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 2 }; + + // Entities found in the script data of the quest + static constexpr auto Actor0 = 1000200; + static constexpr auto Actor1 = 1000204; + static constexpr auto Actor2 = 1000199; + static constexpr auto Actor3 = 1000534; + static constexpr auto Actor4 = 1001284; + static constexpr auto Actor5 = 1003025; + static constexpr auto Actor6 = 1003026; + static constexpr auto Eobject0 = 2000951; + static constexpr auto Eobject1 = 2001840; + static constexpr auto EventActionSearch = 1; + static constexpr auto EventActionWaiting = 10; + static constexpr auto LocActor5Action1 = 834; + static constexpr auto LocPosActor5 = 3877820; + static constexpr auto LocPosPc = 3877813; + static constexpr auto Questbattle0 = 4; + static constexpr auto Territorytype0 = 230; + + public: + ClsArc005() : Sapphire::ScriptAPI::EventScript( 65607 ){}; + ~ClsArc005(){}; + + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + if( actor == Actor0 && !player.hasQuest( getId() ) ) + Scene00000( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 ) + Scene00002( player ); + if( actor == Actor2 && player.getQuestSeq( getId() ) == Seq2 ) + Scene00003( player ); + if( actor == Actor3 && player.getQuestSeq( getId() ) == Seq4 ) + Scene00006( player ); + if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00010( player ); + //EOBJECTS + else if( actor == Eobject0 ) + player.eventActionStart( getId(), 0x0A, + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + Scene00004( player ); + player.sendQuestMessage( getId(), 2, 2, 0, 0 ); + }, + nullptr, eventId ); + } + + private: + + void Scene00000( Entity::Player& player ) + { + player.playScene( getId(), 0, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + Scene00001( player ); + } + } ); + } + + void Scene00001( Entity::Player& player ) + { + player.playScene( getId(), 1, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.updateQuest( getId(), Seq1 ); + } ); + } + + void Scene00002( Entity::Player& player ) + { + player.playScene( getId(), 2, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 0, 2, 0, 0 ); + player.updateQuest( getId(), Seq2 ); + } ); + } + + void Scene00003( Entity::Player& player ) + { + player.playScene( getId(), 3, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.sendQuestMessage( getId(), 1, 2, 0, 0 ); + player.updateQuest( getId(), Seq3 ); + } ); + } + + void Scene00004( Entity::Player& player ) + { + player.playScene( getId(), 4, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + Scene00005( player ); + } ); + } + + void Scene00005( Entity::Player& player ) + { + player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.updateQuest( getId(), Seq4 ); + } ); + } + + void Scene00006( Entity::Player& player ) + { + player.playScene( getId(), 6, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + Scene00007( player ); + } ); + } + + void Scene00007( Entity::Player& player ) + { + player.playScene( getId(), 7, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), SeqFinish ); + // QuestBattle doesn't work + /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); + + player.eventFinish(result.eventId, 0); + pTeriMgr.createAndJoinQuestBattle(player, Questbattle0);*/ + } + } ); + } + + void Scene00008( Entity::Player& player ) + { + player.playScene( getId(), 8, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00009( Entity::Player& player ) + { + player.playScene( getId(), 9, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00010( Entity::Player& player ) + { + player.playScene( getId(), 10, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + if( player.giveQuestRewards( getId(), result.param3 ) ) + { + player.finishQuest( getId() ); + } + } + } ); + } +}; + +EXPOSE_SCRIPT(ClsArc005); \ No newline at end of file From 8f0d7f821676999dec71b3412f0dde633c7bb880 Mon Sep 17 00:00:00 2001 From: DantestyleXD Date: Sat, 20 Jun 2020 03:25:22 +0200 Subject: [PATCH 10/13] [ Class Quest ] ClsArc006 is Fixed ( Will need a revision ) --- .../quest/classquest/ARC/ClsArc006.cpp | 265 ++++++++++++++++++ 1 file changed, 265 insertions(+) create mode 100644 src/scripts/quest/classquest/ARC/ClsArc006.cpp diff --git a/src/scripts/quest/classquest/ARC/ClsArc006.cpp b/src/scripts/quest/classquest/ARC/ClsArc006.cpp new file mode 100644 index 00000000..da055533 --- /dev/null +++ b/src/scripts/quest/classquest/ARC/ClsArc006.cpp @@ -0,0 +1,265 @@ +#include +#include "Manager/EventMgr.h" +#include +#include + +using namespace Sapphire; + +// Quest Script: ClsArc006_00076 +// Quest Name: The One That Got Away +// Quest ID: 65612 +// Start NPC: 1000200 +// End NPC: 1000200 + +class ClsArc006 : public Sapphire::ScriptAPI::EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestBitFlag8 + // GetQuestUI8AL + + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + Seq2 = 2, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardAction = 113; + static constexpr auto RewardItem = 1915; + static constexpr auto RewardItemCount = 1; + uint16_t RewardItemOptional[5] = { 3100, 2753, 3597, 3827, 5825 }; + uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 3 }; + + // Entities found in the script data of the quest + static constexpr auto Actor0 = 1000200; + static constexpr auto Actor1 = 1000795; + static constexpr auto Actor2 = 1000796; + static constexpr auto Actor3 = 1000797; + static constexpr auto Actor4 = 1000798; + static constexpr auto Actor5 = 1000799; + static constexpr auto Actor6 = 1000800; + static constexpr auto Actor7 = 1003066; // silver + static constexpr auto Actor8 = 1003067; // lea + static constexpr auto Actor9 = 1003068; // pawah + static constexpr auto Eobject0 = 2001841; + static constexpr auto Eobject1 = 2000709; + static constexpr auto EventAction = 27; + static constexpr auto EventActionSearch = 1; + static constexpr auto EventMotZephyr = 366; + static constexpr auto LocAction0 = 995; + static constexpr auto LocActor0 = 1000199; + static constexpr auto LocActor1 = 1000204; + static constexpr auto LocVfx = 241; + static constexpr auto LocWs = 113; + static constexpr auto Questbattle0 = 2; + static constexpr auto Questbattle1 = 3; + static constexpr auto Seq0Actor0Lq = 98; + static constexpr auto Territorytype0 = 231; + static constexpr auto Territorytype1 = 236; + + public: + ClsArc006() : Sapphire::ScriptAPI::EventScript( 65612 ){}; + ~ClsArc006(){}; + + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref(); + auto actor = pEventMgr.mapEventActorToRealActor( static_cast( actorId ) ); + + if( actor == Actor0 && !player.hasQuest( getId() ) ) + Scene00000( player ); + if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 ) + Scene00002( player ); + if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00013( player ); + if( actor == Actor7 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00014( player ); + if( actor == Actor8 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00015( player ); + if( actor == Actor9 && player.getQuestSeq( getId() ) == SeqFinish ) + Scene00016( player ); + //EOBJECTS + else if( actor == Eobject1 ) + player.eventActionStart( getId(), 0x1B, + [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + Scene00011( player ); + }, + nullptr, eventId ); + } + + private: + + void Scene00000( Entity::Player& player ) + { + player.playScene( getId(), 0, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + Scene00001( player ); + } + } ); + } + + void Scene00001( Entity::Player& player ) + { + player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.updateQuest( getId(), Seq1 ); + } ); + } + + void Scene00002( Entity::Player& player ) + { + player.playScene( getId(), 2, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), Seq2 ); + // QuestBattle doesn't work + /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); + + player.eventFinish(result.eventId, 0); + pTeriMgr.createAndJoinQuestBattle(player, Questbattle0);*/ + } + } ); + } + + void Scene00003( Entity::Player& player ) + { + player.playScene( getId(), 3, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00004( Entity::Player& player ) + { + player.playScene( getId(), 4, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00005( Entity::Player& player ) + { + player.playScene( getId(), 5, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00006( Entity::Player& player ) + { + player.playScene( getId(), 6, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00007( Entity::Player& player ) + { + player.playScene( getId(), 7, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00008( Entity::Player& player ) + { + player.playScene( getId(), 8, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00009( Entity::Player& player ) + { + player.playScene( getId(), 9, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00010( Entity::Player& player ) + { + player.playScene( getId(), 10, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00011( Entity::Player& player ) + { + player.playScene( getId(), 11, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + player.updateQuest( getId(), SeqFinish ); + // QuestBattle doesn't work + /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); + + player.eventFinish(result.eventId, 0); + pTeriMgr.createAndJoinQuestBattle(player, Questbattle1);*/ + } + } ); + } + + void Scene00012( Entity::Player& player ) + { + player.playScene( getId(), 12, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00013( Entity::Player& player ) + { + player.playScene( getId(), 13, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + if( player.giveQuestRewards( getId(), result.param3 ) ) + { + player.finishQuest( getId() ); + } + } + } ); + } + + void Scene00014( Entity::Player& player ) + { + player.playScene( getId(), 14, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00015( Entity::Player& player ) + { + player.playScene( getId(), 15, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } + + void Scene00016( Entity::Player& player ) + { + player.playScene( getId(), 16, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + } ); + } +}; + +EXPOSE_SCRIPT(ClsArc006); \ No newline at end of file From 29f453485ca4de28b08e5429e5621a3b939a7cbd Mon Sep 17 00:00:00 2001 From: pmgr <26606291+pmgr@users.noreply.github.com> Date: Sun, 21 Jun 2020 00:13:27 +0100 Subject: [PATCH 11/13] Add PlaceFieldMarkerPreset ServerZoneIpc and struct --- src/common/Network/PacketDef/Ipcs.h | 1 + .../Network/PacketDef/Zone/ServerZoneDef.h | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index ca042e79..f6dba912 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -336,6 +336,7 @@ namespace Sapphire::Network::Packets ClientTrigger = 0x017D, // updated 5.25 DiscoveryHandler = 0x02C8, // updated 5.25 + PlaceFieldMarkerPreset = 0x23F, // updated 5.25 PlaceFieldMarker = 0x013C, // updated 5.0 SkillHandler = 0x0241, // updated 5.25 GMCommand1 = 0x01EC, // updated 5.25 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index d3eee984..cf00709c 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1681,6 +1681,31 @@ namespace Sapphire::Network::Packets::Server uint8_t bitmask; }; + /** + * Structural representation of the packet sent by the server + * to place/remove field marker presets + */ + struct FFXIVIpcPlaceFieldMarkerPreset : FFXIVIpcBasePacket< PlaceFieldMarkerPreset > + { + enum FieldMarkerStatus + { + A = 0x1, + B = 0x2, + C = 0x4, + D = 0x8, + One = 0x10, + Two = 0x20, + Three = 0x40, + Four = 0x80 + }; + /*! which fieldmarks to show */ + enum FieldMarkerStatus status; + /*! A coordinates would be (float)Xints[0]/1000.0, (float)Yints[0]/1000.0, (float)Zints[0]/1000.0 */ + uint32_t Xints[8]; + uint32_t Yints[8]; + uint32_t Zints[8]; + }; + /** * Structural representation of the packet sent by the server * to mount a player From d1b0bdaf1a03ab0e51b52d01c70628c060ba8fc9 Mon Sep 17 00:00:00 2001 From: pmgr <26606291+pmgr@users.noreply.github.com> Date: Sun, 21 Jun 2020 01:09:19 +0100 Subject: [PATCH 12/13] At demo's recommendation, stuffed FieldMarkerStatus in Common.h; also added the PlaceFieldMarker struct --- src/common/Common.h | 12 +++++++++ src/common/Network/PacketDef/Ipcs.h | 4 +-- .../Network/PacketDef/Zone/ServerZoneDef.h | 27 ++++++++++--------- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 854f9d6f..14be767a 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -566,6 +566,18 @@ namespace Sapphire::Common }; + enum FieldMarkerStatus : uint32_t + { + A = 0x1, + B = 0x2, + C = 0x4, + D = 0x8, + One = 0x10, + Two = 0x20, + Three = 0x40, + Four = 0x80 + }; + enum struct ActionAspect : uint8_t { None = 0, // Doesn't imply unaspected diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index f6dba912..9187be45 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -336,8 +336,8 @@ namespace Sapphire::Network::Packets ClientTrigger = 0x017D, // updated 5.25 DiscoveryHandler = 0x02C8, // updated 5.25 - PlaceFieldMarkerPreset = 0x23F, // updated 5.25 - PlaceFieldMarker = 0x013C, // updated 5.0 + PlaceFieldMarkerPreset = 0x023F, // updated 5.25 + PlaceFieldMarker = 0x01BA, // updated 5.25 SkillHandler = 0x0241, // updated 5.25 GMCommand1 = 0x01EC, // updated 5.25 GMCommand2 = 0x0368, // updated 5.25 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index cf00709c..6da042a6 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1687,25 +1687,28 @@ namespace Sapphire::Network::Packets::Server */ struct FFXIVIpcPlaceFieldMarkerPreset : FFXIVIpcBasePacket< PlaceFieldMarkerPreset > { - enum FieldMarkerStatus - { - A = 0x1, - B = 0x2, - C = 0x4, - D = 0x8, - One = 0x10, - Two = 0x20, - Three = 0x40, - Four = 0x80 - }; /*! which fieldmarks to show */ - enum FieldMarkerStatus status; + Common::FieldMarkerStatus status; /*! A coordinates would be (float)Xints[0]/1000.0, (float)Yints[0]/1000.0, (float)Zints[0]/1000.0 */ uint32_t Xints[8]; uint32_t Yints[8]; uint32_t Zints[8]; }; + /** + * Structural representation of the packet sent by the server + * to place/remove a field marker + */ + struct FFXIVIpcPlaceFieldMarker : FFXIVIpcBasePacket< PlaceFieldMarker > + { + uint8_t markerId; + uint8_t status; + uint8_t pad[2]; + uint32_t Xint; + uint32_t Yint; + uint32_t Zint; + }; + /** * Structural representation of the packet sent by the server * to mount a player From 5cb87b3b468d2528293897265b669216f90adca6 Mon Sep 17 00:00:00 2001 From: pmgr <26606291+pmgr@users.noreply.github.com> Date: Sun, 21 Jun 2020 01:26:54 +0100 Subject: [PATCH 13/13] Convert markerId in FFXIVIpcPlaceFieldMarker into an enum --- src/common/Common.h | 12 ++++++++++++ src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/common/Common.h b/src/common/Common.h index 14be767a..9c3b9bd3 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -577,6 +577,18 @@ namespace Sapphire::Common Three = 0x40, Four = 0x80 }; + // TODO: consolidate these two into one since FieldMarkerStatus == 1 << FieldMarkerId? + enum class FieldMarkerId : uint8_t + { + A, + B, + C, + D, + One, + Two, + Three, + Four + }; enum struct ActionAspect : uint8_t { diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 6da042a6..a60dad20 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1701,7 +1701,7 @@ namespace Sapphire::Network::Packets::Server */ struct FFXIVIpcPlaceFieldMarker : FFXIVIpcBasePacket< PlaceFieldMarker > { - uint8_t markerId; + Common::FieldMarkerId markerId; uint8_t status; uint8_t pad[2]; uint32_t Xint;