From 66fbc9931b30f53e3468dbede73b63dab49d4e16 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Tue, 20 Mar 2018 22:33:51 +1100
Subject: [PATCH] fix formatting

---
 src/servers/Scripts/ScriptObject.h            |   2 +
 src/servers/Scripts/common/Aethernet.cpp      |   6 +-
 src/servers/Scripts/common/Aetheryte.cpp      |   9 +-
 .../Scripts/common/CmnDefCutSceneReplay.cpp   |   8 +-
 src/servers/Scripts/common/CmnDefInnBed.cpp   |  18 +-
 .../Scripts/common/CmnDefLinkShell.cpp        |  12 +-
 .../Scripts/common/HouFurOrchestrion.cpp      |   4 +-
 .../Scripts/opening/OpeningGridania.cpp       |  25 +-
 src/servers/Scripts/opening/OpeningLimsa.cpp  |  23 +-
 src/servers/Scripts/opening/OpeningUldah.cpp  |  24 +-
 src/servers/Scripts/quest/ManFst001.cpp       |  19 +-
 src/servers/Scripts/quest/ManFst002.cpp       |  38 +--
 src/servers/Scripts/quest/ManFst004.cpp       | 265 +++++++++---------
 src/servers/Scripts/quest/ManSea001.cpp       |  53 ++--
 src/servers/Scripts/quest/ManSea002.cpp       |  26 +-
 src/servers/Scripts/quest/ManWil001.cpp       |  47 ++--
 src/servers/Scripts/quest/ManWil002.cpp       |  25 +-
 .../quest/subquest/gridania/SubFst001.cpp     |  24 +-
 .../quest/subquest/gridania/SubFst002.cpp     |  21 +-
 .../quest/subquest/gridania/SubFst010.cpp     |  13 +-
 .../quest/subquest/gridania/SubFst013.cpp     |  51 ++--
 21 files changed, 370 insertions(+), 343 deletions(-)

diff --git a/src/servers/Scripts/ScriptObject.h b/src/servers/Scripts/ScriptObject.h
index 914bfa75..216ef1f7 100644
--- a/src/servers/Scripts/ScriptObject.h
+++ b/src/servers/Scripts/ScriptObject.h
@@ -6,5 +6,7 @@
 
 #include <Event/EventDefs.h>
 
+#define BIND_SCENE( x ) std::bind( x, *this, std::placeholders::_1 )
+
 
 #endif //SAPPHIRE_SCRIPTOBJECT_H
diff --git a/src/servers/Scripts/common/Aethernet.cpp b/src/servers/Scripts/common/Aethernet.cpp
index 8c31b874..78e22b8b 100644
--- a/src/servers/Scripts/common/Aethernet.cpp
+++ b/src/servers/Scripts/common/Aethernet.cpp
@@ -21,8 +21,10 @@ public:
    {
       if( player.isAetheryteRegistered( eventId & 0xFFFF ) )
       {
-         player.playScene( eventId, 2, 0, []( Entity::Player& player, const Event::SceneResult& result ) {
-            if( result.param1 == 256 ) {
+         player.playScene( eventId, 2, 0, []( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param1 == 256 )
+            {
                player.teleport( result.param2, 2 );
             }
          } );
diff --git a/src/servers/Scripts/common/Aetheryte.cpp b/src/servers/Scripts/common/Aetheryte.cpp
index 93fa20af..800d5c8f 100644
--- a/src/servers/Scripts/common/Aetheryte.cpp
+++ b/src/servers/Scripts/common/Aetheryte.cpp
@@ -23,16 +23,19 @@ public:
    {
       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
             {
                player.setHomepoint( result.eventId & 0xFFFF );
                player.sendQuestMessage( result.eventId, 2, 0xEA, 0, 0 );
             } else if( result.param1 == 512 ) // aethernet access
             {
-               if( result.param2 == 4 ) {
+               if( result.param2 == 4 )
+               {
                   player.teleport( result.param3, 2 );
-               } else if( result.param2 == 2 ) // register favored destination
+               }
+               else if( result.param2 == 2 ) // register favored destination
                {
 
                }
diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
index 5b853704..f286e95a 100644
--- a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
+++ b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
@@ -6,11 +6,11 @@ class CmnDefCutSceneReplay : public EventScript
 {
 public:
    CmnDefCutSceneReplay() : EventScript( 721028 )
-   {}
+   { }
 
    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 )
          {
@@ -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 )
@@ -28,7 +28,7 @@ public:
          // 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
diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp
index 95ee3492..e8d7964e 100644
--- a/src/servers/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/Scripts/common/CmnDefInnBed.cpp
@@ -6,44 +6,44 @@ class CmnDefInnBed : public EventScript
 {
 public:
    CmnDefInnBed() : EventScript( 720916 )
-   {}
+   { }
 
    // menu
    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 )
             Scene00001( player, result.param2 );
       };
 
-      player.playScene( getId( ), 0, 0x2000, 0, 1, callback );
+      player.playScene( getId(), 0, 0x2000, 0, 1, callback );
    }
 
    // lay down
    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 );
       };
 
-      player.playScene( getId( ), 1, 0xF32E48F8, 0, 1, param, callback );
+      player.playScene( getId(), 1, 0xF32E48F8, 0, 1, param, callback );
    }
 
    // logout
    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
    void Scene00100( Entity::Player& player )
    {
       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
@@ -51,7 +51,7 @@ public:
       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 );
    }
