First typo SubSea001

src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp

@@ -11,7 +11,7 @@
 
 class SubSea001 : public EventScript
 {
-   private:
+private:
    // Basic quest information 
    // Quest vars / flags used
    // GetQuestBitFlag8
@@ -48,31 +48,187 @@ class SubSea001 : public EventScript
    static constexpr auto Quest1 = 65645;
    static constexpr auto Territorytype0 = 129;
 
-   public:
+public:
-      SubSea001() : EventScript( 65647 )
+   SubSea001() : EventScript(65647)
    {};
    ~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 actor = Event::mapEventActorToRealActor(actorId);
+      auto currentCC = player.getQuestUI8AL(getId());
 
-      if ( actor == SubSea001::Actor0 )
+      auto despawn1 = player.getQuestUI8FL(getId());
+      auto despawn2 = player.getQuestUI8FH(getId());
+
+      if (actor == SubSea001::Actor0)
       {
-         Scene00000( player );
+         Scene00000(player);
       }
-      else if ( actor == SubSea001::Actor1 )
+      else if (actor == SubSea001::Actor1)
       {
-         Scene00002( player );
+         Scene00002(player);
       }
-      else if ( actor == SubSea001::Actor2 )
+      else if (actor == SubSea001::Actor2)
       {
-         Scene00016( player );
+         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);
          }
       }
 
-   private:
+      /*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);
          } );
    }