mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 01:07:47 +00:00
Code Activity

Renamed bnpc create and retrieve functions

Browse source
This commit is contained in:
Mordred 2022-02-22 21:46:36 +01:00
parent a56585629e
commit a37046f0ec
45 changed files with 105 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scripts/instances/dungeons/Sastasha.cpp
View file

@ -130,7 +130,7 @@ public:
{
instance.setVar( 0, Seq3 );
instance.getEObjByName( "Rambadedoor" )->setPermissionInvisibility( 7 );
madison2 = instance.createBNpcFromInstanceId( 4035056, 600, Common::BNpcType::Enemy );
madison2 = instance.createBNpcFromLayoutId( 4035056, 600, Common::BNpcType::Enemy );
madison = nullptr;
}
@ -187,7 +187,7 @@ public:
if( eobj.getName() == "Inconspicuousswitch" )
{
if( !chopper )
chopper = instance.createBNpcFromInstanceId( 4035011, 400, Common::BNpcType::Enemy );
chopper = instance.createBNpcFromLayoutId( 4035011, 400, Common::BNpcType::Enemy );
else if( chopper && !chopper->isAlive() )
{
eventMgr().eventActionStart( player, getId(), EventActionTouch,
@ -197,7 +197,7 @@ public:
instance.getEObjByName( "Hiddendoor" )->setPermissionInvisibility( 7 );
instance.setVar( 0, Seq2 );
instance.sendEventLogMessage( player, instance, 2064, { 0, 0 } );
madison = instance.createBNpcFromInstanceId( 3988325, 600, Common::BNpcType::Enemy );
madison = instance.createBNpcFromLayoutId( 3988325, 600, Common::BNpcType::Enemy );
},
nullptr, getId() );
}
@ -225,7 +225,7 @@ public:
eobj.setPermissionInvisibility( 1 );
instance.setVar( 0, Seq5 );
instance.sendEventLogMessage( player, instance, 2031, { 2000513 } );
denn = instance.createBNpcFromInstanceId( 3978771, 1000, Common::BNpcType::Enemy );
denn = instance.createBNpcFromLayoutId( 3978771, 1000, Common::BNpcType::Enemy );
},
nullptr, getId() );
}

36
src/scripts/instances/questbattles/ChasingShadows.cpp
View file

