From 333ec303bd1c16e9f115841688338b92bc8911a2 Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 22 Apr 2018 00:49:32 +1000
Subject: [PATCH 01/31] Fixed making new zones

---
 src/servers/sapphire_zone/Zone/TerritoryMgr.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index b6ee10f4..8e5cee2a 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -161,8 +161,9 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp
    auto pZone = make_Zone( territoryTypeId, getNextInstanceId(), pTeri->name, pPlaceName->name );
    pZone->init();
 
-   m_territoryInstanceMap[pZone->getTerritoryId()][pZone->getGuId()] = pZone;
    m_instanceIdToZonePtrMap[pZone->getGuId()] = pZone;
+   m_territoryInstanceMap[pZone->getTerritoryId()][pZone->getGuId()] = pZone;
+   m_zoneSet.insert( { pZone } );
 
    return pZone;
 }

From a9c3f6794473f8fa2f8cab5527baacc71c863b30 Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 22 Apr 2018 00:50:04 +1000
Subject: [PATCH 02/31] Added Zone GuId to gm teri_info and fixed spacing

---
 .../sapphire_zone/Network/Handlers/GMCommandHandlers.cpp   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 7f1d99d0..9ceeebef 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -467,10 +467,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       auto pCurrentZone = player.getCurrentZone();
       player.sendNotice( "ZoneId: " + std::to_string( player.getZoneId() ) + "\nName: " +
                          pCurrentZone->getName() + "\nInternalName: " +
-                         pCurrentZone->getInternalName() + "\nPopCount: " +
+                         pCurrentZone->getInternalName() + "\nGuId: " +
+                         std::to_string( pCurrentZone->getGuId() ) + "\nPopCount: " +
                          std::to_string( pCurrentZone->getPopCount() ) +
-                         "\nCurrentWeather:" + std::to_string( static_cast< uint8_t >( pCurrentZone->getCurrentWeather() ) ) +
-                         "\nNextWeather:" + std::to_string( static_cast< uint8_t >( pCurrentZone->getNextWeather() ) ) );
+                         "\nCurrentWeather: " + std::to_string( static_cast< uint8_t >( pCurrentZone->getCurrentWeather() ) ) +
+                         "\nNextWeather: " + std::to_string( static_cast< uint8_t >( pCurrentZone->getNextWeather() ) ) );
       break;
    }
    case GmCommand::Jump:

From c38ab3a445627110996e85f8475e0197f5715911 Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 22 Apr 2018 01:13:37 +1000
Subject: [PATCH 03/31] Now erase zone from the set and removed count like
 talked about

---
 src/servers/sapphire_zone/Zone/TerritoryMgr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 8e5cee2a..5083d6b8 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -206,8 +206,8 @@ bool Core::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId )
 
    m_instanceIdToZonePtrMap.erase( pZone->getGuId() );
 
-   if( m_instanceZoneSet.count( pZone ) )
-      m_instanceZoneSet.erase( pZone );
+   m_instanceZoneSet.erase( pZone );
+   m_zoneSet.erase( pZone );
 
    if( isInstanceContentTerritory( pZone->getTerritoryId() ) )
    {

From ff6eeef68aacf5b83fb6d4c85b05f69256caa0f9 Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 22 Apr 2018 18:21:22 +1000
Subject: [PATCH 04/31] GM Raise uses the new zoneinpacket system

---
 .../sapphire_zone/Network/Handlers/GMCommandHandlers.cpp      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 9ceeebef..2c88206e 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -538,10 +538,8 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
       targetPlayer->resetHp();
       targetPlayer->resetMp();
       targetPlayer->setStatus( Entity::Chara::ActorStatus::Idle );
+      targetPlayer->sendZoneInPackets( 0x01, 0x01, 0, 113, true );
 
-      targetPlayer->sendToInRangeSet( ActorControlPacket143( player.getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true );
-      targetPlayer->sendToInRangeSet( ActorControlPacket142( player.getId(), SetStatus,
-         static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ), true );
       player.sendNotice( "Raised  " + targetPlayer->getName() );
       break;
    }

From 990a8e231f5ece3405b5c59f3067633ee8997eee Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 22 Apr 2018 18:22:45 +1000
Subject: [PATCH 05/31] [GM] chat now looks for the onlinestatus instead

---
 .../sapphire_zone/Network/Handlers/PacketHandlers.cpp       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 76fb6a99..70c4c86b 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -515,7 +515,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    {
    case ChatType::Say:
    {
-      if (player.getGmRank() > 0)
+      if (player.getOnlineStatus() == OnlineStatus::GameMaster || player.getOnlineStatus() == OnlineStatus::GameMaster1 || player.getOnlineStatus() == OnlineStatus::GameMaster2 )
          chatPacket.data().chatType = ChatType::GMSay;
 
       player.getCurrentZone()->queueOutPacketForRange( player, 50, chatPacket );
@@ -523,7 +523,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    }
    case ChatType::Yell:
    {
-      if( player.getGmRank() > 0 )
+      if( player.getOnlineStatus() == OnlineStatus::GameMaster || player.getOnlineStatus() == OnlineStatus::GameMaster1 || player.getOnlineStatus() == OnlineStatus::GameMaster2 )
          chatPacket.data().chatType = ChatType::GMYell;
 
       player.getCurrentZone()->queueOutPacketForRange( player, 6000, chatPacket );
@@ -531,7 +531,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    }
    case ChatType::Shout:
    {
-      if( player.getGmRank() > 0 )
+      if( player.getOnlineStatus() == OnlineStatus::GameMaster || player.getOnlineStatus() == OnlineStatus::GameMaster1 || player.getOnlineStatus() == OnlineStatus::GameMaster2 )
          chatPacket.data().chatType = ChatType::GMShout;
 
       player.getCurrentZone()->queueOutPacketForRange( player, 6000, chatPacket );

From faebcc8290cc79a210085d1c9e75f660b049250d Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Mon, 14 May 2018 04:55:58 +0200
Subject: [PATCH 06/31] ManSea002 now work properly

---
 src/servers/Scripts/quest/ManSea002.cpp       |  25 +-
 .../quest/subquest/limsa/SubSea001.cpp        | 250 ++++++++++++++++++
 2 files changed, 264 insertions(+), 11 deletions(-)
 create mode 100644 src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp

diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 9817969a..e8ae6aec 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -35,23 +35,26 @@ private:
 
    void Scene00000( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene(getId(), 0, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result)
       {
          if( result.param2 == 1 ) // accept quest
-            Scene00050( player );
-      };
-
-      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
+            Scene00001( player );
+      } );
    }
 
    void Scene00001( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene( getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
+         [&](Entity::Player& player, const Event::SceneResult& result)
       {
+         // on quest accept
+         player.updateQuest(getId(), 1);
+         player.setQuestUI8CH(getId(), 1); // receive key item
 
-      };
-
-      player.playScene( getId(), 1, NONE, callback );
+         //player.forceZoneing(128);        // teleport to real limsa
+         //player.playSceneChain(getId(), 2, NONE, bindScene( &ManSea002::Scene00050 ) );
+      } );
    }
 
    void Scene00002( Entity::Player& player )
@@ -128,12 +131,12 @@ private:
    {
       auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-         // on quest accept
+         /*// on quest accept
          player.updateQuest( getId(), 1 );
          player.setQuestUI8CH( getId(), 1 ); // receive key item
 
          // teleport to real limsa
-         player.forceZoneing( 128 );
+         player.forceZoneing( 128 );*/
       };
 
       player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
new file mode 100644
index 00000000..51dea5cd
--- /dev/null
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -0,0 +1,250 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
+#include <ScriptObject.h>
+
+// Quest Script: SubSea001_00111
+// Quest Name: Making a Name
+// Quest ID: 65647
+// Start NPC: 1002698
+// End NPC: 1003604
+
+class SubSea001 : public EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 50;
+      static constexpr auto RewardItem = 4551;
+      static constexpr auto RewardItemCount = 2;
+
+      // Entities found in the script data of the quest
+      static constexpr auto Actor0 = 1002698;
+      static constexpr auto Actor1 = 1000969;
+      static constexpr auto Actor2 = 1003604;
+      static constexpr auto Eobject0 = 2001563;
+      static constexpr auto Eobject1 = 2001564;
+      static constexpr auto Eobject2 = 2001565;
+      static constexpr auto Eobject3 = 2001566;
+      static constexpr auto Eobject4 = 2001567;
+      static constexpr auto Eobject5 = 2001568;
+      static constexpr auto EventActionProcess = 14;
+      static constexpr auto Item0 = 2000447;
+      static constexpr auto Poprange0 = 4161445;
+      static constexpr auto Quest0 = 65644;
+      static constexpr auto Quest1 = 65645;
+      static constexpr auto Territorytype0 = 129;
+
+   public:
+      SubSea001() : EventScript( 65647 )
+      { }; 
+      ~SubSea001()
+      { }; 
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto actor = Event::mapEventActorToRealActor( actorId );
+
+      if ( actor == SubSea001::Actor0 )
+      {
+         Scene00000( player );
+      }
+      else if ( actor == SubSea001::Actor1 )
+      {
+         Scene00002( player );
+      }
+      else if (actor == SubSea001::Actor2)
+      {
+         Scene00016( player );
+      }
+   }
+
+   private:
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+            if (result.param2 == 1)
+               player.updateQuest( getId(), 1);
+         } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, 8192,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+
+         } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, 8192,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if ( result.param2 == 1 && player.hasQuest( 65644 ) )
+            {
+               player.updateQuest( getId(), 2);
+               player.prepareZoning( 129, true, 1, 0 ); // teleport to real limsa
+               player.changePosition( 10, 21, 13, -2 );
+
+               //HARDCODE for autocomplete quest
+               if (player.getQuestSeq( getId() ) == 2 )
+               {
+                  player.setQuestUI8BH( getId(), 6 );
+                  player.updateQuest( getId(), 255 );
+               }
+            }
+            else
+               return;
+         });
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00009( Entity::Player& player )
+   {
+      player.playScene( getId(), 9, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00010( Entity::Player& player )
+   {
+      player.playScene( getId(), 10, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00011( Entity::Player& player )
+   {
+      player.playScene( getId(), 11, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00012( Entity::Player& player )
+   {
+      player.playScene( getId(), 12, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00013( Entity::Player& player )
+   {
+      player.playScene( getId(), 13, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00014( Entity::Player& player )
+   {
+      player.playScene( getId(), 14, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+         });
+   }
+
+   void Scene00015( Entity::Player& player )
+   {
+      player.playScene( getId(), 15, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+
+         });
+   }
+
+   void Scene00016( Entity::Player& player )
+   {
+      player.playScene( getId(), 16, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+            if (result.param2 == 1)
+            {
+               Scene00017(player);
+            }
+            else return;
+         });
+   }
+
+   void Scene00017( Entity::Player& player )
+   {
+      player.playScene( getId(), 17, 8192,
+         [&](Entity::Player& player, const Event::SceneResult& result)
+         {
+            player.setQuestUI8BH(getId(), 0);
+
+            if (player.giveQuestRewards(getId(), 0))
+               player.finishQuest(getId());
+         });
+   }
+
+};
+

From dc806e6e3ff690b771a51184e1ce57588a2bffc0 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Mon, 14 May 2018 05:13:10 +0200
Subject: [PATCH 07/31] First rev.

---
 src/servers/Scripts/quest/ManSea002.cpp       | 68 +++++-----------
 .../quest/subquest/limsa/SubSea001.cpp        | 81 +++++++++----------
 2 files changed, 62 insertions(+), 87 deletions(-)

diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index e8ae6aec..9fbd929b 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -33,10 +33,27 @@ private:
    static constexpr auto SCREENIMAGE0 = 14;
    static constexpr auto UNLOCK_DESION = 14;
 
+public:
+   ManSea002() : EventScript( 65644 )
+   {}
+   ~ManSea002()
+   {};
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto actor = Event::mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+      // todo: this doesn't actually play a cutscene after accepting the quest
+      if ( actor == ACTOR0 )
+         Scene00000( player );
+   }
+
+private:
+
    void Scene00000( Entity::Player& player )
    {
-      player.playScene(getId(), 0, HIDE_HOTBAR,
-         [&]( Entity::Player& player, const Event::SceneResult& result)
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
          if( result.param2 == 1 ) // accept quest
             Scene00001( player );
@@ -46,14 +63,11 @@ private:
    void Scene00001( Entity::Player& player )
    {
       player.playScene( getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
          // on quest accept
-         player.updateQuest(getId(), 1);
-         player.setQuestUI8CH(getId(), 1); // receive key item
-
-         //player.forceZoneing(128);        // teleport to real limsa
-         //player.playSceneChain(getId(), 2, NONE, bindScene( &ManSea002::Scene00050 ) );
+         player.updateQuest( getId(), 1 );
+         player.setQuestUI8CH( getId(), 1 ); // receive key item
       } );
    }
 
@@ -116,42 +130,4 @@ private:
 
       player.playScene( getId(), 7, NONE, callback );
    }
-
-   void Scene00008( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 8, NONE, callback );
-   }
-
-   void Scene00050( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         /*// on quest accept
-         player.updateQuest( getId(), 1 );
-         player.setQuestUI8CH( getId(), 1 ); // receive key item
-
-         // teleport to real limsa
-         player.forceZoneing( 128 );*/
-      };
-
-      player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
-   }
-
-public:
-   ManSea002() : EventScript( 65644 )
-   {}
-
-   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
-   {
-      auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
-
-      // todo: this doesn't actually play a cutscene after accepting the quest
-      if( actor == ACTOR0 )
-         Scene00000( player );
-   }
 };
\ No newline at end of file
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index 51dea5cd..311f1d11 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -66,7 +66,7 @@ class SubSea001 : public EventScript
       {
          Scene00002( player );
       }
-      else if (actor == SubSea001::Actor2)
+      else if ( actor == SubSea001::Actor2 )
       {
          Scene00016( player );
       }
@@ -77,7 +77,7 @@ class SubSea001 : public EventScript
    void Scene00000( Entity::Player& player )
    {
       player.playScene( getId(), 0, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
             if (result.param2 == 1)
                player.updateQuest( getId(), 1);
@@ -98,7 +98,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 2, 8192,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if ( result.param2 == 1 && player.hasQuest( 65644 ) )
+            if( result.param2 == 1 && player.hasQuest( 65644 ) )
             {
                player.updateQuest( getId(), 2);
                player.prepareZoning( 129, true, 1, 0 ); // teleport to real limsa
@@ -111,139 +111,138 @@ class SubSea001 : public EventScript
                   player.updateQuest( getId(), 255 );
                }
             }
-            else
-               return;
-         });
+            else return;
+         } );
    }
 
    void Scene00003( Entity::Player& player )
    {
       player.playScene( getId(), 3, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00004( Entity::Player& player )
    {
       player.playScene( getId(), 4, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00005( Entity::Player& player )
    {
       player.playScene( getId(), 5, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00006( Entity::Player& player )
    {
       player.playScene( getId(), 6, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00007( Entity::Player& player )
    {
       player.playScene( getId(), 7, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00008( Entity::Player& player )
    {
       player.playScene( getId(), 8, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00009( Entity::Player& player )
    {
       player.playScene( getId(), 9, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00010( Entity::Player& player )
    {
       player.playScene( getId(), 10, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00011( Entity::Player& player )
    {
       player.playScene( getId(), 11, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00012( Entity::Player& player )
    {
       player.playScene( getId(), 12, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00013( Entity::Player& player )
    {
       player.playScene( getId(), 13, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00014( Entity::Player& player )
    {
       player.playScene( getId(), 14, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-         });
+         } );
    }
 
    void Scene00015( Entity::Player& player )
    {
       player.playScene( getId(), 15, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
 
-         });
+         } );
    }
 
    void Scene00016( Entity::Player& player )
    {
       player.playScene( getId(), 16, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if (result.param2 == 1)
+            if( result.param2 == 1 )
             {
-               Scene00017(player);
+               Scene00017( player );
             }
             else return;
-         });
+         } );
    }
 
    void Scene00017( Entity::Player& player )
    {
       player.playScene( getId(), 17, 8192,
-         [&](Entity::Player& player, const Event::SceneResult& result)
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.setQuestUI8BH(getId(), 0);
+            player.setQuestUI8BH( getId(), 0 );
 
-            if (player.giveQuestRewards(getId(), 0))
-               player.finishQuest(getId());
-         });
+            if (player.giveQuestRewards( getId(), 0 ) )
+               player.finishQuest( getId() );
+         } );
    }
 
 };

From 5b10dcf72226abac42ea634576bdbb0b3d0189f7 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Mon, 14 May 2018 05:55:05 +0200
Subject: [PATCH 08/31] little style

---
 src/servers/Scripts/quest/ManSea002.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 9fbd929b..3a7733a3 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -43,8 +43,7 @@ public:
    {
       auto actor = Event::mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
 
-      // todo: this doesn't actually play a cutscene after accepting the quest
-      if ( actor == ACTOR0 )
+      if( actor == ACTOR0 )
          Scene00000( player );
    }
 
@@ -88,7 +87,7 @@ private:
 
       };
 
-      player.playScene( getId(), 3, NONE, callback );
+      player.playScene( getId(), 3, NONE, callback);
    }
 
    void Scene00004( Entity::Player& player )
@@ -98,7 +97,7 @@ private:
 
       };
 
-      player.playScene( getId(), 4, NONE, callback );
+      player.playScene( getId(), 4, NONE, callback);
    }
 
    void Scene00005( Entity::Player& player )
@@ -108,7 +107,7 @@ private:
 
       };
 
-      player.playScene( getId(), 5, NONE, callback );
+      player.playScene( getId(), 5, NONE, callback);
    }
 
    void Scene00006( Entity::Player& player )
@@ -118,7 +117,7 @@ private:
 
       };
 
-      player.playScene( getId(), 6, NONE, callback );
+      player.playScene( getId(), 6, NONE, callback);
    }
 
    void Scene00007( Entity::Player& player )
@@ -128,6 +127,6 @@ private:
 
       };
 