diff --git a/src/servers/Scripts/common/CmnDefLinkShell.cpp b/src/servers/Scripts/common/CmnDefLinkShell.cpp
index c1b831fb..10bc9dc7 100644
--- a/src/servers/Scripts/common/CmnDefLinkShell.cpp
+++ b/src/servers/Scripts/common/CmnDefLinkShell.cpp
@@ -10,11 +10,11 @@ class CmnDefLinkShell : public EventScript
 {
 public:
    CmnDefLinkShell() : EventScript( 0xB0006 )
-   {}
+   { }
 
    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 )
          {
@@ -32,25 +32,25 @@ public:
          }
       };
 
-      player.playScene( getId( ), 1, 0, 0, 0, callback );
+      player.playScene( getId(), 1, 0, 0, 0, callback );
    }
 
    // create linkshell
    void Scene00002( Entity::Player& player )
    {
-      player.playScene( getId( ), 2, 0, 0, 0 );
+      player.playScene( getId(), 2, 0, 0, 0 );
    }
 
    // rename linkshell
    void Scene00003( Entity::Player& player )
    {
-      player.playScene( getId( ), 3, 0, 0, 0 );
+      player.playScene( getId(), 3, 0, 0, 0 );
    }
 
    // remove linkshell
    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
diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp
index b3aabcc8..2df8a762 100644
--- a/src/servers/Scripts/common/HouFurOrchestrion.cpp
+++ b/src/servers/Scripts/common/HouFurOrchestrion.cpp
@@ -6,11 +6,11 @@ class HouFurOrchestrion : public EventScript
 {
 public:
    HouFurOrchestrion() : EventScript( 721226 )
-   {}
+   { }
 
    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
diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp
index 7f123e01..71dc22b9 100644
--- a/src/servers/Scripts/opening/OpeningGridania.cpp
+++ b/src/servers/Scripts/opening/OpeningGridania.cpp
@@ -28,35 +28,35 @@ private:
 
    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 );
          Scene00001( player );
       };
 
-      player.playScene( getId( ), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
-                                     CONDITION_CUTSCENE | HIDE_UI |
-                                     HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
+      player.playScene( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
+                                    CONDITION_CUTSCENE | HIDE_UI |
+                                    HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
    }
 
    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 )
    {
-      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 )
    {
-      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 )
    {
-      auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
+      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
       {
          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:
    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 )
       {
          Scene00000( player );
-      }
-      else
+      } else
       {
          Scene00040( player );
       }
diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp
index 0d57d41f..9613149e 100644
--- a/src/servers/Scripts/opening/OpeningLimsa.cpp
+++ b/src/servers/Scripts/opening/OpeningLimsa.cpp
@@ -43,35 +43,35 @@ private:
 
    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 );
          Scene00001( player );
       };
 
-      player.playScene( getId( ), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
-                                     CONDITION_CUTSCENE | HIDE_UI |
-                                     HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
+      player.playScene( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
+                                    CONDITION_CUTSCENE | HIDE_UI |
+                                    HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
    }
 
    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 )
    {
-      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 )
    {
-      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 )
    {
-      auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
+      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
       {
          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:
-   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 )
          Scene00000( player );
diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp
index 22b2bb92..dfc0bd62 100644
--- a/src/servers/Scripts/opening/OpeningUldah.cpp
+++ b/src/servers/Scripts/opening/OpeningUldah.cpp
@@ -29,49 +29,49 @@ private:
 
    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 );
          Scene00001( player );
       };
 
-      player.playScene( getId( ), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
-                                     CONDITION_CUTSCENE | HIDE_UI |
-                                     HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
+      player.playScene( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
+                                    CONDITION_CUTSCENE | HIDE_UI |
+                                    HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
    }
 
    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 )
    {
-      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 )
    {
-      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 )
    {
-      auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
+      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
       {
          if( player.getOpeningSequence() == 2 )
             Scene00030( player );
       };
 
-      player.playScene( getId( ), 40, NO_DEFAULT_CAMERA, 2, 1, callback );
+      player.playScene( getId(), 40, NO_DEFAULT_CAMERA, 2, 1, callback );
    }
 
 
