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

fix formatting

Browse source
This commit is contained in:
Adam 2018-03-20 22:33:51 +11:00
parent dd8ed62430
commit 66fbc9931b
21 changed files with 370 additions and 343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/servers/Scripts/ScriptObject.h
View file

@ -6,5 +6,7 @@
#include <Event/EventDefs.h> #include <Event/EventDefs.h>
#define BIND_SCENE( x ) std::bind( x, *this, std::placeholders::_1 )
#endif //SAPPHIRE_SCRIPTOBJECT_H #endif //SAPPHIRE_SCRIPTOBJECT_H

6
src/servers/Scripts/common/Aethernet.cpp
View file

@ -21,8 +21,10 @@ public:
{ {
if( player.isAetheryteRegistered( eventId & 0xFFFF ) ) if( player.isAetheryteRegistered( eventId & 0xFFFF ) )
{ {
player.playScene( eventId, 2, 0, []( Entity::Player& player, const Event::SceneResult& result ) { player.playScene( eventId, 2, 0, []( Entity::Player& player, const Event::SceneResult& result )
if( result.param1 == 256 ) { {
if( result.param1 == 256 )
{
player.teleport( result.param2, 2 ); player.teleport( result.param2, 2 );
} }
} ); } );

9
src/servers/Scripts/common/Aetheryte.cpp
View file

@ -23,16 +23,19 @@ public:
{ {
if( player.isAetheryteRegistered( eventId & 0xFFFF ) ) if( player.isAetheryteRegistered( eventId & 0xFFFF ) )
{ {
player.playScene( eventId, 0, 1, []( Entity::Player& player, const Event::SceneResult& result ) { player.playScene( eventId, 0, 1, []( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param1 == 256 ) // set homepoint if( result.param1 == 256 ) // set homepoint
{ {
player.setHomepoint( result.eventId & 0xFFFF ); player.setHomepoint( result.eventId & 0xFFFF );
player.sendQuestMessage( result.eventId, 2, 0xEA, 0, 0 ); player.sendQuestMessage( result.eventId, 2, 0xEA, 0, 0 );
} else if( result.param1 == 512 ) // aethernet access } else if( result.param1 == 512 ) // aethernet access
{ {
if( result.param2 == 4 ) { if( result.param2 == 4 )
{
player.teleport( result.param3, 2 ); player.teleport( result.param3, 2 );
} else if( result.param2 == 2 ) // register favored destination }
else if( result.param2 == 2 ) // register favored destination
{ {
} }

8
src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
View file

@ -6,11 +6,11 @@ class CmnDefCutSceneReplay : public EventScript
{ {
public: public:
CmnDefCutSceneReplay() : EventScript( 721028 ) CmnDefCutSceneReplay() : EventScript( 721028 )
{} { }
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 != 0 ) if( result.param2 != 0 )
{ {
@ -18,7 +18,7 @@ public:
} }
}; };
player.playScene( getId( ), 0, 0x2000, 0, 1, callback ); player.playScene( getId(), 0, 0x2000, 0, 1, callback );
} }
void Scene00001( Entity::Player& player, uint16_t returnScene ) void Scene00001( Entity::Player& player, uint16_t returnScene )
@ -28,7 +28,7 @@ public:
// todo: this is fucked // todo: this is fucked
}; };
player.playScene( getId( ), 1, 0xFB2EC8F8, 0, 1, returnScene, callback ); player.playScene( getId(), 1, 0xFB2EC8F8, 0, 1, returnScene, callback );
} }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override

18
src/servers/Scripts/common/CmnDefInnBed.cpp
View file

@ -6,44 +6,44 @@ class CmnDefInnBed : public EventScript
{ {
public: public:
CmnDefInnBed() : EventScript( 720916 ) CmnDefInnBed() : EventScript( 720916 )
{} { }
// menu // menu
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 > 0 ) if( result.param2 > 0 )
Scene00001( player, result.param2 ); Scene00001( player, result.param2 );
}; };
player.playScene( getId( ), 0, 0x2000, 0, 1, callback ); player.playScene( getId(), 0, 0x2000, 0, 1, callback );
} }
// lay down // lay down
void Scene00001( Entity::Player& player, uint16_t param ) void Scene00001( Entity::Player& player, uint16_t param )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00002( player, result.param2 ); Scene00002( player, result.param2 );
}; };
player.playScene( getId( ), 1, 0xF32E48F8, 0, 1, param, callback ); player.playScene( getId(), 1, 0xF32E48F8, 0, 1, param, callback );
} }
// logout // logout
void Scene00002( Entity::Player& player, uint16_t param ) void Scene00002( Entity::Player& player, uint16_t param )
{ {
player.playScene( getId( ), 2, 0xF32E48F8, 0, 1, param, nullptr ); player.playScene( getId(), 2, 0xF32E48F8, 0, 1, param, nullptr );
} }
// wake up // wake up
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
{ {
auto callback = []( Entity::Player& player, const Event::SceneResult& result ) auto callback = []( Entity::Player& player, const Event::SceneResult& result )
{}; { };
player.playScene( getId( ), 100, 0x800, 0, 0, callback ); player.playScene( getId(), 100, 0x800, 0, 0, callback );
} }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
@ -51,7 +51,7 @@ public:
Scene00000( player ); Scene00000( player );
} }
void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
{ {
Scene00100( player ); Scene00100( player );
} }