@ -223,9 +223,9 @@ public:
auto pair3Spawnd = instance.getDirectorVar( SET_3_SPAWNED );
auto successCalled = instance.getDirectorVar( SUCCESS_CALLED );
auto boss = instance.getActiveBNpcByInstanceId( INIT_POP_BOSS );
auto ida = instance.getActiveBNpcByInstanceId( INIT_P_POP_IDA );
auto papa = instance.getActiveBNpcByInstanceId( INIT_P_POP_PAPARIMO );
auto boss = instance.getActiveBNpcByLayoutId( INIT_POP_BOSS );
auto ida = instance.getActiveBNpcByLayoutId( INIT_P_POP_IDA );
auto papa = instance.getActiveBNpcByLayoutId( INIT_P_POP_PAPARIMO );
auto pPlayer = instance.getPlayerPtr();
uint32_t bossHpPercent = 0;
@ -244,8 +244,8 @@ public:
if( pair1Spawnd == 0 && bossHpPercent <= 75 )
{
instance.setDirectorVar( SET_1_SPAWNED, 1 );
auto a2 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_B_03, 1440, Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_B_04, 1440, Common::BNpcType::Enemy );
auto a2 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_B_03, 1440, Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_B_04, 1440, Common::BNpcType::Enemy );
a2->setFlag( Entity::NoDeaggro );
a3->setFlag( Entity::NoDeaggro );
@ -254,8 +254,8 @@ public:
a2->hateListAdd( papa, 10000 );
a3->hateListAdd( papa, 10000 );
auto a4 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_A_01, 300, Common::BNpcType::Enemy );
auto a5 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_A_02, 300, Common::BNpcType::Enemy );
auto a4 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_A_01, 300, Common::BNpcType::Enemy );
auto a5 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_A_02, 300, Common::BNpcType::Enemy );
a4->setFlag( Entity::NoDeaggro );
a5->setFlag( Entity::NoDeaggro );
@ -267,8 +267,8 @@ public:
if( pair2Spawnd == 0 && bossHpPercent <= 50 )
{
instance.setDirectorVar( SET_2_SPAWNED, 1 );
auto a2 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_B_05, 1440, Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_B_06, 1440, Common::BNpcType::Enemy );
auto a2 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_B_05, 1440, Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_B_06, 1440, Common::BNpcType::Enemy );
a2->setFlag( Entity::NoDeaggro );
a3->setFlag( Entity::NoDeaggro );
@ -277,8 +277,8 @@ public:
a2->hateListAdd( papa, 10000 );
a3->hateListAdd( papa, 10000 );
auto a4 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_A_03, 300, Common::BNpcType::Enemy );
auto a5 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_A_04, 300, Common::BNpcType::Enemy );
auto a4 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_A_03, 300, Common::BNpcType::Enemy );
auto a5 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_A_04, 300, Common::BNpcType::Enemy );
a4->setFlag( Entity::NoDeaggro );
a5->setFlag( Entity::NoDeaggro );
@ -292,8 +292,8 @@ public:
{
instance.setDirectorVar( SET_3_SPAWNED, 1 );
auto a4 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_A_05, 300, Common::BNpcType::Enemy );
auto a5 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_A_06, 300, Common::BNpcType::Enemy );
auto a4 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_A_05, 300, Common::BNpcType::Enemy );
auto a5 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_A_06, 300, Common::BNpcType::Enemy );
a4->setFlag( Entity::NoDeaggro );
a5->setFlag( Entity::NoDeaggro );
@ -336,12 +336,12 @@ public:
void onDutyCommence( QuestBattle& instance, Entity::Player& player ) override
{
auto boss = instance.createBNpcFromInstanceId( INIT_POP_BOSS, 21141, Common::BNpcType::Enemy );
auto a2 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_B_01, 1440, Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromInstanceId( INIT_POP_ENEMY_B_02, 1440, Common::BNpcType::Enemy );
auto boss = instance.createBNpcFromLayoutId( INIT_POP_BOSS, 21141, Common::BNpcType::Enemy );
auto a2 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_B_01, 1440, Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromLayoutId( INIT_POP_ENEMY_B_02, 1440, Common::BNpcType::Enemy );
auto ida = instance.createBNpcFromInstanceId( INIT_P_POP_IDA, 27780, Common::BNpcType::Friendly );
auto papa = instance.createBNpcFromInstanceId( INIT_P_POP_PAPARIMO, 27780, Common::BNpcType::Friendly );
auto ida = instance.createBNpcFromLayoutId( INIT_P_POP_IDA, 27780, Common::BNpcType::Friendly );
auto papa = instance.createBNpcFromLayoutId( INIT_P_POP_PAPARIMO, 27780, Common::BNpcType::Friendly );
boss->setFlag( Entity::NoDeaggro );
a2->setFlag( Entity::NoDeaggro );
a3->setFlag( Entity::NoDeaggro );

2
src/scripts/quest/ManFst401.cpp
View file

@ -154,7 +154,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}

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

@ -196,7 +196,7 @@ private:
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );

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

@ -202,7 +202,7 @@ private:
void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
quest.setBitFlag8( 1, true );

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