-      player.playScene( getId(), 7, NONE, callback );
+      player.playScene( getId(), 7, NONE, callback);
    }
 };
\ No newline at end of file

From 4fc7884c63384ceda0fe639cda7d758045577984 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Tue, 15 May 2018 02:39:35 +0200
Subject: [PATCH 09/31] ManSea002 now work properly and it's over

---
 src/servers/Scripts/quest/ManSea002.cpp       | 125 +++++++++++++-----
 .../quest/subquest/limsa/SubSea001.cpp        |  52 ++++----
 2 files changed, 119 insertions(+), 58 deletions(-)

diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 3a7733a3..573f954b 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -41,14 +41,69 @@ public:
 
    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( actorId );
 
       if( actor == ACTOR0 )
+      {
          Scene00000( player );
+      }
+      else if( actor == AETHERYTE0 )
+      {
+         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 );
+            Scene00002( player );
+         },
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+         {},
+            eventId );
+      }
+      else if( actor == ACTOR1 )
+      {
+         Scene00004( player );
+      }
+      else if( actor == ACTOR2 )
+      {
+         Scene00006( player );
+      }
+      else if( actor == ACTOR3 )
+      {
+         Scene00007( player );
+      }
    }
 
 private:
 
+   void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+   {
+      if ( varIdx == 1 )
+      {
+         player.sendQuestMessage( getId(), 1, 0, 0, 0 );
+      }
+      else if ( varIdx == 2 )
+      {
+         player.sendQuestMessage( getId(), 2, 0, 0, 0 );
+      }
+      else
+      {
+         player.sendQuestMessage( getId(), 0, 0, 0, 0 );
+      }
+
+      auto questId = getId();
+
+      auto QUEST_VAR_ATTUNE = player.getQuestUI8AL( questId );
+      auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId );
+      auto QUEST_VAR_TRADE = player.getQuestUI8BL( questId );
+
+      if ( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
+      {
+         player.updateQuest( questId, SEQ_FINISH );
+      }
+   }
+
    void Scene00000( Entity::Player& player )
    {
       player.playScene( getId(), 0, HIDE_HOTBAR,
@@ -72,61 +127,69 @@ private:
 
    void Scene00002( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-
-      };
-
-      player.playScene( getId(), 2, NONE, callback );
+         Scene00003( player );
+      } );
    }
 
    void Scene00003( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene( getId(), 3, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-
-      };
-
-      player.playScene( getId(), 3, NONE, callback);
+         player.setQuestUI8BL( getId(), 1 );
+         checkQuestCompletion( player, 0 );
+      } );
    }
 
    void Scene00004( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-
-      };
-
-      player.playScene( getId(), 4, NONE, callback);
+         if( result.param2 == 1 )
+         {
+            Scene00005( player );
+         }
+         else return;
+      } );
    }
 
    void Scene00005( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-
-      };
-
-      player.playScene( getId(), 5, NONE, callback);
+         player.setQuestUI8CH( getId(), 0 ); // remove key item, since we have just traded it
+         player.setQuestUI8BH( getId(), 1 );
+         checkQuestCompletion( player, 1 );
+      } );
    }
 
    void Scene00006( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-
-      };
-
-      player.playScene( getId(), 6, NONE, callback);
+         player.setQuestUI8AL( getId(), 1 );
+         checkQuestCompletion( player, 2 );
+      } );
    }
 
    void Scene00007( Entity::Player& player )
    {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      player.playScene( getId(), 7, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-
-      };
-
-      player.playScene( getId(), 7, NONE, callback);
+         if ( result.param2 == 1 ) // finish quest
+         {
+            if (player.giveQuestRewards( getId(), 0 ) )
+            {
+               player.finishQuest( getId() );
+            }
+         }
+      } );
    }
 };
\ No newline at end of file
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index 311f1d11..5b6fc966 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -50,9 +50,9 @@ class SubSea001 : public EventScript
 
    public:
       SubSea001() : EventScript( 65647 )
-      { }; 
+      {}; 
       ~SubSea001()
