1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 23:27:45 +00:00

Merge remote-tracking branch 'origin/ThreePointOh' into ThreePointThree

This commit is contained in:
Mordred 2023-01-20 07:33:34 +01:00
commit ba3f091a69
13 changed files with 2014 additions and 140 deletions

View file

@ -0,0 +1,201 @@
// 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 <root>/scripts/
#include "Manager/EventMgr.h"
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
// Quest Script: SubCts803_01212
// Quest Name: Where the Heart Is (The Lavender Beds)
// Quest ID: 66748
// Start NPC: 1000478
// End NPC: 1000478
using namespace Sapphire;
class SubCts803 : public Sapphire::ScriptAPI::QuestScript
{
private:
// Basic quest information
// Quest vars / flags used
// UI8AL
/// Countable Num: 0 Seq: 1 Event: 1 Listener: 1005530
/// Countable Num: 0 Seq: 2 Event: 15 Listener: 5020000
/// Countable Num: 0 Seq: 3 Event: 1 Listener: 1005530
/// Countable Num: 0 Seq: 255 Event: 1 Listener: 1005879
// 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,
Seq3 = 3,
SeqFinish = 255,
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000478;//Margeria
static constexpr auto Actor1 = 1005530;//Emblyn <<Serpent Private>>
static constexpr auto Actor2 = 1005879;//Serpent Recruit
static constexpr auto CutScene01 = 413;
static constexpr auto LogHousingareaWarpUnlock = 3706;
static constexpr auto Territorytype0 = 340;
static constexpr auto UnlockImageHousingGridania = 160;
public:
SubCts803() : Sapphire::ScriptAPI::QuestScript( 66748 ){};
~SubCts803() = 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 );
else if( quest.getSeq() == SeqFinish )
Scene00006( quest, player );
break;
}
case Actor1:
{
if( quest.getSeq() == Seq1 )
Scene00002( quest, player );
else if( quest.getSeq() == Seq2 )
Scene00004( quest, player );
break;
}
case Actor2:
{
if( quest.getSeq() == Seq3 )
Scene00005( quest, player );
else if( quest.getSeq() == SeqFinish )
Scene00007( quest, player );
break;
}
}
}
void onEnterTerritory(World::Quest& quest, Entity::Player& player, uint16_t param1, uint16_t param2) override
{
if (quest.getSeq() == Seq2)
Scene00003( quest, player );
}
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( &SubCts803::Scene00000Return ) );
}
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )// accept quest
{
Scene00001( quest, player );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00001( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &SubCts803::Scene00001Return ) );
}
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setSeq( Seq1 );
}
//////////////////////////////////////////////////////////////////////
void Scene00002( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &SubCts803::Scene00002Return ) );
}
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
eventMgr().sendEventNotice( player, getId(), 0, 0 );
quest.setSeq( Seq2 );
}
//////////////////////////////////////////////////////////////////////
void Scene00003( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 3, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, bindSceneReturn( &SubCts803::Scene00003Return ) );
}
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
eventMgr().sendEventNotice( player, getId(), 1, 0 );
quest.setSeq( Seq3 );
}
//////////////////////////////////////////////////////////////////////
void Scene00004( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &SubCts803::Scene00004Return ) );
}
void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00005( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &SubCts803::Scene00005Return ) );
}
void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
eventMgr().sendEventNotice( player, getId(), 2, 0 );
quest.setSeq( SeqFinish );
}
//////////////////////////////////////////////////////////////////////
void Scene00006( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &SubCts803::Scene00006Return ) );
}
void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId() );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00007( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &SubCts803::Scene00007Return ) );
}
void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
};
EXPOSE_SCRIPT( SubCts803 );

View file

