From c487a5dd9bd896768c888a0c2bb781677593c05b Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 6 Jan 2023 21:31:30 -0500 Subject: [PATCH 1/2] Delete ClsMar999.cpp --- .../quest/classquest/MAR/ClsMar999.cpp | 72 ------------------- 1 file changed, 72 deletions(-) delete mode 100644 src/scripts/quest/classquest/MAR/ClsMar999.cpp diff --git a/src/scripts/quest/classquest/MAR/ClsMar999.cpp b/src/scripts/quest/classquest/MAR/ClsMar999.cpp deleted file mode 100644 index b88f51e2..00000000 --- a/src/scripts/quest/classquest/MAR/ClsMar999.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// This is an automatically generated C++ script template -// Content needs to be added by hand to make it function -// In order for this script to be loaded, move it to the correct folder in /scripts/ - -#include "Manager/EventMgr.h" -#include -#include -#include -#include - -// Quest Script: ClsMar999_00181 -// Quest Name: So You Want to Be an Archer -// Quest ID: 65715 -// Start NPC: 1000926 -// End NPC: 1000926 - -using namespace Sapphire; - -class ClsMar999 : public Sapphire::ScriptAPI::QuestScript -{ -private: - // Basic quest information - // Quest vars / flags used - - // Steps in this quest ( 0 is before accepting, - // 1 is first, 255 means ready for turning it in - enum Sequence : uint8_t - { - }; - static constexpr auto Actor0 = 1000926; - - // Entities found in the script data of the quest - -public: - ClsMar999() : Sapphire::ScriptAPI::QuestScript( 65715 ){}; - ~ClsMar999() = default; - - ////////////////////////////////////////////////////////////////////// - // Event Handlers - void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override - { - switch( actorId ) - { - case Actor0: - { - Scene00000( quest, player ); - break; - } - } - } - - -private: - ////////////////////////////////////////////////////////////////////// - // Available Scenes in this quest, not necessarly all are used - ////////////////////////////////////////////////////////////////////// - - void Scene00000( World::Quest& quest, Entity::Player& player ) - { - eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ClsMar999::Scene00000Return ) ); - } - - void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) - { - if( result.getResult( 0 ) == 1 ) - { - player.finishQuest( getId(), 0 ); - } - } -}; - -EXPOSE_SCRIPT( ClsMar999 ); \ No newline at end of file From 3e1655990e4a5f3b30040b84963507e01c1b5301 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 6 Jan 2023 21:31:49 -0500 Subject: [PATCH 2/2] Delete ClsMar998.cpp --- .../quest/classquest/MAR/ClsMar998.cpp | 97 ------------------- 1 file changed, 97 deletions(-) delete mode 100644 src/scripts/quest/classquest/MAR/ClsMar998.cpp diff --git a/src/scripts/quest/classquest/MAR/ClsMar998.cpp b/src/scripts/quest/classquest/MAR/ClsMar998.cpp deleted file mode 100644 index 86d5bd46..00000000 --- a/src/scripts/quest/classquest/MAR/ClsMar998.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// This is an automatically generated C++ script template -// Content needs to be added by hand to make it function -// In order for this script to be loaded, move it to the correct folder in /scripts/ - -#include "Manager/EventMgr.h" -#include -#include -#include -#include - -// Quest Script: ClsMar998_00181 -// Quest Name: Way of the Maruader -// Quest ID: 65846 -// Start NPC: 1000926 -// End NPC: 1000927 - -using namespace Sapphire; - -class ClsMar998 : public Sapphire::ScriptAPI::QuestScript -{ -private: - // Basic quest information - // Quest vars / flags used - - // Steps in this quest ( 0 is before accepting, - // 1 is first, 255 means ready for turning it in - enum Sequence : uint8_t - { - SEQ0 = 0, - SEQFINISH = 255 - }; - static constexpr auto Actor0 = 1000926; - static constexpr auto Actor1 = 1000927; - - // Entities found in the script data of the quest - -public: - ClsMar998() : Sapphire::ScriptAPI::QuestScript(65846) {}; - ~ClsMar998() = default; - - ////////////////////////////////////////////////////////////////////// - // Event Handlers - void onTalk(World::Quest& quest, Entity::Player& player, uint64_t actorId) override - { - switch ( actorId ) - { - case Actor0: - { - if (quest.getSeq() == SEQ0) { - Scene00000(quest, player); - } - break; - } - case Actor1: - if (quest.getSeq() == SEQFINISH) { - Scene00001(quest, player); - } - break; - } - } - - -private: - ////////////////////////////////////////////////////////////////////// - // Available Scenes in this quest, not necessarly all are used - ////////////////////////////////////////////////////////////////////// - - void Scene00000(World::Quest& quest, Entity::Player& player) - { - eventMgr().playQuestScene(player, getId(), 0, NONE, bindSceneReturn(&ClsMar998::Scene00000Return)); - } - - void Scene00000Return(World::Quest& quest, Entity::Player& player, const Event::SceneResult& result) - { - if (result.getResult( 0 ) == 1) - { - quest.setSeq(SEQFINISH); - } - } - - void Scene00001(World::Quest& quest, Entity::Player& player) - { - eventMgr().playQuestScene(player, getId(), 1, NONE, bindSceneReturn(&ClsMar998::Scene00001Return)); - } - - void Scene00001Return(World::Quest& quest, Entity::Player& player, const Event::SceneResult& result) - { - if (result.getResult( 0 ) == 1) - { - player.finishQuest(getId()); - player.setLevelForClass(1, Sapphire::Common::ClassJob::Marauder); - player.setMaxGearSets(player.getMaxGearSets() + 1); - } - } -}; - -EXPOSE_SCRIPT(ClsMar998); \ No newline at end of file