-      { }; 
+      {}; 
 
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
@@ -76,35 +76,34 @@ class SubSea001 : public EventScript
 
    void Scene00000( Entity::Player& player )
    {
-      player.playScene( getId(), 0, 8192,
+      player.playScene( getId(), 0, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if (result.param2 == 1)
-               player.updateQuest( getId(), 1);
+            if( result.param2 == 1 )
+               player.updateQuest( getId(), 1 );
          } );
    }
 
    void Scene00001( Entity::Player& player )
    {
-      player.playScene( getId(), 1, 8192,
+      player.playScene( getId(), 1, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-
          } );
    }
 
    void Scene00002( Entity::Player& player )
    {
-      player.playScene( getId(), 2, 8192,
+      player.playScene( getId(), 2, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
             if( result.param2 == 1 && player.hasQuest( 65644 ) )
             {
                player.updateQuest( getId(), 2);
-               player.prepareZoning( 129, true, 1, 0 ); // teleport to real limsa
                player.changePosition( 10, 21, 13, -2 );
+               player.forceZoneing( Territorytype0 ); // teleport to real limsa
 
-               //HARDCODE for autocomplete quest
+               //Autocomplete quest
                if (player.getQuestSeq( getId() ) == 2 )
                {
                   player.setQuestUI8BH( getId(), 6 );
@@ -117,7 +116,7 @@ class SubSea001 : public EventScript
 
    void Scene00003( Entity::Player& player )
    {
-      player.playScene( getId(), 3, 8192,
+      player.playScene( getId(), 3, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -125,7 +124,7 @@ class SubSea001 : public EventScript
 
    void Scene00004( Entity::Player& player )
    {
-      player.playScene( getId(), 4, 8192,
+      player.playScene( getId(), 4, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -133,7 +132,7 @@ class SubSea001 : public EventScript
 
    void Scene00005( Entity::Player& player )
    {
-      player.playScene( getId(), 5, 8192,
+      player.playScene( getId(), 5, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -141,7 +140,7 @@ class SubSea001 : public EventScript
 
    void Scene00006( Entity::Player& player )
    {
-      player.playScene( getId(), 6, 8192,
+      player.playScene( getId(), 6, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -149,7 +148,7 @@ class SubSea001 : public EventScript
 
    void Scene00007( Entity::Player& player )
    {
-      player.playScene( getId(), 7, 8192,
+      player.playScene( getId(), 7, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -157,7 +156,7 @@ class SubSea001 : public EventScript
 
    void Scene00008( Entity::Player& player )
    {
-      player.playScene( getId(), 8, 8192,
+      player.playScene( getId(), 8, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -165,7 +164,7 @@ class SubSea001 : public EventScript
 
    void Scene00009( Entity::Player& player )
    {
-      player.playScene( getId(), 9, 8192,
+      player.playScene( getId(), 9, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -173,7 +172,7 @@ class SubSea001 : public EventScript
 
    void Scene00010( Entity::Player& player )
    {
-      player.playScene( getId(), 10, 8192,
+      player.playScene( getId(), 10, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -181,7 +180,7 @@ class SubSea001 : public EventScript
 
    void Scene00011( Entity::Player& player )
    {
-      player.playScene( getId(), 11, 8192,
+      player.playScene( getId(), 11, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -189,7 +188,7 @@ class SubSea001 : public EventScript
 
    void Scene00012( Entity::Player& player )
    {
-      player.playScene( getId(), 12, 8192,
+      player.playScene( getId(), 12, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -197,7 +196,7 @@ class SubSea001 : public EventScript
 
    void Scene00013( Entity::Player& player )
    {
-      player.playScene( getId(), 13, 8192,
+      player.playScene( getId(), 13, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -205,7 +204,7 @@ class SubSea001 : public EventScript
 
    void Scene00014( Entity::Player& player )
    {
-      player.playScene( getId(), 14, 8192,
+      player.playScene( getId(), 14, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
          } );
@@ -213,16 +212,15 @@ class SubSea001 : public EventScript
 
    void Scene00015( Entity::Player& player )
    {
-      player.playScene( getId(), 15, 8192,
+      player.playScene( getId(), 15, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-
          } );
    }
 
    void Scene00016( Entity::Player& player )
    {
-      player.playScene( getId(), 16, 8192,
+      player.playScene( getId(), 16, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
             if( result.param2 == 1 )
@@ -235,12 +233,12 @@ class SubSea001 : public EventScript
 
    void Scene00017( Entity::Player& player )
    {
-      player.playScene( getId(), 17, 8192,
+      player.playScene( getId(), 17, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
             player.setQuestUI8BH( getId(), 0 );
 
-            if (player.giveQuestRewards( getId(), 0 ) )
+            if( player.giveQuestRewards( getId(), 0 ) )
                player.finishQuest( getId() );
          } );
    }

From 626e84b44a3e7399145f157bb46846cb9a970a67 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Fri, 18 May 2018 22:05:02 +0200
Subject: [PATCH 10/31] First typo SubSea001

---
 .../quest/subquest/limsa/SubSea001.cpp        | 293 ++++++++++++++----
 1 file changed, 227 insertions(+), 66 deletions(-)

diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index 5b6fc966..0eb34d40 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -11,68 +11,224 @@
 
 class SubSea001 : public EventScript
 {
-   private:
-      // Basic quest information 
-      // Quest vars / flags used
-      // GetQuestBitFlag8
-      // GetQuestUI8AL
-      // GetQuestUI8BH
+private:
+   // Basic quest information 
+   // Quest vars / flags used
+   // GetQuestBitFlag8
+   // GetQuestUI8AL
+   // GetQuestUI8BH
 
-      enum Sequence : uint8_t
-      {
-         Seq0 = 0,
-         Seq1 = 1,
-         Seq2 = 2,
-         SeqFinish = 255,
-      };
-
-      // Quest rewards 
-      static constexpr auto RewardExpFactor = 50;
-      static constexpr auto RewardItem = 4551;
-      static constexpr auto RewardItemCount = 2;
-
-      // Entities found in the script data of the quest
-      static constexpr auto Actor0 = 1002698;
-      static constexpr auto Actor1 = 1000969;
-      static constexpr auto Actor2 = 1003604;
-      static constexpr auto Eobject0 = 2001563;
-      static constexpr auto Eobject1 = 2001564;
-      static constexpr auto Eobject2 = 2001565;
-      static constexpr auto Eobject3 = 2001566;
-      static constexpr auto Eobject4 = 2001567;
-      static constexpr auto Eobject5 = 2001568;
-      static constexpr auto EventActionProcess = 14;
-      static constexpr auto Item0 = 2000447;
-      static constexpr auto Poprange0 = 4161445;
-      static constexpr auto Quest0 = 65644;
-      static constexpr auto Quest1 = 65645;
-      static constexpr auto Territorytype0 = 129;
-
-   public:
-      SubSea001() : EventScript( 65647 )
-      {}; 
-      ~SubSea001()
-      {}; 
-
-   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   enum Sequence : uint8_t
    {
-      auto actor = Event::mapEventActorToRealActor( actorId );
+      Seq0 = 0,
+      Seq1 = 1,
+      Seq2 = 2,
+      SeqFinish = 255,
+   };
 
-      if ( actor == SubSea001::Actor0 )
-      {
-         Scene00000( player );
-      }
-      else if ( actor == SubSea001::Actor1 )
-      {
-         Scene00002( player );
-      }
-      else if ( actor == SubSea001::Actor2 )
-      {
-         Scene00016( player );
-      }
-   }
+   // Quest rewards 
+   static constexpr auto RewardExpFactor = 50;
+   static constexpr auto RewardItem = 4551;
+   static constexpr auto RewardItemCount = 2;
 
-   private:
+   // Entities found in the script data of the quest
+   static constexpr auto Actor0 = 1002698;
+   static constexpr auto Actor1 = 1000969;
+   static constexpr auto Actor2 = 1003604;
+   static constexpr auto Eobject0 = 2001563;
+   static constexpr auto Eobject1 = 2001564;
+   static constexpr auto Eobject2 = 2001565;
+   static constexpr auto Eobject3 = 2001566;
+   static constexpr auto Eobject4 = 2001567;
+   static constexpr auto Eobject5 = 2001568;
+   static constexpr auto EventActionProcess = 14;
+   static constexpr auto Item0 = 2000447;
+   static constexpr auto Poprange0 = 4161445;
+   static constexpr auto Quest0 = 65644;
+   static constexpr auto Quest1 = 65645;
+   static constexpr auto Territorytype0 = 129;
+
+public:
+   SubSea001() : EventScript(65647)
+   {};
+   ~SubSea001()
+   {};
+
+   void onTalk(uint32_t eventId, Entity::Player& player, uint64_t actorId) override
+   {
+      auto actor = Event::mapEventActorToRealActor(actorId);
+      auto currentCC = player.getQuestUI8AL(getId());
+
+      auto despawn1 = player.getQuestUI8FL(getId());
+      auto despawn2 = player.getQuestUI8FH(getId());
+
+      if (actor == SubSea001::Actor0)
+      {
+         Scene00000(player);
+      }
+      else if (actor == SubSea001::Actor1)
+      {
+         Scene00002(player);
+      }
+      else if (actor == SubSea001::Actor2)
+      {
+         Scene00016(player);
+      }
+      //EOBJECTS CHECK
+      else if (actor == SubSea001::Eobject0) 
+      {
+         player.eventActionStart(getId(), 0x0E,
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {
+            despawn2 = despawn2 | 8;
+            player.setQuestUI8FL(getId(), despawn2);
+            Scene00003(player);
+         },
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {},
+            eventId);
+      }
+      else if (actor == SubSea001::Eobject1) 
+      {
+         player.eventActionStart(getId(), 0x0E,
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {
+            despawn2 = despawn2 | 4;
+            player.setQuestUI8FL(getId(), despawn2);
+            Scene00005(player);
+         },
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {},
+            eventId);
+      }
+      else if (actor == SubSea001::Eobject2) 
+      {
+         player.eventActionStart(getId(), 0x0E,
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {
+            despawn2 = despawn2 | 2;
+            player.setQuestUI8FL(getId(), despawn2);
+            Scene00007(player);
+         },
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {},
+            eventId);
+      }
+      else if (actor == SubSea001::Eobject3) 
+      {
+         player.eventActionStart(getId(), 0x0E,
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {
+            despawn2 = despawn2 | 1;
+            player.setQuestUI8FL(getId(), despawn2);
+            Scene00009(player);
+         },
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {},
+            eventId);
+      }
+      else if (actor == SubSea001::Eobject4)
+      {
+         player.eventActionStart(getId(), 0x0E,
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {
+            despawn2 = despawn2 | 8;
+            player.setQuestUI8FL(getId(), despawn2);
+            Scene00011(player);
+         },
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {},
+            eventId);
+      }
+      else if (actor == SubSea001::Eobject5)
+      {
+         player.eventActionStart(getId(), 0x0E,
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {
+            despawn2 = despawn2 | 4;
+            player.setQuestUI8FL(getId(), despawn2);
+            Scene00013(player);
+         },
+            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         {},
+            eventId);
+      }
+   };
+
+private:
+
+   void checkQuestcompletion(Entity::Player& player, uint32_t varIdx, uint32_t actorId)
+   {
+      auto currentCC = player.getQuestUI8AL(getId());
+
+      if (varIdx == 1)
+      {
+         player.sendQuestMessage(getId(), 0, 2, currentCC + 1, 6);//sendquestMessage(eventId, 0, 2, currVegetal + 1, 6);
+
+         if (currentCC + 1 == 6)
+         {
+            player.updateQuest(getId(), SeqFinish);//questUpdate(eventId, SubFst015.SEQ_FINISH);
+         }
+         else
+         {
+            player.setQuestUI8AL(getId(), currentCC + 1);
+         }
+      }
+
+      /*auto eobj = Event::mapEventActorToRealActor(actorId);
+      auto currentCC = player.getQuestUI8BH(getId());
+
+      auto despawn1 = player.getQuestUI8FL(getId());
+      auto despawn2 = player.getQuestUI8FH(getId());
+
+      //if(varIdx == 0)
+      if (eobj == SubSea001::Eobject0 && varIdx == 0)
+      {
+         despawn2 = despawn2 | 8;
+         player.setQuestUI8FH(getId(), despawn2);
+      }
+      //if (varIdx == 1)
+      else if (eobj == SubSea001::Eobject1 && varIdx == 1)
+      {
+         despawn2 = despawn2 | 4;
+         player.setQuestUI8FH(getId(), despawn2);
+      }
+      //if (varIdx == 2)
+      else if (eobj == SubSea001::Eobject2 && varIdx == 2)
+      {
+         despawn2 = despawn2 | 2;
+         player.setQuestUI8FH(getId(), despawn2);
+      }
+      //if (varIdx == 3)
+      else if (eobj == SubSea001::Eobject3 && varIdx == 3)
+      {
+         despawn2 = despawn2 | 1;
+         player.setQuestUI8FH(getId(), despawn2);
+      }
+      //if(varIdx == 4)
+      else if (eobj == SubSea001::Eobject4 && varIdx == 4)
+      {
+         despawn2 = despawn2 | 8;
+         player.setQuestUI8FH(getId(), despawn2);
+      }
+      //if(varIdx == 5)
+      else if (eobj == SubSea001::Eobject5 && varIdx == 5)
+      {
+         despawn2 = despawn2 | 4;
+         player.setQuestUI8FH(getId(), despawn2);
+      }
+
+      player.sendQuestMessage(getId(), 0, 2, currentCC + 1, 6);//sendquestMessage(eventId, 0, 2, currVegetal + 1, 6);
+
+      if (currentCC + 1 == 6)
+      {
+         player.updateQuest(getId(), SeqFinish);//questUpdate(eventId, SubFst015.SEQ_FINISH);
+      }
+      else
+      {
+         player.setQuestUI8BH(getId(), currentCC + 1);
+      }*/
+   };
 
    void Scene00000( Entity::Player& player )
    {
@@ -97,18 +253,11 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 2, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if( result.param2 == 1 && player.hasQuest( 65644 ) )
+            if( player.hasQuest(65644) && result.param2 == 1 )
             {
                player.updateQuest( getId(), 2);
                player.changePosition( 10, 21, 13, -2 );
                player.forceZoneing( Territorytype0 ); // teleport to real limsa
-
-               //Autocomplete quest
-               if (player.getQuestSeq( getId() ) == 2 )
-               {
-                  player.setQuestUI8BH( getId(), 6 );
-                  player.updateQuest( getId(), 255 );
-               }
             }
             else return;
          } );
@@ -119,6 +268,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 3, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            Scene00004(player);
          } );
    }
 
@@ -127,6 +277,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 4, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            player.playScene(getId(), 4, 0, 0, 0);
          } );
    }
 
@@ -135,6 +286,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 5, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            Scene00006(player);
          } );
    }
 
@@ -143,6 +295,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 6, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            player.playScene(getId(), 6, 0, 0, 0);
          } );
    }
 
@@ -151,6 +304,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 7, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            Scene00008(player);
          } );
    }
 
@@ -159,6 +313,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 8, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            player.playScene(getId(), 8, 0, 0, 0);
          } );
    }
 
@@ -167,6 +322,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 9, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            Scene00010(player);
          } );
    }
 
@@ -175,6 +331,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 10, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            player.playScene(getId(), 10, 0, 0, 0);
          } );
    }
 
@@ -183,6 +340,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 11, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            Scene00012(player);
          } );
    }
 
@@ -191,6 +349,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 12, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            player.playScene(getId(), 12, 0, 0, 0);
          } );
    }
 
@@ -199,6 +358,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 13, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            Scene00014(player);
          } );
    }
 
@@ -207,6 +367,7 @@ class SubSea001 : public EventScript
       player.playScene( getId(), 14, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            player.playScene(getId(), 14, 0, 0, 0);
          } );
    }
 

From fee16164194d7e5836e6dce21a9a3955bbaa3b76 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Sat, 19 May 2018 03:17:02 +0200
Subject: [PATCH 11/31] Return (Action 6) now work (again?)

---
 src/servers/Scripts/action/ActionReturn6.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/servers/Scripts/action/ActionReturn6.cpp

diff --git a/src/servers/Scripts/action/ActionReturn6.cpp b/src/servers/Scripts/action/ActionReturn6.cpp
new file mode 100644
index 00000000..7f919e15
--- /dev/null
+++ b/src/servers/Scripts/action/ActionReturn6.cpp
@@ -0,0 +1,15 @@
+#include <Script/NativeScriptApi.h>
+#include "../ScriptObject.h"
+#include <Actor/Player.h>
+
+class ActionSprint3 : public ActionScript
+{
+public:
+   ActionSprint3() : ActionScript( 3 )
+   {}
+
+   void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ) override
+   {
+      player.returnToHomepoint();
+   }
+};
\ No newline at end of file

From 24ca02113eeee11b7833f195c395b26924ad5705 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Sat, 19 May 2018 19:27:24 +0200
Subject: [PATCH 12/31] Failed save...

---
 src/servers/Scripts/action/ActionReturn6.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/servers/Scripts/action/ActionReturn6.cpp b/src/servers/Scripts/action/ActionReturn6.cpp
index 7f919e15..7afc07e1 100644
--- a/src/servers/Scripts/action/ActionReturn6.cpp
+++ b/src/servers/Scripts/action/ActionReturn6.cpp
@@ -2,10 +2,10 @@
 #include "../ScriptObject.h"
 #include <Actor/Player.h>
 
-class ActionSprint3 : public ActionScript
+class ActionReturn6 : public ActionScript
 {
 public:
-   ActionSprint3() : ActionScript( 3 )
+   ActionReturn6() : ActionScript( 6 )
    {}
 
    void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ) override

From f06638a7ed73b784aede2d03bed6d024674b494f Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Fri, 1 Jun 2018 21:27:20 +0200
Subject: [PATCH 13/31] [Quest] ManSea003 and SubSea001 now work properly

---
 src/servers/Scripts/quest/ManSea003.cpp       | 210 ++++++++++++++++
 .../quest/subquest/limsa/SubSea001.cpp        | 232 +++++++-----------
 2 files changed, 296 insertions(+), 146 deletions(-)
 create mode 100644 src/servers/Scripts/quest/ManSea003.cpp

diff --git a/src/servers/Scripts/quest/ManSea003.cpp b/src/servers/Scripts/quest/ManSea003.cpp
new file mode 100644
index 00000000..9e3ce751
--- /dev/null
+++ b/src/servers/Scripts/quest/ManSea003.cpp
@@ -0,0 +1,210 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
+#include <ScriptObject.h>
+
+// Quest Script: ManSea003_00109
+// Quest Name: Close to Home
+// Quest ID: 65645
+// Start NPC: 1002697
+// End NPC: 1000972
+
+class ManSea003 : public EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+      // GetQuestUI8BL
+      // GetQuestUI8CH
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         SeqFinish = 255,
+      };
+
+      // 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 = 1002697;
+      static constexpr auto Actor1 = 1001217;
+      static constexpr auto Actor2 = 1000895;
+      static constexpr auto Actor3 = 1000972;
+      static constexpr auto Aetheryte0 = 8;
+      static constexpr auto BindActor0 = 6229226;
+      static constexpr auto Item0 = 2000105;
+      static constexpr auto LocActor1 = 1001023;
+      static constexpr auto LocFace0 = 604;
+      static constexpr auto LocFace1 = 605;
+      static constexpr auto LocPosCam1 = 4106696;
+      static constexpr auto LocPosCam2 = 4106698;
+      static constexpr auto Reward0 = 1;
+      static constexpr auto Screenimage0 = 14;
+      static constexpr auto UnlockDesion = 14;
+
+   public:
+      ManSea003() : EventScript( 65645 )
+      {}; 
+      ~ManSea003()
+      {}; 
+
+      void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+      {
+         auto actor = Event::mapEventActorToRealActor( actorId );
+
+         if( actor == Actor0)
+         {
+            Scene00000( player );
+         }
+         else if( actor == Aetheryte0 )
+         {
+            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 );
+               Scene00002( player );
+            },
+               [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {},
+               eventId );
+         }
+         else if( actor == Actor1 )
+         {
+            Scene00004( player );
+         }
+         else if( actor == Actor2 )
+         {
+            Scene00006( player );
+         }
+         else if( actor == Actor3 )
+         {
+            Scene00007( player );
+         }
+      }
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+   {
+      if( varIdx == 1 )
+      {
+         player.sendQuestMessage( getId(), 1, 0, 0, 0 );
+      }
+      else if( varIdx == 2 )
+      {
+         player.sendQuestMessage( getId(), 2, 0, 0, 0 );
+      }
+      else
+      {
+         player.sendQuestMessage( getId(), 0, 0, 0, 0 );
+      }
+
+      auto questId = getId();
+
+      auto QUEST_VAR_ATTUNE = player.getQuestUI8AL( questId );
+      auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId );
+      auto QUEST_VAR_TRADE = player.getQuestUI8BL( questId );
+
+      if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
+      {
+         player.updateQuest( questId, 255 );
+      }
+   }
+
+   void Scene00000( Entity::Player& player)
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         if(result.param2 == 1) // accept quest
+            Scene00001( player );
+      } );
+   }
+
+   void Scene00001( Entity::Player& player)
+   {
+      player.playScene( getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         // on quest accept
+         player.updateQuest( getId(), 1 );
+         player.setQuestUI8CH( getId(), 1 ); // receive key item
+      } );
+   }
+
+   void Scene00002( Entity::Player& player)
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         Scene00003( player );
+      } );
+   }
+
+   void Scene00003( Entity::Player& player)
+   {
+      player.playScene( getId(), 3, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         player.setQuestUI8BL( getId(), 1 );
+         checkQuestCompletion( player, 0 );
+      } );
+   }
+
+   void Scene00004( Entity::Player& player)
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         if( result.param2 == 1 )
+         {
+            Scene00005( player );
+         }
+         else return;
+      } );
+   }
+
+   void Scene00005( Entity::Player& player)
+   {
+      player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         player.setQuestUI8CH( getId(), 0 ); // remove key item, since we have just traded it
+         player.setQuestUI8BH( getId(), 1 );
+         checkQuestCompletion( player, 1 );
+      } );
+   }
+
+   void Scene00006( Entity::Player& player)
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         player.setQuestUI8AL( getId(), 1 );
+         checkQuestCompletion( player, 2 );
+      } );
+   }
+
+   void Scene00007( Entity::Player& player)
+   {
+      player.playScene( getId(), 7, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         if( result.param2 == 1 ) // finish quest
+         {
+            if(player.giveQuestRewards( getId(), 0 ) )
+            {
+               player.finishQuest( getId() );
+            }
+         }
+      } );
+   }
+};
\ No newline at end of file
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index 0eb34d40..d8e5b522 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -54,181 +54,110 @@ public:
    ~SubSea001()
    {};
 