@ -2,12 +2,15 @@
// 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 <root>/scripts/
#include <Actor/Player.h>
#include <Actor/BNpc.h>
#include "Manager/EventMgr.h"
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
#include "Actor/BNpc.h"
#include "Manager/TerritoryMgr.h"
#include "Territory/Territory.h"
// Quest Script: SubFst033_00127
// Quest Name: Parasite Cleave
// Quest ID: 65663
@ -18,98 +21,186 @@ using namespace Sapphire;
class SubFst033 : public Sapphire::ScriptAPI::QuestScript
{
private:
// Basic quest information
// Quest vars / flags used
// BitFlag8
// UI8AH
// UI8AL
// UI8BH
// UI8BL
// UI8CH
// UI8CL
// UI8DH
// UI8DL
private:
// Basic quest information
// Quest vars / flags used
// BitFlag8
// UI8AH
// UI8AL
// UI8BH
// UI8BL
// UI8CH
// UI8CL
// UI8DH
// UI8DL
/// Countable Num: 3 Seq: 1 Event: 1 Listener: 2000016
/// Countable Num: 1 Seq: 255 Event: 8 Listener: 2000016
// 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,
SeqFinish = 255,
};
/// Countable Num: 3 Seq: 1 Event: 1 Listener: 2000016
/// Countable Num: 1 Seq: 255 Event: 8 Listener: 2000016
// 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,
SeqFinish = 255,
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000461;
static constexpr auto Enemy0 = 2114368;
static constexpr auto Enemy1 = 2114369;
static constexpr auto Enemy2 = 2114370;
static constexpr auto Eobject0 = 2000016;
static constexpr auto Eobject1 = 2000017;
static constexpr auto Eobject2 = 2000018;
static constexpr auto Item0 = 2000061;
static constexpr auto Seq0Actor0 = 0;
static constexpr auto Seq1Eobject0 = 1;
static constexpr auto Seq1Eobject0Useitemno = 99;
static constexpr auto Seq1Eobject0Useitemok = 100;
static constexpr auto Seq1Eobject1 = 2;
static constexpr auto Seq1Eobject1Useitemno = 97;
static constexpr auto Seq1Eobject1Useitemok = 98;
static constexpr auto Seq1Eobject2 = 3;
static constexpr auto Seq1Eobject2Useitemno = 95;
static constexpr auto Seq1Eobject2Useitemok = 96;
static constexpr auto Seq2Actor0 = 4;
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000461;//Gabineaux
static constexpr auto Enemy0 = 2114368;
static constexpr auto Enemy1 = 2114369;
static constexpr auto Enemy2 = 2114370;
static constexpr auto Eobject0 = 2000016;//Decaying Tree (West)
static constexpr auto Eobject1 = 2000017;//Decaying Tree (South)
static constexpr auto Eobject2 = 2000018;//Decaying Tree (East)
static constexpr auto Item0 = 2000061;
static constexpr auto Seq0Actor0 = 0;
static constexpr auto Seq1Eobject0 = 1;
static constexpr auto Seq1Eobject0Useitemno = 99;
static constexpr auto Seq1Eobject0Useitemok = 100;
static constexpr auto Seq1Eobject1 = 2;
static constexpr auto Seq1Eobject1Useitemno = 97;
static constexpr auto Seq1Eobject1Useitemok = 98;
static constexpr auto Seq1Eobject2 = 3;
static constexpr auto Seq1Eobject2Useitemno = 95;
static constexpr auto Seq1Eobject2Useitemok = 96;
static constexpr auto Seq2Actor0 = 4;
public:
SubFst033() : Sapphire::ScriptAPI::QuestScript( 65663 ){};
~SubFst033() = default;
public:
SubFst033() : Sapphire::ScriptAPI::QuestScript( 65663 ){};
~SubFst033() = default;
//////////////////////////////////////////////////////////////////////
// Event Handlers
void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override
{
quest.setBitFlag8( 0, 0 );
quest.setBitFlag8( 1, 0 );
quest.setBitFlag8( 2, 0 );
quest.setUI8AH( 0 );
quest.setUI8AL( 0 );
quest.setUI8BH( 0 );
quest.setUI8BL( 0 );
quest.setUI8CH( 0 );
quest.setUI8CL( 0 );
quest.setUI8DH( 0 );
quest.setUI8DL( 1 );
Scene00000( quest, player );
switch( actorId )
{
case Actor0:
{
if( quest.getSeq() == Seq0 )
Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish )
Scene00004( quest, player );
break;
}
case Eobject0:
{
if( quest.getSeq() == Seq1 )
Scene00001( quest, player );
break;
}
case Eobject1:
{
if( quest.getSeq() == Seq1 )
Scene00002( quest, player );
break;
}
case Eobject2:
{
if( quest.getSeq() == Seq1 )
Scene00003( quest, player );
break;
}
}
}
void onEventItem( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override
{
void onEventItem(World::Quest& quest, Entity::Player& player, uint64_t actorId) override {
if( quest.getSeq() != Seq1 ) return;
}
void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override
{
switch( bnpc.getLayoutId() )
switch( actorId )
{
case Enemy0: { break; }
case Enemy1: { break; }
case Enemy2: { break; }
case Eobject0:
{
Scene00100( quest, player );
break;
}
case Eobject1:
{
Scene00098( quest, player );
break;
}
case Eobject2:
{
Scene00096( quest, player );
break;
}
}
}
private:
void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override
{
switch( bnpc.getLayoutId() )
{
case Enemy0:
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8AL( 1 );
checkQuestCompletion( quest, player );
break;
}
case Enemy1:
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8BL( 1 );
checkQuestCompletion( quest, player );
break;
}
case Enemy2:
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8CL( 1 );
checkQuestCompletion( quest, player );
break;
}
}
}
void onPlayerDeath(World::Quest& quest, Sapphire::Entity::Player& player) override
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enem0 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enem1 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
auto enem2 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy2, player.getId() );
if (enem0 != nullptr)
{
instance->removeActor( enem0 );
quest.setBitFlag8( 1, false );
}
if( enem1 != nullptr )
{
instance->removeActor( enem1 );
quest.setBitFlag8( 2, false );
}
if( enem2 != nullptr )
{
instance->removeActor( enem2 );
quest.setBitFlag8( 3, false );
}
}
private:
void checkQuestCompletion( World::Quest& quest, Entity::Player& player )
{
eventMgr().sendEventNotice( player, getId(), 0, 2, quest.getUI8AH(), 3 );//TODO: Probably needs item icon
if( quest.getUI8AH() >= 3 )
{
quest.setSeq( SeqFinish );
quest.setUI8AH( 0 );
quest.setUI8AL( 0 );
quest.setUI8BH( 0 );
quest.setUI8BL( 0 );
quest.setUI8CH( 0 );
quest.setUI8CL( 0 );
quest.setUI8DH( 0 );
quest.setBitFlag8( 1, false );
quest.setBitFlag8( 2, false );
quest.setBitFlag8( 3, false );
}
}
//////////////////////////////////////////////////////////////////////
// Available Scenes in this quest, not necessarly all are used
//////////////////////////////////////////////////////////////////////
@ -121,8 +212,11 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )// accept quest
{
quest.setUI8DL( 1 );
quest.setSeq( Seq1 );
}
}
//////////////////////////////////////////////////////////////////////
@ -134,8 +228,6 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
@ -147,8 +239,6 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
@ -160,8 +250,6 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
@ -174,7 +262,10 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId(), result.getResult(1) );
}
}
//////////////////////////////////////////////////////////////////////
@ -186,8 +277,6 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00095Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
@ -199,8 +288,11 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00096Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
quest.setBitFlag8( 3, true );
}
//////////////////////////////////////////////////////////////////////
@ -212,8 +304,6 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00097Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
@ -225,8 +315,11 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00098Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
quest.setBitFlag8( 2, true );
}
//////////////////////////////////////////////////////////////////////
@ -238,8 +331,6 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00099Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
@ -251,10 +342,12 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
quest.setBitFlag8( 1, true );
}
};
EXPOSE_SCRIPT( SubFst033 );

View file