-
 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 )
          Scene00000( player );
diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp
index 33049e36..578ca55b 100644
--- a/src/servers/Scripts/quest/ManFst001.cpp
+++ b/src/servers/Scripts/quest/ManFst001.cpp
@@ -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 )
@@ -54,7 +54,7 @@ private:
          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 )
@@ -66,7 +66,7 @@ private:
          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 )
@@ -76,7 +76,7 @@ private:
          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 )
@@ -85,20 +85,21 @@ private:
       {
          if( result.param2 == 1 )
          {
-            if( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               player.finishQuest( getId());
          }
       };
 
-      player.playScene( getId( ), 5, INVIS_OTHER_PC, 0, 0, callback );
+      player.playScene( getId(), 5, INVIS_OTHER_PC, 0, 0, callback );
    }
 
 public:
-   ManFst001() : EventScript( 65575 ) {}
+   ManFst001() : EventScript( 65575 )
+   { }
 
    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 )
          Scene00000( player );
diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp
index 04fe588f..b2824886 100644
--- a/src/servers/Scripts/quest/ManFst002.cpp
+++ b/src/servers/Scripts/quest/ManFst002.cpp
@@ -72,9 +72,9 @@ private:
       else
          player.sendQuestMessage( getId(), 0, 0, 0, 0 );
 
-      auto var_attuned = player.getQuestUI8AL( 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_attuned = player.getQuestUI8AL( 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()));
 
       if( var_attuned == 1 && var_class == 1 && var_trade == 1 )
          player.updateQuest( getId(), SEQ_FINISH );
@@ -88,7 +88,7 @@ private:
             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 )
@@ -99,7 +99,7 @@ private:
          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 )
@@ -110,7 +110,7 @@ private:
          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 )
@@ -123,12 +123,12 @@ private:
             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 )
    {
-      player.playScene( getId( ), SEQ_1_ACTOR0, NONE, 0, 0 );
+      player.playScene( getId(), SEQ_1_ACTOR0, NONE, 0, 0 );
    }
 
    void Scene00005( Entity::Player& player )
@@ -137,12 +137,12 @@ private:
       {
          if( result.param2 == 1 ) // finish quest
          {
-            if( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               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 )
@@ -157,17 +157,17 @@ private:
          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 )
    {
-      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 )
    {
-      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 )
@@ -180,15 +180,16 @@ private:
          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:
-   ManFst002() : EventScript( 65621 ) {}
+   ManFst002() : EventScript( 65621 )
+   { }
 
    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 )
          Scene00000( player );
@@ -206,8 +207,7 @@ public:
 
          player.eventActionStart( 0x050002, 0x13, event, nullptr, 0x050002 );
 
-      }
-      else if( actor == ACTOR2 )
+      } else if( actor == ACTOR2 )
          Scene00002( player );
       else if( actor == ACTOR3 )
          Scene00003( player );
diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp
index bb2514bd..c6832811 100644
--- a/src/servers/Scripts/quest/ManFst004.cpp
+++ b/src/servers/Scripts/quest/ManFst004.cpp
@@ -11,119 +11,117 @@
 
 class ManFst004 : public EventScript
 {
-   private:
-      // Basic quest information
-      // Quest vars / flags used
-      // GetQuestBitFlag8
-      // GetQuestUI8AL
-      // GetQuestUI8BH
-      // GetQuestUI8BL
-      // GetQuestUI8CH
+private:
+   // Basic quest information
+   // Quest vars / flags used
+   // GetQuestBitFlag8
+   // GetQuestUI8AL
+   // GetQuestUI8BH
+   // GetQuestUI8BL
+   // GetQuestUI8CH
 
-      // Steps in this quest ( 0 is before accepting,
-      // 1 is first, 255 means ready for turning it in
-      enum Sequence : uint8_t
-      {
-         Seq0 = 0,
-         Seq1 = 1,
-         SeqFinish = 255,
-      };
+   // Steps in this quest ( 0 is before accepting,
+   // 1 is first, 255 means ready for turning it in
+   enum Sequence : uint8_t
+   {
+      Seq0 = 0,
+      Seq1 = 1,
+      SeqFinish = 255,
+   };
 
-      // Quest rewards
-      static constexpr auto RewardExpFactor = 100;
-      static constexpr auto RewardGil = 107;
+   // Quest rewards
+   static constexpr auto RewardExpFactor = 100;
+   static constexpr auto RewardGil = 107;
 
-      // Entities found in the script data of the quest
-      static constexpr auto Actor0 = 1001140;
-      static constexpr auto Actor1 = 2;
-      static constexpr auto Actor2 = 1000323;
-      static constexpr auto Actor20 = 1000159;
-      static constexpr auto Actor3 = 1000768;
-      static constexpr auto Actor4 = 1000100;
-      static constexpr auto BindActor0 = 6229224;
-      static constexpr auto Item0 = 2000120;
-      static constexpr auto LocActor0 = 1003159;
-      static constexpr auto LocMarker01 = 2153091;
-      static constexpr auto LocMarker02 = 2153104;
-      static constexpr auto LocMarker03 = 2153111;
-      static constexpr auto LocMarker04 = 2154539;
-      static constexpr auto LocMarker05 = 2154540;
-      static constexpr auto LocMarker06 = 2154541;
-      static constexpr auto LocMarker07 = 2210446;
-      static constexpr auto LocMarker08 = 2210454;
-      static constexpr auto LocMarker09 = 2210461;
-      static constexpr auto LocMotion0 = 799;
-      static constexpr auto Poprange0 = 2280858;
-      static constexpr auto RewardDesion = 1;
-      static constexpr auto Seq0Actor0 = 0;
-      static constexpr auto Seq0Actor0Lq = 50;
-      static constexpr auto Seq1Actor0 = 4;
-      static constexpr auto Seq1Actor1 = 1;
-      static constexpr auto Seq1Actor1Wait = 51;
-      static constexpr auto Seq1Actor2 = 2;
-      static constexpr auto Seq1Actor3 = 3;
-      static constexpr auto Seq1Actor3Npctradeno = 99;
-      static constexpr auto Seq1Actor3Npctradeok = 100;
-      static constexpr auto Seq2Actor4 = 5;
-      static constexpr auto Territorytype0 = 132;
-      static constexpr auto UnlockDesion = 14;
+   // Entities found in the script data of the quest
+   static constexpr auto Actor0 = 1001140;
+   static constexpr auto Actor1 = 2;
+   static constexpr auto Actor2 = 1000323;
+   static constexpr auto Actor20 = 1000159;
+   static constexpr auto Actor3 = 1000768;
+   static constexpr auto Actor4 = 1000100;
+   static constexpr auto BindActor0 = 6229224;
+   static constexpr auto Item0 = 2000120;
+   static constexpr auto LocActor0 = 1003159;
+   static constexpr auto LocMarker01 = 2153091;
+   static constexpr auto LocMarker02 = 2153104;
+   static constexpr auto LocMarker03 = 2153111;
+   static constexpr auto LocMarker04 = 2154539;
+   static constexpr auto LocMarker05 = 2154540;
+   static constexpr auto LocMarker06 = 2154541;
+   static constexpr auto LocMarker07 = 2210446;
+   static constexpr auto LocMarker08 = 2210454;
+   static constexpr auto LocMarker09 = 2210461;
+   static constexpr auto LocMotion0 = 799;
+   static constexpr auto Poprange0 = 2280858;
+   static constexpr auto RewardDesion = 1;
+   static constexpr auto Seq0Actor0 = 0;
+   static constexpr auto Seq0Actor0Lq = 50;
+   static constexpr auto Seq1Actor0 = 4;
+   static constexpr auto Seq1Actor1 = 1;
+   static constexpr auto Seq1Actor1Wait = 51;
+   static constexpr auto Seq1Actor2 = 2;
+   static constexpr auto Seq1Actor3 = 3;
+   static constexpr auto Seq1Actor3Npctradeno = 99;
+   static constexpr auto Seq1Actor3Npctradeok = 100;
+   static constexpr auto Seq2Actor4 = 5;
+   static constexpr auto Territorytype0 = 132;
+   static constexpr auto UnlockDesion = 14;
 
-   public:
-      ManFst004() : EventScript( 65660 ){};
-      ~ManFst004(){};
+public:
+   ManFst004() : EventScript( 65660 )
+   { };
+
+   ~ManFst004()
+   { };
 
    //////////////////////////////////////////////////////////////////////
    // Event Handlers
    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 )
       {
          Scene00000( player );
-      }
-      else if( actor == ManFst004::Actor1 )
+      } else if( actor == ManFst004::Actor1 )
       {
          // starting the Aetheryte eventaction
          // player.eventStart( actorId, 0x050002, 7, 0, 0);
          // starting the eventaction 0x13 ( attuning )
          player.eventActionStart( 0x050002, 0x13,
-         	[&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         	{
-         	   player.sendQuestMessage( 0x050002, 0, 1, 0, 0 );
-         	   player.registerAetheryte( 2 );
-         	   player.learnAction( 1 );
-         	   Scene00051( player );
-         	},
-         	[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) {},
-         	eventId );
-      }
-      else if( actor == ManFst004::Actor2 )
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {
+               player.sendQuestMessage( 0x050002, 0, 1, 0, 0 );
+               player.registerAetheryte( 2 );
+               player.learnAction( 1 );
+               Scene00051( player );
+            },
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            { },
+            eventId );
+      } else if( actor == ManFst004::Actor2 )
       {
          Scene00002( player );
-      }
-      else if( actor == ManFst004::Actor3 )
+      } else if( actor == ManFst004::Actor3 )
       {
          Scene00003( player );
-      }
-      else if( actor == ManFst004::Actor4 )
+      } else if( actor == ManFst004::Actor4 )
       {
          Scene00005( player );
       }
    }
 
