mirror of
https://github.com/SapphireServer/Sapphire.git
synced 2025-04-27 06:47:45 +00:00
ARC quests formatting
This commit is contained in:
dude22072
parent
d78523a072
commit
55d212ddf6
11 changed files with 1370 additions and 1499 deletions
|
|
@ -2,8 +2,8 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
|
||||
|
|
@ -63,13 +63,11 @@ class ClsArc000 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
Scene00000( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
{
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == Seq1 )
|
||||
Scene00001( quest, player );
|
||||
else
|
||||
|
|
@ -81,10 +79,10 @@ class ClsArc000 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void onBNpcKill( World::Quest &quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player &player ) override
|
||||
{
|
||||
if (entityId != Enemy0 && entityId != Enemy1 && entityId != Enemy2)
|
||||
if( nameId != Enemy0 && nameId != Enemy1 && nameId != Enemy2 )
|
||||
return;
|
||||
|
||||
switch(entityId)
|
||||
switch( nameId )
|
||||
{
|
||||
case Enemy0: {
|
||||
auto currentKC37 = quest.getUI8AL();
|
||||
|
|
@ -138,7 +136,6 @@ class ClsArc000 : public Sapphire::ScriptAPI::QuestScript
|
|||
}
|
||||
|
||||
private:
|
||||
|
||||
void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx )
|
||||
{
|
||||
if( varIdx == 1 )
|
||||
|
|
@ -189,7 +186,6 @@ class ClsArc000 : public Sapphire::ScriptAPI::QuestScript
|
|||
eventMgr().sendEventNotice( player, getId(), 0, 0, 0, 0 );
|
||||
quest.setSeq( Seq2 );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -207,9 +203,7 @@ class ClsArc000 : public Sapphire::ScriptAPI::QuestScript
|
|||
player.learnAction( Sapphire::Common::UnlockEntry::HuntingLog );
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc000 );
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
|
||||
|
|
@ -65,8 +65,7 @@ class ClsArc001 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( !player.hasQuest( getId() ) )
|
||||
Scene00000( quest, player );
|
||||
if( quest.getSeq() == Seq2 )
|
||||
|
|
@ -162,9 +161,8 @@ class ClsArc001 : public Sapphire::ScriptAPI::QuestScript
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx )
|
||||
{
|
||||
if( varIdx == 1 )
|
||||
|
|
@ -560,9 +558,7 @@ class ClsArc001 : public Sapphire::ScriptAPI::QuestScript
|
|||
//if( player.giveQuestRewards( getId(), result.getResult(1)) )
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc001 );
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
|
||||
|
|
@ -73,8 +73,7 @@ class ClsArc002 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( !player.hasQuest( getId() ) )
|
||||
Scene00000( quest, player );
|
||||
else if( quest.getSeq() == SeqFinish )
|
||||
|
|
@ -82,8 +81,7 @@ class ClsArc002 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
{
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == Seq1 )
|
||||
Scene00001( quest, player );
|
||||
else if( quest.getSeq() == Seq3 )
|
||||
|
|
@ -93,8 +91,7 @@ class ClsArc002 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
break;
|
||||
}
|
||||
case Actor2:
|
||||
{
|
||||
case Actor2: {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -189,9 +186,8 @@ class ClsArc002 : public Sapphire::ScriptAPI::QuestScript
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx )
|
||||
{
|
||||
if( varIdx == 1 )
|
||||
|
|
@ -608,12 +604,12 @@ class ClsArc002 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00030Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
if (result.getResult(0) == 1) {
|
||||
if( result.getResult( 0 ) == 1 )
|
||||
{
|
||||
//if (player.giveQuestRewards(getId(), result.getResult(1)))
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc002 );
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
|
||||
// Quest Script: ClsArc003_00068
|
||||
// Quest Name: Violators Will Be Shot
|
||||
|
|
@ -75,31 +75,32 @@ class ClsArc003 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( !player.hasQuest( getId() ) )
|
||||
Scene00000( quest, player );
|
||||
else if (quest.getSeq() == SeqFinish) {
|
||||
else if( quest.getSeq() == SeqFinish )
|
||||
{
|
||||
Scene00031( quest, player );
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == Seq1 )
|
||||
{
|
||||
if (quest.getSeq() == Seq1) {
|
||||
Scene00001( quest, player );
|
||||
}
|
||||
else if (quest.getSeq() == Seq3) {
|
||||
else if( quest.getSeq() == Seq3 )
|
||||
{
|
||||
Scene00026( quest, player );
|
||||
}
|
||||
else if (quest.getSeq() == Seq5) {
|
||||
else if( quest.getSeq() == Seq5 )
|
||||
{
|
||||
Scene00030( quest, player );
|
||||
}
|
||||
break;
|
||||
}
|
||||
case Eobject8:
|
||||
{
|
||||
case Eobject8: {
|
||||
if( quest.getSeq() == Seq4 )
|
||||
Scene00027( quest, player );
|
||||
break;
|
||||
|
|
@ -156,9 +157,8 @@ class ClsArc003 : public Sapphire::ScriptAPI::QuestScript
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
void checkQuestCompletion( World::Quest &quest, Entity::Player &player )
|
||||
{
|
||||
auto currentCC = quest.getUI8AL();
|
||||
|
|
@ -536,7 +536,8 @@ class ClsArc003 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00028Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
if (result.getResult(0) == 1) {
|
||||
if( result.getResult( 0 ) == 1 )
|
||||
{
|
||||
//Broken QuestBattle
|
||||
quest.setSeq( Seq5 );
|
||||
|
||||
|
|
@ -587,9 +588,7 @@ class ClsArc003 : public Sapphire::ScriptAPI::QuestScript
|
|||
//if( player.giveQuestRewards( getId(), result.getResult(1)) )
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc003 );
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
//Temporrary because QuestBattles are broken
|
||||
#include "Manager/PlayerMgr.h"
|
||||
|
||||
|
|
@ -75,8 +75,7 @@ class ClsArc004 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( !player.hasQuest( getId() ) )
|
||||
Scene00000( quest, player );
|
||||
else if( quest.getSeq() == SeqFinish )
|
||||
|
|
@ -84,8 +83,7 @@ class ClsArc004 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
{
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == Seq1 )
|
||||
Scene00002( quest, player );
|
||||
else if( quest.getSeq() == Seq5 )//Master claims we can't talk with this NPC
|
||||
|
|
@ -93,72 +91,63 @@ class ClsArc004 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
break;
|
||||
}
|
||||
case Actor2:
|
||||
{
|
||||
case Actor2: {
|
||||
if( quest.getSeq() == Seq5 )
|
||||
Scene00020( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor3:
|
||||
{
|
||||
case Actor3: {
|
||||
if( quest.getSeq() == Seq5 )
|
||||
Scene00019( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor4:
|
||||
{
|
||||
case Actor4: {
|
||||
break;
|
||||
}
|
||||
case Actor5:
|
||||
{
|
||||
case Actor5: {
|
||||
break;
|
||||
}
|
||||
case Eobject0:
|
||||
{
|
||||
eventMgr().eventActionStart(player, getId(), 0x07,
|
||||
[&](Entity::Player& player, uint32_t eventId, uint64_t additional)
|
||||
{
|
||||
case Eobject0: {
|
||||
eventMgr().eventActionStart(
|
||||
player, getId(), 0x07,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
|
||||
Scene00003( quest, player );
|
||||
},
|
||||
nullptr, 0 );
|
||||
break;
|
||||
}
|
||||
case Eobject1:
|
||||
{
|
||||
eventMgr().eventActionStart(player, getId(), 0x07,
|
||||
[&](Entity::Player& player, uint32_t eventId, uint64_t additional)
|
||||
{
|
||||
case Eobject1: {
|
||||
eventMgr().eventActionStart(
|
||||
player, getId(), 0x07,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
|
||||
Scene00004( quest, player );
|
||||
},
|
||||
nullptr, 0 );
|
||||
break;
|
||||
}
|
||||
case Eobject2:
|
||||
{
|
||||
eventMgr().eventActionStart(player, getId(), 0x07,
|
||||
[&](Entity::Player& player, uint32_t eventId, uint64_t additional)
|
||||
{
|
||||
case Eobject2: {
|
||||
eventMgr().eventActionStart(
|
||||
player, getId(), 0x07,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
|
||||
Scene00005( quest, player );
|
||||
},
|
||||
nullptr, 0 );
|
||||
break;
|
||||
}
|
||||
case Eobject3:
|
||||
{
|
||||
eventMgr().eventActionStart( player, getId(), 0x0A,
|
||||
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
|
||||
{
|
||||
case Eobject3: {
|
||||
eventMgr().eventActionStart(
|
||||
player, getId(), 0x0A,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
|
||||
Scene00013( quest, player );
|
||||
eventMgr().sendEventNotice( player, getId(), 2, 2, 0, 0 );
|
||||
},
|
||||
nullptr, 0 );
|
||||
break;
|
||||
}
|
||||
case Eobject4:
|
||||
{
|
||||
eventMgr().eventActionStart( player, getId(), 0x01,
|
||||
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
|
||||
{
|
||||
case Eobject4: {
|
||||
eventMgr().eventActionStart(
|
||||
player, getId(), 0x01,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
|
||||
Scene00015( quest, player );
|
||||
},
|
||||
nullptr, 0 );
|
||||
|
|
@ -169,8 +158,6 @@ class ClsArc004 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
void checkQuestCompletion( World::Quest &quest, Entity::Player &player )
|
||||
{
|
||||
auto currentCC = quest.getUI8AL();
|
||||
|
|
@ -401,7 +388,7 @@ class ClsArc004 : public Sapphire::ScriptAPI::QuestScript
|
|||
if( result.getResult( 0 ) == 1 )
|
||||
{
|
||||
//QuestBattle weirdness, Plus not being able to talk to that NPC, so we have to skip Seq5 entirely
|
||||
Sapphire::World::Manager::PlayerMgr::sendDebug(player, "QuestBattle content is currently broken. The fight has been skipped for you.");
|
||||
Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
|
||||
quest.setSeq( SeqFinish );
|
||||
|
||||
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
|
||||
|
|
@ -474,9 +461,7 @@ class ClsArc004 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc004 );
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
//Temporrary because QuestBattles are broken
|
||||
#include "Manager/PlayerMgr.h"
|
||||
|
||||
|
|
@ -62,8 +62,7 @@ private:
|
|||
static constexpr auto Territorytype0 = 230;
|
||||
|
||||
public:
|
||||
ClsArc005() : Sapphire::ScriptAPI::QuestScript( 65607 )
|
||||
{};
|
||||
ClsArc005() : Sapphire::ScriptAPI::QuestScript( 65607 ){};
|
||||
|
||||
~ClsArc005() = default;
|
||||
|
||||
|
|
@ -73,8 +72,7 @@ public:
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( !player.hasQuest( getId() ) )
|
||||
Scene00000( quest, player );
|
||||
else if( quest.getSeq() == SeqFinish )
|
||||
|
|
@ -82,41 +80,34 @@ public:
|
|||
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
{
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == Seq1 )
|
||||
Scene00002( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor2:
|
||||
{
|
||||
case Actor2: {
|
||||
if( quest.getSeq() == Seq2 )
|
||||
Scene00003( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor3:
|
||||
{
|
||||
case Actor3: {
|
||||
if( quest.getSeq() == Seq4 )
|
||||
Scene00006( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor4:
|
||||
{
|
||||
case Actor4: {
|
||||
break;
|
||||
}
|
||||
case Actor5:
|
||||
{
|
||||
case Actor5: {
|
||||
break;
|
||||
}
|
||||
case Actor6:
|
||||
{
|
||||
case Actor6: {
|
||||
break;
|
||||
}
|
||||
case Eobject0:
|
||||
{
|
||||
eventMgr().eventActionStart( player, getId(), 0x0A,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional )
|
||||
{
|
||||
case Eobject0: {
|
||||
eventMgr().eventActionStart(
|
||||
player, getId(), 0x0A,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
|
||||
Scene00004( quest, player );
|
||||
eventMgr().sendEventNotice( player, getId(), 2, 2, 0, 0 );
|
||||
},
|
||||
|
|
@ -232,7 +223,7 @@ private:
|
|||
{
|
||||
//Questbattles be broken
|
||||
quest.setSeq( SeqFinish );
|
||||
Sapphire::World::Manager::PlayerMgr::sendDebug(player, "QuestBattle content is currently broken. The fight has been skipped for you.");
|
||||
Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
|
||||
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
|
||||
|
||||
eventMgr().eventFinish( player, result.eventId, 0 );
|
||||
|
|
@ -278,9 +269,7 @@ private:
|
|||
{
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc005 );
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
#include "Manager/TerritoryMgr.h"
|
||||
//Temporrary because QuestBattles are broken
|
||||
#include "Manager/PlayerMgr.h"
|
||||
|
||||
|
|
@ -76,8 +76,7 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( !player.hasQuest( getId() ) )
|
||||
Scene00000( quest, player );
|
||||
else if( quest.getSeq() == SeqFinish )
|
||||
|
|
@ -85,59 +84,49 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
{
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == Seq1 )
|
||||
Scene00002( quest, player );
|
||||
|
||||
break;
|
||||
}
|
||||
case Actor2:
|
||||
{
|
||||
case Actor2: {
|
||||
break;
|
||||
}
|
||||
case Actor3:
|
||||
{
|
||||
case Actor3: {
|
||||
break;
|
||||
}
|
||||
case Actor4:
|
||||
{
|
||||
case Actor4: {
|
||||
break;
|
||||
}
|
||||
case Actor5:
|
||||
{
|
||||
case Actor5: {
|
||||
break;
|
||||
}
|
||||
case Actor6:
|
||||
{
|
||||
case Actor6: {
|
||||
break;
|
||||
}
|
||||
case Actor7:
|
||||
{
|
||||
case Actor7: {
|
||||
if( quest.getSeq() == SeqFinish )
|
||||
Scene00014( quest, player );
|
||||
|
||||
break;
|
||||
}
|
||||
case Actor8:
|
||||
{
|
||||
case Actor8: {
|
||||
if( quest.getSeq() == SeqFinish )
|
||||
Scene00015( quest, player );
|
||||
|
||||
break;
|
||||
}
|
||||
case Actor9:
|
||||
{
|
||||
case Actor9: {
|
||||
if( quest.getSeq() == SeqFinish )
|
||||
Scene00016( quest, player );
|
||||
|
||||
break;
|
||||
}
|
||||
case Eobject1:
|
||||
{
|
||||
eventMgr().eventActionStart(player, getId(), 0x1B,
|
||||
[&](Entity::Player& player, uint32_t eventId, uint64_t additional)
|
||||
{
|
||||
case Eobject1: {
|
||||
eventMgr().eventActionStart(
|
||||
player, getId(), 0x1B,
|
||||
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
|
||||
Scene00011( quest, player );
|
||||
},
|
||||
nullptr, 0 );
|
||||
|
|
@ -187,10 +176,11 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00002Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
if (result.getResult(0) == 1) {
|
||||
if( result.getResult( 0 ) == 1 )
|
||||
{
|
||||
//QuestBattles don't work atm
|
||||
quest.setSeq( Seq2 );
|
||||
Sapphire::World::Manager::PlayerMgr::sendDebug(player, "QuestBattle content is currently broken. The fight has been skipped for you.");
|
||||
Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
|
||||
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
|
||||
|
||||
eventMgr().eventFinish(player, result.eventId, 0);
|
||||
|
|
@ -207,8 +197,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00003Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -220,8 +208,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00004Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -233,8 +219,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -246,8 +230,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00006Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -259,8 +241,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00007Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -272,8 +252,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00008Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -285,8 +263,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00009Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -298,8 +274,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -311,10 +285,11 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
if (result.getResult(0) == 1) {
|
||||
if( result.getResult( 0 ) == 1 )
|
||||
{
|
||||
//QuestBattles don't work atm
|
||||
quest.setSeq( SeqFinish );
|
||||
Sapphire::World::Manager::PlayerMgr::sendDebug(player, "QuestBattle content is currently broken. The fight has been skipped for you.");
|
||||
Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
|
||||
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
|
||||
|
||||
eventMgr().eventFinish(player, result.eventId, 0);
|
||||
|
|
@ -331,8 +306,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -349,7 +322,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -361,8 +333,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -374,8 +344,6 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -387,10 +355,7 @@ class ClsArc006 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc006 );
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
|
||||
|
|
@ -55,8 +55,7 @@ class ClsArc100 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( quest.getSeq() == Seq0 )
|
||||
Scene00000( quest, player );
|
||||
else if( quest.getSeq() == SeqFinish )
|
||||
|
|
@ -127,8 +126,6 @@ class ClsArc100 : public Sapphire::ScriptAPI::QuestScript
|
|||
}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
void checkQuestCompletion( World::Quest &quest, Entity::Player &player )
|
||||
{
|
||||
auto currentKC37 = quest.getUI8AL();
|
||||
|
|
@ -174,9 +171,7 @@ class ClsArc100 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
player.finishQuest( getId() );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc100 );
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
|
||||
|
|
@ -70,16 +70,14 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( quest.getSeq() == Seq0 )
|
||||
Scene00000( quest, player );
|
||||
else if( quest.getSeq() == SeqFinish )
|
||||
Scene00030( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
{
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == Seq1 )
|
||||
Scene00001( quest, player );
|
||||
else if( quest.getSeq() == Seq3 )
|
||||
|
|
@ -88,8 +86,7 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
Scene00029( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor2:
|
||||
{
|
||||
case Actor2: {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -179,9 +176,8 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
void checkQuestCompletion( World::Quest &quest, Entity::Player &player, uint32_t varIdx )
|
||||
{
|
||||
if( varIdx == 1 )
|
||||
|
|
@ -354,8 +350,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00010Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -367,8 +361,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00011Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -380,8 +372,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00012Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -393,8 +383,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00013Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -406,8 +394,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00014Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -419,8 +405,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00015Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -432,8 +416,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00016Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -445,8 +427,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00017Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -458,8 +438,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00018Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -471,8 +449,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00019Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -484,8 +460,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00020Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -497,8 +471,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00021Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -510,8 +482,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00022Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -523,8 +493,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00023Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -536,8 +504,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00024Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -549,8 +515,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00025Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -574,8 +538,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00027Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -587,8 +549,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00028Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -615,7 +575,6 @@ class ClsArc997 : public Sapphire::ScriptAPI::QuestScript
|
|||
if( result.getResult( 0 ) == 1 )
|
||||
player.finishQuest( getId(), result.getResult( 1 ) );
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc997 );
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
|
||||
|
|
@ -51,14 +51,12 @@ class ClsArc998 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
if( quest.getSeq() == Seq0 )
|
||||
Scene00000( quest, player );
|
||||
break;
|
||||
}
|
||||
case Actor1:
|
||||
{
|
||||
case Actor1: {
|
||||
if( quest.getSeq() == SeqFinish )
|
||||
Scene00001( quest, player );
|
||||
break;
|
||||
|
|
@ -83,8 +81,6 @@ class ClsArc998 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
quest.setSeq( SeqFinish );
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -101,9 +97,7 @@ class ClsArc998 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
player.finishQuest( getId() );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc998 );
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
// 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 "Manager/EventMgr.h"
|
||||
#include <Actor/Player.h>
|
||||
#include <ScriptObject.h>
|
||||
#include <Service.h>
|
||||
|
||||
|
|
@ -40,8 +40,7 @@ class ClsArc999 : public Sapphire::ScriptAPI::QuestScript
|
|||
{
|
||||
switch( actorId )
|
||||
{
|
||||
case Actor0:
|
||||
{
|
||||
case Actor0: {
|
||||
Scene00000( quest, player );
|
||||
break;
|
||||
}
|
||||
|
|
@ -61,12 +60,12 @@ class ClsArc999 : public Sapphire::ScriptAPI::QuestScript
|
|||
|
||||
void Scene00000Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
|
||||
{
|
||||
if (result.getResult(0) == 1) {
|
||||
if( result.getResult( 0 ) == 1 )
|
||||
{
|
||||
player.finishQuest( getId(), 0 );
|
||||
player.setLevelForClass( 1, Sapphire::Common::ClassJob::Archer );
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EXPOSE_SCRIPT( ClsArc999 );
|
||||
Loading…
Add table
Reference in a new issue