@ -0,0 +1,123 @@
// 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 <root>/scripts/
#include "Manager/EventMgr.h"
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
#include "Actor/BNpc.h"
// Quest Script: SubFst036_00130
// Quest Name: Soil Despoilers
// Quest ID: 65666
// Start NPC: 1000461
// End NPC: 1000455
using namespace Sapphire;
class SubFst036 : public Sapphire::ScriptAPI::QuestScript
{
private:
// Basic quest information
// Quest vars / flags used
// UI8AL
/// Countable Num: 8 Seq: 1 Event: 5 Listener: 32
/// Countable Num: 1 Seq: 255 Event: 1 Listener: 1000455
// 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,
SeqFinish = 255,
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000461;//Gabineaux
static constexpr auto Actor1 = 1000455;//Ealdfrith
static constexpr auto Enemy0 = 32; //Microchu
static constexpr auto Seq0Actor0 = 0;
static constexpr auto Seq2Actor1 = 1;
public:
SubFst036() : Sapphire::ScriptAPI::QuestScript( 65666 ){};
~SubFst036() = 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;
}
}
}
void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override
{
switch( bnpc.getBNpcNameId() )
{
case Enemy0:
{
quest.setUI8AL( quest.getUI8AL() + 1 );
eventMgr().sendEventNotice( player, getId(), 0, 2, quest.getUI8AL(), 8 );
if( quest.getUI8AL() >= 8 )
{
quest.setUI8AL( 0 );
quest.setSeq( SeqFinish );
}
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( &SubFst036::Scene00000Return ) );
}
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )// accept quest
{
quest.setSeq( Seq1 );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00001( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &SubFst036::Scene00001Return ) );
}
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId(), result.getResult( 1 ) );
}
}
};
EXPOSE_SCRIPT( SubFst036 );

View file

@ -2,9 +2,9 @@
// 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 <root>/scripts/
#include <Actor/Player.h>
#include <Actor/BNpc.h>
#include "Manager/EventMgr.h"
#include <Actor/BNpc.h>
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
@ -36,10 +36,10 @@ private:
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000742;
static constexpr auto Actor1 = 1000474;
static constexpr auto Actor2 = 1000476;
static constexpr auto Actor3 = 1000483;
static constexpr auto Actor0 = 1000742;//Kukuvachi
static constexpr auto Actor1 = 1000474;//Aethelthryth
static constexpr auto Actor2 = 1000476;//Leodaire
static constexpr auto Actor3 = 1000483;//Bernard
static constexpr auto Seq0Actor0 = 0;
static constexpr auto Seq1Actor1 = 1;
static constexpr auto Seq1Actor2 = 2;
@ -47,8 +47,7 @@ private:
static constexpr auto Seq2Actor0 = 4;
public:
SubFst048() : Sapphire::ScriptAPI::QuestScript( 65911 )
{};
SubFst048() : Sapphire::ScriptAPI::QuestScript( 65911 ){};
~SubFst048() = default;
@ -60,7 +59,7 @@ public:
{
case Actor0:
{
if( !player.hasQuest( getId() ) )
if( quest.getSeq() == Seq0 )
Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish )
Scene00004( quest, player );
@ -113,7 +112,7 @@ private:
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 ) // accept quest
if( result.getResult( 0 ) == 1 )// accept quest
{
quest.setSeq( Seq1 );
}
@ -170,11 +169,9 @@ private:
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId(), result.getResult( 1 ) );
player.finishQuest( getId() );
}
}
};
EXPOSE_SCRIPT( SubFst048 );

View file

@ -0,0 +1,202 @@
// 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 <root>/scripts/
#include "Manager/EventMgr.h"
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
#include "Actor/BNpc.h"
// Quest Script: SubFst052_00158
// Quest Name: Sting in a Bottle
// Quest ID: 65694
// Start NPC: 1000501
// End NPC: 1000473
using namespace Sapphire;
class SubFst052 : public Sapphire::ScriptAPI::QuestScript
{
private:
// Basic quest information
// Quest vars / flags used
// UI8AL
// UI8BH
// UI8BL
/// Countable Num: 4 Seq: 1 Event: 9 Listener: 57
/// Countable Num: 1 Seq: 2 Event: 1 Listener: 1000501
/// Countable Num: 1 Seq: 255 Event: 1 Listener: 1000473
// 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,
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000501;//Walthoef
static constexpr auto Actor1 = 1000473;//MARGAULT
static constexpr auto Enemy0 = 54;//Hornet Swarm (INCORRECT: 57)
static constexpr auto Item0 = 2000099;
static constexpr auto Item1 = 2000094;
static constexpr auto Seq0Actor0 = 0;
static constexpr auto Seq2Actor0 = 1;
static constexpr auto Seq2Actor0Npctradeno = 99;
static constexpr auto Seq2Actor0Npctradeok = 100;
static constexpr auto Seq3Actor1 = 2;
static constexpr auto Seq3Actor1Npctradeno = 97;
static constexpr auto Seq3Actor1Npctradeok = 98;
public:
SubFst052() : Sapphire::ScriptAPI::QuestScript( 65694 ){};
~SubFst052() = 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 );
else if( quest.getSeq() == Seq2 )
Scene00001( quest, player );
break;
}
case Actor1:
{
if( quest.getSeq() == SeqFinish )
Scene00002( quest, player );
break;
}
}
}
void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override
{
switch( bnpc.getBNpcNameId() )
{
case Enemy0:
{
quest.setUI8BH( quest.getUI8BH() + 1 );
quest.setUI8AL( quest.getUI8AL() + 1 );
eventMgr().sendEventNotice( player, getId(), 0, 2, quest.getUI8AL(), 4 );//TODO: Probably needs item icon
if( quest.getUI8AL() >= 4 )
{
quest.setUI8AL( 0 );
quest.setUI8BH( 0 );
quest.setUI8BL( 4 );
quest.setSeq( Seq2 );
}
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( &SubFst052::Scene00000Return ) );
}
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )// accept quest
{
quest.setSeq( Seq1 );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00001( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &SubFst052::Scene00001Return ) );
}
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
Scene00100( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00002( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &SubFst052::Scene00002Return ) );
}
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
Scene00098( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00097( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 97, NONE, bindSceneReturn( &SubFst052::Scene00097Return ) );
}
void Scene00097Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00098( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 98, HIDE_HOTBAR, bindSceneReturn( &SubFst052::Scene00098Return ) );
}
void Scene00098Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId(), result.getResult( 1 ) );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00099( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 99, NONE, bindSceneReturn( &SubFst052::Scene00099Return ) );
}
void Scene00099Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00100( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 100, HIDE_HOTBAR, bindSceneReturn( &SubFst052::Scene00100Return ) );
}
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8BH( 1 );
quest.setUI8BL( 0 );
quest.setSeq( SeqFinish );
}
};
EXPOSE_SCRIPT( SubFst052 );

View file