-   private:
+private:
 
    void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
    {
       if( varIdx == 3 )
       {
          player.sendQuestMessage( m_id, 1, 0, 0, 0 );
-      }
-      else if( varIdx == 2 )
+      } else if( varIdx == 2 )
       {
          player.sendQuestMessage( m_id, 2, 0, 0, 0 );
-      }
-      else
+      } else
       {
          player.sendQuestMessage( m_id, 0, 0, 0, 0 );
       }
@@ -139,47 +137,54 @@ class ManFst004 : public EventScript
          player.updateQuest( questId, SeqFinish );
       }
    }
+
    //////////////////////////////////////////////////////////////////////
    // Available Scenes in this quest, not necessarly all are used
    void Scene00000( Entity::Player& player )
    {
       player.playScene( m_id, 0, 0x2000,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           if( result.param2 == 1 ) // accept quest
-                           {
-                              Scene00050( player );
-                           }
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 ) // accept quest
+            {
+               Scene00050( player );
+            }
+         } );
    }
 
    void Scene00001( Entity::Player& player )
    {
       player.playScene( m_id, 1, 0,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           player.setQuestUI8AL( m_id, 1 );
-                           checkQuestCompletion( player, 0 );
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8AL( m_id, 1 );
+            checkQuestCompletion( player, 0 );
+         } );
    }
 
    void Scene00002( Entity::Player& player )
    {
       player.playScene( m_id, 2, 0,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           player.setQuestUI8BH( m_id, 1 );
-                           checkQuestCompletion( player, 3 );
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8BH( m_id, 1 );
+            checkQuestCompletion( player, 3 );
+         } );
    }
 
    void Scene00003( Entity::Player& player )
    {
       player.playScene( m_id, 3, 0,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           if( result.param2 == 1 ) {
-                              Scene00100( player );
-                           } else {
-                              Scene00099( player );
-                           }
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 )
+            {
+               Scene00100( player );
+            } else
+            {
+               Scene00099( player );
+            }
+         } );
    }
 
    void Scene00004( Entity::Player& player )
@@ -190,53 +195,59 @@ class ManFst004 : public EventScript
    void Scene00005( Entity::Player& player )
    {
       player.playScene( m_id, 5, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           if( result.param2 == 1 ) // finish quest
-                           {
-                              if( player.giveQuestRewards( m_id, 0 )) {
-                                 player.finishQuest( m_id );
-                              }
-                           }
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 ) // finish quest
+            {
+               if( player.giveQuestRewards( m_id, 0 ))
+               {
+                  player.finishQuest( m_id );
+               }
+            }
+         } );
    }
 
    void Scene00050( Entity::Player& player )
    {
       player.playScene( m_id, 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0/*unk*/, 0/*unk*/,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           // accepting quest "close to home"
-                           player.updateQuest( m_id, 1 );
-                           player.setQuestUI8CH( m_id, 1 ); // receive key item
-                           // event is done, need to teleport to real zone.
-                           player.setZone( 132 );
-                           //player.setZone(183); back to starting griania for debug purpose
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            // accepting quest "close to home"
+            player.updateQuest( m_id, 1 );
+            player.setQuestUI8CH( m_id, 1 ); // receive key item
+            // event is done, need to teleport to real zone.
+            player.setZone( 132 );
+            //player.setZone(183); back to starting griania for debug purpose
+         } );
    }
 
    void Scene00051( Entity::Player& player )
    {
       player.playScene( m_id, 51, NONE,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           Scene00001( player );
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            Scene00001( player );
+         } );
    }
 
    void Scene00099( Entity::Player& player )
    {
       player.playScene( m_id, 99, NONE,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           Scene00004( player );
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            Scene00004( player );
+         } );
    }
 
    void Scene00100( Entity::Player& player )
    {
       player.playScene( m_id, 100, NONE,
-                        [&]( Entity::Player& player, const Event::SceneResult& result ) {
-                           player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it
-                           player.setQuestUI8BL( m_id, 1 );
-                           checkQuestCompletion( player, 2 );
-                        } );
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it
+            player.setQuestUI8BL( m_id, 1 );
+            checkQuestCompletion( player, 2 );
+         } );
    }
 
 };
