From 4f954ba328b7f10b54d1baaa88649419b982a75f Mon Sep 17 00:00:00 2001 From: dude22072 Date: Tue, 17 Jan 2023 17:03:24 -0600 Subject: [PATCH 1/4] Fix LogMessage stuff --- src/scripts/quest/classquest/WHM/JobWhm350.cpp | 2 +- src/scripts/quest/classquest/WHM/JobWhm450.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scripts/quest/classquest/WHM/JobWhm350.cpp b/src/scripts/quest/classquest/WHM/JobWhm350.cpp index 7c45ae54..b8019a72 100644 --- a/src/scripts/quest/classquest/WHM/JobWhm350.cpp +++ b/src/scripts/quest/classquest/WHM/JobWhm350.cpp @@ -222,7 +222,7 @@ private: void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { 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 ); } diff --git a/src/scripts/quest/classquest/WHM/JobWhm450.cpp b/src/scripts/quest/classquest/WHM/JobWhm450.cpp index b7a316b9..4953a214 100644 --- a/src/scripts/quest/classquest/WHM/JobWhm450.cpp +++ b/src/scripts/quest/classquest/WHM/JobWhm450.cpp @@ -215,7 +215,7 @@ private: void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { 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.setUI8CH( 0 ); checkQuestCompletion( quest, player ); @@ -242,7 +242,7 @@ private: void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { 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.setUI8CL( 0 ); checkQuestCompletion( quest, player ); @@ -269,7 +269,7 @@ private: void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { 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.setUI8DH( 0 ); checkQuestCompletion( quest, player ); @@ -437,7 +437,7 @@ private: void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { 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.setUI8BH( 0 ); } From 1db2c0a14e7410ae67d718786f7f5fe4b8e1d8a2 Mon Sep 17 00:00:00 2001 From: dude22072 Date: Tue, 17 Jan 2023 17:03:55 -0600 Subject: [PATCH 2/4] Fix semicolon that made linux build unhappy --- src/scripts/quest/classquest/WHM/JobWhm001.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/quest/classquest/WHM/JobWhm001.cpp b/src/scripts/quest/classquest/WHM/JobWhm001.cpp index 0c607406..4a809993 100644 --- a/src/scripts/quest/classquest/WHM/JobWhm001.cpp +++ b/src/scripts/quest/classquest/WHM/JobWhm001.cpp @@ -8,7 +8,7 @@ #include #include "Actor/BNpc.h" -#include "Inventory/Item.h"; +#include "Inventory/Item.h" // Quest Script: JobWhm001_01124 // Quest Name: A Relic Reborn (Thyrus) From 83428a56d09ae0bb432a8fef7c588e8ee1ef24be Mon Sep 17 00:00:00 2001 From: dude22072 Date: Tue, 17 Jan 2023 17:34:04 -0600 Subject: [PATCH 3/4] linux are you happy yet --- src/scripts/quest/classquest/WHM/JobWhm350.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scripts/quest/classquest/WHM/JobWhm350.cpp b/src/scripts/quest/classquest/WHM/JobWhm350.cpp index b8019a72..7f1969ad 100644 --- a/src/scripts/quest/classquest/WHM/JobWhm350.cpp +++ b/src/scripts/quest/classquest/WHM/JobWhm350.cpp @@ -122,8 +122,7 @@ public: 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 enem1 = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); From 0926f25fc5dfd13ee611616bece7f252e4b40f27 Mon Sep 17 00:00:00 2001 From: dude22072 Date: Tue, 17 Jan 2023 17:48:01 -0600 Subject: [PATCH 4/4] linux please --- src/scripts/quest/classquest/WHM/JobWhm350.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scripts/quest/classquest/WHM/JobWhm350.cpp b/src/scripts/quest/classquest/WHM/JobWhm350.cpp index 7f1969ad..ad93b6d0 100644 --- a/src/scripts/quest/classquest/WHM/JobWhm350.cpp +++ b/src/scripts/quest/classquest/WHM/JobWhm350.cpp @@ -174,8 +174,7 @@ private: 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 enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ) != nullptr;