[Quest] ManSea003 and SubSea001 now work properly

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() );
+            }
+         }
+      } );
+   }
+};

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

@@ -54,182 +54,111 @@ 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)
+      if( currentCC + 1 >= 6 )
       {
-            player.updateQuest(getId(), SeqFinish);//questUpdate(eventId, SubFst015.SEQ_FINISH);
+         player.updateQuest( getId(), SeqFinish );
       }
       else
       {
-            player.setQuestUI8AL(getId(), currentCC + 1);
+         player.setQuestUI8BH( getId(), currentCC + 1 );
+         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 )
    {
       player.playScene( getId(), 0, HIDE_HOTBAR,
@@ -253,12 +182,15 @@ 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);
+               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 );
          } );
    }
 
@@ -397,12 +337,12 @@ private:
       player.playScene( getId(), 17, HIDE_HOTBAR,
          [&]( Entity::Player& player, const Event::SceneResult& result )
       {
-            player.setQuestUI8BH( getId(), 0 );
-
+         if( result.param2 == 1 )
+         {
             if( player.giveQuestRewards( getId(), 0 ) )
                player.finishQuest( getId() );
+         }
        } );
    }
-
 };