@ -0,0 +1,498 @@
// 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 <root>/scripts/
#include "Manager/EventMgr.h"
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
#include "Actor/BNpc.h"
#include "Manager/TerritoryMgr.h"
#include "Territory/Territory.h"
// Quest Script: SubFst067_00383
// Quest Name: If Ye Break Faith
// Quest ID: 65919
// Start NPC: 1000494
// End NPC: 1002946
using namespace Sapphire;
class SubFst067 : public Sapphire::ScriptAPI::QuestScript
{
private:
// Basic quest information
// Quest vars / flags used
// BitFlag8
// UI8AL
// UI8BH
/// Countable Num: 1 Seq: 1 Event: 1 Listener: 1002946
/// Countable Num: 3 Seq: 2 Event: 1 Listener: 2001007
/// Countable Num: 1 Seq: 255 Event: 8 Listener: 2001007
// 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,
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000494;//Finnea
static constexpr auto Actor1 = 1002946;//Balarr
static constexpr auto Enemy0 = 3841338;
static constexpr auto Enemy1 = 3841340;
static constexpr auto Eobject0 = 2001007;//Barrow (East)
static constexpr auto Eobject1 = 2001008;//Barrow (West)
static constexpr auto Eobject2 = 2001009;//Barrow (North)
static constexpr auto Eobject3 = 2001844;
static constexpr auto Eventrange0 = 3841476;
static constexpr auto EventActionSearch = 1;
static constexpr auto Item0 = 2000192;
public:
SubFst067() : Sapphire::ScriptAPI::QuestScript( 65919 ){};
~SubFst067() = 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() == Seq1 )
Scene00002( quest, player );
else if( quest.getSeq() == SeqFinish )
Scene00015( quest, player );
break;
}
case Eobject0:
{
if( quest.getSeq() == Seq2 )
Scene00003( quest, player );
break;
}
case Eobject1:
{
if( quest.getSeq() == Seq2 )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
bool enemy0Downed = false;
bool enemy1Downed = false;
auto enem0 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enem1 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( enem0 == nullptr || ( enem0 != nullptr && enem0->getHp() == 0 ) ) enemy0Downed = true;
if( enem1 == nullptr || ( enem1 != nullptr && enem1->getHp() == 0 ) ) enemy1Downed = true;
if( enemy0Downed && enemy1Downed )
Scene00006( quest, player );
else
Scene00013( quest, player );
}
break;
}
case Eobject2:
{
if( quest.getSeq() == Seq2 )
Scene00009( quest, player );
break;
}
}
}
void onEventItem( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override
{
if( quest.getSeq() != Seq2 ) return;
switch( actorId )
{
case Eobject0:
{
Scene00004( quest, player );
break;
}
case Eobject1:
{
Scene00007( quest, player );
break;
}
case Eobject2:
{
Scene00010( quest, player );
break;
}
}
}
void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override
{
switch( bnpc.getLayoutId() )
{
case Enemy0:
{
break;
}
case Enemy1:
{
break;
}
}
}
void onWithinRange( World::Quest& quest, Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) override
{
if( quest.getSeq() == Seq2 && param1 == Eventrange0 )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
bool enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ) != nullptr;
bool enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ) != nullptr;
if( !enemy0Spawned && !enemy1Spawned )
{
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}
}
}
void onPlayerDeath( World::Quest& quest, Sapphire::Entity::Player& player ) override
{
}
private:
void checkQuestCompletion( World::Quest& quest, Entity::Player& player )
{
eventMgr().sendEventNotice( player, getId(), 1, 2, quest.getUI8AL(), 3 );//TODO: Item Icon
if( quest.getUI8AL() >= 3 )
{
quest.setUI8AL( 0 );
quest.setBitFlag8( 1, false );
quest.setBitFlag8( 2, false );
quest.setBitFlag8( 3, false );
quest.setSeq( SeqFinish );
}
}
//////////////////////////////////////////////////////////////////////
// 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( &SubFst067::Scene00000Return ) );
}
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )// accept quest
{
Scene00001( quest, player );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00001( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00001Return ) );
}
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setSeq( Seq1 );
}
//////////////////////////////////////////////////////////////////////
void Scene00002( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00002Return ) );
}
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
eventMgr().sendEventNotice( player, getId(), 0, 0 );
quest.setSeq( Seq2 );
quest.setUI8BH( 3 );
}
//////////////////////////////////////////////////////////////////////
void Scene00003( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00003Return ) );
}
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00004( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00004Return ) );
}
void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8BH( quest.getUI8BH() - 1 );
quest.setUI8AL( quest.getUI8AL() + 1 );
quest.setBitFlag8( 1, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00005( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 5, NONE, bindSceneReturn( &SubFst067::Scene00005Return ) );
}
void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00006( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00006Return ) );
}
void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00007( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00007Return ) );
}
void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8BH( quest.getUI8BH() - 1 );
quest.setUI8AL( quest.getUI8AL() + 1 );
quest.setBitFlag8( 2, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00008( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 8, NONE, bindSceneReturn( &SubFst067::Scene00008Return ) );
}
void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00009( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 9, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00009Return ) );
}
void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00010( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 10, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00010Return ) );
}
void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8BH( quest.getUI8BH() - 1 );
quest.setUI8AL( quest.getUI8AL() + 1 );
quest.setBitFlag8( 3, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00011( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 11, NONE, bindSceneReturn( &SubFst067::Scene00011Return ) );
}
void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00012( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 12, NONE, bindSceneReturn( &SubFst067::Scene00012Return ) );
}
void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00013( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 13, NONE, bindSceneReturn( &SubFst067::Scene00013Return ) );
}
void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00014( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 14, NONE, bindSceneReturn( &SubFst067::Scene00014Return ) );
}
void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00015( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 15, HIDE_HOTBAR, bindSceneReturn( &SubFst067::Scene00015Return ) );
}
void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId() );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00016( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 16, NONE, bindSceneReturn( &SubFst067::Scene00016Return ) );
}
void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00017( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 17, NONE, bindSceneReturn( &SubFst067::Scene00017Return ) );
}
void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00018( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 18, NONE, bindSceneReturn( &SubFst067::Scene00018Return ) );
}
void Scene00018Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00019( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 19, NONE, bindSceneReturn( &SubFst067::Scene00019Return ) );
}
void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00020( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 20, NONE, bindSceneReturn( &SubFst067::Scene00020Return ) );
}
void Scene00020Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00021( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 21, NONE, bindSceneReturn( &SubFst067::Scene00021Return ) );
}
void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00022( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 22, NONE, bindSceneReturn( &SubFst067::Scene00022Return ) );
}
void Scene00022Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00023( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 23, NONE, bindSceneReturn( &SubFst067::Scene00023Return ) );
}
void Scene00023Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00024( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 24, NONE, bindSceneReturn( &SubFst067::Scene00024Return ) );
}
void Scene00024Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
};
EXPOSE_SCRIPT( SubFst067 );

