mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-05 18:27:47 +00:00
Code Activity

Merge pull request #753 from dude22072/ThreePointOh

Browse source 
[3.0] More ARC cleanup
This commit is contained in:
Mordred 2022-01-16 10:57:16 +01:00 • committed by GitHub
commit 1085403677
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/scripts/quest/classquest/ARC/ClsArc001.cpp
View file

@ -558,7 +558,6 @@ private:
if( result.getResult( 0 ) == 1 )
{
//if( player.giveQuestRewards( getId(), result.getResult(1)) )
player.finishQuest( getId(), result.getResult( 1 ) );
}
}

1
src/scripts/quest/classquest/ARC/ClsArc002.cpp
View file

@ -619,7 +619,6 @@ private:
{
if( result.getResult( 0 ) == 1 )
{
//if (player.giveQuestRewards(getId(), result.getResult(1)))
player.finishQuest( getId(), result.getResult( 1 ) );
}
}

4
src/scripts/quest/classquest/ARC/ClsArc003.cpp
View file

@ -549,7 +549,9 @@ private:
{
if( result.getResult( 0 ) == 1 )
{
//Broken QuestBattle
//TODO: QuestBattle
playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
eventMgr().sendEventNotice( player, getId(), 3, 0 );
quest.setSeq( Seq5 );
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();

5
src/scripts/quest/classquest/ARC/ClsArc004.cpp
View file

@ -7,8 +7,6 @@
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
//Temporrary because QuestBattles are broken
#include "Manager/PlayerMgr.h"
// Quest Script: ClsArc004_00070
// Quest Name: To Catch a Poacher
@ -399,7 +397,8 @@ private:
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::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
eventMgr().sendEventNotice( player, getId(), 3, 0 );
quest.setSeq( SeqFinish );
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();

8
src/scripts/quest/classquest/ARC/ClsArc005.cpp
View file

@ -7,8 +7,6 @@
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
//Temporrary because QuestBattles are broken
#include "Manager/PlayerMgr.h"
// Quest Script: ClsArc005_00071
// Quest Name: Homecoming
@ -203,6 +201,7 @@ private:
void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
{
eventMgr().sendEventNotice( player, getId(), 2, 0 );
quest.setSeq( Seq4 );
}
@ -229,9 +228,10 @@ private:
{
if( result.getResult( 0 ) == 1 )
{
//Questbattles be broken
//TODO: Questbattles be broken
playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
eventMgr().sendEventNotice( player, getId(), 3, 0 );
quest.setSeq( SeqFinish );
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 );

12
src/scripts/quest/classquest/ARC/ClsArc006.cpp
View file

@ -7,8 +7,6 @@
#include <Actor/Player.h>
#include <ScriptObject.h>
#include <Service.h>
//Temporrary because QuestBattles are broken
#include "Manager/PlayerMgr.h"
// Quest Script: ClsArc006_00076
// Quest Name: The One that Got Away
@ -189,9 +187,10 @@ private:
{
if( result.getResult( 0 ) == 1 )
{
//QuestBattles don't work atm
//TODO: QuestBattles don't work atm
playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
eventMgr().sendEventNotice( player, getId(), 2, 0 );
quest.setSeq( Seq2 );
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);
@ -298,9 +297,10 @@ private:
{
if( result.getResult( 0 ) == 1 )
{
//QuestBattles don't work atm
//TODO: QuestBattles don't work atm
playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
eventMgr().sendEventNotice( player, getId(), 3, 0 );
quest.setSeq( SeqFinish );
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);

1
src/scripts/quest/classquest/ARC/ClsArc100.cpp
View file

@ -141,6 +141,7 @@ private:
quest.setUI8AL( 0 );
quest.setUI8BH( 0 );
quest.setUI8BL( 0 );
eventMgr().sendEventNotice( player, getId(), 3, 0 );
quest.setSeq( SeqFinish );
}
}

3
src/scripts/quest/classquest/ARC/ClsArc997.cpp
View file

@ -239,6 +239,7 @@ private:
void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
{
eventMgr().sendEventNotice( player, getId(), 1, 0 );
quest.setSeq( Seq2 );
}
@ -531,6 +532,7 @@ private:
void Scene00026Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
{
eventMgr().sendEventNotice( player, getId(), 2, 0 );
quest.setSeq( Seq4 );
}
@ -565,6 +567,7 @@ private:
void Scene00029Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
{
eventMgr().sendEventNotice( player, getId(), 5, 0 );
quest.setSeq( SeqFinish );
}