@ -288,7 +288,7 @@ private:
void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 319 /*Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 319 /*Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
}

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

@ -326,7 +326,7 @@ private:
void Scene00096Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -352,7 +352,7 @@ private:
void Scene00098Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -378,7 +378,7 @@ private:
void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
}

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

@ -240,7 +240,7 @@ private:
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
quest.setBitFlag8( 1, true );
@ -335,7 +335,7 @@ private:
void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
quest.setBitFlag8( 1, true );
@ -430,7 +430,7 @@ private:
void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy->setTriggerOwnerId( player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );

6
src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp
View file

@ -187,9 +187,9 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy0->setTriggerOwnerId( player.getId() );
enemy1->setTriggerOwnerId( player.getId() );
enemy2->setTriggerOwnerId( player.getId() );

4
src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp
View file

@ -186,8 +186,8 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy0->setTriggerOwnerId( player.getId() );
enemy1->setTriggerOwnerId( player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );

2
src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp
View file

@ -397,7 +397,7 @@ private:
void Scene00022Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy0->setTriggerOwnerId( player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp
View file

@ -179,7 +179,7 @@ private:
if( !enemy0Spawned )
{
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
}
}

6
src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp
View file

@ -193,7 +193,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy0->setTriggerOwnerId( player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -220,7 +220,7 @@ private:
{
quest.setBitFlag8( 2, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy1->setTriggerOwnerId( player.getId() );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -247,7 +247,7 @@ private:
{
quest.setBitFlag8( 3, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy2->setTriggerOwnerId( player.getId() );
enemy2->hateListAddDelayed( player.getAsPlayer(), 1 );
}

8
src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp
View file

@ -279,10 +279,10 @@ private:
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy3 = instance->createBNpcFromInstanceId( Enemy3, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy3 = instance->createBNpcFromLayoutId( Enemy3, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );

8
src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp
View file

@ -167,10 +167,10 @@ private:
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy3 = instance->createBNpcFromInstanceId( Enemy3, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy3 = instance->createBNpcFromLayoutId( Enemy3, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );

6
src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp
View file

@ -175,8 +175,8 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -203,7 +203,7 @@ private:
{
quest.setBitFlag8( 2, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy2->hateListAddDelayed( player.getAsPlayer(), 1 );
}

6
src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp
View file

@ -207,7 +207,7 @@ private:
checkQuestCompletion( quest, player );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
}
@ -236,8 +236,8 @@ private:
checkQuestCompletion( quest, player );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy1->hateListAdd( player.getAsPlayer(), 1 );
enemy2->hateListAdd( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp
View file

@ -283,7 +283,7 @@ private:
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned )
{
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}
}

6
src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp
View file

@ -234,7 +234,7 @@ private:
if( quest.getUI8CH() < 3 )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy0->setTriggerOwnerId( player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -268,7 +268,7 @@ private:
if( quest.getUI8CH() < 3 )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy1->setTriggerOwnerId( player.getId() );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -302,7 +302,7 @@ private:
if( quest.getUI8CH() < 3 )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy2->setTriggerOwnerId( player.getId() );
enemy2->hateListAddDelayed( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp
View file

@ -145,7 +145,7 @@ private:
if( !enemySpawned )
{
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}
}

2
src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp
View file

@ -164,7 +164,7 @@ private:
if( !enemySpawned && quest.getUI8AL() < 1)
{
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}
}

6
src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp
View file

@ -189,7 +189,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy0->setTriggerOwnerId( player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -216,7 +216,7 @@ private:
{
quest.setBitFlag8( 2, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy1->setTriggerOwnerId( player.getId() );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -243,7 +243,7 @@ private:
{
quest.setBitFlag8( 3, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy );
enemy2->setTriggerOwnerId( player.getId() );
enemy2->hateListAddDelayed( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp
View file

@ -161,7 +161,7 @@ private:
if( !enemySpawned )
{
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}
}

2
src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp
View file

@ -174,7 +174,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp
View file

@ -167,7 +167,7 @@ private:
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned )
{
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}
}

4
src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp
View file

@ -172,8 +172,8 @@ private:
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
enemy1->hateListAdd( player.getAsPlayer(), 1 );

6
src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp
View file

@ -200,9 +200,9 @@ private:
if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8BL() < 3 )
{
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );

6
src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp
View file

@ -143,9 +143,9 @@ private:
if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8AL() < 3 )
{
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
enemy1->hateListAdd( player.getAsPlayer(), 1 );

2
src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp
View file

@ -190,7 +190,7 @@ private:
if( !enemySpawned )
{
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
// quest.setBitFlag8( 1, true );
}

4
src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp
View file

@ -157,8 +157,8 @@ private:
if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2)
{
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp
View file

@ -202,7 +202,7 @@ private:
if( !enemySpawned )
{
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}
}

6
src/scripts/quest/subquest/gridania/GaiUsa002.cpp
View file

@ -233,7 +233,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -259,7 +259,7 @@ private:
{
quest.setBitFlag8( 2, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
}
@ -285,7 +285,7 @@ private:
{
quest.setBitFlag8( 3, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAddDelayed( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp
View file

@ -189,7 +189,7 @@ private:
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp
View file

@ -198,7 +198,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value, Lv33*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value, Lv33*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
}

10
src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp
View file

@ -104,7 +104,7 @@ private:
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy4 = instance->createBNpcFromInstanceId( Enemy4, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy4 = instance->createBNpcFromLayoutId( Enemy4, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy4->hateListAdd( player.getAsPlayer(), 1 );
}
@ -168,10 +168,10 @@ private:
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy3 = instance->createBNpcFromInstanceId( Enemy3, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy3 = instance->createBNpcFromLayoutId( Enemy3, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
enemy1->hateListAdd( player.getAsPlayer(), 1 );

2
src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp
View file

@ -147,7 +147,7 @@ private:
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp
View file

@ -150,7 +150,7 @@ private:
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp
View file

@ -155,7 +155,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy->hateListAdd( player.getAsPlayer(), 1 );
}

4
src/scripts/quest/subquest/thanalan_east/SubWil110.cpp
View file

@ -288,8 +288,8 @@ private:
if( !enemy0Spawned && !enemy1Spawned )
{
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}

4
src/scripts/quest/subquest/thanalan_east/SubWil113.cpp
View file

@ -248,8 +248,8 @@ private:
if( !enemy0Spawned && !enemy1Spawned )
{
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
}

4
src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp
View file

@ -154,8 +154,8 @@ private:
if( !enemy0Spawned && !enemy1Spawned )
{
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
enemy1->hateListAdd( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp
View file

@ -182,7 +182,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy0->hateListAdd( player.getAsPlayer(), 1 );
}

2
src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp
View file

@ -201,7 +201,7 @@ private:
{
quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
enemy1->hateListAdd( player.getAsPlayer(), 1 );
}

4
src/world/Territory/Territory.cpp
View file

@ -829,7 +829,7 @@ uint32_t Territory::getNextEffectSequence()
return m_effectCounter++;
}
Entity::BNpcPtr Territory::createBNpcFromInstanceId( uint32_t levelId, uint32_t hp, Common::BNpcType bnpcType, uint32_t triggerOwnerId )
Entity::BNpcPtr Territory::createBNpcFromLayoutId( uint32_t levelId, uint32_t hp, Common::BNpcType bnpcType, uint32_t triggerOwnerId )
{
auto infoPtr = m_bNpcBaseMap.find( levelId );
if( infoPtr == m_bNpcBaseMap.end() )
@ -850,7 +850,7 @@ Entity::BNpcPtr Territory::getActiveBNpcByEntityId( uint32_t entityId )
return it->second;
}
Entity::BNpcPtr Territory::getActiveBNpcByInstanceId( uint32_t instanceId )
Entity::BNpcPtr Territory::getActiveBNpcByLayoutId( uint32_t instanceId )
{
for( const auto& bnpcIt : m_bNpcMap )
{

4
src/world/Territory/Territory.h
View file

@ -174,11 +174,11 @@ namespace Sapphire
void addEObj( Entity::EventObjectPtr object );
Entity::BNpcPtr createBNpcFromInstanceId( uint32_t levelId, uint32_t hp, Common::BNpcType bnpcType, uint32_t triggerOwnerId = 0 );
Entity::BNpcPtr createBNpcFromLayoutId( uint32_t levelId, uint32_t hp, Common::BNpcType bnpcType, uint32_t triggerOwnerId = 0 );
Entity::BNpcPtr getActiveBNpcByEntityId( uint32_t entityId );
Entity::BNpcPtr getActiveBNpcByInstanceId( uint32_t instanceId );
Entity::BNpcPtr getActiveBNpcByLayoutId( uint32_t instanceId );
Entity::BNpcPtr getActiveBNpcByInstanceIdAndTriggerOwner( uint32_t instanceId, uint32_t triggerOwnerId );