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
{ {
} }

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

@ -77,8 +77,7 @@ public:
if( player.getOpeningSequence() == 0 ) if( player.getOpeningSequence() == 0 )
{ {
Scene00000( player ); Scene00000( player );
} } else
else
{ {
Scene00040( player ); Scene00040( player );
} }

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

@ -85,7 +85,8 @@ private:
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
{ {

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

@ -67,9 +67,9 @@ private:
} }
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
{ {

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

@ -94,7 +94,8 @@ private:
} }
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
{ {

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

@ -162,12 +162,12 @@ private:
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 )
@ -184,7 +184,8 @@ private:
} }
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
{ {
@ -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 );

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

@ -69,8 +69,11 @@ class ManFst004 : public EventScript
static constexpr auto UnlockDesion = 14; static constexpr auto UnlockDesion = 14;
public: public:
ManFst004() : EventScript( 65660 ){}; ManFst004() : EventScript( 65660 )
~ManFst004(){}; { };
~ManFst004()
{ };
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Event Handlers // Event Handlers
@ -80,8 +83,7 @@ class ManFst004 : public EventScript
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,18 +96,16 @@ 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 );
} }
@ -118,12 +118,10 @@ class ManFst004 : public EventScript
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 );

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

@ -146,7 +146,8 @@ private:
} }
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
{ {

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

@ -138,8 +138,10 @@ private:
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
{ {

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

@ -131,7 +131,8 @@ private:
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
{ {

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

@ -147,7 +147,8 @@ private:
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
{ {

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

@ -63,7 +63,8 @@ private:
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
{ {
@ -75,8 +76,7 @@ public:
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 );

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

@ -49,7 +49,8 @@ private:
} }
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
{ {

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

@ -45,7 +45,8 @@ private:
} }
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
{ {

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

@ -151,7 +151,8 @@ private:
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
{ {