12
src/servers/Scripts/common/CmnDefLinkShell.cpp
View file

@ -10,11 +10,11 @@ class CmnDefLinkShell : public EventScript
{ {
public: public:
CmnDefLinkShell() : EventScript( 0xB0006 ) CmnDefLinkShell() : EventScript( 0xB0006 )
{} { }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
switch( result.param2 ) switch( result.param2 )
{ {
@ -32,25 +32,25 @@ public:
} }
}; };
player.playScene( getId( ), 1, 0, 0, 0, callback ); player.playScene( getId(), 1, 0, 0, 0, callback );
} }
// create linkshell // create linkshell
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
player.playScene( getId( ), 2, 0, 0, 0 ); player.playScene( getId(), 2, 0, 0, 0 );
} }
// rename linkshell // rename linkshell
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
player.playScene( getId( ), 3, 0, 0, 0 ); player.playScene( getId(), 3, 0, 0, 0 );
} }
// remove linkshell // remove linkshell
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
player.playScene( getId( ), 4, 0, 0, 0 ); player.playScene( getId(), 4, 0, 0, 0 );
} }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override

4
src/servers/Scripts/common/HouFurOrchestrion.cpp
View file

@ -6,11 +6,11 @@ class HouFurOrchestrion : public EventScript
{ {
public: public:
HouFurOrchestrion() : EventScript( 721226 ) HouFurOrchestrion() : EventScript( 721226 )
{} { }
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
player.playScene( getId( ), 0, 0x2000, 0, 1 ); player.playScene( getId(), 0, 0x2000, 0, 1 );
} }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override

21
src/servers/Scripts/opening/OpeningGridania.cpp
View file