-   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(actorId);
-      auto currentCC = player.getQuestUI8AL(getId());
+      auto actor = Event::mapEventActorToRealActor( actorId );
+      auto currentCC = player.getQuestUI8AL( getId() );
 
-      auto despawn1 = player.getQuestUI8FL(getId());
-      auto despawn2 = player.getQuestUI8FH(getId());
-
-      if (actor == SubSea001::Actor0)
+      if( actor == Actor0 )
       {
-         Scene00000(player);
+         Scene00000( player );
       }
-      else if (actor == SubSea001::Actor1)
+      else if( actor == Actor1 )
       {
-         Scene00002(player);
+         Scene00002( player );
       }
-      else if (actor == SubSea001::Actor2)
+      else if( actor == Actor2 )
       {
-         Scene00016(player);
+         Scene00016( player );
       }
       //EOBJECTS CHECK
-      else if (actor == SubSea001::Eobject0) 
+      else if( actor == Eobject0 ) 
       {
-         player.eventActionStart(getId(), 0x0E,
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         player.eventActionStart( getId(), 0x0E,
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {
-            despawn2 = despawn2 | 8;
-            player.setQuestUI8FL(getId(), despawn2);
-            Scene00003(player);
+            Scene00003( player );
          },
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {},
-            eventId);
+            eventId );
       }
-      else if (actor == SubSea001::Eobject1) 
+      else if(actor == Eobject1) 
       {
-         player.eventActionStart(getId(), 0x0E,
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         player.eventActionStart( getId(), 0x0E,
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {
-            despawn2 = despawn2 | 4;
-            player.setQuestUI8FL(getId(), despawn2);
-            Scene00005(player);
+            Scene00005( player );
          },
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {},
-            eventId);
+            eventId );
       }
-      else if (actor == SubSea001::Eobject2) 
+      else if( actor == Eobject2 ) 
       {
-         player.eventActionStart(getId(), 0x0E,
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         player.eventActionStart( getId(), 0x0E,
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {
-            despawn2 = despawn2 | 2;
-            player.setQuestUI8FL(getId(), despawn2);
-            Scene00007(player);
+            Scene00007( player );
          },
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {},
-            eventId);
+            eventId );
       }
-      else if (actor == SubSea001::Eobject3) 
+      else if( actor == Eobject3) 
       {
-         player.eventActionStart(getId(), 0x0E,
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         player.eventActionStart( getId(), 0x0E,
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {
-            despawn2 = despawn2 | 1;
-            player.setQuestUI8FL(getId(), despawn2);
-            Scene00009(player);
+            Scene00009( player );
          },
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {},
-            eventId);
+            eventId );
       }
-      else if (actor == SubSea001::Eobject4)
+      else if( actor == Eobject4)
       {
-         player.eventActionStart(getId(), 0x0E,
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         player.eventActionStart( getId(), 0x0E,
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {
-            despawn2 = despawn2 | 8;
-            player.setQuestUI8FL(getId(), despawn2);
-            Scene00011(player);
+            Scene00011( player );
          },
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {},
-            eventId);
+            eventId );
       }
-      else if (actor == SubSea001::Eobject5)
+      else if( actor == Eobject5)
       {
-         player.eventActionStart(getId(), 0x0E,
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+         player.eventActionStart( getId(), 0x0E,
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {
-            despawn2 = despawn2 | 4;
-            player.setQuestUI8FL(getId(), despawn2);
-            Scene00013(player);
+            Scene00013( player );
          },
-            [&](Entity::Player& player, uint32_t eventId, uint64_t additional)
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
          {},
-            eventId);
+            eventId );
       }
    };
 
 private:
 
-   void checkQuestcompletion(Entity::Player& player, uint32_t varIdx, uint32_t actorId)
+   void checkQuestcompletion( Entity::Player& player )
    {
-      auto currentCC = player.getQuestUI8AL(getId());
+      auto currentCC = player.getQuestUI8BH( getId() );
 
-      if (varIdx == 1)
-      {
-         player.sendQuestMessage(getId(), 0, 2, currentCC + 1, 6);//sendquestMessage(eventId, 0, 2, currVegetal + 1, 6);
+      player.sendQuestMessage( getId(), 1, 3, currentCC + 1, 6 );
 
-         if (currentCC + 1 == 6)
-         {
-            player.updateQuest(getId(), SeqFinish);//questUpdate(eventId, SubFst015.SEQ_FINISH);
-         }
-         else
-         {
-            player.setQuestUI8AL(getId(), currentCC + 1);
-         }
-      }
-
-      /*auto eobj = Event::mapEventActorToRealActor(actorId);
-      auto currentCC = player.getQuestUI8BH(getId());
-
-      auto despawn1 = player.getQuestUI8FL(getId());
-      auto despawn2 = player.getQuestUI8FH(getId());
-
-      //if(varIdx == 0)
-      if (eobj == SubSea001::Eobject0 && varIdx == 0)
+      if( currentCC + 1 >= 6 )
       {
-         despawn2 = despawn2 | 8;
-         player.setQuestUI8FH(getId(), despawn2);
-      }
-      //if (varIdx == 1)
-      else if (eobj == SubSea001::Eobject1 && varIdx == 1)
-      {
-         despawn2 = despawn2 | 4;
-         player.setQuestUI8FH(getId(), despawn2);
-      }
-      //if (varIdx == 2)
-      else if (eobj == SubSea001::Eobject2 && varIdx == 2)
-      {
-         despawn2 = despawn2 | 2;
-         player.setQuestUI8FH(getId(), despawn2);
-      }
-      //if (varIdx == 3)
-      else if (eobj == SubSea001::Eobject3 && varIdx == 3)
-      {
-         despawn2 = despawn2 | 1;
-         player.setQuestUI8FH(getId(), despawn2);
-      }
-      //if(varIdx == 4)
-      else if (eobj == SubSea001::Eobject4 && varIdx == 4)
-      {
-         despawn2 = despawn2 | 8;
-         player.setQuestUI8FH(getId(), despawn2);
-      }
-      //if(varIdx == 5)
-      else if (eobj == SubSea001::Eobject5 && varIdx == 5)
-      {
-         despawn2 = despawn2 | 4;
-         player.setQuestUI8FH(getId(), despawn2);
-      }
-
-      player.sendQuestMessage(getId(), 0, 2, currentCC + 1, 6);//sendquestMessage(eventId, 0, 2, currVegetal + 1, 6);
-
-      if (currentCC + 1 == 6)
-      {
-         player.updateQuest(getId(), SeqFinish);//questUpdate(eventId, SubFst015.SEQ_FINISH);
+         player.updateQuest( getId(), SeqFinish );
       }
       else
       {
-         player.setQuestUI8BH(getId(), currentCC + 1);
-      }*/
-   };
+         player.setQuestUI8BH( getId(), currentCC + 1 );
+         player.setQuestUI8AL( getId(), currentCC + 1 );
+      }
+   }
 
    void Scene00000( Entity::Player& player )
    {
@@ -253,11 +182,14 @@ private:
       player.playScene( getId(), 2, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if( player.hasQuest(65644) && result.param2 == 1 )
+            if( player.hasQuest(65644) || player.hasQuest(65645))
             {
-               player.updateQuest( getId(), 2);
-               player.changePosition( 10, 21, 13, -2 );
-               player.forceZoneing( Territorytype0 ); // teleport to real limsa
+               if( result.param2 == 1 )
+               {
+                  player.updateQuest( getId(), 2 );
+                  player.changePosition( 10, 21, 13, -2 );
+                  player.forceZoneing( Territorytype0 ); // teleport to real limsa
+               }
             }
             else return;
          } );
@@ -268,7 +200,7 @@ private:
       player.playScene( getId(), 3, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            Scene00004(player);
+            Scene00004( player );
          } );
    }
 
@@ -277,7 +209,8 @@ private:
       player.playScene( getId(), 4, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.playScene(getId(), 4, 0, 0, 0);
+            checkQuestcompletion( player );
+            player.setQuestBitFlag8( getId(), 7, true );
          } );
    }
 
@@ -286,7 +219,7 @@ private:
       player.playScene( getId(), 5, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            Scene00006(player);
+            Scene00006( player );
          } );
    }
 
@@ -295,7 +228,8 @@ private:
       player.playScene( getId(), 6, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.playScene(getId(), 6, 0, 0, 0);
+            checkQuestcompletion( player );
+            player.setQuestBitFlag8( getId(), 6, true );
          } );
    }
 
@@ -304,7 +238,7 @@ private:
       player.playScene( getId(), 7, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            Scene00008(player);
+            Scene00008( player );
          } );
    }
 
@@ -313,7 +247,8 @@ private:
       player.playScene( getId(), 8, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.playScene(getId(), 8, 0, 0, 0);
+            checkQuestcompletion( player );
+            player.setQuestBitFlag8( getId(), 5, true );
          } );
    }
 
@@ -322,7 +257,7 @@ private:
       player.playScene( getId(), 9, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            Scene00010(player);
+            Scene00010( player );
          } );
    }
 
@@ -331,7 +266,8 @@ private:
       player.playScene( getId(), 10, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.playScene(getId(), 10, 0, 0, 0);
+            checkQuestcompletion( player );
+            player.setQuestBitFlag8( getId(), 4, true );
          } );
    }
 
@@ -340,7 +276,7 @@ private:
       player.playScene( getId(), 11, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            Scene00012(player);
+            Scene00012( player );
          } );
    }
 
@@ -349,7 +285,8 @@ private:
       player.playScene( getId(), 12, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.playScene(getId(), 12, 0, 0, 0);
+            checkQuestcompletion( player );
+            player.setQuestBitFlag8( getId(), 3, true );
          } );
    }
 
@@ -358,7 +295,7 @@ private:
       player.playScene( getId(), 13, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            Scene00014(player);
+            Scene00014( player );
          } );
    }
 
@@ -367,7 +304,8 @@ private:
       player.playScene( getId(), 14, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.playScene(getId(), 14, 0, 0, 0);
+            checkQuestcompletion( player );
+            player.setQuestBitFlag8( getId(), 2, true );
          } );
    }
 
@@ -376,6 +314,7 @@ private:
       player.playScene( getId(), 15, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
+            player.playScene( getId(), 15, 0, 0, 0 );
          } );
    }
 
@@ -388,7 +327,8 @@ private:
             {
                Scene00017( player );
             }
-            else return;
+            else 
+               Scene00015( player );
          } );
    }
 
@@ -396,13 +336,13 @@ private:
    {
       player.playScene( getId(), 17, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
+      {
+         if( result.param2 == 1 )
          {
-            player.setQuestUI8BH( getId(), 0 );
-
             if( player.giveQuestRewards( getId(), 0 ) )
                player.finishQuest( getId() );
-         } );
+         }
+       } );
    }
-
 };
 

From 12ab33d5d1623dac078ee4ea80c8d1c5c27d6c37 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Tue, 12 Jun 2018 23:57:36 +0200
Subject: [PATCH 14/31] [ Quest ] Now they work fine

