mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-10 04:37:45 +00:00
Code Activity

Merge pull request #834 from dude22072/ClassQuestWork

Browse source 
[3.0] Fix some WHM Questline stuff
This commit is contained in:
Adam 2023-01-19 13:33:05 +11:00 • committed by GitHub
commit 297a536951
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scripts/quest/classquest/WHM/JobWhm350.cpp
View file

@ -122,8 +122,7 @@ public:
void onPlayerDeath( World::Quest& quest, Sapphire::Entity::Player& player ) override void onPlayerDeath( World::Quest& quest, Sapphire::Entity::Player& player ) override
{ {
auto& teriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto& instance = teriMgr.getTerritoryByGuId( player.getTerritoryId() );
auto enem0 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); auto enem0 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enem1 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); auto enem1 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
@ -175,8 +174,7 @@ private:
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
auto& teriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref(); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto& instance = teriMgr.getTerritoryByGuId( player.getTerritoryId() );
bool enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ) != nullptr; bool enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ) != nullptr;
bool enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ) != nullptr; bool enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ) != nullptr;
@ -222,7 +220,7 @@ private:
void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().sendEventNotice( player, getId(), 0, 0 ); eventMgr().sendEventNotice( player, getId(), 0, 0 );
//TODO: Show the "Your communion has furthered your potentional as a white mage." message. Is it that logmessage0 var? playerMgr().sendLogMessage( player, Logmessage0 );
quest.setSeq( SeqFinish ); quest.setSeq( SeqFinish );
} }

8
src/scripts/quest/classquest/WHM/JobWhm450.cpp
View file

@ -215,7 +215,7 @@ private:
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().sendEventNotice( player, getId(), 0, 0 );//TODO:Item Icon, Cleric's Gloves eventMgr().sendEventNotice( player, getId(), 0, 0 );//TODO:Item Icon, Cleric's Gloves
//TODO: Show "Your Garb is not blessed with the power of A-Towa-Cant." message (Logmessage0?) playerMgr().sendLogMessage( player, Logmessage0 );
quest.setUI8AL( 1 ); quest.setUI8AL( 1 );
quest.setUI8CH( 0 ); quest.setUI8CH( 0 );
checkQuestCompletion( quest, player ); checkQuestCompletion( quest, player );
@ -242,7 +242,7 @@ private:
void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().sendEventNotice( player, getId(), 1, 0 );//TODO:Item Icon, Cleric's Culottes eventMgr().sendEventNotice( player, getId(), 1, 0 );//TODO:Item Icon, Cleric's Culottes
//TODO: Show "Your Garb is not blessed with the power of A-Towa-Cant." message (Logmessage0?) playerMgr().sendLogMessage( player, Logmessage0 );
quest.setUI8BH( 1 ); quest.setUI8BH( 1 );
quest.setUI8CL( 0 ); quest.setUI8CL( 0 );
checkQuestCompletion( quest, player ); checkQuestCompletion( quest, player );
@ -269,7 +269,7 @@ private:
void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().sendEventNotice( player, getId(), 2, 0 );//TODO:Item Icon, Cleric's Boots eventMgr().sendEventNotice( player, getId(), 2, 0 );//TODO:Item Icon, Cleric's Boots
//TODO: Show "Your Garb is not blessed with the power of A-Towa-Cant." message (Logmessage0?) playerMgr().sendLogMessage( player, Logmessage0 );
quest.setUI8BL( 1 ); quest.setUI8BL( 1 );
quest.setUI8DH( 0 ); quest.setUI8DH( 0 );
checkQuestCompletion( quest, player ); checkQuestCompletion( quest, player );
@ -437,7 +437,7 @@ private:
void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
eventMgr().sendEventNotice( player, getId(), 6, 0 );//TODO:Item Icon, Cleric's Circlet eventMgr().sendEventNotice( player, getId(), 6, 0 );//TODO:Item Icon, Cleric's Circlet
//TODO: Show "Your Garb is not blessed with the power of A-Towa-Cant." message (Logmessage0?) playerMgr().sendLogMessage( player, Logmessage0 );
quest.setSeq( SeqFinish ); quest.setSeq( SeqFinish );
quest.setUI8BH( 0 ); quest.setUI8BH( 0 );
} }