@ -28,35 +28,35 @@ private:
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setOpeningSequence( 1 ); player.setOpeningSequence( 1 );
Scene00001( player ); Scene00001( player );
}; };
player.playScene( getId( ), 0, NO_DEFAULT_CAMERA | INVIS_ENPC | player.playScene( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
CONDITION_CUTSCENE | HIDE_UI | CONDITION_CUTSCENE | HIDE_UI |
HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback ); HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId( ), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 1, 0x32 ); player.playScene( getId(), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 1, 0x32 );
} }
void Scene00020( Entity::Player& player ) void Scene00020( Entity::Player& player )
{ {
player.playScene( getId( ), 20, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 1 ); player.playScene( getId(), 20, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 1 );
} }
void Scene00030( Entity::Player& player ) void Scene00030( Entity::Player& player )
{ {
player.playScene( getId( ), 30, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0 ); player.playScene( getId(), 30, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0 );
} }
void Scene00040( Entity::Player& player ) void Scene00040( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( player.getOpeningSequence() == 2 ) if( player.getOpeningSequence() == 2 )
{ {
@ -65,20 +65,19 @@ private:
} }
}; };
player.playScene( getId( ), 40, 1, 2, 1, callback ); player.playScene( getId(), 40, 1, 2, 1, callback );
} }
public: public:
OpeningGridania() : EventScript( 1245186 ) OpeningGridania() : EventScript( 1245186 )
{} { }
void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
{ {
if( player.getOpeningSequence() == 0 ) if( player.getOpeningSequence() == 0 )
{ {
Scene00000( player ); Scene00000( player );
} } else
else
{ {
Scene00040( player ); Scene00040( player );
} }

19
src/servers/Scripts/opening/OpeningLimsa.cpp
View file

@ -43,35 +43,35 @@ private:
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setOpeningSequence( 1 ); player.setOpeningSequence( 1 );
Scene00001( player ); Scene00001( player );
}; };
player.playScene( getId( ), 0, NO_DEFAULT_CAMERA | INVIS_ENPC | player.playScene( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
CONDITION_CUTSCENE | HIDE_UI | CONDITION_CUTSCENE | HIDE_UI |
HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback ); HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId( ), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 1, 0x32 ); player.playScene( getId(), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 1, 0x32 );
} }
void Scene00020( Entity::Player& player ) void Scene00020( Entity::Player& player )
{ {
player.playScene( getId( ), 20, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 1 ); player.playScene( getId(), 20, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 1 );
} }
void Scene00030( Entity::Player& player ) void Scene00030( Entity::Player& player )
{ {
player.playScene( getId( ), 30, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0 ); player.playScene( getId(), 30, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0 );
} }
void Scene00040( Entity::Player& player ) void Scene00040( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( player.getOpeningSequence() == 2 ) if( player.getOpeningSequence() == 2 )
{ {
@ -80,14 +80,15 @@ private:
} }
}; };
player.playScene( getId( ), 40, NO_DEFAULT_CAMERA, 2, 1, callback ); player.playScene( getId(), 40, NO_DEFAULT_CAMERA, 2, 1, callback );
} }
public: public:
OpeningLimsa() : EventScript( 1245185 ) {} OpeningLimsa() : EventScript( 1245185 )
{ }
void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
{ {
if( player.getOpeningSequence() == 0 ) if( player.getOpeningSequence() == 0 )
Scene00000( player ); Scene00000( player );

20
src/servers/Scripts/opening/OpeningUldah.cpp
View file

@ -29,49 +29,49 @@ private:
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setOpeningSequence( 1 ); player.setOpeningSequence( 1 );
Scene00001( player ); Scene00001( player );
}; };
player.playScene( getId( ), 0, NO_DEFAULT_CAMERA | INVIS_ENPC | player.playScene( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
CONDITION_CUTSCENE | HIDE_UI | CONDITION_CUTSCENE | HIDE_UI |
HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback ); HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId( ), 1, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 1, 0x32 ); player.playScene( getId(), 1, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 1, 0x32 );
} }
void Scene00020( Entity::Player& player ) void Scene00020( Entity::Player& player )
{ {
player.playScene( getId( ), 20, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 1 ); player.playScene( getId(), 20, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 1 );
} }
void Scene00030( Entity::Player& player ) void Scene00030( Entity::Player& player )
{ {
player.playScene( getId( ), 30, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 ); player.playScene( getId(), 30, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 );
} }
void Scene00040( Entity::Player& player ) void Scene00040( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( player.getOpeningSequence() == 2 ) if( player.getOpeningSequence() == 2 )
Scene00030( player ); Scene00030( player );
}; };
player.playScene( getId( ), 40, NO_DEFAULT_CAMERA, 2, 1, callback ); player.playScene( getId(), 40, NO_DEFAULT_CAMERA, 2, 1, callback );
} }
public: public:
OpeningUldah() : EventScript( 1245187 ) {} OpeningUldah() : EventScript( 1245187 )
{ }
void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
{ {
if( player.getOpeningSequence() == 0 ) if( player.getOpeningSequence() == 0 )
Scene00000( player ); Scene00000( player );

19
src/servers/Scripts/quest/ManFst001.cpp
View file

@ -44,7 +44,7 @@ private:
} }
}; };
player.playScene( getId( ), 0, HIDE_HOTBAR, 0, 0, callback ); player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
@ -54,7 +54,7 @@ private:
Scene00002( player ); Scene00002( player );
}; };
player.playScene( getId( ), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback ); player.playScene( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
@ -66,7 +66,7 @@ private:
player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 ); player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 );
}; };
player.playScene( getId( ), 2, 0, 0, 0, callback ); player.playScene( getId(), 2, 0, 0, 0, callback );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
@ -76,7 +76,7 @@ private:
Scene00005( player ); Scene00005( player );
}; };
player.playScene( getId( ), 4, FADE_OUT | HIDE_HOTBAR | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback ); player.playScene( getId(), 4, FADE_OUT | HIDE_HOTBAR | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
@ -85,20 +85,21 @@ private:
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), 5, INVIS_OTHER_PC, 0, 0, callback ); player.playScene( getId(), 5, INVIS_OTHER_PC, 0, 0, callback );
} }
public: public:
ManFst001() : EventScript( 65575 ) {} ManFst001() : EventScript( 65575 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

38
src/servers/Scripts/quest/ManFst002.cpp
View file

@ -72,9 +72,9 @@ private:
else else
player.sendQuestMessage( getId(), 0, 0, 0, 0 ); player.sendQuestMessage( getId(), 0, 0, 0, 0 );
auto var_attuned = player.getQuestUI8AL( static_cast< uint16_t >( getId() ) ); auto var_attuned = player.getQuestUI8AL( static_cast< uint16_t >( getId()));
auto var_class = player.getQuestUI8BH( static_cast< uint16_t >( getId() ) ); auto var_class = player.getQuestUI8BH( static_cast< uint16_t >( getId()));
auto var_trade = player.getQuestUI8BL( static_cast< uint16_t >( getId() ) ); auto var_trade = player.getQuestUI8BL( static_cast< uint16_t >( getId()));
if( var_attuned == 1 && var_class == 1 && var_trade == 1 ) if( var_attuned == 1 && var_class == 1 && var_trade == 1 )
player.updateQuest( getId(), SEQ_FINISH ); player.updateQuest( getId(), SEQ_FINISH );
@ -88,7 +88,7 @@ private:
Scene00050( player ); Scene00050( player );
}; };
player.playScene( getId( ), SEQ_0_ACTOR0, HIDE_HOTBAR, 0, 0, callback ); player.playScene( getId(), SEQ_0_ACTOR0, HIDE_HOTBAR, 0, 0, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
@ -99,7 +99,7 @@ private:
checkQuestCompletion( player, 0 ); checkQuestCompletion( player, 0 );
}; };
player.playScene( getId( ), SEQ_1_ACTOR1, 0x0EFB, 0, 0, callback ); player.playScene( getId(), SEQ_1_ACTOR1, 0x0EFB, 0, 0, callback );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
@ -110,7 +110,7 @@ private:
checkQuestCompletion( player, 3 ); checkQuestCompletion( player, 3 );
}; };
player.playScene( getId( ), SEQ_1_ACTOR2, NONE, 0, 0, callback ); player.playScene( getId(), SEQ_1_ACTOR2, NONE, 0, 0, callback );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
@ -123,12 +123,12 @@ private:
Scene00099( player ); Scene00099( player );
}; };
player.playScene( getId( ), SEQ_1_ACTOR3, NONE, 0, 0, callback ); player.playScene( getId(), SEQ_1_ACTOR3, NONE, 0, 0, callback );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
player.playScene( getId( ), SEQ_1_ACTOR0, NONE, 0, 0 ); player.playScene( getId(), SEQ_1_ACTOR0, NONE, 0, 0 );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
@ -137,12 +137,12 @@ private:
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), SEQ_2_ACTOR4, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback ); player.playScene( getId(), SEQ_2_ACTOR4, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
} }
void Scene00050( Entity::Player& player ) void Scene00050( Entity::Player& player )
@ -157,17 +157,17 @@ private:
player.forceZoneing( TERRITORYTYPE0 ); player.forceZoneing( TERRITORYTYPE0 );
}; };
player.playScene( getId( ), SEQ_0_ACTOR0_LQ, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback ); player.playScene( getId(), SEQ_0_ACTOR0_LQ, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
} }
void Scene00051( Entity::Player& player ) void Scene00051( Entity::Player& player )
{ {
player.playSceneChain( getId(), SEQ_1_ACTOR1_WAIT, NONE, Scene00001 ); player.playSceneChain( getId(), SEQ_1_ACTOR1_WAIT, NONE, BIND_SCENE( &ManFst002::Scene00001 ));
} }
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playSceneChain( getId(), SEQ_1_ACTOR3_NPCTRADENO, NONE, Scene00004 ); player.playSceneChain( getId(), SEQ_1_ACTOR3_NPCTRADENO, NONE, BIND_SCENE( &ManFst002::Scene00005 ));
} }
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
@ -180,15 +180,16 @@ private:
checkQuestCompletion( player, 2 ); checkQuestCompletion( player, 2 );
}; };
player.playScene( getId( ), SEQ_1_ACTOR3_NPCTRADEOK, 0x0EFB, 0, 0, callback ); player.playScene( getId(), SEQ_1_ACTOR3_NPCTRADEOK, 0x0EFB, 0, 0, callback );
} }
public: public:
ManFst002() : EventScript( 65621 ) {} ManFst002() : EventScript( 65621 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );
@ -206,8 +207,7 @@ public:
player.eventActionStart( 0x050002, 0x13, event, nullptr, 0x050002 ); player.eventActionStart( 0x050002, 0x13, event, nullptr, 0x050002 );
} } else if( actor == ACTOR2 )
else if( actor == ACTOR2 )
Scene00002( player ); Scene00002( player );
else if( actor == ACTOR3 ) else if( actor == ACTOR3 )
Scene00003( player ); Scene00003( player );

