From 198e64142079d341244d20cd6bb4f88fedc0c8a4 Mon Sep 17 00:00:00 2001 From: Mordred Date: Mon, 24 Jan 2022 10:10:33 +0100 Subject: [PATCH] Helper function in QuestScript to get a terriMgr reference --- src/scripts/quest/classquest/CNJ/ClsCnj001.cpp | 3 +-- src/scripts/quest/classquest/CNJ/ClsCnj002.cpp | 3 +-- src/scripts/quest/classquest/CNJ/ClsCnj003.cpp | 3 +-- src/scripts/quest/classquest/CNJ/ClsCnj004.cpp | 9 +++------ src/scripts/quest/classquest/CNJ/ClsCnj006.cpp | 9 +++------ src/world/Script/NativeScriptApi.h | 6 ++++++ 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp index 7013370f..f8dd9712 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp @@ -195,8 +195,7 @@ private: void Scene00100Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp index d168dafd..0673f5ce 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp @@ -201,8 +201,7 @@ private: void Scene00004Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp index cd6c240b..45246918 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp @@ -287,8 +287,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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 319 /*Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp index c32bd3c2..c8ec23a4 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp @@ -325,8 +325,7 @@ private: void Scene00096Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); @@ -352,8 +351,7 @@ private: void Scene00098Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); @@ -379,8 +377,7 @@ private: void Scene00100Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp index 84ca89ce..5bc37d8d 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp @@ -239,8 +239,7 @@ private: void Scene00003Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); @@ -335,8 +334,7 @@ private: void Scene00011Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); @@ -431,8 +429,7 @@ private: void Scene00019Return( 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() ); auto enemy = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy ); enemy->setTriggerOwnerId( player.getId() ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h index 9bf38233..671475da 100644 --- a/src/world/Script/NativeScriptApi.h +++ b/src/world/Script/NativeScriptApi.h @@ -7,6 +7,7 @@ #include "Manager/EventMgr.h" #include "Manager/LinkshellMgr.h" #include "Manager/PlayerMgr.h" +#include "Manager/TerritoryMgr.h" #include "Service.h" #ifdef _MSC_VER @@ -241,6 +242,11 @@ namespace Sapphire::ScriptAPI { return Common::Service< World::Manager::PlayerMgr >::ref(); } + + World::Manager::TerritoryMgr& teriMgr() + { + return Common::Service< World::Manager::TerritoryMgr >::ref(); + } }; /*!