mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 05:57:45 +00:00
Code Activity

Use a common definition for BNpcType

Browse source
This commit is contained in:
Mordred 2019-04-15 23:45:58 +02:00
parent 69f3d47100
commit a8bb58e51c
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/Common.h
View file

@ -63,6 +63,12 @@ namespace Sapphire::Common
GmTellMsg = 0x4, GmTellMsg = 0x4,
}; };
enum BNpcType : uint8_t
{
Friendly = 0,
Enemy = 4,
};
enum ObjKind : uint8_t enum ObjKind : uint8_t
{ {
None = 0x00, None = 0x00,

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

@ -40,14 +40,19 @@ public:
void onInit( QuestBattle& instance ) override void onInit( QuestBattle& instance ) override
{ {
instance.registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f, -0.000006f ); instance.registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f, -0.000006f );
auto a1 = instance.createBNpcFromLevelEntry( INIT_POP_BOSS, 12, 0, 21141, 939, instance.getDirectorId(), 4 ); auto a1 = instance.createBNpcFromLevelEntry( INIT_POP_BOSS, 12, 0, 21141, 939,
auto a2 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_01, 10, 0, 1440, 938, instance.getDirectorId(), 4 ); instance.getDirectorId(), Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_02, 10, 0, 1440, 938, instance.getDirectorId(), 4 ); auto a2 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_01, 10, 0, 1440, 938,
instance.getDirectorId(), Common::BNpcType::Enemy );
auto a3 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_02, 10, 0, 1440, 938,
instance.getDirectorId(), Common::BNpcType::Enemy );
instance.pushActor( a1 ); instance.pushActor( a1 );
instance.pushActor( a2 ); instance.pushActor( a2 );
instance.pushActor( a3 ); instance.pushActor( a3 );
auto a4 = instance.createBNpcFromLevelEntry( INIT_P_POP_IDA, 50, 0, 27780, 1375, instance.getDirectorId(), 0 ); auto a4 = instance.createBNpcFromLevelEntry( INIT_P_POP_IDA, 50, 0, 27780, 1375,
auto a5 = instance.createBNpcFromLevelEntry( INIT_P_POP_PAPARIMO, 50, 0, 27780, 1376, instance.getDirectorId(), 0 ); instance.getDirectorId(), Common::BNpcType::Friendly );
auto a5 = instance.createBNpcFromLevelEntry( INIT_P_POP_PAPARIMO, 50, 0, 27780, 1376,
instance.getDirectorId(), Common::BNpcType::Friendly );
instance.pushActor( a4 ); instance.pushActor( a4 );
instance.pushActor( a5 ); instance.pushActor( a5 );
} }