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

Helper function in QuestScript to get a terriMgr reference

Browse source
This commit is contained in:
Mordred 2022-01-24 10:10:33 +01:00
parent abb98420fb
commit 198e641420
6 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/scripts/quest/classquest/CNJ/ClsCnj001.cpp
View file

@ -195,8 +195,7 @@ private:
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) 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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );

3
src/scripts/quest/classquest/CNJ/ClsCnj002.cpp
View file

@ -201,8 +201,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 )
{ {
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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );

3
src/scripts/quest/classquest/CNJ/ClsCnj003.cpp
View file

@ -287,8 +287,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() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 319 /*Find the right value*/, Common::BNpcType::Enemy ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 319 /*Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );

9
src/scripts/quest/classquest/CNJ/ClsCnj004.cpp
View file

@ -325,8 +325,7 @@ private:
void Scene00096Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) 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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
@ -352,8 +351,7 @@ private:
void Scene00098Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) 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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
@ -379,8 +377,7 @@ private:
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) 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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );

9
src/scripts/quest/classquest/CNJ/ClsCnj006.cpp
View file

@ -239,8 +239,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 )
{ {
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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
@ -335,8 +334,7 @@ private:
void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) 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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
@ -431,8 +429,7 @@ private:
void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) 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 ); auto enemy = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() ); enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 ); enemy->hateListAddDelayed( player.getAsPlayer(), 1 );

6
src/world/Script/NativeScriptApi.h
View file

@ -7,6 +7,7 @@
#include "Manager/EventMgr.h" #include "Manager/EventMgr.h"
#include "Manager/LinkshellMgr.h" #include "Manager/LinkshellMgr.h"
#include "Manager/PlayerMgr.h" #include "Manager/PlayerMgr.h"
#include "Manager/TerritoryMgr.h"
#include "Service.h" #include "Service.h"
#ifdef _MSC_VER #ifdef _MSC_VER
@ -241,6 +242,11 @@ namespace Sapphire::ScriptAPI
{ {
return Common::Service< World::Manager::PlayerMgr >::ref(); return Common::Service< World::Manager::PlayerMgr >::ref();
} }
World::Manager::TerritoryMgr& teriMgr()
{
return Common::Service< World::Manager::TerritoryMgr >::ref();
}
}; };
/*! /*!