From eb6f7777e8d246041cd4ddcaed7fdaa40e0924f0 Mon Sep 17 00:00:00 2001 From: dude22072 Date: Wed, 23 Feb 2022 02:36:22 -0600 Subject: [PATCH] Did I fix it --- src/scripts/quest/classquest/ARC/ClsArc000.cpp | 7 ++++--- src/scripts/quest/classquest/ARC/ClsArc001.cpp | 7 ++++--- src/scripts/quest/classquest/ARC/ClsArc002.cpp | 7 ++++--- src/scripts/quest/classquest/ARC/ClsArc100.cpp | 7 ++++--- src/scripts/quest/classquest/ARC/ClsArc997.cpp | 7 ++++--- src/scripts/quest/classquest/CNJ/ClsCnj000.cpp | 7 ++++--- src/scripts/quest/classquest/CNJ/ClsCnj001.cpp | 7 ++++--- src/scripts/quest/classquest/CNJ/ClsCnj002.cpp | 7 ++++--- src/scripts/quest/classquest/CNJ/ClsCnj003.cpp | 9 +++++---- src/scripts/quest/classquest/CNJ/ClsCnj004.cpp | 15 ++++++++------- src/scripts/quest/classquest/CNJ/ClsCnj006.cpp | 11 ++++++----- .../quest/subquest/coerthas_central/GaiUsb604.cpp | 9 +++++---- .../quest/subquest/coerthas_central/GaiUsb607.cpp | 11 ++++++----- .../quest/subquest/coerthas_central/GaiUsb701.cpp | 11 ++++++----- .../quest/subquest/coerthas_central/GaiUsb801.cpp | 7 ++++--- .../quest/subquest/coerthas_central/GaiUsb902.cpp | 5 +++-- .../quest/subquest/coerthas_central/GaiUsb903.cpp | 9 +++++---- .../quest/subquest/coerthas_central/GaiUsb904.cpp | 9 +++++---- src/scripts/quest/subquest/gridania/GaiUsa002.cpp | 11 ++++++----- src/scripts/quest/subquest/gridania/SubFst002.cpp | 5 +++-- src/scripts/quest/subquest/gridania/SubFst007.cpp | 5 +++-- src/scripts/quest/subquest/gridania/SubFst011.cpp | 5 +++-- src/scripts/quest/subquest/gridania/SubFst013.cpp | 5 ++++- .../quest/subquest/thanalan_east/GaiUsa504.cpp | 7 ++++--- .../quest/subquest/thanalan_east/GaiUsb512.cpp | 7 ++++--- .../quest/subquest/thanalan_east/SubWil110.cpp | 9 +++++---- .../quest/subquest/thanalan_east/SubWil113.cpp | 9 +++++---- .../quest/subquest/thanalan_south/GaiUsa705.cpp | 9 +++++---- .../quest/subquest/thanalan_south/GaiUsb101.cpp | 5 +++-- .../quest/subquest/thanalan_south/GaiUsb102.cpp | 7 ++++--- .../quest/subquest/thanalan_south/GaiUsb103.cpp | 9 +++++---- 31 files changed, 139 insertions(+), 106 deletions(-) diff --git a/src/scripts/quest/classquest/ARC/ClsArc000.cpp b/src/scripts/quest/classquest/ARC/ClsArc000.cpp index 224f61d6..7af58efe 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc000.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc000.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -80,12 +81,12 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( nameId != Enemy0 && nameId != Enemy1 && nameId != Enemy2 ) + if( bnpc.getBNpcNameId() != Enemy0 && bnpc.getBNpcNameId() != Enemy1 && bnpc.getBNpcNameId() != Enemy2 ) return; - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/classquest/ARC/ClsArc001.cpp b/src/scripts/quest/classquest/ARC/ClsArc001.cpp index de576b30..8bb69c7b 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc001.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc001.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -79,15 +80,15 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( nameId != Enemy0 && nameId != Enemy1 ) + if( bnpc.getBNpcNameId() != Enemy0 && bnpc.getBNpcNameId() != Enemy1 ) return; auto currentKC5 = quest.getUI8AL() + 1; auto currentKC32 = quest.getUI8BH() + 1; - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/classquest/ARC/ClsArc002.cpp b/src/scripts/quest/classquest/ARC/ClsArc002.cpp index e4c33575..69d2bd5b 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc002.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc002.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -100,15 +101,15 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( entityId != Enemy0 && entityId != Enemy1 ) + if( bnpc.getLayoutId() != Enemy0 && bnpc.getLayoutId() != Enemy1 ) return; auto currentKC39 = quest.getUI8AL() + 1; auto currentKC12 = quest.getUI8BH() + 1; - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { diff --git a/src/scripts/quest/classquest/ARC/ClsArc100.cpp b/src/scripts/quest/classquest/ARC/ClsArc100.cpp index b3ee39ab..b7e0331a 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc100.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc100.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -66,9 +67,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( nameId != Enemy0 && nameId != Enemy1 && nameId != Enemy2 ) + if( bnpc.getBNpcNameId() != Enemy0 && bnpc.getBNpcNameId() != Enemy1 && bnpc.getBNpcNameId() != Enemy2 ) return; @@ -76,7 +77,7 @@ public: auto currentKC49 = quest.getUI8BH() + 1; auto currentKC47 = quest.getUI8BL() + 1; - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/classquest/ARC/ClsArc997.cpp b/src/scripts/quest/classquest/ARC/ClsArc997.cpp index 036e5798..80d133df 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc997.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc997.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -95,15 +96,15 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( nameId != Enemy0 && nameId != Enemy1 ) + if( bnpc.getBNpcNameId() != Enemy0 && bnpc.getBNpcNameId() != Enemy1 ) return; auto currentKC39 = quest.getUI8AL() + 1; auto currentKC12 = quest.getUI8BH() + 1; - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj000.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj000.cpp index 73a2a6e7..59be403f 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj000.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj000.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -77,9 +78,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( nameId != Enemy0 && nameId != Enemy1 && nameId != Enemy2 ) + if( bnpc.getBNpcNameId() != Enemy0 && bnpc.getBNpcNameId() != Enemy1 && bnpc.getBNpcNameId() != Enemy2 ) return; @@ -87,7 +88,7 @@ public: auto currentKC49 = quest.getUI8BH() + 1; auto currentKC47 = quest.getUI8BL() + 1; - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp index f8dd9712..97638945 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj001.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -92,9 +93,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -196,7 +197,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..b5787d29 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -124,9 +125,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -202,7 +203,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..6eba69ea 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -225,11 +226,11 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( entityId != Enemy0 ) + if( bnpc.getLayoutId() != Enemy0 ) return; - else if( entityId == Enemy0 && quest.getSeq() == Seq1 ) + else if( bnpc.getLayoutId() == Enemy0 && quest.getSeq() == Seq1 ) { eventMgr().sendEventNotice( player, getId(), 0, 0 ); quest.setUI8BH( 0 ); @@ -288,7 +289,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..78c16fa1 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -146,19 +147,19 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( quest.getSeq() == Seq1 && entityId == Enemy0 ) + if( quest.getSeq() == Seq1 && bnpc.getLayoutId() == Enemy0 ) { eventMgr().sendEventNotice( player, getId(), 0, 0 ); quest.setSeq( Seq2 ); } - else if( quest.getSeq() == Seq3 && entityId == Enemy1 ) + else if( quest.getSeq() == Seq3 && bnpc.getLayoutId() == Enemy1 ) { eventMgr().sendEventNotice( player, getId(), 2, 0 ); quest.setSeq( Seq4 ); } - else if( quest.getSeq() == Seq5 && entityId == Enemy2 ) + else if( quest.getSeq() == Seq5 && bnpc.getLayoutId() == Enemy2 ) { eventMgr().sendEventNotice( player, getId(), 4, 0 ); quest.setSeq( Seq6 ); @@ -326,7 +327,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 +353,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 +379,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..d939abfb 100644 --- a/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp +++ b/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -152,9 +153,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -240,7 +241,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 +336,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 +431,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/coerthas_central/GaiUsb604.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp index bf1ab5eb..9c7f65fe 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -104,9 +105,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: case Enemy1: @@ -172,8 +173,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..50ff05a6 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -122,9 +123,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: case Enemy1: @@ -200,9 +201,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..4c0f2949 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -74,9 +75,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: case Enemy1: @@ -143,9 +144,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..00cc68dc 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -122,9 +123,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -190,7 +191,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/GaiUsb902.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb902.cpp index 45e254c9..3e0ccbb1 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb902.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb902.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -63,9 +64,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp index 7ee02ea5..906ea263 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -92,9 +93,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: case Enemy1: @@ -157,8 +158,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..cbf7fa5f 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -121,15 +122,15 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - if( entityId == Enemy0 ) + if( bnpc.getLayoutId() == Enemy0 ) { eventMgr().sendEventNotice( player, getId(), 0, 0 ); quest.setSeq( Seq2 ); quest.setUI8BH( 1 ); } - else if( nameId == Enemy1 ) + else if( bnpc.getBNpcNameId() == Enemy1 ) { } } @@ -202,7 +203,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..d3693120 100644 --- a/src/scripts/quest/subquest/gridania/GaiUsa002.cpp +++ b/src/scripts/quest/subquest/gridania/GaiUsa002.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -134,9 +135,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -233,7 +234,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 +260,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 +286,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/gridania/SubFst002.cpp b/src/scripts/quest/subquest/gridania/SubFst002.cpp index f881688f..0697709c 100644 --- a/src/scripts/quest/subquest/gridania/SubFst002.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst002.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -60,9 +61,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( nameId != Enemy0 ) + if( bnpc.getBNpcNameId() != Enemy0 ) return; auto currentKC = quest.getUI8AL() + 1; diff --git a/src/scripts/quest/subquest/gridania/SubFst007.cpp b/src/scripts/quest/subquest/gridania/SubFst007.cpp index 21d2e178..e53ec28f 100644 --- a/src/scripts/quest/subquest/gridania/SubFst007.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst007.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -64,9 +65,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - if( nameId != Enemy0 ) + if( bnpc.getBNpcNameId() != Enemy0 ) return; auto currentKC = quest.getUI8AL(); diff --git a/src/scripts/quest/subquest/gridania/SubFst011.cpp b/src/scripts/quest/subquest/gridania/SubFst011.cpp index 68699a46..5c7286b6 100644 --- a/src/scripts/quest/subquest/gridania/SubFst011.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst011.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -59,9 +60,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) override { - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/subquest/gridania/SubFst013.cpp b/src/scripts/quest/subquest/gridania/SubFst013.cpp index 661c6a8e..3908bc04 100644 --- a/src/scripts/quest/subquest/gridania/SubFst013.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst013.cpp @@ -3,6 +3,7 @@ // In order for this script to be loaded, move it to the correct folder in /scripts/ #include +#include #include "Manager/EventMgr.h" #include #include @@ -73,7 +74,9 @@ public: { case Actor0: { - if( quest.getSeq() == Seq2 ) + if( quest.getSeq() == Seq0 ) + Scene00000( quest, player ); + else if( quest.getSeq() == Seq2 ) Scene00002( quest, player ); else if( quest.getSeq() == Seq4 ) Scene00004( quest, player ); diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp index 385661fc..afd56eb6 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -79,9 +80,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -150,7 +151,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..bff1dc32 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -88,9 +89,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -155,7 +156,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..b9b51f1c 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -109,9 +110,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { @@ -288,8 +289,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..059f665e 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -122,9 +123,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -248,8 +249,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..7d10f6af 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -80,9 +81,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -154,8 +155,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/GaiUsb101.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsb101.cpp index 96ecb5fb..fa0f9cc8 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsb101.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsb101.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -60,9 +61,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp index 7533f0d6..d8232e53 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsb102.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -82,9 +83,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: { @@ -182,7 +183,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..2ae8baf3 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -110,15 +111,15 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - if(nameId == Enemy0) + if( bnpc.getBNpcNameId() == Enemy0 ) { quest.setUI8BH( 1 ); eventMgr().sendEventNotice( player, getId(), 0, 0 ); quest.setSeq( Seq2 ); } - else if( entityId == Enemy1 ) + else if( bnpc.getLayoutId() == Enemy1 ) { quest.setUI8BH( 1 ); eventMgr().sendEventNotice( player, getId(), 2, 0 ); @@ -201,7 +202,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 ); }