\ No newline at end of file
diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp
index aca4e5c3..3b9bc45e 100644
--- a/src/servers/Scripts/quest/ManSea001.cpp
+++ b/src/servers/Scripts/quest/ManSea001.cpp
@@ -27,7 +27,7 @@ private:
 
    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 )
          {
@@ -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 )
    {
-      auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
+      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
       {
          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 )
    {
-      auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
+      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
       {
          Scene00003( player );
       };
 
-      player.playScene( getId( ), 2, NONE, 0, 0, callback );
+      player.playScene( getId(), 2, NONE, 0, 0, callback );
    }
 
    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( getId( ), 3, NONE, 0, 0, callback );
+      player.playScene( getId(), 3, NONE, 0, 0, callback );
    }
 
    void Scene00004( Entity::Player& player )
    {
-      player.playScene( getId( ), 4, NONE, 0, 0 );
+      player.playScene( getId(), 4, NONE, 0, 0 );
    }
 
    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 );
       };
 
-      player.playScene( getId( ), 5, HIDE_HOTBAR, 0, 0, callback );
+      player.playScene( getId(), 5, HIDE_HOTBAR, 0, 0, callback );
    }
 
    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.prepareZoning( player.getZoneId(), true, 1, 0 );
          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 )
    {
-      player.playScene( getId( ), 7, NONE, 0, 0 );
+      player.playScene( getId(), 7, NONE, 0, 0 );
    }
 
    void Scene00008( Entity::Player& player )
    {
-      player.playScene( getId( ), 8, NONE, 0, 0 );
+      player.playScene( getId(), 8, NONE, 0, 0 );
    }
 
    void Scene00009( Entity::Player& player )
    {
-      player.playScene( getId( ), 9, NONE, 0, 0 );
+      player.playScene( getId(), 9, NONE, 0, 0 );
    }
 
    void Scene00010( Entity::Player& player )
    {
-      player.playScene( getId( ), 10, NONE, 0, 0 );
+      player.playScene( getId(), 10, NONE, 0, 0 );
    }
 
    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 );
       };
 
-      player.playScene( getId( ), 11, 0x2c02, 0, 0, callback );
+      player.playScene( getId(), 11, 0x2c02, 0, 0, callback );
    }
 
    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( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               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 )
    {
-      player.playScene( getId( ), 13, NONE, 0, 0 );
+      player.playScene( getId(), 13, NONE, 0, 0 );
    }
 
 public:
-   ManSea001() : EventScript( 65643 ) {}
+   ManSea001() : EventScript( 65643 )
+   { }
 
    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 )
          Scene00000( player );
diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 135bbdfd..268fc643 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -41,7 +41,7 @@ private:
             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 )
@@ -51,7 +51,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 1, NONE, callback );
+      player.playScene( getId(), 1, NONE, callback );
    }
 
    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 )
@@ -71,7 +71,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 3, NONE, callback );
+      player.playScene( getId(), 3, NONE, callback );
    }
 
    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 )
@@ -91,7 +91,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 5, NONE, callback );
+      player.playScene( getId(), 5, NONE, callback );
    }
 
    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 )
@@ -111,7 +111,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 7, NONE, callback );
+      player.playScene( getId(), 7, NONE, callback );
    }
 
    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 )
@@ -136,14 +136,16 @@ private:
          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:
-   ManSea002() : EventScript( 65644 ) {}
+   ManSea002() : EventScript( 65644 )
+   { }
 
    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
       if( actor == ACTOR0 )
diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp
index bc0770f8..123551cc 100644
--- a/src/servers/Scripts/quest/ManWil001.cpp
+++ b/src/servers/Scripts/quest/ManWil001.cpp
@@ -28,7 +28,7 @@ private:
 
    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 )
          {
@@ -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 )
    {
-      auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
+      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
       {
          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 )
    {
-      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( getId( ), 2, NONE, 0, 0, callback );
+      player.playScene( getId(), 2, NONE, 0, 0, callback );
    }
 
    void Scene00003( Entity::Player& player )
    {
-      player.playScene( getId( ), 3, NONE, 0, 0 );
+      player.playScene( getId(), 3, NONE, 0, 0 );
    }
 
    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 );
       };
 
