diff --git a/src/scripts/quest/ManFst003.cpp b/src/scripts/quest/ManFst003.cpp index 68d3ad16..a79eb032 100644 --- a/src/scripts/quest/ManFst003.cpp +++ b/src/scripts/quest/ManFst003.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 diff --git a/src/scripts/quest/ManFst004.cpp b/src/scripts/quest/ManFst004.cpp index 0f1086c6..0b49789e 100644 --- a/src/scripts/quest/ManFst004.cpp +++ b/src/scripts/quest/ManFst004.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 diff --git a/src/scripts/quest/ManFst006.cpp b/src/scripts/quest/ManFst006.cpp index af10ccd0..89e09d4e 100644 --- a/src/scripts/quest/ManFst006.cpp +++ b/src/scripts/quest/ManFst006.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst007.cpp b/src/scripts/quest/ManFst007.cpp index d73796fb..8a6e94d5 100644 --- a/src/scripts/quest/ManFst007.cpp +++ b/src/scripts/quest/ManFst007.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst008.cpp b/src/scripts/quest/ManFst008.cpp index 6581847d..bc4052c4 100644 --- a/src/scripts/quest/ManFst008.cpp +++ b/src/scripts/quest/ManFst008.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst009.cpp b/src/scripts/quest/ManFst009.cpp index 97188643..951031cb 100644 --- a/src/scripts/quest/ManFst009.cpp +++ b/src/scripts/quest/ManFst009.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst200.cpp b/src/scripts/quest/ManFst200.cpp index 65391df9..50dd3f25 100644 --- a/src/scripts/quest/ManFst200.cpp +++ b/src/scripts/quest/ManFst200.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst203.cpp b/src/scripts/quest/ManFst203.cpp index 8cc0226a..f99987c1 100644 --- a/src/scripts/quest/ManFst203.cpp +++ b/src/scripts/quest/ManFst203.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst204.cpp b/src/scripts/quest/ManFst204.cpp index f656ad1c..8fc00dd8 100644 --- a/src/scripts/quest/ManFst204.cpp +++ b/src/scripts/quest/ManFst204.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst205.cpp b/src/scripts/quest/ManFst205.cpp index d327c68d..4767acd1 100644 --- a/src/scripts/quest/ManFst205.cpp +++ b/src/scripts/quest/ManFst205.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst206.cpp b/src/scripts/quest/ManFst206.cpp index 896a7323..e16a0d4b 100644 --- a/src/scripts/quest/ManFst206.cpp +++ b/src/scripts/quest/ManFst206.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst207.cpp b/src/scripts/quest/ManFst207.cpp index 05995d91..1b4e438e 100644 --- a/src/scripts/quest/ManFst207.cpp +++ b/src/scripts/quest/ManFst207.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst208.cpp b/src/scripts/quest/ManFst208.cpp index 22f2a2d8..c29c4d1b 100644 --- a/src/scripts/quest/ManFst208.cpp +++ b/src/scripts/quest/ManFst208.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst209.cpp b/src/scripts/quest/ManFst209.cpp index e2b7fb86..a4048b94 100644 --- a/src/scripts/quest/ManFst209.cpp +++ b/src/scripts/quest/ManFst209.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst300.cpp b/src/scripts/quest/ManFst300.cpp index 08c26bea..8a9c7fad 100644 --- a/src/scripts/quest/ManFst300.cpp +++ b/src/scripts/quest/ManFst300.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst302.cpp b/src/scripts/quest/ManFst302.cpp index 69fa358e..e9fb6829 100644 --- a/src/scripts/quest/ManFst302.cpp +++ b/src/scripts/quest/ManFst302.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst303.cpp b/src/scripts/quest/ManFst303.cpp index eab843f6..8818e5fb 100644 --- a/src/scripts/quest/ManFst303.cpp +++ b/src/scripts/quest/ManFst303.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst304.cpp b/src/scripts/quest/ManFst304.cpp index 306d4cbc..1665d967 100644 --- a/src/scripts/quest/ManFst304.cpp +++ b/src/scripts/quest/ManFst304.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst306.cpp b/src/scripts/quest/ManFst306.cpp index 6e49f25f..e01d758c 100644 --- a/src/scripts/quest/ManFst306.cpp +++ b/src/scripts/quest/ManFst306.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst309.cpp b/src/scripts/quest/ManFst309.cpp index 28dc5638..909a64e2 100644 --- a/src/scripts/quest/ManFst309.cpp +++ b/src/scripts/quest/ManFst309.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst313.cpp b/src/scripts/quest/ManFst313.cpp index 5834d302..6ac8beac 100644 --- a/src/scripts/quest/ManFst313.cpp +++ b/src/scripts/quest/ManFst313.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/ManFst401.cpp b/src/scripts/quest/ManFst401.cpp index 39e0f0e5..5d7b0d0d 100644 --- a/src/scripts/quest/ManFst401.cpp +++ b/src/scripts/quest/ManFst401.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: { diff --git a/src/scripts/quest/ManSea001.cpp b/src/scripts/quest/ManSea001.cpp index 42fa9e7c..6586fa84 100644 --- a/src/scripts/quest/ManSea001.cpp +++ b/src/scripts/quest/ManSea001.cpp @@ -2,6 +2,7 @@ // param used: //WARP_GREHFARR = 181|9|40|14|0|false #include +#include #include #include #include "Manager/TerritoryMgr.h" @@ -112,9 +113,9 @@ public: onProgress( quest, player, EVENT_ON_EMOTE, actorId, 0, emoteId ); } - 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 { - onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( nameId ), entityId, 0 ); + onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( bnpc.getBNpcNameId() ), bnpc.getLayoutId(), 0 ); } void onWithinRange( World::Quest& quest, Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) override diff --git a/src/scripts/quest/ManSea002.cpp b/src/scripts/quest/ManSea002.cpp index 4afd769a..43bee9df 100644 --- a/src/scripts/quest/ManSea002.cpp +++ b/src/scripts/quest/ManSea002.cpp @@ -1,4 +1,5 @@ #include +#include #include "Manager/EventMgr.h" #include #include diff --git a/src/scripts/quest/ManSea003.cpp b/src/scripts/quest/ManSea003.cpp index a8fd5d8c..d253909c 100644 --- a/src/scripts/quest/ManSea003.cpp +++ b/src/scripts/quest/ManSea003.cpp @@ -1,4 +1,5 @@ #include +#include #include "Manager/EventMgr.h" #include #include diff --git a/src/scripts/quest/ManSea005.cpp b/src/scripts/quest/ManSea005.cpp index 78191ea1..8a432147 100644 --- a/src/scripts/quest/ManSea005.cpp +++ b/src/scripts/quest/ManSea005.cpp @@ -1,6 +1,7 @@ // FFXIVTheMovie.ParserV3.8 // fake IsAnnounce table #include +#include #include #include #include "Manager/TerritoryMgr.h" @@ -92,9 +93,9 @@ public: onProgress( quest, player, EVENT_ON_EMOTE, actorId, 0, emoteId ); } - 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 { - onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( nameId ), entityId, 0 ); + onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( bnpc.getBNpcNameId() ), bnpc.getLayoutId(), 0 ); } void onWithinRange( World::Quest& quest, Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) override diff --git a/src/scripts/quest/ManWil001.cpp b/src/scripts/quest/ManWil001.cpp index d24cd500..0f303b9e 100644 --- a/src/scripts/quest/ManWil001.cpp +++ b/src/scripts/quest/ManWil001.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 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/ARC/ClsArc998.cpp b/src/scripts/quest/classquest/ARC/ClsArc998.cpp index 4d4536bf..e7f536f2 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc998.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc998.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/ARC/ClsArc999.cpp b/src/scripts/quest/classquest/ARC/ClsArc999.cpp index dad0f365..f223f408 100644 --- a/src/scripts/quest/classquest/ARC/ClsArc999.cpp +++ b/src/scripts/quest/classquest/ARC/ClsArc999.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv001.cpp b/src/scripts/quest/classquest/BTN/ClsHrv001.cpp index 61aa5982..d043179d 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv001.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv001.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv002.cpp b/src/scripts/quest/classquest/BTN/ClsHrv002.cpp index 32a96dff..c1ba927d 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv002.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv002.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv003.cpp b/src/scripts/quest/classquest/BTN/ClsHrv003.cpp index f7ae88ed..ff88f0bf 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv003.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv003.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv004.cpp b/src/scripts/quest/classquest/BTN/ClsHrv004.cpp index fc716def..b82e6f48 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv004.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv004.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv005.cpp b/src/scripts/quest/classquest/BTN/ClsHrv005.cpp index f88f1ae0..714dbd0d 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv005.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv005.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv006.cpp b/src/scripts/quest/classquest/BTN/ClsHrv006.cpp index 328a7a0c..36e9eba1 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv006.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv006.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv007.cpp b/src/scripts/quest/classquest/BTN/ClsHrv007.cpp index 1441dc82..353d0853 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv007.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv007.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv008.cpp b/src/scripts/quest/classquest/BTN/ClsHrv008.cpp index 5c1c89fb..9711a1be 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv008.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv008.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv009.cpp b/src/scripts/quest/classquest/BTN/ClsHrv009.cpp index dedb0fbc..4e27a488 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv009.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv009.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv010.cpp b/src/scripts/quest/classquest/BTN/ClsHrv010.cpp index b161294a..304a3ca5 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv010.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv010.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv011.cpp b/src/scripts/quest/classquest/BTN/ClsHrv011.cpp index 0270d2d2..38bd8f08 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv011.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv011.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv100.cpp b/src/scripts/quest/classquest/BTN/ClsHrv100.cpp index baec6c40..30d35120 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv100.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv100.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv502.cpp b/src/scripts/quest/classquest/BTN/ClsHrv502.cpp index 8f0a51ce..85c1fec8 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv502.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv502.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv530.cpp b/src/scripts/quest/classquest/BTN/ClsHrv530.cpp index eaed087c..53319b7f 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv530.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv530.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv550.cpp b/src/scripts/quest/classquest/BTN/ClsHrv550.cpp index 3d72dbfb..f528eccd 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv550.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv550.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv580.cpp b/src/scripts/quest/classquest/BTN/ClsHrv580.cpp index 5f6f31a5..fe752380 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv580.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv580.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv600.cpp b/src/scripts/quest/classquest/BTN/ClsHrv600.cpp index f510ce04..0eaf613f 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv600.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv600.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/classquest/BTN/ClsHrv999.cpp b/src/scripts/quest/classquest/BTN/ClsHrv999.cpp index 30b1f1e2..93c5b34b 100644 --- a/src/scripts/quest/classquest/BTN/ClsHrv999.cpp +++ b/src/scripts/quest/classquest/BTN/ClsHrv999.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include 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 71873743..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: { diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj002.cpp index 9e72acd8..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: { diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj003.cpp index 2d568732..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 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj004.cpp index bcd8e093..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 ); diff --git a/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp b/src/scripts/quest/classquest/CNJ/ClsCnj006.cpp index e46f42b7..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: { diff --git a/src/scripts/quest/festivalquest/FesLgt001.cpp b/src/scripts/quest/festivalquest/FesLgt001.cpp index 6e0f9d69..a182e136 100644 --- a/src/scripts/quest/festivalquest/FesLgt001.cpp +++ b/src/scripts/quest/festivalquest/FesLgt001.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesLgt002.cpp b/src/scripts/quest/festivalquest/FesLgt002.cpp index b22afd3a..3bab0a23 100644 --- a/src/scripts/quest/festivalquest/FesLgt002.cpp +++ b/src/scripts/quest/festivalquest/FesLgt002.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesLgt003.cpp b/src/scripts/quest/festivalquest/FesLgt003.cpp index a5d8b99f..752b497d 100644 --- a/src/scripts/quest/festivalquest/FesLgt003.cpp +++ b/src/scripts/quest/festivalquest/FesLgt003.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesLgt004.cpp b/src/scripts/quest/festivalquest/FesLgt004.cpp index 2c21dbf3..e20a5c8e 100644 --- a/src/scripts/quest/festivalquest/FesLgt004.cpp +++ b/src/scripts/quest/festivalquest/FesLgt004.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesVlt101.cpp b/src/scripts/quest/festivalquest/FesVlt101.cpp index 6dc9296f..3a9861d7 100644 --- a/src/scripts/quest/festivalquest/FesVlt101.cpp +++ b/src/scripts/quest/festivalquest/FesVlt101.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesVlt102.cpp b/src/scripts/quest/festivalquest/FesVlt102.cpp index d2d14a61..066721ae 100644 --- a/src/scripts/quest/festivalquest/FesVlt102.cpp +++ b/src/scripts/quest/festivalquest/FesVlt102.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesVlt103.cpp b/src/scripts/quest/festivalquest/FesVlt103.cpp index 2f5575b3..07d7242b 100644 --- a/src/scripts/quest/festivalquest/FesVlt103.cpp +++ b/src/scripts/quest/festivalquest/FesVlt103.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesVlt104.cpp b/src/scripts/quest/festivalquest/FesVlt104.cpp index c3532e27..747eeb09 100644 --- a/src/scripts/quest/festivalquest/FesVlt104.cpp +++ b/src/scripts/quest/festivalquest/FesVlt104.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/festivalquest/FesVlt105.cpp b/src/scripts/quest/festivalquest/FesVlt105.cpp index 315b0833..594e8297 100644 --- a/src/scripts/quest/festivalquest/FesVlt105.cpp +++ b/src/scripts/quest/festivalquest/FesVlt105.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst029.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst029.cpp index 1216e1a2..58fcfde5 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst029.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst029.cpp @@ -3,7 +3,9 @@ // In order for this script to be loaded, move it to the correct folder in /scripts/ #include +#include #include "Manager/EventMgr.h" + #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst031.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst031.cpp index a8961d6d..363a3fec 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst031.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst031.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -153,9 +154,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 { - if( nameId != Enemy0 ) + if( bnpc.getBNpcNameId() != Enemy0 ) return; else { diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst033.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst033.cpp index d1ca8837..456c7d01 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst033.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst033.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 @@ -98,9 +99,9 @@ class SubFst033 : public Sapphire::ScriptAPI::QuestScript } - 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: { break; } case Enemy1: { break; } diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst034.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst034.cpp index 52f3c7a3..a980810d 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst034.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst034.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 @@ -72,9 +73,9 @@ class SubFst034 : public Sapphire::ScriptAPI::QuestScript { } - 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/blackshroud_central/SubFst035.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst035.cpp index dfcf1bc4..b694f9ad 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst035.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst035.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst038.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst038.cpp index 831f3723..79e9ab69 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst038.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst038.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst039.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst039.cpp index 1f341728..7646d9b5 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst039.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst039.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/blackshroud_central/SubFst041.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst041.cpp index 3c6a606e..cd3843b3 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst041.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst041.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -67,9 +68,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.getUI8BH(); diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst042.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst042.cpp index 57c99dfe..3c41a00d 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst042.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst042.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/blackshroud_central/SubFst045.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst045.cpp index 67fdd993..1818ed1a 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst045.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst045.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 diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst046.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst046.cpp index b97a12a1..07731134 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst046.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst046.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 diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst047.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst047.cpp index 5ad75a81..32630264 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst047.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst047.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst048.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst048.cpp index 5ba3b61f..76fe52df 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst048.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst048.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 diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst049.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst049.cpp index 9f47489b..69d41183 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst049.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst049.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -67,9 +68,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 { - if( nameId != Enemy0 ) + if( bnpc.getBNpcNameId() != Enemy0 ) return; else { diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst050.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst050.cpp index 60151bb2..bedbb781 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst050.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst050.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -68,9 +69,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/blackshroud_central/SubFst053.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp index 4a22756b..411149de 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst053.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -87,9 +88,9 @@ public: Scene00100( quest, player ); } - 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: diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst055.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst055.cpp index 830c6f60..4f80ed8a 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst055.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst055.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst056.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst056.cpp index 78863e92..0e2ad535 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst056.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst056.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst058.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst058.cpp index 6c7e282b..be04165f 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst058.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst058.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst059.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst059.cpp index 68897111..4d00b785 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst059.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst059.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp index 2d7ebb93..cc7aa0b9 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst060.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -91,9 +92,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: { diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst066.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst066.cpp index 7a3d0067..3a9cf97c 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst066.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst066.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -58,9 +59,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/blackshroud_central/SubFst068.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst068.cpp index 3f45a2c5..b35b9608 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst068.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst068.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp index 99a2e879..75695afa 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst073.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -103,9 +104,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: { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa003.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa003.cpp index a99f5940..a455a725 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa003.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa003.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp index 24add8ac..0e12ad31 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.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: { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa005.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa005.cpp index 60b734f0..8f428663 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa005.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa005.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -71,9 +72,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/blackshroud_east/GaiUsa007.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp index cfed57f7..2c506c7d 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa007.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -106,9 +107,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: { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa008.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa008.cpp index aa68baf2..7312b18d 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa008.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa008.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -58,9 +59,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/blackshroud_east/GaiUsa101.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa101.cpp index 8ec56416..c99afd8f 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa101.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa101.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa103.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa103.cpp index ec55a85c..86be2540 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa103.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa103.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa104.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa104.cpp index 2f73e981..9dca24a0 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa104.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa104.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -137,9 +138,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/blackshroud_east/GaiUsa105.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp index 5e602932..1fe00ea2 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa105.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -123,9 +124,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: { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa106.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa106.cpp index 6a2a1958..71195221 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa106.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa106.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp index 6a2dd2d2..ecdd39f4 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa107.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -90,9 +91,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: diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp index c1d09bc1..1e816d4f 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa108.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -90,9 +91,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: diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa109.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa109.cpp index 68f743fc..7cc165ee 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa109.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa109.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa201.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa201.cpp index a3d266d1..d63d117c 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa201.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa201.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa202.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa202.cpp index 4bacbcc6..67d9df60 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa202.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa202.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa203.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa203.cpp index 28c5032d..26216f93 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa203.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa203.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa301.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa301.cpp index b84935fc..3fc95695 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa301.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa301.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa302.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa302.cpp index 343132dd..20ff36cc 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa302.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa302.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -73,9 +74,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/blackshroud_east/GaiUsa305.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa305.cpp index 43ce0f72..854c9b49 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa305.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa305.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp index 10ec3f42..17127aea 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa306.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -125,9 +126,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: { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp index ff23d5ea..705d6e34 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -125,9 +126,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: { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa402.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa402.cpp index fa2feb45..b9e35247 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa402.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa402.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp index 0bf06072..8f8cd4c6 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsc303.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -123,9 +124,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: { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsc305.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsc305.cpp index b1b6ad11..1a9265c2 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsc305.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsc305.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsc306.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsc306.cpp index cceab11e..b8f4bff1 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsc306.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsc306.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, 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/blackshroud_north/GaiUsa801.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa801.cpp index 1ed19abf..ab7c1ad4 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa801.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa801.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -58,9 +59,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/blackshroud_north/GaiUsa802.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp index 986dab19..e2ec2dbe 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -76,9 +77,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: { diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsa803.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa803.cpp index e6f549ce..15fcf1da 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa803.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa803.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp index 04680a0d..c19cdaed 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -99,9 +100,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: { diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsa905.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa905.cpp index 1fe32c44..b0618dd6 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa905.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa905.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsb602.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsb602.cpp index 4b8da01f..c1e1587b 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsb602.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsb602.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_north/SubFst021.cpp b/src/scripts/quest/subquest/blackshroud_north/SubFst021.cpp index 9e9a3a3b..137d3ecc 100644 --- a/src/scripts/quest/subquest/blackshroud_north/SubFst021.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/SubFst021.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -58,9 +59,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 credit = quest.getUI8AL(); diff --git a/src/scripts/quest/subquest/blackshroud_north/SubFst025.cpp b/src/scripts/quest/subquest/blackshroud_north/SubFst025.cpp index 18615b7f..e3b5cf6d 100644 --- a/src/scripts/quest/subquest/blackshroud_north/SubFst025.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/SubFst025.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -65,9 +66,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 credit = quest.getUI8AL(); diff --git a/src/scripts/quest/subquest/blackshroud_north/SubFst026.cpp b/src/scripts/quest/subquest/blackshroud_north/SubFst026.cpp index 252050b5..ab133e68 100644 --- a/src/scripts/quest/subquest/blackshroud_north/SubFst026.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/SubFst026.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(); diff --git a/src/scripts/quest/subquest/blackshroud_north/SubFst030.cpp b/src/scripts/quest/subquest/blackshroud_north/SubFst030.cpp index 55cbd8a7..dbb08dc6 100644 --- a/src/scripts/quest/subquest/blackshroud_north/SubFst030.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/SubFst030.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 diff --git a/src/scripts/quest/subquest/blackshroud_north/SubFst037.cpp b/src/scripts/quest/subquest/blackshroud_north/SubFst037.cpp index 70a63769..9c1914d3 100644 --- a/src/scripts/quest/subquest/blackshroud_north/SubFst037.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/SubFst037.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -64,11 +65,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 { auto credit = 0; - switch( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/subquest/blackshroud_north/SubFst043.cpp b/src/scripts/quest/subquest/blackshroud_north/SubFst043.cpp index 543b93c6..7d2804e7 100644 --- a/src/scripts/quest/subquest/blackshroud_north/SubFst043.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/SubFst043.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 diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa401.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa401.cpp index aa20d5c4..83adec42 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa401.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa401.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa603.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa603.cpp index 91ac941a..6e4a95f2 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa603.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa603.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp index cc789a98..42316277 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa604.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -102,9 +103,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: { diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa609.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa609.cpp index a3bcf514..7d046599 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa609.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa609.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa701.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa701.cpp index 96182ee5..ed7ef212 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa701.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa701.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( nameId ) + switch( bnpc.getBNpcNameId() ) { case Enemy0: { diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp index 1815eff7..0180dffb 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -89,9 +90,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: { diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa703.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa703.cpp index 507e2015..75975704 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa703.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa703.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp index 09a901f1..64660822 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsb008.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -96,9 +97,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: { diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsb009.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsb009.cpp index 3890c8bd..1704bd29 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsb009.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsb009.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp index f6c4658b..861e2841 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -100,9 +101,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: { diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsc610.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsc610.cpp index 1bad6c19..fcff431f 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsc610.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsc610.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/blackshroud_south/GaiUsc611.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsc611.cpp index 72dd1493..0f420c63 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsc611.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsc611.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -67,9 +68,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/GaiUsb604.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp index e9857c12..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: diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb605.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb605.cpp index acc1f8d5..c86a523e 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb605.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb605.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp index 103738de..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: diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb608.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb608.cpp index 3635fbd2..86b9ae62 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb608.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb608.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp index 7b48917e..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: diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb702.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb702.cpp index 6500c8fe..02cc33a4 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb702.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb702.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp index dea5cebe..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: { diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb802.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb802.cpp index ec78977b..bb658ba3 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb802.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb802.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb803.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb803.cpp index 3ad59dd5..96c6b1f3 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb803.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb803.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp index 6129eab1..5ef10f23 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb901.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb901.cpp index 81609d85..976a14b0 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb901.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb901.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include 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 52a2ddee..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: diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp index 90f32743..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 ) { } } diff --git a/src/scripts/quest/subquest/gridania/GaiUsa002.cpp b/src/scripts/quest/subquest/gridania/GaiUsa002.cpp index ce511ec2..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: { diff --git a/src/scripts/quest/subquest/gridania/GaiUsa404.cpp b/src/scripts/quest/subquest/gridania/GaiUsa404.cpp index a8d288cb..0d3c34f2 100644 --- a/src/scripts/quest/subquest/gridania/GaiUsa404.cpp +++ b/src/scripts/quest/subquest/gridania/GaiUsa404.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/gridania/GaiUsa906.cpp b/src/scripts/quest/subquest/gridania/GaiUsa906.cpp index ff79d489..b1673d19 100644 --- a/src/scripts/quest/subquest/gridania/GaiUsa906.cpp +++ b/src/scripts/quest/subquest/gridania/GaiUsa906.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/gridania/GaiUsc302.cpp b/src/scripts/quest/subquest/gridania/GaiUsc302.cpp index 413307dc..e82e67fb 100644 --- a/src/scripts/quest/subquest/gridania/GaiUsc302.cpp +++ b/src/scripts/quest/subquest/gridania/GaiUsc302.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/gridania/SubFst000.cpp b/src/scripts/quest/subquest/gridania/SubFst000.cpp index 472e8d7d..cb9b80a0 100644 --- a/src/scripts/quest/subquest/gridania/SubFst000.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst000.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/gridania/SubFst001.cpp b/src/scripts/quest/subquest/gridania/SubFst001.cpp index 72154e87..3a1ddb0c 100644 --- a/src/scripts/quest/subquest/gridania/SubFst001.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst001.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 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/SubFst003.cpp b/src/scripts/quest/subquest/gridania/SubFst003.cpp index 56c3794e..369c7ecb 100644 --- a/src/scripts/quest/subquest/gridania/SubFst003.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst003.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 diff --git a/src/scripts/quest/subquest/gridania/SubFst004.cpp b/src/scripts/quest/subquest/gridania/SubFst004.cpp index 1c819aba..7894abef 100644 --- a/src/scripts/quest/subquest/gridania/SubFst004.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst004.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 diff --git a/src/scripts/quest/subquest/gridania/SubFst005.cpp b/src/scripts/quest/subquest/gridania/SubFst005.cpp index 41652b8a..ec8d7a46 100644 --- a/src/scripts/quest/subquest/gridania/SubFst005.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst005.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 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/SubFst008.cpp b/src/scripts/quest/subquest/gridania/SubFst008.cpp index 203b731a..551af21f 100644 --- a/src/scripts/quest/subquest/gridania/SubFst008.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst008.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 diff --git a/src/scripts/quest/subquest/gridania/SubFst009.cpp b/src/scripts/quest/subquest/gridania/SubFst009.cpp index 7abdb4ca..6d1a63c0 100644 --- a/src/scripts/quest/subquest/gridania/SubFst009.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst009.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 diff --git a/src/scripts/quest/subquest/gridania/SubFst010.cpp b/src/scripts/quest/subquest/gridania/SubFst010.cpp index 5c53aa23..4f189167 100644 --- a/src/scripts/quest/subquest/gridania/SubFst010.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst010.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 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 e0c79949..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 diff --git a/src/scripts/quest/subquest/gridania/SubFst014.cpp b/src/scripts/quest/subquest/gridania/SubFst014.cpp index 90fce39c..07c4b9e9 100644 --- a/src/scripts/quest/subquest/gridania/SubFst014.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst014.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 diff --git a/src/scripts/quest/subquest/gridania/SubFst015.cpp b/src/scripts/quest/subquest/gridania/SubFst015.cpp index f044e9c2..da7f85ce 100644 --- a/src/scripts/quest/subquest/gridania/SubFst015.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst015.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 diff --git a/src/scripts/quest/subquest/gridania/SubFst019.cpp b/src/scripts/quest/subquest/gridania/SubFst019.cpp index 3ca663c7..78375f4f 100644 --- a/src/scripts/quest/subquest/gridania/SubFst019.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst019.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 diff --git a/src/scripts/quest/subquest/gridania/SubFst027.cpp b/src/scripts/quest/subquest/gridania/SubFst027.cpp index 8b3d1705..7dd13603 100644 --- a/src/scripts/quest/subquest/gridania/SubFst027.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst027.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/gridania/SubFst103.cpp b/src/scripts/quest/subquest/gridania/SubFst103.cpp index e72cdeec..bc9a4f18 100644 --- a/src/scripts/quest/subquest/gridania/SubFst103.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst103.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/gridania/SubFst910.cpp b/src/scripts/quest/subquest/gridania/SubFst910.cpp index c07787de..4b0ce67f 100644 --- a/src/scripts/quest/subquest/gridania/SubFst910.cpp +++ b/src/scripts/quest/subquest/gridania/SubFst910.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp index 89e9eb23..63edb697 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb005.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -96,9 +97,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: { diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb007.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb007.cpp index 5d5e19ac..c8825f3b 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb007.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb007.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb201.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb201.cpp index 16332383..7f1cbb43 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb201.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb201.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb208.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb208.cpp index 05fc1e74..60452562 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb208.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb208.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb209.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb209.cpp index 59b6274f..3b6ef5cc 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb209.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb209.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb212.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb212.cpp index 94de1534..40f37b6e 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb212.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb212.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb304.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb304.cpp index 5052c87f..53366215 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb304.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb304.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb305.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb305.cpp index 5e1f1303..c3b92ff1 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb305.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb305.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -58,9 +59,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t layoutId, 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/lanoscea_east/GaiUsb306.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb306.cpp index f3ddcfeb..c2b950de 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb306.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb306.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 layoutId, 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/lanoscea_east/GaiUsb307.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb307.cpp index 0aec4137..da34b14c 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb307.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb307.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp index 9bc7f1de..1755f0a6 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb309.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: { diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb313.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb313.cpp index 4ec80559..946328d8 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb313.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb313.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb314.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb314.cpp index 2a3e37bb..daaa5b8b 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb314.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb314.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_east/GaiUsb315.cpp b/src/scripts/quest/subquest/lanoscea_east/GaiUsb315.cpp index 6a325bf6..05c88ef0 100644 --- a/src/scripts/quest/subquest/lanoscea_east/GaiUsb315.cpp +++ b/src/scripts/quest/subquest/lanoscea_east/GaiUsb315.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp index 1de218d5..dcb62644 100644 --- a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.cpp +++ b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb002.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: case Enemy1: diff --git a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp index 352c42be..2bbb3b3d 100644 --- a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp +++ b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb003.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -81,9 +82,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: { diff --git a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb004.cpp b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb004.cpp index 31ee14a6..e71b17fd 100644 --- a/src/scripts/quest/subquest/lanoscea_lower/GaiUsb004.cpp +++ b/src/scripts/quest/subquest/lanoscea_lower/GaiUsb004.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/lanoscea_upper/GaiUsb401.cpp b/src/scripts/quest/subquest/lanoscea_upper/GaiUsb401.cpp index 5329b79f..c23979b2 100644 --- a/src/scripts/quest/subquest/lanoscea_upper/GaiUsb401.cpp +++ b/src/scripts/quest/subquest/lanoscea_upper/GaiUsb401.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/limsa/SubSea001.cpp b/src/scripts/quest/subquest/limsa/SubSea001.cpp index 12846b34..9ab9d279 100644 --- a/src/scripts/quest/subquest/limsa/SubSea001.cpp +++ b/src/scripts/quest/subquest/limsa/SubSea001.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 diff --git a/src/scripts/quest/subquest/limsa/SubSea012.cpp b/src/scripts/quest/subquest/limsa/SubSea012.cpp index 59016828..900760f0 100644 --- a/src/scripts/quest/subquest/limsa/SubSea012.cpp +++ b/src/scripts/quest/subquest/limsa/SubSea012.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -71,9 +72,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/limsa/SubSea050.cpp b/src/scripts/quest/subquest/limsa/SubSea050.cpp index 0e40a006..9f9efd88 100644 --- a/src/scripts/quest/subquest/limsa/SubSea050.cpp +++ b/src/scripts/quest/subquest/limsa/SubSea050.cpp @@ -1,6 +1,7 @@ // FFXIVTheMovie.ParserV3.8 // fake IsAnnounce table #include +#include #include #include #include "Manager/TerritoryMgr.h" @@ -73,9 +74,9 @@ public: onProgress( quest, player, EVENT_ON_EMOTE, actorId, 0, emoteId ); } - 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 { - onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( nameId ), entityId, 0 ); + onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( bnpc.getBNpcNameId() ), bnpc.getLayoutId(), 0 ); } void onWithinRange( World::Quest& quest, Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) override diff --git a/src/scripts/quest/subquest/limsa/SubSea051.cpp b/src/scripts/quest/subquest/limsa/SubSea051.cpp index 3a394f5e..366891d8 100644 --- a/src/scripts/quest/subquest/limsa/SubSea051.cpp +++ b/src/scripts/quest/subquest/limsa/SubSea051.cpp @@ -1,6 +1,7 @@ // FFXIVTheMovie.ParserV3.8 // fake IsAnnounce table #include +#include #include #include #include "Manager/TerritoryMgr.h" @@ -67,9 +68,9 @@ public: onProgress( quest, player, EVENT_ON_EMOTE, actorId, 0, emoteId ); } - 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 { - onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( nameId ), entityId, 0 ); + onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( bnpc.getBNpcNameId() ), bnpc.getLayoutId(), 0 ); } void onWithinRange( World::Quest& quest, Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) override diff --git a/src/scripts/quest/subquest/limsa/SubSea052.cpp b/src/scripts/quest/subquest/limsa/SubSea052.cpp index 6188194b..164afef0 100644 --- a/src/scripts/quest/subquest/limsa/SubSea052.cpp +++ b/src/scripts/quest/subquest/limsa/SubSea052.cpp @@ -1,6 +1,7 @@ // FFXIVTheMovie.ParserV3.9 // fake IsAnnounce table #include +#include #include #include #include "Manager/TerritoryMgr.h" @@ -79,9 +80,9 @@ public: onProgress( quest, player, EVENT_ON_EMOTE, actorId, 0, emoteId ); } - 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 { - onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( nameId ), entityId, 0 ); + onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( bnpc.getBNpcNameId() ), bnpc.getLayoutId(), 0 ); } void onWithinRange( World::Quest& quest, Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) override diff --git a/src/scripts/quest/subquest/limsa/SubSea053.cpp b/src/scripts/quest/subquest/limsa/SubSea053.cpp index ec5d9d2f..1bfb8790 100644 --- a/src/scripts/quest/subquest/limsa/SubSea053.cpp +++ b/src/scripts/quest/subquest/limsa/SubSea053.cpp @@ -6,6 +6,7 @@ //ID_ACTOR4 = 4298896551 //ID_ACTOR5 = 4298896552 #include +#include #include #include #include "Manager/TerritoryMgr.h" @@ -121,9 +122,9 @@ public: onProgress( quest, player, EVENT_ON_EMOTE, actorId, 0, emoteId ); } - 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 { - onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( nameId ), entityId, 0 ); + onProgress( quest, player, EVENT_ON_BNPC_KILL, static_cast< uint64_t >( bnpc.getBNpcNameId() ), bnpc.getLayoutId(), 0 ); } void onWithinRange( World::Quest& quest, Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) override diff --git a/src/scripts/quest/subquest/limsa/SubSea150.cpp b/src/scripts/quest/subquest/limsa/SubSea150.cpp index 71686adc..a24f1cc5 100644 --- a/src/scripts/quest/subquest/limsa/SubSea150.cpp +++ b/src/scripts/quest/subquest/limsa/SubSea150.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsa406.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsa406.cpp index e37c4f80..eba43ab3 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsa406.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsa406.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsa410.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsa410.cpp index 80d1d945..a0f4e7eb 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsa410.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsa410.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsa504.cpp index ec9f453d..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: { diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsa505.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsa505.cpp index d606dd34..b4f2e5f0 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsa505.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsa505.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb502.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb502.cpp index 38e6d039..c19dc278 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb502.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb502.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb503.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb503.cpp index 8f3993ac..9730f7de 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb503.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb503.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb507.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb507.cpp index 6930c619..303dda58 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb507.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb507.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb508.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb508.cpp index d6e812dc..343ec5a4 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb508.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb508.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb509.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb509.cpp index adc4b99e..4183dbec 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb509.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb509.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb512.cpp index ee84ea45..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: { diff --git a/src/scripts/quest/subquest/thanalan_east/GaiUsb601.cpp b/src/scripts/quest/subquest/thanalan_east/GaiUsb601.cpp index 8dc52244..6bbc36cb 100644 --- a/src/scripts/quest/subquest/thanalan_east/GaiUsb601.cpp +++ b/src/scripts/quest/subquest/thanalan_east/GaiUsb601.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp index 1af9bcf7..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: { diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil111.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil111.cpp index 6b4d559d..ec753c98 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil111.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil111.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil112.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil112.cpp index 8a35b0a2..28283be2 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil112.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil112.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp index 691708f0..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: { diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil114.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil114.cpp index f81b7b73..cef7a0a4 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil114.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil114.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil129.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil129.cpp index ce5f45f6..35017d47 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil129.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil129.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa509.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa509.cpp index 78721971..eea2a2b4 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa509.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa509.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa510.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa510.cpp index 96a22290..e244e1c7 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa510.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa510.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa704.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa704.cpp index 05b11a46..4ff3806a 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa704.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa704.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp index 853e39f2..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: { diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa709.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa709.cpp index 25b8e3de..a0d8d681 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa709.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa709.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa710.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa710.cpp index 8720e616..da08ce6e 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa710.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa710.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include 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 9e775834..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: { diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsb103.cpp index 799ab67f..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 ); diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsb112.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsb112.cpp index 4d9db1f3..e2e6aa5c 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsb112.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsb112.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_west/GaiUsa405.cpp b/src/scripts/quest/subquest/thanalan_west/GaiUsa405.cpp index 46cc4423..5cbac15f 100644 --- a/src/scripts/quest/subquest/thanalan_west/GaiUsa405.cpp +++ b/src/scripts/quest/subquest/thanalan_west/GaiUsa405.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_west/GaiUsa601.cpp b/src/scripts/quest/subquest/thanalan_west/GaiUsa601.cpp index 3dde0ab4..fddc9f77 100644 --- a/src/scripts/quest/subquest/thanalan_west/GaiUsa601.cpp +++ b/src/scripts/quest/subquest/thanalan_west/GaiUsa601.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_west/GaiUsa711.cpp b/src/scripts/quest/subquest/thanalan_west/GaiUsa711.cpp index 6718c4b7..bd2a563d 100644 --- a/src/scripts/quest/subquest/thanalan_west/GaiUsa711.cpp +++ b/src/scripts/quest/subquest/thanalan_west/GaiUsa711.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/thanalan_west/SubCts809.cpp b/src/scripts/quest/subquest/thanalan_west/SubCts809.cpp index 64f86564..b1bf33f9 100644 --- a/src/scripts/quest/subquest/thanalan_west/SubCts809.cpp +++ b/src/scripts/quest/subquest/thanalan_west/SubCts809.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/scripts/quest/subquest/uldah/SubWil000.cpp b/src/scripts/quest/subquest/uldah/SubWil000.cpp index deb1c266..b43a54b9 100644 --- a/src/scripts/quest/subquest/uldah/SubWil000.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil000.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil001.cpp b/src/scripts/quest/subquest/uldah/SubWil001.cpp index b6285f0f..2c16e474 100644 --- a/src/scripts/quest/subquest/uldah/SubWil001.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil001.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil002.cpp b/src/scripts/quest/subquest/uldah/SubWil002.cpp index 84bc4e40..ed2f2e05 100644 --- a/src/scripts/quest/subquest/uldah/SubWil002.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil002.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil004.cpp b/src/scripts/quest/subquest/uldah/SubWil004.cpp index ff53423c..60c54136 100644 --- a/src/scripts/quest/subquest/uldah/SubWil004.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil004.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil006.cpp b/src/scripts/quest/subquest/uldah/SubWil006.cpp index ed643ff8..5c7fbece 100644 --- a/src/scripts/quest/subquest/uldah/SubWil006.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil006.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil007.cpp b/src/scripts/quest/subquest/uldah/SubWil007.cpp index 9de7f1a1..eaabbb53 100644 --- a/src/scripts/quest/subquest/uldah/SubWil007.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil007.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil018.cpp b/src/scripts/quest/subquest/uldah/SubWil018.cpp index 583aab86..9af89eaf 100644 --- a/src/scripts/quest/subquest/uldah/SubWil018.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil018.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil019.cpp b/src/scripts/quest/subquest/uldah/SubWil019.cpp index e00aae68..792ef318 100644 --- a/src/scripts/quest/subquest/uldah/SubWil019.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil019.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil020.cpp b/src/scripts/quest/subquest/uldah/SubWil020.cpp index e850f9ba..52e58fa9 100644 --- a/src/scripts/quest/subquest/uldah/SubWil020.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil020.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil021.cpp b/src/scripts/quest/subquest/uldah/SubWil021.cpp index 33391177..b4ff2431 100644 --- a/src/scripts/quest/subquest/uldah/SubWil021.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil021.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil022.cpp b/src/scripts/quest/subquest/uldah/SubWil022.cpp index b62eb095..f6f07d5a 100644 --- a/src/scripts/quest/subquest/uldah/SubWil022.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil022.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil027.cpp b/src/scripts/quest/subquest/uldah/SubWil027.cpp index b76cf299..df787d3f 100644 --- a/src/scripts/quest/subquest/uldah/SubWil027.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil027.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil028.cpp b/src/scripts/quest/subquest/uldah/SubWil028.cpp index feaa0068..5d4e260e 100644 --- a/src/scripts/quest/subquest/uldah/SubWil028.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil028.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil029.cpp b/src/scripts/quest/subquest/uldah/SubWil029.cpp index 233a3f1e..29d8913e 100644 --- a/src/scripts/quest/subquest/uldah/SubWil029.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil029.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 diff --git a/src/scripts/quest/subquest/uldah/SubWil141.cpp b/src/scripts/quest/subquest/uldah/SubWil141.cpp index 1c950ce8..563401a3 100644 --- a/src/scripts/quest/subquest/uldah/SubWil141.cpp +++ b/src/scripts/quest/subquest/uldah/SubWil141.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index 2d72c88d..77e40724 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -24,7 +24,7 @@ Sapphire::Data::ExdData g_exdDataGen; namespace fs = std::filesystem; using namespace Sapphire; -std::string javaPath( "C:\\Program Files (x86)\\Java\\jre1.8.0_301\\bin\\java.exe" ); +std::string javaPath( "\"C:\\Program Files (x86)\\Java\\jre1.8.0_301\\bin\\java.exe\"" ); std::string gamePath( "F:\\client3.0\\game\\sqpack" ); const std::string onWithinRangeStr( @@ -389,9 +389,9 @@ createScript( std::shared_ptr< Excel::ExcelStruct< Excel::Quest > >& pQuestData, if( !enemy_ids.empty() ) scriptEntry += std::string( - " void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override\n" + " void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override\n" " {\n" - " switch( entityId )\n" + " switch( bnpc->getBNpcNameId() )\n" " {\n" ); for( auto enemy : enemy_strings ) diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index b93451fa..cb812358 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -854,7 +854,7 @@ void Sapphire::Entity::BNpc::onDeath() auto pPlayer = pHateEntry->m_pChara->getAsPlayer(); if( pPlayer ) { - playerMgr.onMobKill( *pPlayer, static_cast< uint16_t >( m_bNpcNameId ), getLayoutId() ); + playerMgr.onMobKill( *pPlayer, *this ); pPlayer->gainExp( paramGrowthInfo->data().BaseExp ); } } diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp index 1db8129b..5c988447 100644 --- a/src/world/Manager/PlayerMgr.cpp +++ b/src/world/Manager/PlayerMgr.cpp @@ -198,14 +198,14 @@ void PlayerMgr::onMountUpdate( Entity::Player& player, uint32_t mountId ) } } -void PlayerMgr::onMobKill( Entity::Player& player, uint16_t nameId, uint32_t layoutId ) +void PlayerMgr::onMobKill( Entity::Player& player, Entity::BNpc& bnpc ) { auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref(); - scriptMgr.onBNpcKill( player, nameId, layoutId ); + scriptMgr.onBNpcKill( player, bnpc ); if( player.hasReward( Common::UnlockEntry::HuntingLog ) ) { - player.updateHuntingLog( nameId ); + player.updateHuntingLog( bnpc.getBNpcNameId() ); } } diff --git a/src/world/Manager/PlayerMgr.h b/src/world/Manager/PlayerMgr.h index 27d2e019..3e2aea0b 100644 --- a/src/world/Manager/PlayerMgr.h +++ b/src/world/Manager/PlayerMgr.h @@ -38,7 +38,7 @@ class PlayerMgr void onMountUpdate( Sapphire::Entity::Player& player, uint32_t mountId ); - void onMobKill( Sapphire::Entity::Player& player, uint16_t nameId, uint32_t entityId ); + void onMobKill( Sapphire::Entity::Player& player, Sapphire::Entity::BNpc& bnpc ); void onHateListChanged( Sapphire::Entity::Player& player ); diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp index c8a7efb9..2b984cb1 100644 --- a/src/world/Script/NativeScriptApi.cpp +++ b/src/world/Script/NativeScriptApi.cpp @@ -150,11 +150,11 @@ namespace Sapphire::ScriptAPI { } - void QuestScript::onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t layoutId, Entity::Player& player ) + void QuestScript::onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) { } - void QuestScript::onTriggerOwnerDeaggro( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ) + void QuestScript::onTriggerOwnerDeaggro( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) { } diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h index a88625f1..9dbe0168 100644 --- a/src/world/Script/NativeScriptApi.h +++ b/src/world/Script/NativeScriptApi.h @@ -242,7 +242,7 @@ namespace Sapphire::ScriptAPI virtual void onEventItem( World::Quest& quest, Sapphire::Entity::Player& player, uint64_t actorId ); - virtual void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Sapphire::Entity::Player& player ); + virtual void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ); virtual void onTriggerOwnerDeaggro( World::Quest& quest, Sapphire::Entity::BNpc& bnpc, Sapphire::Entity::Player& player ); diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp index 8e6040be..2ac24dde 100644 --- a/src/world/Script/ScriptMgr.cpp +++ b/src/world/Script/ScriptMgr.cpp @@ -460,7 +460,7 @@ void Sapphire::Scripting::ScriptMgr::onTriggerOwnerDeaggro( Entity::Player& play } } -bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_t nameId, uint32_t layoutId ) +bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, Entity::BNpc& bnpc ) { auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref(); @@ -478,11 +478,11 @@ bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_ { std::string objName = eventMgr.getEventName( questId ); - PlayerMgr::sendDebug( player, "Calling: {0}.onBnpcKill nameId#{1}", objName, nameId ); + PlayerMgr::sendDebug( player, "Calling: {0}.onBnpcKill nameId#{1}", objName, bnpc.getBNpcNameId() ); World::Quest preQ = quest; - script->onBNpcKill( quest, nameId, layoutId, player ); + script->onBNpcKill( quest, bnpc, player ); if( quest != preQ ) player.updateQuest( quest ); } diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h index f336682b..07c074c4 100644 --- a/src/world/Script/ScriptMgr.h +++ b/src/world/Script/ScriptMgr.h @@ -68,7 +68,7 @@ namespace Sapphire::Scripting bool onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint64_t targetId ); - bool onBNpcKill( Entity::Player& player, uint16_t nameId, uint32_t layoutId ); + bool onBNpcKill( Entity::Player& player, Entity::BNpc& bnpc ); void onTriggerOwnerDeaggro( Entity::Player& player, Entity::BNpc& bnpc );