mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Code Activity

Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh

Browse source
This commit is contained in:
Mordred 2022-01-18 08:12:08 +01:00
commit 7bde6c9c00
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ public:
{ {
case Actor0: case Actor0:
{ {
if( !player.hasQuest( getId() ) ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
Scene00021( quest, player ); Scene00021( quest, player );
@ -396,10 +396,13 @@ private:
{ {
if( result.getResult( 0 ) == 1 ) if( result.getResult( 0 ) == 1 )
{ {
//QuestBattle weirdness, Plus not being able to talk to that NPC, so we have to skip Seq5 entirely //TODO: QuestBattles are broken
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 ); eventMgr().sendEventNotice( player, getId(), 3, 0 );
quest.setSeq( SeqFinish ); quest.setSeq( Seq5 );
quest.setBitFlag8( 1, false );
quest.setBitFlag8( 2, false );
quest.setBitFlag8( 3, false );
/*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();