---
 src/servers/Scripts/quest/ManSea002.cpp          |  6 +++---
 src/servers/Scripts/quest/ManSea003.cpp          |  4 ++--
 .../Scripts/quest/subquest/limsa/SubSea001.cpp   | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 573f954b..8e6d5eb6 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -41,7 +41,7 @@ public:
 
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-      auto actor = Event::mapEventActorToRealActor( actorId );
+      auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
       if( actor == ACTOR0 )
       {
@@ -79,11 +79,11 @@ private:
 
    void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
    {
-      if ( varIdx == 1 )
+      if( varIdx == 1 )
       {
          player.sendQuestMessage( getId(), 1, 0, 0, 0 );
       }
-      else if ( varIdx == 2 )
+      else if( varIdx == 2 )
       {
          player.sendQuestMessage( getId(), 2, 0, 0, 0 );
       }
diff --git a/src/servers/Scripts/quest/ManSea003.cpp b/src/servers/Scripts/quest/ManSea003.cpp
index 9e3ce751..4435b263 100644
--- a/src/servers/Scripts/quest/ManSea003.cpp
+++ b/src/servers/Scripts/quest/ManSea003.cpp
@@ -56,7 +56,7 @@ class ManSea003 : public EventScript
 
       void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
       {
-         auto actor = Event::mapEventActorToRealActor( actorId );
+         auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
          if( actor == Actor0)
          {
@@ -124,7 +124,7 @@ class ManSea003 : public EventScript
       player.playScene( getId(), 0, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-         if(result.param2 == 1) // accept quest
+         if( result.param2 == 1 ) // accept quest
             Scene00001( player );
       } );
    }
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index d8e5b522..b3dedf80 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -56,7 +56,7 @@ public:
 
    void onTalk(uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-      auto actor = Event::mapEventActorToRealActor( actorId );
+      auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
       auto currentCC = player.getQuestUI8AL( getId() );
 
       if( actor == Actor0 )
@@ -83,7 +83,7 @@ public:
          {},
             eventId );
       }
-      else if(actor == Eobject1) 
+      else if(actor == Eobject1 ) 
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@@ -105,7 +105,7 @@ public:
          {},
             eventId );
       }
-      else if( actor == Eobject3) 
+      else if( actor == Eobject3 ) 
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@@ -116,7 +116,7 @@ public:
          {},
             eventId );
       }
-      else if( actor == Eobject4)
+      else if( actor == Eobject4 )
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@@ -127,7 +127,7 @@ public:
          {},
             eventId );
       }
-      else if( actor == Eobject5)
+      else if( actor == Eobject5 )
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
@@ -151,6 +151,8 @@ private:
       if( currentCC + 1 >= 6 )
       {
          player.updateQuest( getId(), SeqFinish );
+         player.setQuestUI8BH(getId(), currentCC + 1);
+         player.setQuestUI8AL(getId(), currentCC + 1);
       }
       else
       {
@@ -182,7 +184,7 @@ private:
       player.playScene( getId(), 2, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if( player.hasQuest(65644) || player.hasQuest(65645))
+            if( player.hasQuest( 65644 ) || player.hasQuest( 65645 ) )
             {
                if( result.param2 == 1 )
                {
@@ -327,8 +329,6 @@ private:
             {
                Scene00017( player );
             }
-            else 
-               Scene00015( player );
          } );
    }
 

From 82da50d69e7e46026085c5fc5a3832415d321df8 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Sun, 17 Jun 2018 19:22:18 +0200
Subject: [PATCH 15/31] [Quest] ManFst003 added

---
 src/servers/Scripts/quest/ManFst003.cpp | 237 +++++++++++++++++++++++-
 1 file changed, 231 insertions(+), 6 deletions(-)

diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp
index 25344bf2..a5090d22 100644
--- a/src/servers/Scripts/quest/ManFst003.cpp
+++ b/src/servers/Scripts/quest/ManFst003.cpp
@@ -1,7 +1,7 @@
 #include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManFst003_00123
 // Quest Name: Close to Home
@@ -11,15 +11,240 @@
 
 class ManFst003 : public EventScript
 {
-private:
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+      // GetQuestUI8BL
+      // GetQuestUI8CH
 
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         SeqFinish = 255,
+      };
 
-public:
-   ManFst003() : EventScript( 65659 )
-   {}
+      // 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 = 1000197;
+      static constexpr auto Actor20 = 1000159;
+      static constexpr auto Actor3 = 1000768;
+      static constexpr auto Actor4 = 1000100;
+      static constexpr auto BindActor0 = 6229224;
+      static constexpr auto Item0 = 2000119;
+      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:
+      ManFst003() : EventScript( 65659 ){}; 
+      ~ManFst003(){}; 
 
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
+      auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
+      if( actor == Actor0 )
+      {
+         Scene00000( player );
+      }
+      else if( actor == Actor1 )
+      {
+         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 == Actor2 )
+      {
+         Scene00002( player );
+      }
+      else if( actor == Actor3 )
+      {
+         Scene00003( player );
+      }
+      else if( actor == Actor4 )
+      {
+         Scene00005( player );
+      }
    }
-};
\ No newline at end of file
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+   {
+      if( varIdx == 3 )
+      {
+         player.sendQuestMessage( getId(), 1, 0, 0, 0 );
+      }
+      else if( varIdx == 2)
+      {
+         player.sendQuestMessage( getId(), 2, 0, 0, 0 );
+      }
+      else
+      {
+         player.sendQuestMessage( getId(), 0, 0, 0, 0 );
+      }
+
+      auto questId = getId();
+
+      auto QUEST_VAR_ATTUNE = player.getQuestUI8AL( questId );
+      auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId );
+      auto QUEST_VAR_TRADE = player.getQuestUI8BL( questId );
+
+      if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
+      {
+         player.updateQuest( questId, 255 );
+      }
+   }
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 )
+            {
+               Scene00050( player );
+            }
+         } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8AL( getId(), 1 );
+            checkQuestCompletion( player, 0 );
+         } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8BH( getId(), 1 );
+            checkQuestCompletion( player, 3 );
+         } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1)
+            {
+               Scene00100( player );
+            }
+            else
+            {
+               Scene00099( player );
+            }
+         } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 4, 0, 0, 0 );
+         } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 )
+            {
+               if( player.giveQuestRewards( getId(), 0 ) )
+               {
+                  player.finishQuest( getId() );
+               }
+            }
+         } );
+   }
+
+   void Scene00050( Entity::Player& player )
+   {
+      player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.updateQuest( getId(), 1 );
+            player.setQuestUI8CH( getId(), 1 );
+            player.forceZoneing( 132 );
+         } );
+   }
+
+   void Scene00051( Entity::Player& player )
+   {
+      player.playScene( getId(), 51, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            Scene00001( player );
+         } );
+   }
+
+   void Scene00099( Entity::Player& player )
+   {
+      player.playScene( getId(), 99, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            Scene00004( player );
+         } );
+   }
+
+   void Scene00100( Entity::Player& player )
+   {
+      player.playScene( getId(), 100, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8CH( getId(), 0 );
+            player.setQuestUI8BL( getId(), 1 );
+            checkQuestCompletion( player, 2 );
+         } );
+   }
+};
+

From cef9e36f975a54be4f79ed4bbf9d572224f08a42 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 18 Jun 2018 13:14:11 +0000
Subject: [PATCH 16/31] cleanup script includes

---
 src/servers/Scripts/action/ActionSprint3.cpp              | 3 +--
 src/servers/Scripts/common/Aethernet.cpp                  | 3 +--
 src/servers/Scripts/common/Aetheryte.cpp                  | 3 +--
 src/servers/Scripts/common/CmnDefCutSceneReplay.cpp       | 3 +--
 src/servers/Scripts/common/CmnDefInnBed.cpp               | 3 +--
 src/servers/Scripts/common/CmnDefLinkShell.cpp            | 3 +--
 src/servers/Scripts/common/HouFurOrchestrion.cpp          | 3 +--
 src/servers/Scripts/opening/OpeningGridania.cpp           | 1 -
 src/servers/Scripts/opening/OpeningLimsa.cpp              | 1 -
 src/servers/Scripts/opening/OpeningUldah.cpp              | 1 -
 src/servers/Scripts/quest/ManFst001.cpp                   | 3 +--
 src/servers/Scripts/quest/ManFst002.cpp                   | 3 +--
 src/servers/Scripts/quest/ManFst003.cpp                   | 3 +--
 src/servers/Scripts/quest/ManFst004.cpp                   | 1 -
 src/servers/Scripts/quest/ManSea001.cpp                   | 1 -
 src/servers/Scripts/quest/ManSea002.cpp                   | 3 +--
 src/servers/Scripts/quest/ManWil001.cpp                   | 3 +--
 src/servers/Scripts/quest/ManWil002.cpp                   | 3 +--
 src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp | 3 +--
 src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp | 3 +--
 src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp | 3 +--
 src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp | 3 +--
 22 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/src/servers/Scripts/action/ActionSprint3.cpp b/src/servers/Scripts/action/ActionSprint3.cpp
index 3d5da658..b630cd8b 100644
--- a/src/servers/Scripts/action/ActionSprint3.cpp
+++ b/src/servers/Scripts/action/ActionSprint3.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class ActionSprint3 : public ActionScript
diff --git a/src/servers/Scripts/common/Aethernet.cpp b/src/servers/Scripts/common/Aethernet.cpp
index 78e22b8b..b925564e 100644
--- a/src/servers/Scripts/common/Aethernet.cpp
+++ b/src/servers/Scripts/common/Aethernet.cpp
@@ -1,5 +1,4 @@
-#include "Script/NativeScriptApi.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 #define ACTION_ATTUNE 0x13
diff --git a/src/servers/Scripts/common/Aetheryte.cpp b/src/servers/Scripts/common/Aetheryte.cpp
index 800d5c8f..d883bd3c 100644
--- a/src/servers/Scripts/common/Aetheryte.cpp
+++ b/src/servers/Scripts/common/Aetheryte.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 
diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
index d3730d60..fdd742e1 100644
--- a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
+++ b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class CmnDefCutSceneReplay : public EventScript
diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp
index b97f129b..2b524502 100644
--- a/src/servers/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/Scripts/common/CmnDefInnBed.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class CmnDefInnBed : public EventScript
diff --git a/src/servers/Scripts/common/CmnDefLinkShell.cpp b/src/servers/Scripts/common/CmnDefLinkShell.cpp
index c5758211..81d174b8 100644
--- a/src/servers/Scripts/common/CmnDefLinkShell.cpp
+++ b/src/servers/Scripts/common/CmnDefLinkShell.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 #define ACTION_CREATE 2
diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp
index 2269789e..7ceeea71 100644
--- a/src/servers/Scripts/common/HouFurOrchestrion.cpp
+++ b/src/servers/Scripts/common/HouFurOrchestrion.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class HouFurOrchestrion : public EventScript
diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp
index 71dc22b9..453aa7fd 100644
--- a/src/servers/Scripts/opening/OpeningGridania.cpp
+++ b/src/servers/Scripts/opening/OpeningGridania.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 
diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp
index 9613149e..088b9ba3 100644
--- a/src/servers/Scripts/opening/OpeningLimsa.cpp
+++ b/src/servers/Scripts/opening/OpeningLimsa.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 
diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp
index dfc0bd62..7ef8d392 100644
--- a/src/servers/Scripts/opening/OpeningUldah.cpp
+++ b/src/servers/Scripts/opening/OpeningUldah.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 
diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp
index a351e61c..ba606e80 100644
--- a/src/servers/Scripts/quest/ManFst001.cpp
+++ b/src/servers/Scripts/quest/ManFst001.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <sapphire_zone/Event/EventHandler.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include "Event/EventHelper.h"
 
 // Quest Script: ManFst001_00039
diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp
index 153fb9a0..b9c8e38d 100644
--- a/src/servers/Scripts/quest/ManFst002.cpp
+++ b/src/servers/Scripts/quest/ManFst002.cpp
@@ -1,8 +1,7 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <sapphire_zone/Event/EventHandler.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManFst002_00124
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp
index 25344bf2..77134ab7 100644
--- a/src/servers/Scripts/quest/ManFst003.cpp
+++ b/src/servers/Scripts/quest/ManFst003.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManFst003_00123
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp
index da1fb49b..72617bb4 100644
--- a/src/servers/Scripts/quest/ManFst004.cpp
+++ b/src/servers/Scripts/quest/ManFst004.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
 #include <ScriptObject.h>
diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp
index 7f0a8840..ddea858e 100644
--- a/src/servers/Scripts/quest/ManSea001.cpp
+++ b/src/servers/Scripts/quest/ManSea001.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
 #include <ScriptObject.h>
diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 9817969a..aeb2f96d 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManSea002_00108
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp
index 8a3f0dfd..7bcf68a7 100644
--- a/src/servers/Scripts/quest/ManWil001.cpp
+++ b/src/servers/Scripts/quest/ManWil001.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManWil001_00594
 // Quest Name: Coming to Ul'dah
diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp
index 55530020..f0956f0b 100644
--- a/src/servers/Scripts/quest/ManWil002.cpp
+++ b/src/servers/Scripts/quest/ManWil002.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManWil002_00568
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
index 4c22f807..261233d9 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: SubFst001_00024
 // Quest Name: Coarse Correspondence
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
index 505a601c..124cc4ad 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: SubFst002_00025
 // Quest Name: Quarrels with Squirrels
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
index a7053079..104c8d2c 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: SubFst010_00001
 // Quest Name: A Good Adventurer Is Hard to Find
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
index 6c5e2b99..c6f36790 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
 
 // Quest Script: SubFst013_00040
 // Quest Name: For Friendship

From c189089f76f4ca2c93efe462f4d217ed97d3594e Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Tue, 19 Jun 2018 23:53:02 +0200
Subject: [PATCH 17/31] typo and style

---
 src/servers/Scripts/quest/ManFst003.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp
index a5090d22..5ba98036 100644
--- a/src/servers/Scripts/quest/ManFst003.cpp
+++ b/src/servers/Scripts/quest/ManFst003.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
 #include <ScriptObject.h>
@@ -88,9 +87,7 @@ class ManFst003 : public EventScript
             player.learnAction( 1 );
             Scene00051( player );
          },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            nullptr, eventId );
       }
       else if( actor == Actor2 )
       {
@@ -114,7 +111,7 @@ class ManFst003 : public EventScript
       {
          player.sendQuestMessage( getId(), 1, 0, 0, 0 );
       }
-      else if( varIdx == 2)
+      else if( varIdx == 2 )
       {
          player.sendQuestMessage( getId(), 2, 0, 0, 0 );
       }
@@ -172,7 +169,7 @@ class ManFst003 : public EventScript
       player.playScene( getId(), 3, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if( result.param2 == 1)
+            if( result.param2 == 1 )
             {
                Scene00100( player );
             }

From 805eb07451dd17fc7e15fbb3613a9a5d6cb554f0 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Wed, 20 Jun 2018 20:04:42 +0200
Subject: [PATCH 18/31] VS must hate me

---
 src/servers/Scripts/quest/ManFst003.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp
index 5ba98036..e1cf36bf 100644
--- a/src/servers/Scripts/quest/ManFst003.cpp
+++ b/src/servers/Scripts/quest/ManFst003.cpp
@@ -81,13 +81,13 @@ class ManFst003 : public EventScript
       {
          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 );
-         },
-            nullptr, eventId );
+            {
+               player.sendQuestMessage( 0x050002, 0, 1, 0, 0 );
+               player.registerAetheryte( 2 );
+               player.learnAction( 1 );
+               Scene00051( player );
+            },
+               nullptr, eventId );
       }
       else if( actor == Actor2 )
       {

From 9c8a7f53183926547313f7fc13ab298feab86c71 Mon Sep 17 00:00:00 2001
From: Dantestyle <null-fox@hotmail.it>
Date: Wed, 20 Jun 2018 20:17:45 +0200
Subject: [PATCH 19/31] update

---
 src/servers/Scripts/quest/ManSea002.cpp       | 94 +++++++++----------
 src/servers/Scripts/quest/ManSea003.cpp       | 92 +++++++++---------
 .../quest/subquest/limsa/SubSea001.cpp        | 60 +++++-------
 3 files changed, 115 insertions(+), 131 deletions(-)

diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 8e6d5eb6..9690fda9 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManSea002_00108
 // Quest Name: Close to Home
@@ -51,15 +50,13 @@ public:
       {
          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 );
-            Scene00002( player );
-         },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            {
+               player.sendQuestMessage( 0x050002, 0, 1, 0, 0 );
+               player.registerAetheryte( 2 );
+               player.learnAction( 1 );
+               Scene00002( player );
+            },
+               nullptr, eventId );
       }
       else if( actor == ACTOR1 )
       {
@@ -108,88 +105,89 @@ private:
    {
       player.playScene( getId(), 0, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if( result.param2 == 1 ) // accept quest
-            Scene00001( player );
-      } );
+         {
+            if (result.param2 == 1)
+            {
+               Scene00001(player);
+            }
+         } );
    }
 
    void Scene00001( Entity::Player& player )
    {
       player.playScene( getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         // on quest accept
-         player.updateQuest( getId(), 1 );
-         player.setQuestUI8CH( getId(), 1 ); // receive key item
-      } );
+         {
+            player.updateQuest( getId(), 1 );
+            player.setQuestUI8CH( getId(), 1 );
+         } );
    }
 
    void Scene00002( Entity::Player& player )
    {
       player.playScene( getId(), 2, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         Scene00003( player );
-      } );
+         {
+            Scene00003( player );
+         } );
    }
 
    void Scene00003( Entity::Player& player )
    {
       player.playScene( getId(), 3, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.setQuestUI8BL( getId(), 1 );
-         checkQuestCompletion( player, 0 );
-      } );
+         {
+            player.setQuestUI8BL( getId(), 1 );
+            checkQuestCompletion( player, 0 );
+         } );
    }
 
    void Scene00004( Entity::Player& player )
    {
       player.playScene( getId(), 4, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if( result.param2 == 1 )
          {
-            Scene00005( player );
-         }
-         else return;
-      } );
+            if( result.param2 == 1 )
+            {
+               Scene00005( player );
+            }
+            else return;
+         } );
    }
 
    void Scene00005( Entity::Player& player )
    {
       player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.setQuestUI8CH( getId(), 0 ); // remove key item, since we have just traded it
-         player.setQuestUI8BH( getId(), 1 );
-         checkQuestCompletion( player, 1 );
-      } );
+         {
+            player.setQuestUI8CH( getId(), 0 );
+            player.setQuestUI8BH( getId(), 1 );
+            checkQuestCompletion( player, 1 );
+         } );
    }
 
    void Scene00006( Entity::Player& player )
    {
       player.playScene( getId(), 6, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.setQuestUI8AL( getId(), 1 );
-         checkQuestCompletion( player, 2 );
-      } );
+         {
+            player.setQuestUI8AL( getId(), 1 );
+            checkQuestCompletion( player, 2 );
+         } );
    }
 
    void Scene00007( Entity::Player& player )
    {
       player.playScene( getId(), 7, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if ( result.param2 == 1 ) // finish quest
          {
-            if (player.giveQuestRewards( getId(), 0 ) )
+            if ( result.param2 == 1 )
             {
-               player.finishQuest( getId() );
+               if (player.giveQuestRewards( getId(), 0 ) )
+               {
+                  player.finishQuest( getId() );
+               }
             }
-         }
-      } );
+         } );
    }
 };
\ No newline at end of file
diff --git a/src/servers/Scripts/quest/ManSea003.cpp b/src/servers/Scripts/quest/ManSea003.cpp
index 4435b263..267b7602 100644
--- a/src/servers/Scripts/quest/ManSea003.cpp
+++ b/src/servers/Scripts/quest/ManSea003.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
 #include <ScriptObject.h>
@@ -66,15 +65,13 @@ class ManSea003 : public EventScript
          {
             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 );
-               Scene00002( player );
-            },
-               [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-            {},
-               eventId );
+               {
+                  player.sendQuestMessage( 0x050002, 0, 1, 0, 0 );
+                  player.registerAetheryte( 2 );
+                  player.learnAction( 1 );
+                  Scene00002( player );
+               },
+                  nullptr, eventId );
          }
          else if( actor == Actor1 )
          {
@@ -123,88 +120,89 @@ class ManSea003 : public EventScript
    {
       player.playScene( getId(), 0, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if( result.param2 == 1 ) // accept quest
-            Scene00001( player );
-      } );
+         {
+            if (result.param2 == 1)
+            {
+               Scene00001(player);
+            }
+         } );
    }
 
    void Scene00001( Entity::Player& player)
    {
       player.playScene( getId(), 1, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         // on quest accept
-         player.updateQuest( getId(), 1 );
-         player.setQuestUI8CH( getId(), 1 ); // receive key item
-      } );
+         {
+            player.updateQuest( getId(), 1 );
+            player.setQuestUI8CH( getId(), 1 );
+         } );
    }
 
    void Scene00002( Entity::Player& player)
    {
       player.playScene( getId(), 2, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         Scene00003( player );
-      } );
+         {
+            Scene00003( player );
+         } );
    }
 
    void Scene00003( Entity::Player& player)
    {
       player.playScene( getId(), 3, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.setQuestUI8BL( getId(), 1 );
-         checkQuestCompletion( player, 0 );
-      } );
+         {
+            player.setQuestUI8BL( getId(), 1 );
+            checkQuestCompletion( player, 0 );
+         } );
    }
 
    void Scene00004( Entity::Player& player)
    {
       player.playScene( getId(), 4, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if( result.param2 == 1 )
          {
-            Scene00005( player );
-         }
-         else return;
-      } );
+            if( result.param2 == 1 )
+            {
+               Scene00005( player );
+            }
+            else return;
+         } );
    }
 
    void Scene00005( Entity::Player& player)
    {
       player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.setQuestUI8CH( getId(), 0 ); // remove key item, since we have just traded it
-         player.setQuestUI8BH( getId(), 1 );
-         checkQuestCompletion( player, 1 );
-      } );
+         {
+            player.setQuestUI8CH( getId(), 0 );
+            player.setQuestUI8BH( getId(), 1 );
+            checkQuestCompletion( player, 1 );
+         } );
    }
 
    void Scene00006( Entity::Player& player)
    {
       player.playScene( getId(), 6, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.setQuestUI8AL( getId(), 1 );
-         checkQuestCompletion( player, 2 );
-      } );
+         {
+            player.setQuestUI8AL( getId(), 1 );
+            checkQuestCompletion( player, 2 );
+         } );
    }
 
    void Scene00007( Entity::Player& player)
    {
       player.playScene( getId(), 7, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, 0, 0,
          [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if( result.param2 == 1 ) // finish quest
          {
-            if(player.giveQuestRewards( getId(), 0 ) )
+            if( result.param2 == 1 )
             {
-               player.finishQuest( getId() );
+               if(player.giveQuestRewards( getId(), 0 ) )
+               {
+                  player.finishQuest( getId() );
+               }
             }
-         }
-      } );
+         } );
    }
 };
\ No newline at end of file
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index b3dedf80..76ba8783 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -76,67 +76,55 @@ public:
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {
-            Scene00003( player );
-         },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            {
+               Scene00003( player );
+            },
+               nullptr, eventId );
       }
       else if(actor == Eobject1 ) 
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {
-            Scene00005( player );
-         },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            {
+               Scene00005( player );
+            },
+               nullptr, eventId );
       }
       else if( actor == Eobject2 ) 
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {
-            Scene00007( player );
-         },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            {
+               Scene00007( player );
+            },
+               nullptr, eventId );
       }
       else if( actor == Eobject3 ) 
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {
-            Scene00009( player );
-         },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            {
+               Scene00009( player );
+            },
+               nullptr, eventId );
       }
       else if( actor == Eobject4 )
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {
-            Scene00011( player );
-         },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            {
+               Scene00011( player );
+            },
+               nullptr, eventId );
       }
       else if( actor == Eobject5 )
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {
-            Scene00013( player );
-         },
-            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
-         {},
-            eventId );
+            {
+               Scene00013( player );
+            },
+               nullptr, eventId );
       }
    };
 

From 2b0e101459ed57cee083d89ed60518d343486b64 Mon Sep 17 00:00:00 2001
From: goaaats <fakecake@icloud.com>
Date: Sat, 23 Jun 2018 21:05:31 +0200
Subject: [PATCH 20/31] Streamline INI network configuration

---
 bin/config/global.ini.default              |  3 ++-
 bin/config/lobby.ini.default               |  6 +++++-
 bin/config/rest.ini.default                |  6 +++++-
 bin/config/zone.ini.default                |  4 ++++
 src/servers/sapphire_api/main.cpp          | 13 ++++++-------
 src/servers/sapphire_lobby/ServerLobby.cpp | 10 +++++-----
 src/servers/sapphire_zone/ServerZone.cpp   | 11 +++++------
 7 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/bin/config/global.ini.default b/bin/config/global.ini.default
index 90adfc7c..072d3f7c 100644
--- a/bin/config/global.ini.default
+++ b/bin/config/global.ini.default
@@ -2,7 +2,7 @@
 Host = 127.0.0.1
 Port = 3306
 Database = sapphire
-Username = sapphire
+Username = root
 Password =
 SyncThreads = 2
 AsyncThreads = 2
@@ -12,6 +12,7 @@ ServerSecret = default
 DataPath = C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack
 
 [GlobalNetwork]
+; Values definining how Users and other servers will access - these have to be set to your public IP when running a public server
 ZoneHost = 127.0.0.1
 ZonePort = 54992
 
diff --git a/bin/config/lobby.ini.default b/bin/config/lobby.ini.default
index 8d81d75d..077e947c 100644
--- a/bin/config/lobby.ini.default
+++ b/bin/config/lobby.ini.default
@@ -1,4 +1,8 @@
 [Lobby]
 WorldID = 67
 AllowNoSessionConnect = false
-WorldName = Sapphire
\ No newline at end of file
+WorldName = Sapphire
+
+[LobbyNetwork]
+ListenIp = 0.0.0.0
+ListenPort = 54994
\ No newline at end of file
diff --git a/bin/config/rest.ini.default b/bin/config/rest.ini.default
index 564a6cee..d51b4967 100644
--- a/bin/config/rest.ini.default
+++ b/bin/config/rest.ini.default
@@ -1,2 +1,6 @@
 [CharacterCreation]
-DefaultGMRank = 255
\ No newline at end of file
+DefaultGMRank = 255
+
+[RestNetwork]
+ListenIp = 0.0.0.0
+ListenPort = 80
\ No newline at end of file
diff --git a/bin/config/zone.ini.default b/bin/config/zone.ini.default
index 3dba125d..7631e9eb 100644
--- a/bin/config/zone.ini.default
+++ b/bin/config/zone.ini.default
@@ -9,6 +9,10 @@ HotSwap = true
 [Network]
 DisconnectTimeout = 20
 
+[ZoneNetwork]
+ListenIp = 0.0.0.0
+ListenPort = 54992
+
 [General]
 ; Sent on login - each line must be shorter than 307 characters, split lines with ';'
 MotD = Welcome to Sapphire!;This is a very good server;You can change these messages by editing General.MotD in config/zone.ini