-      player.playScene( getId( ), 4, 0x2c02, 0, 0, callback );
+      player.playScene( getId(), 4, 0x2c02, 0, 0, callback );
    }
 
    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( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               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 )
    {
-      player.playScene( getId( ), 6, 0, 0, 0 );
+      player.playScene( getId(), 6, 0, 0, 0 );
    }
 
    void Scene00007( Entity::Player& player )
    {
-      player.playScene( getId( ), 7, 0, 0, 0 );
+      player.playScene( getId(), 7, 0, 0, 0 );
    }
 
    void Scene00008( Entity::Player& player )
    {
-      player.playScene( getId( ), 8, 0, 0, 0 );
+      player.playScene( getId(), 8, 0, 0, 0 );
    }
 
    void Scene00009( Entity::Player& player )
    {
-      player.playScene( getId( ), 9, 0, 0, 0 );
+      player.playScene( getId(), 9, 0, 0, 0 );
    }
 
    void Scene00010( Entity::Player& player )
    {
-      player.playScene( getId( ), 10, 0, 0, 0 );
+      player.playScene( getId(), 10, 0, 0, 0 );
    }
 
    void Scene00011( Entity::Player& player )
    {
-      player.playScene( getId( ), 11, 0, 0, 0 );
+      player.playScene( getId(), 11, 0, 0, 0 );
    }
 
    void Scene00012( Entity::Player& player )
    {
-      player.playScene( getId( ), 12, 0, 0, 0 );
+      player.playScene( getId(), 12, 0, 0, 0 );
    }
 
    void Scene00013( Entity::Player& player )
    {
-      player.playScene( getId( ), 13, 0, 0, 0 );
+      player.playScene( getId(), 13, 0, 0, 0 );
    }
 
 
 public:
-   ManWil001() : EventScript( 66130 ) {}
+   ManWil001() : EventScript( 66130 )
+   { }
 
    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 )
          Scene00000( player );
diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp
index 1349ee7f..ef99b871 100644
--- a/src/servers/Scripts/quest/ManWil002.cpp
+++ b/src/servers/Scripts/quest/ManWil002.cpp
@@ -47,7 +47,7 @@ private:
             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 )
@@ -57,7 +57,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 1, NONE, callback );
+      player.playScene( getId(), 1, NONE, callback );
    }
 
    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 )
@@ -77,7 +77,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 3, NONE, callback );
+      player.playScene( getId(), 3, NONE, callback );
    }
 
    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 )
@@ -97,7 +97,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 5, NONE, callback );
+      player.playScene( getId(), 5, NONE, callback );
    }
 
    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 )
@@ -117,7 +117,7 @@ private:
 
       };
 
-      player.playScene( getId( ), 7, NONE, callback );
+      player.playScene( getId(), 7, NONE, callback );
    }
 
    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 )
@@ -142,16 +142,17 @@ private:
          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:
-   ManWil002() : EventScript( 66104 ) { }
+   ManWil002() : EventScript( 66104 )
+   { }
 
    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 )
          Scene00000( player );
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
index 1e9b9059..f5558a74 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
@@ -34,17 +34,17 @@ private:
          }
       };
 
-      player.playScene( getId( ), 0, NONE, callback );
+      player.playScene( getId(), 0, NONE, callback );
    }
 
    void Scene00001( Entity::Player& player )
    {
-      player.playScene( getId( ), 1, NONE );
+      player.playScene( getId(), 1, NONE );
    }
 
    void Scene00099( Entity::Player& player )
    {
-      player.playScene( getId( ), 99, NONE );
+      player.playScene( getId(), 99, NONE );
    }
 
    void Scene00100( Entity::Player& player )
@@ -53,32 +53,32 @@ private:
       {
          if( result.param2 == 1 ) // accept quest
          {
-            if( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               player.finishQuest( getId());
          }
       };
 
-      player.playScene( getId( ), 100, NONE, callback );
+      player.playScene( getId(), 100, NONE, callback );
    }
 
 
 public:
-   SubFst001() : EventScript( 65560 ) {}
+   SubFst001() : EventScript( 65560 )
+   { }
 
    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( !player.hasQuest( getId() ) )
+         if( !player.hasQuest( getId()))
             Scene00000( player );
          else
             Scene00001( player );
-      }
-      else if( actor == ACTOR1 )
+      } else if( actor == ACTOR1 )
       {
-         if( !player.hasQuest( getId() ) )
+         if( !player.hasQuest( getId()))
             Scene00099( player );
          else
             Scene00100( player );
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
index 32382e0b..c3f9ae6e 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
@@ -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 )
       {
          if( result.param2 == 1 ) // finish quest
          {
-            if( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               player.finishQuest( getId());
          }
       };
 
-      player.playScene( getId( ), 1, NONE, callback );
+      player.playScene( getId(), 1, NONE, callback );
    }
 
 public:
-   SubFst002() : EventScript( 65561 ) {}
+   SubFst002() : EventScript( 65561 )
+   { }
 
    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 );
-      else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH )
+      else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH )
          Scene00001( player );
    }
 
@@ -66,7 +67,7 @@ public:
       if( npcId != ENEMY0 )
          return;
 
-      auto currentKC = player.getQuestUI8AL( getId() ) + 1;
+      auto currentKC = player.getQuestUI8AL( getId()) + 1;
 
       if( currentKC >= 6 )
          player.updateQuest( getId(), SEQ_FINISH );
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
index c8ba532d..83da85a8 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
@@ -27,7 +27,7 @@ private:
             player.updateQuest( getId(), SEQ_FINISH );
       };
 