73
src/servers/Scripts/quest/ManFst004.cpp
View file

@ -11,7 +11,7 @@
class ManFst004 : public EventScript class ManFst004 : public EventScript
{ {
private: private:
// Basic quest information // Basic quest information
// Quest vars / flags used // Quest vars / flags used
// GetQuestBitFlag8 // GetQuestBitFlag8
@ -68,20 +68,22 @@ class ManFst004 : public EventScript
static constexpr auto Territorytype0 = 132; static constexpr auto Territorytype0 = 132;
static constexpr auto UnlockDesion = 14; static constexpr auto UnlockDesion = 14;
public: public:
ManFst004() : EventScript( 65660 ){}; ManFst004() : EventScript( 65660 )
~ManFst004(){}; { };
~ManFst004()
{ };
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Event Handlers // Event Handlers
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ManFst004::Actor0 ) if( actor == ManFst004::Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} } else if( actor == ManFst004::Actor1 )
else if( actor == ManFst004::Actor1 )
{ {
// starting the Aetheryte eventaction // starting the Aetheryte eventaction
// player.eventStart( actorId, 0x050002, 7, 0, 0); // player.eventStart( actorId, 0x050002, 7, 0, 0);
@ -94,36 +96,32 @@ class ManFst004 : public EventScript
player.learnAction( 1 ); player.learnAction( 1 );
Scene00051( player ); Scene00051( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) {}, [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ },
eventId ); eventId );
} } else if( actor == ManFst004::Actor2 )
else if( actor == ManFst004::Actor2 )
{ {
Scene00002( player ); Scene00002( player );
} } else if( actor == ManFst004::Actor3 )
else if( actor == ManFst004::Actor3 )
{ {
Scene00003( player ); Scene00003( player );
} } else if( actor == ManFst004::Actor4 )
else if( actor == ManFst004::Actor4 )
{ {
Scene00005( player ); Scene00005( player );
} }
} }
private: private:
void checkQuestCompletion( Entity::Player& player, uint32_t varIdx ) void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
{ {
if( varIdx == 3 ) if( varIdx == 3 )
{ {
player.sendQuestMessage( m_id, 1, 0, 0, 0 ); player.sendQuestMessage( m_id, 1, 0, 0, 0 );
} } else if( varIdx == 2 )
else if( varIdx == 2 )
{ {
player.sendQuestMessage( m_id, 2, 0, 0, 0 ); player.sendQuestMessage( m_id, 2, 0, 0, 0 );
} } else
else
{ {
player.sendQuestMessage( m_id, 0, 0, 0, 0 ); player.sendQuestMessage( m_id, 0, 0, 0, 0 );
} }
@ -139,12 +137,14 @@ class ManFst004 : public EventScript
player.updateQuest( questId, SeqFinish ); player.updateQuest( questId, SeqFinish );
} }
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Available Scenes in this quest, not necessarly all are used // Available Scenes in this quest, not necessarly all are used
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
player.playScene( m_id, 0, 0x2000, player.playScene( m_id, 0, 0x2000,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param2 == 1 ) // accept quest if( result.param2 == 1 ) // accept quest
{ {
Scene00050( player ); Scene00050( player );
@ -155,7 +155,8 @@ class ManFst004 : public EventScript
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( m_id, 1, 0, player.playScene( m_id, 1, 0,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
player.setQuestUI8AL( m_id, 1 ); player.setQuestUI8AL( m_id, 1 );
checkQuestCompletion( player, 0 ); checkQuestCompletion( player, 0 );
} ); } );
@ -164,7 +165,8 @@ class ManFst004 : public EventScript
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
player.playScene( m_id, 2, 0, player.playScene( m_id, 2, 0,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
player.setQuestUI8BH( m_id, 1 ); player.setQuestUI8BH( m_id, 1 );
checkQuestCompletion( player, 3 ); checkQuestCompletion( player, 3 );
} ); } );
@ -173,10 +175,13 @@ class ManFst004 : public EventScript
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
player.playScene( m_id, 3, 0, player.playScene( m_id, 3, 0,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
if( result.param2 == 1 ) { {
if( result.param2 == 1 )
{
Scene00100( player ); Scene00100( player );
} else { } else
{
Scene00099( player ); Scene00099( player );
} }
} ); } );
@ -190,10 +195,12 @@ class ManFst004 : public EventScript
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
player.playScene( m_id, 5, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, player.playScene( m_id, 5, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( m_id, 0 )) { if( player.giveQuestRewards( m_id, 0 ))
{
player.finishQuest( m_id ); player.finishQuest( m_id );
} }
} }
@ -203,7 +210,8 @@ class ManFst004 : public EventScript
void Scene00050( Entity::Player& player ) void Scene00050( Entity::Player& player )
{ {
player.playScene( m_id, 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0/*unk*/, 0/*unk*/, player.playScene( m_id, 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0/*unk*/, 0/*unk*/,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
// accepting quest "close to home" // accepting quest "close to home"
player.updateQuest( m_id, 1 ); player.updateQuest( m_id, 1 );
player.setQuestUI8CH( m_id, 1 ); // receive key item player.setQuestUI8CH( m_id, 1 ); // receive key item
@ -216,7 +224,8 @@ class ManFst004 : public EventScript
void Scene00051( Entity::Player& player ) void Scene00051( Entity::Player& player )
{ {
player.playScene( m_id, 51, NONE, player.playScene( m_id, 51, NONE,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
Scene00001( player ); Scene00001( player );
} ); } );
} }
@ -224,7 +233,8 @@ class ManFst004 : public EventScript
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playScene( m_id, 99, NONE, player.playScene( m_id, 99, NONE,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
Scene00004( player ); Scene00004( player );
} ); } );
} }
@ -232,7 +242,8 @@ class ManFst004 : public EventScript
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
{ {
player.playScene( m_id, 100, NONE, player.playScene( m_id, 100, NONE,
[&]( Entity::Player& player, const Event::SceneResult& result ) { [&]( Entity::Player& player, const Event::SceneResult& result )
{
player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it
player.setQuestUI8BL( m_id, 1 ); player.setQuestUI8BL( m_id, 1 );
checkQuestCompletion( player, 2 ); checkQuestCompletion( player, 2 );

53
src/servers/Scripts/quest/ManSea001.cpp
View file

@ -27,7 +27,7 @@ private:
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
@ -36,121 +36,122 @@ private:
} }
}; };
player.playScene( getId( ), 0, HIDE_HOTBAR, 0, 0, callback ); player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00002( player ); Scene00002( player );
}; };
player.playScene( getId( ), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback ); player.playScene( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00003( player ); Scene00003( player );
}; };
player.playScene( getId( ), 2, NONE, 0, 0, callback ); player.playScene( getId(), 2, NONE, 0, 0, callback );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 1, 0 ); player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 1, 0 );
}; };
player.playScene( getId( ), 3, NONE, 0, 0, callback ); player.playScene( getId(), 3, NONE, 0, 0, callback );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
player.playScene( getId( ), 4, NONE, 0, 0 ); player.playScene( getId(), 4, NONE, 0, 0 );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00006( player ); Scene00006( player );
}; };
player.playScene( getId( ), 5, HIDE_HOTBAR, 0, 0, callback ); player.playScene( getId(), 5, HIDE_HOTBAR, 0, 0, callback );
} }
void Scene00006( Entity::Player& player ) void Scene00006( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.updateQuest( getId(), SEQ_FINISH ); player.updateQuest( getId(), SEQ_FINISH );
player.prepareZoning( player.getZoneId(), true, 1, 0 ); player.prepareZoning( player.getZoneId(), true, 1, 0 );
player.changePosition( 9, 40, 14, 2 ); player.changePosition( 9, 40, 14, 2 );
}; };
player.playScene( getId( ), 6, INVIS_OTHER_PC, 0, 0, callback ); player.playScene( getId(), 6, INVIS_OTHER_PC, 0, 0, callback );
} }
void Scene00007( Entity::Player& player ) void Scene00007( Entity::Player& player )
{ {
player.playScene( getId( ), 7, NONE, 0, 0 ); player.playScene( getId(), 7, NONE, 0, 0 );
} }
void Scene00008( Entity::Player& player ) void Scene00008( Entity::Player& player )
{ {
player.playScene( getId( ), 8, NONE, 0, 0 ); player.playScene( getId(), 8, NONE, 0, 0 );
} }
void Scene00009( Entity::Player& player ) void Scene00009( Entity::Player& player )
{ {
player.playScene( getId( ), 9, NONE, 0, 0 ); player.playScene( getId(), 9, NONE, 0, 0 );
} }
void Scene00010( Entity::Player& player ) void Scene00010( Entity::Player& player )
{ {
player.playScene( getId( ), 10, NONE, 0, 0 ); player.playScene( getId(), 10, NONE, 0, 0 );
} }
void Scene00011( Entity::Player& player ) void Scene00011( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00012( player ); Scene00012( player );
}; };
player.playScene( getId( ), 11, 0x2c02, 0, 0, callback ); player.playScene( getId(), 11, 0x2c02, 0, 0, callback );
} }
void Scene00012( Entity::Player& player ) void Scene00012( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), 12, INVIS_OTHER_PC, 0, 0, callback ); player.playScene( getId(), 12, INVIS_OTHER_PC, 0, 0, callback );
} }
void Scene00013( Entity::Player& player ) void Scene00013( Entity::Player& player )
{ {
player.playScene( getId( ), 13, NONE, 0, 0 ); player.playScene( getId(), 13, NONE, 0, 0 );
} }
public: public:
ManSea001() : EventScript( 65643 ) {} ManSea001() : EventScript( 65643 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

26
src/servers/Scripts/quest/ManSea002.cpp
View file

@ -41,7 +41,7 @@ private:
Scene00050( player ); Scene00050( player );
}; };
player.playScene( getId( ), 0, HIDE_HOTBAR, 0, 0, callback ); player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
@ -51,7 +51,7 @@ private:
}; };
player.playScene( getId( ), 1, NONE, callback ); player.playScene( getId(), 1, NONE, callback );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
@ -61,7 +61,7 @@ private:
}; };
player.playScene( getId( ), 2, NONE, callback ); player.playScene( getId(), 2, NONE, callback );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
@ -71,7 +71,7 @@ private:
}; };
player.playScene( getId( ), 3, NONE, callback ); player.playScene( getId(), 3, NONE, callback );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
@ -81,7 +81,7 @@ private:
}; };
player.playScene( getId( ), 4, NONE, callback ); player.playScene( getId(), 4, NONE, callback );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
@ -91,7 +91,7 @@ private:
}; };
player.playScene( getId( ), 5, NONE, callback ); player.playScene( getId(), 5, NONE, callback );
} }
void Scene00006( Entity::Player& player ) void Scene00006( Entity::Player& player )
@ -101,7 +101,7 @@ private:
}; };
player.playScene( getId( ), 6, NONE, callback ); player.playScene( getId(), 6, NONE, callback );
} }
void Scene00007( Entity::Player& player ) void Scene00007( Entity::Player& player )
@ -111,7 +111,7 @@ private:
}; };
player.playScene( getId( ), 7, NONE, callback ); player.playScene( getId(), 7, NONE, callback );
} }
void Scene00008( Entity::Player& player ) void Scene00008( Entity::Player& player )
@ -121,7 +121,7 @@ private:
}; };
player.playScene( getId( ), 8, NONE, callback ); player.playScene( getId(), 8, NONE, callback );
} }
void Scene00050( Entity::Player& player ) void Scene00050( Entity::Player& player )
@ -136,14 +136,16 @@ private:
player.forceZoneing( 128 ); player.forceZoneing( 128 );
}; };
player.playScene( getId( ), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback ); player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
} }
public: public:
ManSea002() : EventScript( 65644 ) {} ManSea002() : EventScript( 65644 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
// todo: this doesn't actually play a cutscene after accepting the quest // todo: this doesn't actually play a cutscene after accepting the quest
if( actor == ACTOR0 ) if( actor == ACTOR0 )

47
src/servers/Scripts/quest/ManWil001.cpp
View file

@ -28,7 +28,7 @@ private:
void Scene00000( Entity::Player& player ) void Scene00000( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
@ -37,105 +37,106 @@ private:
} }
}; };
player.playScene( getId( ), 0, HIDE_HOTBAR, 0, 0, callback ); player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00002( player ); Scene00002( player );
}; };
player.playScene( getId( ), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback ); player.playScene( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 ); player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 );
}; };
player.playScene( getId( ), 2, NONE, 0, 0, callback ); player.playScene( getId(), 2, NONE, 0, 0, callback );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
player.playScene( getId( ), 3, NONE, 0, 0 ); player.playScene( getId(), 3, NONE, 0, 0 );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00005( player ); Scene00005( player );
}; };
player.playScene( getId( ), 4, 0x2c02, 0, 0, callback ); player.playScene( getId(), 4, 0x2c02, 0, 0, callback );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), 5, INVIS_OTHER_PC, 0, 0, callback ); player.playScene( getId(), 5, INVIS_OTHER_PC, 0, 0, callback );
} }
void Scene00006( Entity::Player& player ) void Scene00006( Entity::Player& player )
{ {
player.playScene( getId( ), 6, 0, 0, 0 ); player.playScene( getId(), 6, 0, 0, 0 );
} }
void Scene00007( Entity::Player& player ) void Scene00007( Entity::Player& player )
{ {
player.playScene( getId( ), 7, 0, 0, 0 ); player.playScene( getId(), 7, 0, 0, 0 );
} }
void Scene00008( Entity::Player& player ) void Scene00008( Entity::Player& player )
{ {
player.playScene( getId( ), 8, 0, 0, 0 ); player.playScene( getId(), 8, 0, 0, 0 );
} }
void Scene00009( Entity::Player& player ) void Scene00009( Entity::Player& player )
{ {
player.playScene( getId( ), 9, 0, 0, 0 ); player.playScene( getId(), 9, 0, 0, 0 );
} }
void Scene00010( Entity::Player& player ) void Scene00010( Entity::Player& player )
{ {
player.playScene( getId( ), 10, 0, 0, 0 ); player.playScene( getId(), 10, 0, 0, 0 );
} }
void Scene00011( Entity::Player& player ) void Scene00011( Entity::Player& player )
{ {
player.playScene( getId( ), 11, 0, 0, 0 ); player.playScene( getId(), 11, 0, 0, 0 );
} }
void Scene00012( Entity::Player& player ) void Scene00012( Entity::Player& player )
{ {
player.playScene( getId( ), 12, 0, 0, 0 ); player.playScene( getId(), 12, 0, 0, 0 );
} }
void Scene00013( Entity::Player& player ) void Scene00013( Entity::Player& player )
{ {
player.playScene( getId( ), 13, 0, 0, 0 ); player.playScene( getId(), 13, 0, 0, 0 );
} }
public: public:
ManWil001() : EventScript( 66130 ) {} ManWil001() : EventScript( 66130 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

25
src/servers/Scripts/quest/ManWil002.cpp
View file

@ -47,7 +47,7 @@ private:
Scene00050( player ); Scene00050( player );
}; };
player.playScene( getId( ), 0, HIDE_HOTBAR, 0, 0, callback ); player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
@ -57,7 +57,7 @@ private:
}; };
player.playScene( getId( ), 1, NONE, callback ); player.playScene( getId(), 1, NONE, callback );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
@ -67,7 +67,7 @@ private:
}; };
player.playScene( getId( ), 2, NONE, callback ); player.playScene( getId(), 2, NONE, callback );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
@ -77,7 +77,7 @@ private:
}; };
player.playScene( getId( ), 3, NONE, callback ); player.playScene( getId(), 3, NONE, callback );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
@ -87,7 +87,7 @@ private:
}; };
player.playScene( getId( ), 4, NONE, callback ); player.playScene( getId(), 4, NONE, callback );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
@ -97,7 +97,7 @@ private:
}; };
player.playScene( getId( ), 5, NONE, callback ); player.playScene( getId(), 5, NONE, callback );
} }
void Scene00006( Entity::Player& player ) void Scene00006( Entity::Player& player )
@ -107,7 +107,7 @@ private:
}; };
player.playScene( getId( ), 6, NONE, callback ); player.playScene( getId(), 6, NONE, callback );
} }
void Scene00007( Entity::Player& player ) void Scene00007( Entity::Player& player )
@ -117,7 +117,7 @@ private:
}; };
player.playScene( getId( ), 7, NONE, callback ); player.playScene( getId(), 7, NONE, callback );
} }
void Scene00008( Entity::Player& player ) void Scene00008( Entity::Player& player )
@ -127,7 +127,7 @@ private:
}; };
player.playScene( getId( ), 8, NONE, callback ); player.playScene( getId(), 8, NONE, callback );
} }
void Scene00050( Entity::Player& player ) void Scene00050( Entity::Player& player )
@ -142,16 +142,17 @@ private:
player.forceZoneing( 130 ); player.forceZoneing( 130 );
}; };
player.playScene( getId( ), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback ); player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
} }
public: public:
ManWil002() : EventScript( 66104 ) { } ManWil002() : EventScript( 66104 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

24
src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
View file

@ -34,17 +34,17 @@ private:
} }
}; };
player.playScene( getId( ), 0, NONE, callback ); player.playScene( getId(), 0, NONE, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId( ), 1, NONE ); player.playScene( getId(), 1, NONE );
} }
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playScene( getId( ), 99, NONE ); player.playScene( getId(), 99, NONE );
} }
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
@ -53,32 +53,32 @@ private:
{ {
if( result.param2 == 1 ) // accept quest if( result.param2 == 1 ) // accept quest
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), 100, NONE, callback ); player.playScene( getId(), 100, NONE, callback );
} }
public: public:
SubFst001() : EventScript( 65560 ) {} SubFst001() : EventScript( 65560 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 ) if( actor == ACTOR0 )
{ {
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId()))
Scene00000( player ); Scene00000( player );
else else
Scene00001( player ); Scene00001( player );
} } else if( actor == ACTOR1 )
else if( actor == ACTOR1 )
{ {
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId()))
Scene00099( player ); Scene00099( player );
else else
Scene00100( player ); Scene00100( player );