View file

@ -0,0 +1,178 @@
// 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 <root>/scripts/
#include "Manager/EventMgr.h"
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
// Quest Script: SubFst069_00385
// Quest Name: Favor for the Fisherwoman
// Quest ID: 65921
// Start NPC: 1000502
// End NPC: 1000502
using namespace Sapphire;
class SubFst069 : public Sapphire::ScriptAPI::QuestScript
{
private:
// Basic quest information
// Quest vars / flags used
// UI8AL
// UI8BH
/// Countable Num: 1 Seq: 1 Event: 1 Listener: 2000685
/// Countable Num: 1 Seq: 255 Event: 1 Listener: 1000502
// 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,
SeqFinish = 255,
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000502;//Berthe
static constexpr auto Eobject0 = 2000685;//Well-worn Fishing Rod
static constexpr auto EventActionSearch = 1;
static constexpr auto Item0 = 2000185;
static constexpr auto Seq0Actor0 = 0;
static constexpr auto Seq1Eobject0 = 1;
static constexpr auto Seq1Eobject0Eventactionno = 99;
static constexpr auto Seq1Eobject0Eventactionok = 100;
static constexpr auto Seq2Actor0 = 2;
static constexpr auto Seq2Actor0Npctradeno = 97;
static constexpr auto Seq2Actor0Npctradeok = 98;
public:
SubFst069() : Sapphire::ScriptAPI::QuestScript( 65921 ){};
~SubFst069() = 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 );
else if( quest.getSeq() == SeqFinish )
Scene00002( quest, player );
break;
}
case Eobject0:
{
if( quest.getSeq() == Seq1 )
eventMgr().eventActionStart(
player, getId(), EventActionSearch,
[ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) {
Scene00100( quest, player );
},
nullptr, 0 );
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( &SubFst069::Scene00000Return ) );
}
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )// accept quest
{
quest.setSeq( Seq1 );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00001( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 1, NONE, bindSceneReturn( &SubFst069::Scene00001Return ) );
}
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00002( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &SubFst069::Scene00002Return ) );
}
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
Scene00098( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00097( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 97, NONE, bindSceneReturn( &SubFst069::Scene00097Return ) );
}
void Scene00097Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00098( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 98, HIDE_HOTBAR, bindSceneReturn( &SubFst069::Scene00098Return ) );
}
void Scene00098Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId(), result.getResult( 1 ) );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00099( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 99, NONE, bindSceneReturn( &SubFst069::Scene00099Return ) );
}
void Scene00099Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00100( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 100, NONE, bindSceneReturn( &SubFst069::Scene00100Return ) );
}
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
eventMgr().sendEventNotice( player, getId(), 0, 0 );//TODO: Probably Item Icon
quest.setUI8BH( 1 );
quest.setSeq( SeqFinish );
}
};
EXPOSE_SCRIPT( SubFst069 );

View file

