From a37046f0ec83b1633a1e781808ba1385ef62f931 Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 22 Feb 2022 21:46:36 +0100 Subject: [PATCH] Renamed bnpc create and retrieve functions --- src/scripts/instances/dungeons/Sastasha.cpp | 8 ++--- .../instances/questbattles/ChasingShadows.cpp | 36 +++++++++---------- src/scripts/quest/ManFst401.cpp | 2 +- .../quest/classquest/CNJ/ClsCnj001.cpp | 2 +- .../quest/classquest/CNJ/ClsCnj002.cpp | 2 +- .../quest/classquest/CNJ/ClsCnj003.cpp | 2 +- .../quest/classquest/CNJ/ClsCnj004.cpp | 6 ++-- .../quest/classquest/CNJ/ClsCnj006.cpp | 6 ++-- .../blackshroud_central/SubFst053.cpp | 6 ++-- .../blackshroud_central/SubFst060.cpp | 4 +-- .../blackshroud_central/SubFst073.cpp | 2 +- .../subquest/blackshroud_east/GaiUsa004.cpp | 2 +- .../subquest/blackshroud_east/GaiUsa007.cpp | 6 ++-- .../subquest/blackshroud_east/GaiUsa105.cpp | 8 ++--- .../subquest/blackshroud_east/GaiUsa107.cpp | 8 ++--- .../subquest/blackshroud_east/GaiUsa108.cpp | 6 ++-- .../subquest/blackshroud_east/GaiUsa306.cpp | 6 ++-- .../subquest/blackshroud_east/GaiUsa308.cpp | 2 +- .../subquest/blackshroud_east/GaiUsc303.cpp | 6 ++-- .../subquest/blackshroud_north/GaiUsa802.cpp | 2 +- .../subquest/blackshroud_north/GaiUsa904.cpp | 2 +- .../subquest/blackshroud_south/GaiUsa604.cpp | 6 ++-- .../subquest/blackshroud_south/GaiUsa702.cpp | 2 +- .../subquest/blackshroud_south/GaiUsb008.cpp | 2 +- .../subquest/blackshroud_south/GaiUsb012.cpp | 2 +- .../subquest/coerthas_central/GaiUsb604.cpp | 4 +-- .../subquest/coerthas_central/GaiUsb607.cpp | 6 ++-- .../subquest/coerthas_central/GaiUsb701.cpp | 6 ++-- .../subquest/coerthas_central/GaiUsb801.cpp | 2 +- .../subquest/coerthas_central/GaiUsb903.cpp | 4 +-- .../subquest/coerthas_central/GaiUsb904.cpp | 2 +- .../quest/subquest/gridania/GaiUsa002.cpp | 6 ++-- .../subquest/lanoscea_east/GaiUsb005.cpp | 2 +- .../subquest/lanoscea_east/GaiUsb309.cpp | 2 +- .../subquest/lanoscea_lower/GaiUsb002.cpp | 10 +++--- .../subquest/lanoscea_lower/GaiUsb003.cpp | 2 +- .../subquest/thanalan_east/GaiUsa504.cpp | 2 +- .../subquest/thanalan_east/GaiUsb512.cpp | 2 +- .../subquest/thanalan_east/SubWil110.cpp | 4 +-- .../subquest/thanalan_east/SubWil113.cpp | 4 +-- .../subquest/thanalan_south/GaiUsa705.cpp | 4 +-- .../subquest/thanalan_south/GaiUsb102.cpp | 2 +- .../subquest/thanalan_south/GaiUsb103.cpp | 2 +- src/world/Territory/Territory.cpp | 4 +-- src/world/Territory/Territory.h | 4 +-- 45 files changed, 105 insertions(+), 105 deletions(-) diff --git a/src/scripts/instances/dungeons/Sastasha.cpp b/src/scripts/instances/dungeons/Sastasha.cpp index 736e1795..29155c56 100644 --- a/src/scripts/instances/dungeons/Sastasha.cpp +++ b/src/scripts/instances/dungeons/Sastasha.cpp @@ -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() ); } diff --git a/src/scripts/instances/questbattles/ChasingShadows.cpp b/src/scripts/instances/questbattles/ChasingShadows.cpp index 30732a93..222d6d6a 100644 --- a/src/scripts/instances/questbattles/ChasingShadows.cpp +++ b/src/scripts/instances/questbattles/ChasingShadows.cpp @@ -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 ); diff --git a/src/scripts/quest/ManFst401.cpp b/src/scripts/quest/ManFst401.cpp index c0bf23a4..39e0f0e5 100644 --- a/src/scripts/quest/ManFst401.cpp +++ b/src/scripts/quest/ManFst401.cpp @@ -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 ); } diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp index f8dd9712..71873743 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp @@ -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 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp index 0673f5ce..9e72acd8 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp @@ -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 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp index 45246918..2d568732 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp @@ -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 ); } diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp index c8ec23a4..bcd8e093 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp @@ -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 ); } diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp index 5bc37d8d..e46f42b7 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp index 6c3988fb..4a22756b 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp @@ -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() ); diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp index ede31c31..2d7ebb93 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp index 3e423e49..99a2e879 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp index f77cbdc9..24add8ac 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp @@ -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 ); } } diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp index 49c7efac..cfed57f7 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp index 4fa09975..5e602932 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp index ccb0c9f2..6a2dd2d2 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp index 7e8e8129..c1d09bc1 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp index f9ed0ddd..10ec3f42 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp index 602af9d3..ff23d5ea 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp @@ -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 ); } } diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp index 0ed2298a..0bf06072 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp index 6f709bbd..986dab19 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp @@ -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 ); } } diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp index 18abb08b..04680a0d 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp @@ -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 ); } } diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp index 7f9da66c..cc789a98 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp index 3d6f4c14..1815eff7 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp @@ -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 ); } } diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp index 2f7a20e1..09a901f1 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp index 9361afb9..f6c4658b 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp @@ -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 ); } } diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp index bf1ab5eb..e9857c12 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp index a7cf2569..103738de 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp index 5a4603a0..7b48917e 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp index c7067d19..dea5cebe 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp index 7ee02ea5..52a2ddee 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp index f569d01a..90f32743 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp @@ -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 ); } } diff --git a/src/scripts/quest/subquest/gridania/GaiUsa002.cpp b/src/scripts/quest/subquest/gridania/GaiUsa002.cpp index db050231..ce511ec2 100644 --- a/src/scripts/quest/subquest/gridania/GaiUsa002.cpp +++ b/src/scripts/quest/subquest/gridania/GaiUsa002.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp index 58ac70ad..89e9eb23 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp index f38d74d5..9bc7f1de 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp index 7545dd90..1de218d5 100644 --- a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp +++ b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp @@ -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 ); diff --git a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp index aeb78508..352c42be 100644 --- a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp +++ b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp index 385661fc..ec9f453d 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp index 478a674d..ee84ea45 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp index 5251cd71..1af9bcf7 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp index d4d27ed0..691708f0 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp index 500ce410..853e39f2 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp index 7533f0d6..9e775834 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp @@ -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 ); } diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp index 8ce364fc..799ab67f 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp @@ -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 ); } diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp index 71fab331..ed9a8ae6 100644 --- a/src/world/Territory/Territory.cpp +++ b/src/world/Territory/Territory.cpp @@ -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 ) { diff --git a/src/world/Territory/Territory.h b/src/world/Territory/Territory.h index 2a96f7d9..32db98fb 100644 --- a/src/world/Territory/Territory.h +++ b/src/world/Territory/Territory.h @@ -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 );