-      player.playScene( getId( ), 0, NONE, callback );
+      player.playScene( getId(), 0, NONE, callback );
    }
 
    void Scene00001( Entity::Player& player )
@@ -36,20 +36,21 @@ private:
       {
          if( result.param2 == 1 ) // finish quest
          {
-            if( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               player.finishQuest( getId());
          }
       };
 
-      player.playScene( getId( ), 1, NONE, callback );
+      player.playScene( getId(), 1, NONE, callback );
    }
 
 public:
-   SubFst010() : EventScript( 65537 ) {}
+   SubFst010() : EventScript( 65537 )
+   { }
 
    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 )
          Scene00000( player );
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
index baf08fbf..55e50d2d 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
@@ -49,12 +49,12 @@ private:
          }
       };
 
-      player.playScene( getId( ), 0, NONE, callback );
+      player.playScene( getId(), 0, NONE, callback );
    }
 
    void Scene00001( Entity::Player& player )
    {
-      player.playScene( getId( ), 2, NONE );
+      player.playScene( getId(), 2, NONE );
    }
 
    void Scene00002( Entity::Player& player )
@@ -64,12 +64,12 @@ private:
          player.updateQuest( getId(), SEQ_3 );
       };
 
-      player.playScene( getId( ), 2, NONE, callback );
+      player.playScene( getId(), 2, NONE, callback );
    }
 
    void Scene00003( Entity::Player& player )
    {
-      player.playScene( getId( ), 3, NONE );
+      player.playScene( getId(), 3, NONE );
    }
 
    void Scene00004( Entity::Player& player )
@@ -79,12 +79,12 @@ private:
          player.updateQuest( getId(), SEQ_5 );
       };
 
-      player.playScene( getId( ), 4, NONE, callback );
+      player.playScene( getId(), 4, NONE, callback );
    }
 
    void Scene00005( Entity::Player& player )
    {
-      player.playScene( getId( ), 5, NONE );
+      player.playScene( getId(), 5, NONE );
    }
 
    void Scene00006( Entity::Player& player )
@@ -93,17 +93,17 @@ private:
       {
          if( result.param2 == 1 ) // finish quest
          {
-            if( player.giveQuestRewards( getId(), 0 ) )
-               player.finishQuest( getId() );
+            if( player.giveQuestRewards( getId(), 0 ))
+               player.finishQuest( getId());
          }
       };
 
-      player.playScene( getId( ), 6, NONE, callback );
+      player.playScene( getId(), 6, NONE, callback );
    }
 
    void Scene00095( Entity::Player& player )
    {
-      player.playScene( getId( ), 95, NONE );
+      player.playScene( getId(), 95, NONE );
    }
 
    void Scene00096( Entity::Player& player )
@@ -114,12 +114,12 @@ private:
          player.sendQuestMessage( getId(), 4, 2, 0, 0 );
       };
 
-      player.playScene( getId( ), 96, NONE, callback );
+      player.playScene( getId(), 96, NONE, callback );
    }
 
    void Scene00097( Entity::Player& player )
    {
-      player.playScene( getId( ), 97, NONE );
+      player.playScene( getId(), 97, NONE );
    }
 
    void Scene00098( Entity::Player& player )
@@ -130,12 +130,12 @@ private:
          player.sendQuestMessage( getId(), 2, 2, 0, 0 );
       };
 
-      player.playScene( getId( ), 98, NONE, callback );
+      player.playScene( getId(), 98, NONE, callback );
    }
 
    void Scene00099( Entity::Player& player )
    {
-      player.playScene( getId( ), 99, NONE );
+      player.playScene( getId(), 99, NONE );
    }
 
    void Scene00100( Entity::Player& player )
@@ -146,18 +146,19 @@ private:
          player.sendQuestMessage( getId(), 0, 2, 0, 0 );
       };
 
-      player.playScene( getId( ), 100, NONE, callback );
+      player.playScene( getId(), 100, NONE, callback );
    }
 
 
 public:
-   SubFst013() : EventScript( 65576 ) {}
+   SubFst013() : EventScript( 65576 )
+   { }
 
    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 );
          return;
@@ -165,23 +166,23 @@ public:
 
       if( actor == ACTOR1 ) // talking to Aunillie while on quest
          Scene00003( player );
-      else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_2 )
+      else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_2 )
          Scene00002( player );
-      else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_4 )
+      else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_4 )
          Scene00004( player );
-      else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH )
+      else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH )
          Scene00006( player );
    }
 
    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 );
-      else if( actor == ACTOR1 && emoteId == 18 && player.getQuestSeq( getId() ) == SEQ_3 )
+      else if( actor == ACTOR1 && emoteId == 18 && player.getQuestSeq( getId()) == SEQ_3 )
          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 );
    }
 };
\ No newline at end of file