@ -0,0 +1,426 @@
// 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 <root>/scripts/
#include "Manager/EventMgr.h"
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
// Quest Script: SubFst072_00386
// Quest Name: Walking the Planks
// Quest ID: 65922
// Start NPC: 1000501
// End NPC: 1000501
using namespace Sapphire;
class SubFst072 : public Sapphire::ScriptAPI::QuestScript
{
private:
// Basic quest information
// Quest vars / flags used
// BitFlag8
// UI8AH
// UI8AL
// UI8BH
// UI8BL
// UI8CH
// UI8CL
// UI8DH
/// Countable Num: 3 Seq: 1 Event: 1 Listener: 2001013
/// Countable Num: 3 Seq: 2 Event: 1 Listener: 2001014
/// Countable Num: 1 Seq: 255 Event: 1 Listener: 2001015
// 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,
};
// Entities found in the script data of the quest
static constexpr auto Actor0 = 1000501; //Waltheof
static constexpr auto Actor1 = 1000502; //Berthe
static constexpr auto Actor2 = 1000507; //Kyleigh
static constexpr auto Actor3 = 1000505; //Daranmert
static constexpr auto Eobject0 = 2001013;//Crayfish Balls
static constexpr auto Eobject1 = 2001014;//Muy-Tuy Beans
static constexpr auto Eobject2 = 2001015;//Pate Mail
static constexpr auto EventActionSearch = 1;
static constexpr auto Item0 = 2000246;
static constexpr auto Item1 = 2000247;
static constexpr auto Item2 = 2000248;
static constexpr auto Seq0Actor0 = 0;
static constexpr auto Seq1Eobject0 = 1;
static constexpr auto Seq1Eobject0Eventactionno = 99;
static constexpr auto Seq1Eobject0Eventactionok = 100;
static constexpr auto Seq1Eobject1 = 2;
static constexpr auto Seq1Eobject1Eventactionno = 97;
static constexpr auto Seq1Eobject1Eventactionok = 98;
static constexpr auto Seq1Eobject2 = 3;
static constexpr auto Seq1Eobject2Eventactionno = 95;
static constexpr auto Seq1Eobject2Eventactionok = 96;
static constexpr auto Seq2Actor1 = 4;
static constexpr auto Seq2Actor1Npctradeno = 93;
static constexpr auto Seq2Actor1Npctradeok = 94;
static constexpr auto Seq2Actor2 = 5;
static constexpr auto Seq2Actor2Npctradeno = 91;
static constexpr auto Seq2Actor2Npctradeok = 92;
static constexpr auto Seq2Actor3 = 6;
static constexpr auto Seq2Actor3Npctradeno = 89;
static constexpr auto Seq2Actor3Npctradeok = 90;
static constexpr auto Seq3Actor0 = 7;
public:
SubFst072() : Sapphire::ScriptAPI::QuestScript( 65922 ){};
~SubFst072() = 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 );
else if( quest.getSeq() == SeqFinish )
Scene00007( quest, player );
break;
}
case Actor1:
{
if( quest.getSeq() == Seq2 )
Scene00004( quest, player );
break;
}
case Actor2:
{
if( quest.getSeq() == Seq2 )
Scene00005( quest, player );
break;
}
case Actor3:
{
if( quest.getSeq() == Seq2 )
Scene00006( quest, player );
break;
}
case Eobject0:
{
eventMgr().eventActionStart(
player, getId(), EventActionSearch,
[ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) {
Scene00100( quest, player );
},
nullptr, 0 );
break;
}
case Eobject1:
{
eventMgr().eventActionStart(
player, getId(), EventActionSearch,
[ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) {
Scene00098( quest, player );
},
nullptr, 0 );
break;
}
case Eobject2:
{
eventMgr().eventActionStart(
player, getId(), EventActionSearch,
[ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional ) {
Scene00096( quest, player );
},
nullptr, 0 );
break;
}
}
}
private:
void checkQuestCompletion( World::Quest& quest, Entity::Player& player )
{
eventMgr().sendEventNotice( player, getId(), ( quest.getSeq() == Seq1 ) ? 0 : 1, 2, quest.getUI8AH(), 3 );
if( quest.getUI8AH() >= 3 )
{
quest.setUI8AH( 0 );
quest.setBitFlag8( 1, false );
quest.setBitFlag8( 2, false );
quest.setBitFlag8( 3, false );
if( quest.getSeq() == Seq1 )
quest.setSeq( Seq2 );
else if( quest.getSeq() == Seq2 )
quest.setSeq( SeqFinish );
}
}
//////////////////////////////////////////////////////////////////////
// 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( &SubFst072::Scene00000Return ) );
}
void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )// accept quest
{
quest.setSeq( Seq1 );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00001( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 1, NONE, bindSceneReturn( &SubFst072::Scene00001Return ) );
}
void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00002( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 2, NONE, bindSceneReturn( &SubFst072::Scene00002Return ) );
}
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00003( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 3, NONE, bindSceneReturn( &SubFst072::Scene00003Return ) );
}
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00004( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &SubFst072::Scene00004Return ) );
}
void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
Scene00094( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00005( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &SubFst072::Scene00005Return ) );
}
void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
Scene00092( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00006( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &SubFst072::Scene00006Return ) );
}
void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
Scene00090( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00007( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &SubFst072::Scene00007Return ) );
}
void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
if( result.getResult( 0 ) == 1 )
{
player.finishQuest( getId(), result.getResult( 1 ) );
}
}
//////////////////////////////////////////////////////////////////////
void Scene00089( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 89, NONE, bindSceneReturn( &SubFst072::Scene00089Return ) );
}
void Scene00089Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00090( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 90, HIDE_HOTBAR, bindSceneReturn( &SubFst072::Scene00090Return ) );
}
void Scene00090Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8DH( 0 );
quest.setBitFlag8( 3, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00091( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 91, NONE, bindSceneReturn( &SubFst072::Scene00091Return ) );
}
void Scene00091Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00092( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 92, HIDE_HOTBAR, bindSceneReturn( &SubFst072::Scene00092Return ) );
}
void Scene00092Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8CL( 0 );
quest.setBitFlag8( 2, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00093( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 93, NONE, bindSceneReturn( &SubFst072::Scene00093Return ) );
}
void Scene00093Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00094( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 94, HIDE_HOTBAR, bindSceneReturn( &SubFst072::Scene00094Return ) );
}
void Scene00094Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8CH( 0 );
quest.setBitFlag8( 1, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00095( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 95, NONE, bindSceneReturn( &SubFst072::Scene00095Return ) );
}
void Scene00095Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00096( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 96, NONE, bindSceneReturn( &SubFst072::Scene00096Return ) );
}
void Scene00096Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8DH( 1 );
quest.setBitFlag8( 3, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00097( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 97, NONE, bindSceneReturn( &SubFst072::Scene00097Return ) );
}
void Scene00097Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00098( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 98, NONE, bindSceneReturn( &SubFst072::Scene00098Return ) );
}
void Scene00098Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8CL( 1 );
quest.setBitFlag8( 2, true );
checkQuestCompletion( quest, player );
}
//////////////////////////////////////////////////////////////////////
void Scene00099( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 99, NONE, bindSceneReturn( &SubFst072::Scene00099Return ) );
}
void Scene00099Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
}
//////////////////////////////////////////////////////////////////////
void Scene00100( World::Quest& quest, Entity::Player& player )
{
eventMgr().playQuestScene( player, getId(), 100, NONE, bindSceneReturn( &SubFst072::Scene00100Return ) );
}
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
quest.setUI8AH( quest.getUI8AH() + 1 );
quest.setUI8CH( 1 );
quest.setBitFlag8( 1, true );
checkQuestCompletion( quest, player );
}
};
EXPOSE_SCRIPT( SubFst072 );

View file

@ -3,6 +3,7 @@
#include <stdint.h>
#include <vector>
#include <cstring>
struct PCB_HEADER
{
@ -172,4 +173,4 @@ struct PCB_LIST_FILE
PCB_LIST_BASE_ENTRY entry;
std::vector< PCB_LIST_ENTRY > entries;
};
#endif
#endif

View file

@ -3,6 +3,7 @@
#include <stdint.h>
#include <vector>
#include <cstring>
struct PCB_HEADER
{
@ -173,4 +174,4 @@ struct PCB_LIST_FILE
PCB_LIST_BASE_ENTRY entry;
std::vector< PCB_LIST_ENTRY > entries;
};
#endif
#endif

View file