21
src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
View file

@ -31,33 +31,34 @@ private:
} }
}; };
player.playScene( getId( ), 0, NONE, callback ); player.playScene( getId(), 0, NONE, callback );
} }
void Scene00001(Entity::Player& player) void Scene00001( Entity::Player& player )
{ {
auto callback = [&]( Entity::Player& player, const Event::SceneResult& result ) auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), 1, NONE, callback ); player.playScene( getId(), 1, NONE, callback );
} }
public: public:
SubFst002() : EventScript( 65561 ) {} SubFst002() : EventScript( 65561 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 && !player.hasQuest( getId() ) ) if( actor == ACTOR0 && !player.hasQuest( getId()))
Scene00000( player ); Scene00000( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH ) else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH )
Scene00001( player ); Scene00001( player );
} }
@ -66,7 +67,7 @@ public:
if( npcId != ENEMY0 ) if( npcId != ENEMY0 )
return; return;
auto currentKC = player.getQuestUI8AL( getId() ) + 1; auto currentKC = player.getQuestUI8AL( getId()) + 1;
if( currentKC >= 6 ) if( currentKC >= 6 )
player.updateQuest( getId(), SEQ_FINISH ); player.updateQuest( getId(), SEQ_FINISH );

13
src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
View file

@ -27,7 +27,7 @@ private:
player.updateQuest( getId(), SEQ_FINISH ); player.updateQuest( getId(), SEQ_FINISH );
}; };
player.playScene( getId( ), 0, NONE, callback ); player.playScene( getId(), 0, NONE, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
@ -36,20 +36,21 @@ private:
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), 1, NONE, callback ); player.playScene( getId(), 1, NONE, callback );
} }
public: public:
SubFst010() : EventScript( 65537 ) {} SubFst010() : EventScript( 65537 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

51
src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
View file

@ -49,12 +49,12 @@ private:
} }
}; };
player.playScene( getId( ), 0, NONE, callback ); player.playScene( getId(), 0, NONE, callback );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId( ), 2, NONE ); player.playScene( getId(), 2, NONE );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
@ -64,12 +64,12 @@ private:
player.updateQuest( getId(), SEQ_3 ); player.updateQuest( getId(), SEQ_3 );
}; };
player.playScene( getId( ), 2, NONE, callback ); player.playScene( getId(), 2, NONE, callback );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
player.playScene( getId( ), 3, NONE ); player.playScene( getId(), 3, NONE );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
@ -79,12 +79,12 @@ private:
player.updateQuest( getId(), SEQ_5 ); player.updateQuest( getId(), SEQ_5 );
}; };
player.playScene( getId( ), 4, NONE, callback ); player.playScene( getId(), 4, NONE, callback );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
player.playScene( getId( ), 5, NONE ); player.playScene( getId(), 5, NONE );
} }
void Scene00006( Entity::Player& player ) void Scene00006( Entity::Player& player )
@ -93,17 +93,17 @@ private:
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId() ); player.finishQuest( getId());
} }
}; };
player.playScene( getId( ), 6, NONE, callback ); player.playScene( getId(), 6, NONE, callback );
} }
void Scene00095( Entity::Player& player ) void Scene00095( Entity::Player& player )
{ {
player.playScene( getId( ), 95, NONE ); player.playScene( getId(), 95, NONE );
} }
void Scene00096( Entity::Player& player ) void Scene00096( Entity::Player& player )
@ -114,12 +114,12 @@ private:
player.sendQuestMessage( getId(), 4, 2, 0, 0 ); player.sendQuestMessage( getId(), 4, 2, 0, 0 );
}; };
player.playScene( getId( ), 96, NONE, callback ); player.playScene( getId(), 96, NONE, callback );
} }
void Scene00097( Entity::Player& player ) void Scene00097( Entity::Player& player )
{ {
player.playScene( getId( ), 97, NONE ); player.playScene( getId(), 97, NONE );
} }
void Scene00098( Entity::Player& player ) void Scene00098( Entity::Player& player )
@ -130,12 +130,12 @@ private:
player.sendQuestMessage( getId(), 2, 2, 0, 0 ); player.sendQuestMessage( getId(), 2, 2, 0, 0 );
}; };
player.playScene( getId( ), 98, NONE, callback ); player.playScene( getId(), 98, NONE, callback );
} }
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playScene( getId( ), 99, NONE ); player.playScene( getId(), 99, NONE );
} }
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
@ -146,18 +146,19 @@ private:
player.sendQuestMessage( getId(), 0, 2, 0, 0 ); player.sendQuestMessage( getId(), 0, 2, 0, 0 );
}; };
player.playScene( getId( ), 100, NONE, callback ); player.playScene( getId(), 100, NONE, callback );
} }
public: public:
SubFst013() : EventScript( 65576 ) {} SubFst013() : EventScript( 65576 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId()))
{ {
Scene00000( player ); Scene00000( player );
return; return;
@ -165,23 +166,23 @@ public:
if( actor == ACTOR1 ) // talking to Aunillie while on quest if( actor == ACTOR1 ) // talking to Aunillie while on quest
Scene00003( player ); Scene00003( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_2 ) else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_2 )
Scene00002( player ); Scene00002( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_4 ) else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_4 )
Scene00004( player ); Scene00004( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH ) else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH )
Scene00006( player ); Scene00006( player );
} }
void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 ) if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId()) == SEQ_1 )
Scene00100( player ); Scene00100( player );
else if( actor == ACTOR1 && emoteId == 18 && player.getQuestSeq( getId() ) == SEQ_3 ) else if( actor == ACTOR1 && emoteId == 18 && player.getQuestSeq( getId()) == SEQ_3 )
Scene00098( player ); Scene00098( player );
else if( actor == ACTOR1 && emoteId == 11 && player.getQuestSeq( getId() ) == SEQ_5 ) else if( actor == ACTOR1 && emoteId == 11 && player.getQuestSeq( getId()) == SEQ_5 )
Scene00096( player ); Scene00096( player );
} }
}; };