\ No newline at end of file
diff --git a/src/servers/sapphire_api/main.cpp b/src/servers/sapphire_api/main.cpp
index d4fac57b..bd84343e 100644
--- a/src/servers/sapphire_api/main.cpp
+++ b/src/servers/sapphire_api/main.cpp
@@ -95,12 +95,11 @@ bool loadSettings( int32_t argc, char* argv[] )
 
          if( arg == "ip" )
          {
-            // todo: ip addr in config
-            m_pConfig->setValue< std::string >( "GlobalNetwork.RestHost", val );
+            m_pConfig->setValue< std::string >( "RestNetwork.ListenIp", val );
          }
          else if( arg == "p" || arg == "port" )
          {
-            m_pConfig->setValue< std::string >( "GlobalNetwork.RestPort", val );
+            m_pConfig->setValue< std::string >( "RestNetwork.ListenPort", val );
          }
          else if( arg == "exdpath" || arg == "datapath" )
          {
@@ -164,7 +163,8 @@ bool loadSettings( int32_t argc, char* argv[] )
    if( !loader.initDbs() )
       return false;
 
-   server.config.port = static_cast< uint16_t >( std::stoul( m_pConfig->getValue< std::string >( "GlobalNetwork.RestPort", "80" ) ) );
+   server.config.port = static_cast< uint16_t >( std::stoul( m_pConfig->getValue< std::string >( "RestNetwork.ListenPort", "80" ) ) );
+   server.config.address = m_pConfig->getValue< std::string >( "RestNetwork.ListenIp", "0.0.0.0" );
 
    g_log.info( "Database: Connected to " + info.host + ":" + std::to_string( info.port ) );
 
@@ -756,9 +756,6 @@ int main( int argc, char* argv[] )
    if( !loadSettings( argc, argv ) )
       throw std::exception();
 
-   server.config.port = stoi( m_pConfig->getValue< std::string >( "GlobalNetwork.RestPort", "80" ) );
-   g_log.info( "Starting API server at port " + m_pConfig->getValue< std::string >( "GlobalNetwork.RestPort", "80" ) + "..." );
-
    server.resource["^/ZoneName/([0-9]+)$"]["GET"] = &getZoneName; 
    server.resource["^/sapphire-api/lobby/createAccount"]["POST"] = &createAccount;
    server.resource["^/sapphire-api/lobby/login"]["POST"] = &login;
@@ -781,6 +778,8 @@ int main( int argc, char* argv[] )
       server.start();
    } );
 
+   g_log.info( "API server running on " + m_pConfig->getValue< std::string >( "RestNetwork.ListenIp", "0.0.0.0" ) + ":" + m_pConfig->getValue< std::string >( "RestNetwork.ListenPort", "80" ) );
+
    //Wait for server to start so that the client can connect
    this_thread::sleep_for( chrono::seconds( 1 ) );
    
diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp
index ff59fd84..a623a4e5 100644
--- a/src/servers/sapphire_lobby/ServerLobby.cpp
+++ b/src/servers/sapphire_lobby/ServerLobby.cpp
@@ -75,7 +75,7 @@ namespace Core {
       Network::HivePtr hive( new Network::Hive() );
       Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive );
 
-      g_log.info( "Lobbyserver ready for connections." );
+      g_log.info( "Lobby server running on " + m_pConfig->getValue< std::string >( "LobbyNetwork.ListenIp", "0.0.0.0" ) + ":" + m_pConfig->getValue< std::string >( "LobbyNetwork.ListenPort", "80" ) );
 
       boost::thread_group worker_threads;
       worker_threads.create_thread( boost::bind( &Network::Hive::Run, hive.get() ) );