@ -5,6 +5,7 @@
#include <set>
#include <string>
#include <cstring>
#include <unordered_map>
#include <filesystem>
@ -24,8 +25,8 @@ Sapphire::Data::ExdData g_exdDataGen;
namespace fs = std::filesystem;
using namespace Sapphire;
std::string javaPath( "\"C:\\Program Files (x86)\\Java\\jre1.8.0_301\\bin\\java.exe\"" );
std::string gamePath( "F:\\client3.0\\game\\sqpack" );
std::string javaPath("java " );
std::string gamePath( "H:\\Games\\ffxiv3.05\\game\\sqpack" );
const std::string onWithinRangeStr(
" void onWithinRange( World::Quest& quest, Entity::Player& player, uint64_t eRangeId, float x, float y, float z ) override\n"
@ -39,6 +40,38 @@ const std::string onEmoteStr(
" }\n\n"
);
// https://stackoverflow.com/a/9745132
bool compareNat(const std::string& a, const std::string& b)
{
if (a.empty())
return true;
if (b.empty())
return false;
if (std::isdigit(a[0]) && !std::isdigit(b[0]))
return true;
if (!std::isdigit(a[0]) && std::isdigit(b[0]))
return false;
if (!std::isdigit(a[0]) && !std::isdigit(b[0]))
{
if (std::toupper(a[0]) == std::toupper(b[0]))
return compareNat(a.substr(1), b.substr(1));
return (std::toupper(a[0]) < std::toupper(b[0]));
}
std::istringstream issa(a);
std::istringstream issb(b);
int ia, ib;
issa >> ia;
issb >> ib;
if (ia != ib)
return ia < ib;
std::string anew, bnew;
std::getline(issa, anew);
std::getline(issb, bnew);
return (compareNat(anew, bnew));
}
std::string titleCase( const std::string& str )
{
if( str.empty() )
@ -99,6 +132,117 @@ Container& split(
return result;
}
const std::string& getItemNameFromExd( uint32_t id )
{
static std::unordered_map< uint32_t, std::string > itemNames;
static std::string invalid;
if( itemNames.empty() )
{
auto nameIdList = g_exdDataGen.getIdList< Excel::Item >();
for( auto id : nameIdList )
{
auto itemName = g_exdDataGen.getRow< Excel::Item >( id );
if( itemName && !itemName->getString( itemName->data().Text.SGL ).empty() )
itemNames[id] = itemName->getString( itemName->data().Text.SGL );
}
}
if( auto name = itemNames.find( id ); name != itemNames.end() )
return name->second;
return invalid;
}
const std::string& getActorPosFromLevelExd( uint32_t id )
{
static std::unordered_map< uint32_t, std::string > levelPositions;
static std::string invalid;
if( levelPositions.empty() )
{
auto levelIdList = g_exdDataGen.getIdList< Excel::Level >();
for( auto id : levelIdList )
{
auto levelRow = g_exdDataGen.getRow< Excel::Level >( id );
if( levelRow )
{
auto assetType = levelRow->data().eAssetType;
// enpc, bnpc, eobj
if( assetType != 8 && assetType != 9 && assetType != 45 )
continue;
std::string pos(" ( Pos: ");
pos +=
std::to_string( levelRow->data().TransX ) + " " +
std::to_string( levelRow->data().TransY ) + " " +
std::to_string( levelRow->data().TransZ ) + " " +
"Teri: " + std::to_string( levelRow->data().TerritoryType ) + " )";
levelPositions.emplace( levelRow->data().BaseId, pos );
}
}
}
if( auto pos = levelPositions.find( id ); pos != levelPositions.end() )
return pos->second;
return invalid;
}
const std::string& getActorNameFromExd( uint32_t id )
{
static std::unordered_map< uint32_t, std::string > bnpcNames, enpcNames, eobjNames;
static std::string invalid;
// bnpc
if( id < 1000000 )
{
if( bnpcNames.empty() )
{
auto nameIdList = g_exdDataGen.getIdList< Excel::BNpcName >();
for( auto id : nameIdList )
{
auto BNpcName = g_exdDataGen.getRow< Excel::BNpcName >( id );
if( BNpcName && !BNpcName->getString( BNpcName->data().Text.SGL ).empty() )
bnpcNames[id] = BNpcName->getString( BNpcName->data().Text.SGL );
}
}
if( auto name = bnpcNames.find( id ); name != bnpcNames.end() )
return name->second;
}
// enpcresident
else if( id < 2000000 )
{
if( enpcNames.empty() )
{
auto nameIdList = g_exdDataGen.getIdList< Excel::ENpcResident >();
for( auto id : nameIdList )
{
auto eNpcName = g_exdDataGen.getRow< Excel::ENpcResident >( id );
if( eNpcName && !eNpcName->getString( eNpcName->data().Text.SGL ).empty() )
enpcNames[id] = eNpcName->getString( eNpcName->data().Text.SGL );
}
}
if( auto name = enpcNames.find( id ); name != enpcNames.end() )
return name->second;
}
// eobj
else
{
if( eobjNames.empty() )
{
auto nameIdList = g_exdDataGen.getIdList< Excel::EObj >();
for( auto id : nameIdList )
{
auto eObjName = g_exdDataGen.getRow< Excel::EObj >( id );
if( eObjName && !eObjName->getString( eObjName->data().Text.SGL ).empty() )
eobjNames[id] = eObjName->getString( eObjName->data().Text.SGL );
}
}
if( auto name = eobjNames.find( id ); name != eobjNames.end() )
return name->second;
}
return invalid;
}
void
createScript( std::shared_ptr< Excel::ExcelStruct< Excel::Quest > >& pQuestData, std::set< std::string >& additionalList, int questId, std::vector< std::string >& functions )
{
@ -152,11 +296,6 @@ createScript( std::shared_ptr< Excel::ExcelStruct< Excel::Quest > >& pQuestData,
std::size_t splitPos( pQuestData->getString( pQuestData->data().Script ).find( '_' ) );
std::string className( pQuestData->getString( pQuestData->data().Script ).substr( 0, splitPos ) );
if( className == "SubFst033" )
{
className = className;
}
std::string todoInfo;
for( int i = 0; i < 23; ++i )
{
@ -181,8 +320,8 @@ createScript( std::shared_ptr< Excel::ExcelStruct< Excel::Quest > >& pQuestData,
std::string rewardString(
" if( result.getResult( 0 ) == 1 )\n"
" {\n"
" if( player.giveQuestRewards( getId(), 0 ) )\n"
" player.finishQuest( getId() );\n"
" if( player.giveQuestRewards( getId(), 0, result.getResult( 1 ) )\n"
" player.finishQuest( getId(), result.getResult( 1 ) );\n"
" }\n"
);
@ -319,29 +458,43 @@ createScript( std::shared_ptr< Excel::ExcelStruct< Excel::Quest > >& pQuestData,
if( !name.empty() )
{
if( titleCaseNoUnderscores(name).substr( 0, 5 ) == "Actor" )
{
auto nameStripped = titleCaseNoUnderscores( name );
if( nameStripped.substr( 0, 5 ) == "Actor" )
actorList.push_back( titleCaseNoUnderscores( name ) );
std::transform( nameStripped.begin(), nameStripped.end(), nameStripped.begin(), ::tolower);
// comment actor names and positions if possible
if( nameStripped.find( "acto" ) != std::string::npos || nameStripped.find( "enemy" ) != std::string::npos
|| nameStripped.find( "eobj" ) != std::string::npos || nameStripped.find( "npc" ) != std::string::npos )
{
script_entities.push_back( name + " = " + std::to_string( pQuestData->data().Define[ ca ].Value ) + "; // " +
getActorNameFromExd( pQuestData->data().Define[ca].Value ) + getActorPosFromLevelExd( pQuestData->data().Define[ca].Value ) );
}
script_entities.push_back(
name + " = " + std::to_string( pQuestData->data().Define[ ca ].Value ) );
// comment item names
else if( nameStripped.find( "ritem" ) != std::string::npos )
{
script_entities.push_back( name + " = " + std::to_string( pQuestData->data().Define[ ca ].Value ) + "; // " + getItemNameFromExd( pQuestData->data().Define[ca].Value ) );
}
else
script_entities.push_back(
name + " = " + std::to_string( pQuestData->data().Define[ ca ].Value ) + ";");
}
}
std::sort( script_entities.begin(), script_entities.end() );
std::sort( script_entities.begin(), script_entities.end(), compareNat );
for( auto& entity : script_entities )
{
auto name = titleCaseNoUnderscores( entity );
sentities += " static constexpr auto " + name + ";\n";
sentities += " static constexpr auto " + name + "\n";
}
std::string additional = "// Quest Script: " + pQuestData->getString( pQuestData->data().Script ) + "\n";
additional += "// Quest Name: " + pQuestData->getString( pQuestData->data().Text.Name ) + "\n";
additional += "// Quest ID: " + std::to_string( questId ) + "\n";
additional += "// Start NPC: " + std::to_string( pQuestData->data().Client ) + "\n";
additional += "// End NPC: " + std::to_string( pQuestData->data().Finish ) + "\n\n";
additional += "// Start NPC: " + std::to_string( pQuestData->data().Client ) + " (" + getActorNameFromExd( pQuestData->data().Client ) + ")\n";
additional += "// End NPC: " + std::to_string( pQuestData->data().Finish ) + " (" + getActorNameFromExd( pQuestData->data().Finish ) + ")\n\n";
additional += "using namespace Sapphire;\n\n";
@ -598,7 +751,7 @@ int main( int argc, char** argv )
offset += static_cast< uint32_t >( entry.size() + 1 );
if( entry.size() > 3
&& entry.find_first_not_of( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_-" ) ==
&& entry.find_first_not_of( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-" ) ==
std::string::npos )
{
if( entry.find( "SEQ" ) != std::string::npos

View file

@ -1826,17 +1826,18 @@ void Player::updateHuntingLog( uint16_t id )
std::vector< uint32_t > rankRewards{ 2500, 10000, 20000, 30000, 40000 };
const auto maxRank = 4;
auto& pExdData = Common::Service< Data::ExdData >::ref();
auto currentClassId = static_cast< uint8_t >( getClass() );
// make sure we get the matching base-class if a job is being used
auto classJobInfo = pExdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( getClass() ) );
if( !classJobInfo )
return;
auto currentClassId = classJobInfo->data().MainClass;
auto& logEntry = m_huntingLogEntries[ currentClassId - 1 ];
bool logChanged = false;
// make sure we get the matching base-class if a job is being used
auto currentClass = currentClassId;
auto classJobInfo = pExdData.getRow< Excel::ClassJob >( currentClass );
if( !classJobInfo )
return;
bool allSectionsComplete = true;
for( int i = 1; i <= 10; ++i )

View file

@ -25,31 +25,31 @@ bool Sapphire::World::Quest::getBitFlag8( uint8_t index )
bool Sapphire::World::Quest::getBitFlag16( uint8_t index )
{
uint8_t realIdx = 16 - index;
uint8_t realIdx = 8 - index;
return m_data.a.BitFlag16 & ( 1 << realIdx );
}
bool Sapphire::World::Quest::getBitFlag24( uint8_t index )
{
uint8_t realIdx = 24 - index;
uint8_t realIdx = 8 - index;
return m_data.a.BitFlag24 & ( 1 << realIdx );
}
bool Sapphire::World::Quest::getBitFlag32( uint8_t index )
{
uint8_t realIdx = 32 - index;
uint8_t realIdx = 8 - index;
return m_data.a.BitFlag32 & ( 1 << realIdx );
}
bool Sapphire::World::Quest::getBitFlag40( uint8_t index )
{
uint8_t realIdx = 40 - index;
uint8_t realIdx = 8 - index;
return m_data.a.BitFlag40 & ( 1 << realIdx );
}
bool Sapphire::World::Quest::getBitFlag48( uint8_t index )
{
uint8_t realIdx = 48 - index;
uint8_t realIdx = 8 - index;
return m_data.a.BitFlag48 & ( 1 << realIdx );
}
@ -320,7 +320,7 @@ void Sapphire::World::Quest::setBitFlag8( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag16( uint8_t index, bool val )
{
uint8_t realIdx = 16 - index;
uint8_t realIdx = 8 - index;
if( val )
m_data.a.BitFlag16 |= ( 1 << realIdx );
else
@ -329,7 +329,7 @@ void Sapphire::World::Quest::setBitFlag16( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag24( uint8_t index, bool val )
{
uint8_t realIdx = 24 - index;
uint8_t realIdx = 8 - index;
if( val )
m_data.a.BitFlag24 |= ( 1 << realIdx );
else
@ -338,7 +338,7 @@ void Sapphire::World::Quest::setBitFlag24( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag32( uint8_t index, bool val )
{
uint8_t realIdx = 32 - index;
uint8_t realIdx = 8 - index;
if( val )
m_data.a.BitFlag32 |= ( 1 << realIdx );
else
@ -347,7 +347,7 @@ void Sapphire::World::Quest::setBitFlag32( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag40( uint8_t index, bool val )
{
uint8_t realIdx = 40 - index;
uint8_t realIdx = 8 - index;
if( val )
m_data.a.BitFlag40 |= ( 1 << realIdx );
else
@ -356,7 +356,7 @@ void Sapphire::World::Quest::setBitFlag40( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag48( uint8_t index, bool val )
{
uint8_t realIdx = 48 - index;
uint8_t realIdx = 8 - index;
if( val )
m_data.a.BitFlag48 |= ( 1 << realIdx );
else