@@ -109,11 +109,11 @@ namespace Core {
             if( arg == "ip" )
             {
                // todo: ip addr in config
-               m_pConfig->setValue< std::string >( "GlobalNetwork.LobbyHost", val );
+               m_pConfig->setValue< std::string >( "LobbyNetwork.ListenIp", val );
             }
             else if( arg == "p" || arg == "port" )
             {
-               m_pConfig->setValue< std::string >( "GlobalNetwork.LobbyPort", val );
+               m_pConfig->setValue< std::string >( "LobbyNetwork.LobbyPort", val );
             }
             else if( arg == "worldip" || arg == "worldip" )
             {
@@ -131,8 +131,8 @@ namespace Core {
          }
       }
 
-      m_port = m_pConfig->getValue< uint16_t >( "GlobalNetwork.LobbyPort", 54994 );
-      m_ip = m_pConfig->getValue< std::string >( "GlobalNetwork.LobbyHost", "0.0.0.0" );
+      m_port = m_pConfig->getValue< uint16_t >( "LobbyNetwork.ListenPort", 54994 );
+      m_ip = m_pConfig->getValue< std::string >( "LobbyNetwork.ListenIp", "0.0.0.0" );
 
       g_restConnector.restHost = m_pConfig->getValue< std::string >( "GlobalNetwork.RestHost" ) + ":" + m_pConfig->getValue< std::string >( "GlobalNetwork.RestPort" );
       g_restConnector.serverSecret = m_pConfig->getValue< std::string >( "GlobalParameters.ServerSecret" );
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index 87b23a4f..a63a9fff 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -85,11 +85,11 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
          if( arg == "ip" )
          {
             // todo: ip addr in config
-            pConfig->setValue< std::string >( "GlobalNetwork.ZoneIP", val );
+            pConfig->setValue< std::string >( "ZoneNetwork.ListenIp", val );
          }
          else if( arg == "p" || arg == "port" )
          {
-            pConfig->setValue< std::string >( "GlobalNetwork.ZonePort", val );
+            pConfig->setValue< std::string >( "ZoneNetwork.ListenPort", val );
          }
          else if( arg == "exdpath" || arg == "datapath" )
          {
@@ -145,8 +145,8 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
    if( !loader.initDbs() )
       return false;
 
-   m_port = pConfig->getValue< uint16_t >( "GlobalNetwork.ZonePort", 54992 );
-   m_ip = pConfig->getValue< std::string >( "GlobalNetwork.ZoneIP", "0.0.0.0" );
+   m_port = pConfig->getValue< uint16_t >( "ZoneNetwork.ListenPort", 54992 );
+   m_ip = pConfig->getValue< std::string >( "ZoneNetwork.ListenIp", "0.0.0.0" );
 
    return true;
 }
@@ -184,8 +184,7 @@ void Core::ServerZone::run( int32_t argc, char* argv[] )
    std::vector< std::thread > thread_list;
    thread_list.emplace_back( std::thread( std::bind( &Network::Hive::Run, hive.get() ) ) );
 
-   pLog->info( "Server listening on port: " + std::to_string( m_port ) );
-   pLog->info( "Ready for connections..." );
+   pLog->info( "Zone server running on " + m_ip + ":" + std::to_string( m_port ) );
 
    mainLoop();
 

From f414e706862dfcf0f18eb58ca7d53f3a350921fb Mon Sep 17 00:00:00 2001
From: goaaats <fakecake@icloud.com>
Date: Sat, 23 Jun 2018 21:05:57 +0200
Subject: [PATCH 21/31] Add cmake objects.txt, exports.def to gitignore

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9be79d14..7bb065de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,4 +117,7 @@ src/servers/Scripts/*/ScriptLoader.cpp
 
 # cotire generated files/folders
 cotire/
-*_cotire.cmake
\ No newline at end of file
+*_cotire.cmake
+
+*objects.txt
+*exports.def
\ No newline at end of file

From 0bd352b50b78ce6391f8bfa403dfc5f8b25047c2 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 30 Jun 2018 11:53:45 +1000
Subject: [PATCH 22/31] create larger stacks correctly, fix indent

---
 src/servers/sapphire_zone/Inventory/Inventory.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
index e1d2078b..84fa68cc 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.cpp
+++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp
@@ -134,7 +134,7 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint16_t quantity
    auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
 
-   uint8_t itemAmount = quantity;
+   uint16_t itemAmount = quantity;
 
    if( itemInfo->stackSize == 1 )
       itemAmount = 1;
@@ -146,14 +146,14 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint16_t quantity
 
 //   std::string itemName( itemInfo->name );
 
-   ItemPtr pItem( new Item( catalogId ) );
+   ItemPtr pItem = make_Item( catalogId );
 
    pItem->setStackSize( itemAmount );
    pItem->setUId( getNextUId() );
    pItem->setModelIds( itemInfo->modelMain, itemInfo->modelSub );
    pItem->setCategory( static_cast< ItemUICategory >( itemInfo->itemUICategory ) );
 
-  pDb->execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
+   pDb->execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
                       std::to_string( m_pOwner->getId() ) + ", " +
                       std::to_string( pItem->getUId() ) + ", " +
                       std::to_string( pItem->getId() ) + ", " +

From a2caccb2eea20c27a555739088f1faf72b32b183 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 30 Jun 2018 12:45:41 +1000
Subject: [PATCH 23/31] fix added items having incorrect data

---
 .../sapphire_zone/Inventory/Inventory.cpp      | 18 ++++++++++--------
 src/servers/sapphire_zone/Inventory/Item.cpp   |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
index 84fa68cc..c3eff997 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.cpp
+++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp
@@ -134,6 +134,9 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint16_t quantity
    auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
 
+   if( !itemInfo )
+      return nullptr;
+
    uint16_t itemAmount = quantity;
 
    if( itemInfo->stackSize == 1 )
@@ -144,14 +147,14 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint16_t quantity
 
    uint8_t flags = 0;
 
-//   std::string itemName( itemInfo->name );
-
-   ItemPtr pItem = make_Item( catalogId );
+   ItemPtr pItem = make_Item( getNextUId(),
+                              catalogId,
+                              itemInfo->modelMain,
+                              itemInfo->modelSub,
+                              static_cast< ItemUICategory >( itemInfo->itemUICategory ),
+                              false );
 
    pItem->setStackSize( itemAmount );
-   pItem->setUId( getNextUId() );
-   pItem->setModelIds( itemInfo->modelMain, itemInfo->modelSub );
-   pItem->setCategory( static_cast< ItemUICategory >( itemInfo->itemUICategory ) );
 
    pDb->execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
                       std::to_string( m_pOwner->getId() ) + ", " +
@@ -161,7 +164,6 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint16_t quantity
                       std::to_string( flags ) + ");" );
 
    return pItem;
-
 }
 
 
@@ -739,7 +741,7 @@ Core::ItemPtr Core::Inventory::loadItem( uint64_t uId )
    try
    {
       auto itemInfo = pExdData->get< Core::Data::Item >( itemRes->getUInt( 1 ) );
-      bool isHq = itemRes->getUInt( 3 ) == 1 ? true : false;
+      bool isHq = itemRes->getUInt( 3 ) == 1;
       ItemPtr pItem( new Item( uId,
                                itemRes->getUInt( 1 ),
                                itemInfo->modelMain,
diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp
index a264f77a..b94b8d0b 100644
--- a/src/servers/sapphire_zone/Inventory/Item.cpp
+++ b/src/servers/sapphire_zone/Inventory/Item.cpp
@@ -28,6 +28,7 @@ Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t mo
 {
    auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
+   
    m_delayMs = itemInfo->delayms;
    m_physicalDmg = itemInfo->damagePhys;
    m_magicalDmg = itemInfo->damageMag;

From 37b1500a097bbaafa22fe8fb21c6ac23591f0afd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 30 Jun 2018 12:49:34 +1000
Subject: [PATCH 24/31] inventory item creation cleanup

---
 .../sapphire_zone/Inventory/Inventory.cpp     | 11 ++++-----
 src/servers/sapphire_zone/Inventory/Item.cpp  | 24 ++++---------------
 src/servers/sapphire_zone/Inventory/Item.h    |  6 ++---
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
index c3eff997..d3416fc1 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.cpp
+++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp
@@ -150,9 +150,7 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint16_t quantity
    ItemPtr pItem = make_Item( getNextUId(),
                               catalogId,
                               itemInfo->modelMain,
-                              itemInfo->modelSub,
-                              static_cast< ItemUICategory >( itemInfo->itemUICategory ),
-                              false );
+                              itemInfo->modelSub );
 
    pItem->setStackSize( itemAmount );
 
@@ -742,12 +740,13 @@ Core::ItemPtr Core::Inventory::loadItem( uint64_t uId )
    {
       auto itemInfo = pExdData->get< Core::Data::Item >( itemRes->getUInt( 1 ) );
       bool isHq = itemRes->getUInt( 3 ) == 1;
-      ItemPtr pItem( new Item( uId,
+
+      ItemPtr pItem = make_Item( uId,
                                itemRes->getUInt( 1 ),
                                itemInfo->modelMain,
                                itemInfo->modelSub,
-                               static_cast< ItemUICategory >( itemInfo->itemUICategory ),
-                               isHq ) );
+                               isHq );
+
       pItem->setStackSize( itemRes->getUInt( 2 ) );
 
       return pItem;
diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp
index b94b8d0b..73727509 100644
--- a/src/servers/sapphire_zone/Inventory/Item.cpp
+++ b/src/servers/sapphire_zone/Inventory/Item.cpp
@@ -1,47 +1,31 @@
 #include <Common.h>
 #include <Exd/ExdDataGenerated.h>
+#include <CommonGen.h>
 
 #include "Framework.h"
 #include "Item.h"
 
 extern Core::Framework g_fw;
 
-Core::Item::Item()
-{
-
-}
-
-Core::Item::Item( uint32_t catalogId ) :
-   m_id( catalogId ),
-   m_isHq( false )
-{
-
-}
-
-Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, Common::ItemUICategory categoryId, bool isHq ) :
+Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, bool isHq ) :
    m_id( catalogId ),
    m_uId( uId ),
-   m_category( categoryId ),
    m_model1( model1 ),
    m_model2( model2 ),
    m_isHq( isHq )
 {
    auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
-   
+
    m_delayMs = itemInfo->delayms;
    m_physicalDmg = itemInfo->damagePhys;
    m_magicalDmg = itemInfo->damageMag;
    m_weaponDmg = ( m_physicalDmg != 0 ) ? m_physicalDmg : m_magicalDmg;
    m_autoAttackDmg = static_cast< float >( m_weaponDmg * m_delayMs ) / 3000;
+   m_category = static_cast< Common::ItemUICategory >( itemInfo->itemUICategory );
    m_itemLevel = itemInfo->levelItem;
 }
 
-Core::Item::~Item()
-{
-
-}
-
 float Core::Item::getAutoAttackDmg() const
 {
    return m_autoAttackDmg;
diff --git a/src/servers/sapphire_zone/Inventory/Item.h b/src/servers/sapphire_zone/Inventory/Item.h
index 97df4937..2801adf4 100644
--- a/src/servers/sapphire_zone/Inventory/Item.h
+++ b/src/servers/sapphire_zone/Inventory/Item.h
@@ -9,10 +9,8 @@ class Item
 {
 
 public:
-   Item();
-   Item( uint32_t catalogId );
-   Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, Common::ItemUICategory categoryId, bool isHq = false );
-   ~Item();
+   Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, bool isHq = false );
+   ~Item() = default;
 
    uint32_t getId() const;
 

From 65c9647591ee7f2225cc922aba0a066b41a2abc6 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 30 Jun 2018 12:49:47 +1000
Subject: [PATCH 25/31] fix formatting

---
 .../quest/subquest/limsa/SubSea001.cpp        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
index 76ba8783..223d2bb7 100644
--- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
@@ -79,16 +79,16 @@ public:
             {
                Scene00003( player );
             },
-               nullptr, eventId );
+            nullptr, eventId );
       }
-      else if(actor == Eobject1 ) 
+      else if( actor == Eobject1 )
       {
          player.eventActionStart( getId(), 0x0E,
             [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
             {
                Scene00005( player );
             },
-               nullptr, eventId );
+            nullptr, eventId );
       }
       else if( actor == Eobject2 ) 
       {
@@ -97,7 +97,7 @@ public:
             {
                Scene00007( player );
             },
-               nullptr, eventId );
+            nullptr, eventId );
       }
       else if( actor == Eobject3 ) 
       {
@@ -106,7 +106,7 @@ public:
             {
                Scene00009( player );
             },
-               nullptr, eventId );
+            nullptr, eventId );
       }
       else if( actor == Eobject4 )
       {
@@ -124,13 +124,13 @@ public:
             {
                Scene00013( player );
             },
-               nullptr, eventId );
+            nullptr, eventId );
       }
    };
 
 private:
 
-   void checkQuestcompletion( Entity::Player& player )
+   void checkQuestCompletion( Entity::Player& player )
    {
       auto currentCC = player.getQuestUI8BH( getId() );
 
@@ -172,7 +172,7 @@ private:
       player.playScene( getId(), 2, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if( player.hasQuest( 65644 ) || player.hasQuest( 65645 ) )
+            if( player.hasQuest( Quest0 ) || player.hasQuest( Quest1 ) )
             {
                if( result.param2 == 1 )
                {
@@ -199,7 +199,7 @@ private:
       player.playScene( getId(), 4, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            checkQuestcompletion( player );
+            checkQuestCompletion( player );
             player.setQuestBitFlag8( getId(), 7, true );
          } );
    }
@@ -218,7 +218,7 @@ private:
       player.playScene( getId(), 6, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            checkQuestcompletion( player );
+            checkQuestCompletion( player );
             player.setQuestBitFlag8( getId(), 6, true );
          } );
    }
@@ -237,7 +237,7 @@ private:
       player.playScene( getId(), 8, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            checkQuestcompletion( player );
+            checkQuestCompletion( player );
             player.setQuestBitFlag8( getId(), 5, true );
          } );
    }
@@ -256,7 +256,7 @@ private:
       player.playScene( getId(), 10, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            checkQuestcompletion( player );
+            checkQuestCompletion( player );
             player.setQuestBitFlag8( getId(), 4, true );
          } );
    }
@@ -275,7 +275,7 @@ private:
       player.playScene( getId(), 12, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            checkQuestcompletion( player );
+            checkQuestCompletion( player );
             player.setQuestBitFlag8( getId(), 3, true );
          } );
    }
@@ -294,7 +294,7 @@ private:
       player.playScene( getId(), 14, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            checkQuestcompletion( player );
+            checkQuestCompletion( player );
             player.setQuestBitFlag8( getId(), 2, true );
          } );
    }

From 1172861d4d0d7606ec912227d80b4f6b8d21a023 Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 1 Jul 2018 21:31:26 +1000
Subject: [PATCH 26/31] label now comes before getter in //gm teri

---
 .../Network/Handlers/GMCommandHandlers.cpp             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 2c88206e..22fc41b9 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -465,11 +465,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    case GmCommand::TeriInfo:
    {
       auto pCurrentZone = player.getCurrentZone();
-      player.sendNotice( "ZoneId: " + std::to_string( player.getZoneId() ) + "\nName: " +
-                         pCurrentZone->getName() + "\nInternalName: " +
-                         pCurrentZone->getInternalName() + "\nGuId: " +
-                         std::to_string( pCurrentZone->getGuId() ) + "\nPopCount: " +
-                         std::to_string( pCurrentZone->getPopCount() ) +
+      player.sendNotice( "ZoneId: " + std::to_string( player.getZoneId() ) +
+                         "\nName: " + pCurrentZone->getName() +
+                         "\nInternalName: " + pCurrentZone->getInternalName() +
+                         "\nGuId: " + std::to_string( pCurrentZone->getGuId() ) +
+                         "\nPopCount: " + std::to_string( pCurrentZone->getPopCount() ) +
                          "\nCurrentWeather: " + std::to_string( static_cast< uint8_t >( pCurrentZone->getCurrentWeather() ) ) +
                          "\nNextWeather: " + std::to_string( static_cast< uint8_t >( pCurrentZone->getNextWeather() ) ) );
       break;

From 54be80a26b531117ab59aa68ffaf34e5dd8beeeb Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 1 Jul 2018 21:31:49 +1000
Subject: [PATCH 27/31] add isActingAsGm in Player

---
 src/servers/sapphire_zone/Actor/Player.cpp | 5 +++++
 src/servers/sapphire_zone/Actor/Player.h   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 1e72fcb3..57bdc6f3 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -142,6 +142,11 @@ void Core::Entity::Player::setGmInvis( bool invis )
    m_gmInvis = invis;
 }
 
+const bool Core::Entity::Player::isActingAsGm()
+{
+	return getOnlineStatus() == OnlineStatus::GameMaster || getOnlineStatus() == OnlineStatus::GameMaster1 || getOnlineStatus() == OnlineStatus::GameMaster2;
+}
+
 uint8_t Core::Entity::Player::getMode() const
 {
    return m_mode;
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 7bb5b8d0..8a6be745 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -551,6 +551,8 @@ public:
    bool getGmInvis() const;
    void setGmInvis( bool invis );
 
+   const bool isActingAsGm();
+
    uint8_t getMode() const;
    void setMode( uint8_t mode );
 

From 3daeffbb1167cb865009eb949b61fc28e6eae12c Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 1 Jul 2018 21:33:37 +1000
Subject: [PATCH 28/31] change [GM] chat to isActingAsGm instead of directly
 checking Status

---
 .../sapphire_zone/Network/Handlers/PacketHandlers.cpp       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 70c4c86b..e28f4195 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -515,7 +515,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    {
    case ChatType::Say:
    {
-      if (player.getOnlineStatus() == OnlineStatus::GameMaster || player.getOnlineStatus() == OnlineStatus::GameMaster1 || player.getOnlineStatus() == OnlineStatus::GameMaster2 )
+      if ( player.isActingAsGm() )
          chatPacket.data().chatType = ChatType::GMSay;
 
       player.getCurrentZone()->queueOutPacketForRange( player, 50, chatPacket );
@@ -523,7 +523,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    }
    case ChatType::Yell:
    {
-      if( player.getOnlineStatus() == OnlineStatus::GameMaster || player.getOnlineStatus() == OnlineStatus::GameMaster1 || player.getOnlineStatus() == OnlineStatus::GameMaster2 )
+      if( player.isActingAsGm() )
          chatPacket.data().chatType = ChatType::GMYell;
 
       player.getCurrentZone()->queueOutPacketForRange( player, 6000, chatPacket );
@@ -531,7 +531,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    }
    case ChatType::Shout:
    {
-      if( player.getOnlineStatus() == OnlineStatus::GameMaster || player.getOnlineStatus() == OnlineStatus::GameMaster1 || player.getOnlineStatus() == OnlineStatus::GameMaster2 )
+      if( player.isActingAsGm() )
          chatPacket.data().chatType = ChatType::GMShout;
 
       player.getCurrentZone()->queueOutPacketForRange( player, 6000, chatPacket );

From 7ee18f713fda5d3b10f452c0211e9658d3ed619d Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 1 Jul 2018 21:36:35 +1000
Subject: [PATCH 29/31] Rename m_territoryInstanceMap to
 m_territoryIdToInstanceGuidMap

---
 src/servers/sapphire_zone/Zone/TerritoryMgr.cpp | 10 +++++-----
 src/servers/sapphire_zone/Zone/TerritoryMgr.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 5083d6b8..6ec35837 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -132,7 +132,7 @@ bool Core::TerritoryMgr::createDefaultTerritories()
       InstanceIdToZonePtrMap instanceMap;
       instanceMap[guid] = pZone;
       m_instanceIdToZonePtrMap[guid] = pZone;
-      m_territoryInstanceMap[territoryId] = instanceMap;
+      m_territoryIdToInstanceGuidMap[territoryId] = instanceMap;
       m_zoneSet.insert( { pZone } );
 
    }
@@ -162,7 +162,7 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp
    pZone->init();
 
    m_instanceIdToZonePtrMap[pZone->getGuId()] = pZone;
-   m_territoryInstanceMap[pZone->getTerritoryId()][pZone->getGuId()] = pZone;
+   m_territoryIdToInstanceGuidMap[pZone->getTerritoryId()][pZone->getGuId()] = pZone;
    m_zoneSet.insert( { pZone } );
 
    return pZone;
@@ -215,7 +215,7 @@ bool Core::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId )
       m_instanceContentToInstanceMap[instance->getInstanceContentId()].erase( pZone->getGuId() );
    }
    else
-      m_territoryInstanceMap[pZone->getTerritoryId()].erase( pZone->getGuId() );
+      m_territoryIdToInstanceGuidMap[pZone->getTerritoryId()].erase( pZone->getGuId() );
 
 
    return true;
@@ -276,8 +276,8 @@ Core::ZonePositionPtr Core::TerritoryMgr::getTerritoryPosition( uint32_t territo
 
 Core::ZonePtr Core::TerritoryMgr::getZoneByTerriId( uint32_t territoryId ) const
 {
-   auto zoneMap = m_territoryInstanceMap.find( territoryId );
-   if( zoneMap == m_territoryInstanceMap.end() )
+   auto zoneMap = m_territoryIdToInstanceGuidMap.find( territoryId );
+   if( zoneMap == m_territoryIdToInstanceGuidMap.end() )
       return nullptr;
 
    // TODO: actually select the proper one
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
index c4602e5e..32d5532d 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
@@ -135,7 +135,7 @@ namespace Core
       TerritoryTypeDetailCache m_territoryTypeDetailCacheMap;
 
       /*! map holding actual instances of default territories */
-      TerritoryIdToInstanceMap m_territoryInstanceMap;
+      TerritoryIdToInstanceMap m_territoryIdToInstanceGuidMap;
 
       /*! map holding actual instances of InstanceContent */
       InstanceContentIdToInstanceMap m_instanceContentToInstanceMap;

From 667ab110b98239de779bec942ea1da550c7a1434 Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Sun, 1 Jul 2018 21:43:50 +1000
Subject: [PATCH 30/31] Update isActingAsGm so we don't call getOnlineStatus 3
 times

---
 src/servers/sapphire_zone/Actor/Player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 57bdc6f3..e1f7cbfb 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -144,7 +144,8 @@ void Core::Entity::Player::setGmInvis( bool invis )
 
 const bool Core::Entity::Player::isActingAsGm()
 {
-	return getOnlineStatus() == OnlineStatus::GameMaster || getOnlineStatus() == OnlineStatus::GameMaster1 || getOnlineStatus() == OnlineStatus::GameMaster2;
+	auto status = getOnlineStatus();
+	return status == OnlineStatus::GameMaster || status == OnlineStatus::GameMaster1 || status == OnlineStatus::GameMaster2;
 }
 
 uint8_t Core::Entity::Player::getMode() const

From 062566f8481eb62724b55c1c6a9083430899d0eb Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Mon, 2 Jul 2018 07:31:23 +1000
Subject: [PATCH 31/31] change isActingAsGm const location and add const to
 getOnlineStatus

---
 src/servers/sapphire_zone/Actor/Player.cpp | 4 ++--
 src/servers/sapphire_zone/Actor/Player.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index e1f7cbfb..97936ada 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -142,7 +142,7 @@ void Core::Entity::Player::setGmInvis( bool invis )
    m_gmInvis = invis;
 }
 
-const bool Core::Entity::Player::isActingAsGm()
+bool Core::Entity::Player::isActingAsGm() const
 {
 	auto status = getOnlineStatus();
 	return status == OnlineStatus::GameMaster || status == OnlineStatus::GameMaster1 || status == OnlineStatus::GameMaster2;
@@ -173,7 +173,7 @@ bool Core::Entity::Player::isMarkedForRemoval() const
    return m_markedForRemoval;
 }
 
-Core::Common::OnlineStatus Core::Entity::Player::getOnlineStatus()
+Core::Common::OnlineStatus Core::Entity::Player::getOnlineStatus() const
 {
    auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    if( !pExdData )
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 8a6be745..d7ec1496 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -325,7 +325,7 @@ public:
    /*! sets players combat state */
    void setInCombat( bool mode );
    /*! return current online status depending on current state / activity */
-   Common::OnlineStatus getOnlineStatus();
+   Common::OnlineStatus getOnlineStatus() const;
    /*! sets the players zone, initiating a zoning process */
    void setZone( uint32_t zoneId );
    /*! sets the players instance & initiates zoning process */
@@ -551,7 +551,7 @@ public:
    bool getGmInvis() const;
    void setGmInvis( bool invis );
 
-   const bool isActingAsGm();
+   bool isActingAsGm() const;
 
    uint8_t getMode() const;
    void setMode( uint8_t mode );