More MSQ, Add emote unlocks to Common.h

src/common/Common.h

@@ -513,7 +513,19 @@ namespace Sapphire::Common
     Dye = 14,
     Glamour = 15,
     HuntingLog = 21,
-    Desynth = 95
+    EmoteImperialSalute = 23,
+    EmoteThrowSnowball = 24,
+    EmoteStepDance = 27,
+    EmoteHarvestDance = 28,
+    EmoteBallDance = 29,
+    EmoteMadervilleDance = 30,
+    Desynth = 95,
+    EmoteBombDance = 98,
+    EmoteHuzzah = 225,
+    EmoteEmbrace = 229,
+    EmoteMostGentlemanly = 244,
+    EmoteFistBump = 259
+
   };
 
   enum ContainerType : uint16_t

src/scripts/quest/subquest/mordhona/GaiUsc602.cpp

@@ -224,7 +224,7 @@ private:
 
     if( result.getResult( 0 ) == 1 )
     {
-      //TODO:Reward Imperial Salute?
+      player.setSystemActionUnlocked( Common::UnlockEntry::EmoteImperialSalute );
       player.finishQuest( getId(), result.getResult( 1 ) );
     }
   }

src/scripts/quest/subquest/mordhona/GaiUsc604.cpp

@@ -0,0 +1,452 @@
+// This is an automatically generated C++ script template
+// Content needs to be added by hand to make it function
+// In order for this script to be loaded, move it to the correct folder in <root>/scripts/
+
+#include "Manager/EventMgr.h"
+#include <Actor/Player.h>
+#include <ScriptObject.h>
+#include <Service.h>
+
+#include "Manager/TerritoryMgr.h"
+#include "Territory/Territory.h"
+
+// Quest Script: GaiUsc604_01004
+// Quest Name: Fool Me Twice
+// Quest ID: 66540
+// Start NPC: 1006531
+// End NPC: 1006555
+
+using namespace Sapphire;
+
+class GaiUsc604 : public Sapphire::ScriptAPI::QuestScript
+{
+private:
+  // Basic quest information
+  // Quest vars / flags used
+  // BitFlag8
+  // UI8AH
+  // UI8AL
+  // UI8BH
+
+  /// Countable Num: 0 Seq: 1 Event: 1 Listener: 1006709
+  /// Countable Num: 0 Seq: 2 Event: 2 Listener: 1006709
+  /// Countable Num: 0 Seq: 255 Event: 1 Listener: 1006553
+  // Steps in this quest ( 0 is before accepting,
+  // 1 is first, 255 means ready for turning it in
+  enum Sequence : uint8_t
+  {
+    Seq0 = 0,
+    Seq1 = 1,
+    Seq2 = 2,
+    SeqFinish = 255,
+  };
+
+  // Entities found in the script data of the quest
+  static constexpr auto Actor0 = 1006531;
+  static constexpr auto Actor1 = 1006709;//Imperial Centurion
+  static constexpr auto Actor2 = 1006553;//Amiable Imperial
+  static constexpr auto Actor3 = 1006706;//Cross Imperial
+  static constexpr auto Actor4 = 1006707;//Beleaguered Imperial
+  static constexpr auto Actor5 = 1006708;//Beguiled Imperial
+  static constexpr auto Actor6 = 1006554;
+  static constexpr auto Actor7 = 1006705;//Careless Imperial
+  static constexpr auto Actor8 = 1006555;//Cid
+  static constexpr auto Actor9 = 1006530;//Slafborn
+  static constexpr auto Eobject0 = 2002329;
+  static constexpr auto EquipCheckBody = 6224;
+  static constexpr auto EquipCheckHead = 6223;
+  static constexpr auto Item0 = 2000771;
+  static constexpr auto Poprange0 = 4321644;
+  static constexpr auto Questbattle0 = 63;
+  static constexpr auto Territorytype0 = 308;
+  static constexpr auto Territorytype1 = 156;
+
+public:
+  GaiUsc604() : Sapphire::ScriptAPI::QuestScript( 66540 ){};
+  ~GaiUsc604() = default;
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+  void onTalk( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override
+  {
+    switch( actorId )
+    {
+      case Actor0:
+      {
+        if( quest.getSeq() == Seq0 )
+          Scene00000( quest, player );
+        break;
+      }
+      case Actor1:
+      {
+        if( quest.getSeq() == Seq1 )
+          Scene00002( quest, player );
+        else if( quest.getSeq() == Seq2 )
+          Scene00017( quest, player );
+        break;
+      }
+      case Actor2:
+      {
+        if( quest.getSeq() == Seq1 )
+          Scene00005( quest, player );
+        else if( quest.getSeq() == Seq2 )
+          Scene00013( quest, player );
+        break;
+      }
+      case Actor3:
+      {
+        if( quest.getSeq() == Seq1 )
+          Scene00006( quest, player );
+        else if( quest.getSeq() == Seq2 )
+          Scene00014( quest, player );
+        break;
+      }
+      case Actor4:
+      {
+        if( quest.getSeq() == Seq1 )
+          Scene00007( quest, player );
+        else if( quest.getSeq() == Seq2 )
+          Scene00015( quest, player );
+        break;
+      }
+      case Actor5:
+      {
+        if( quest.getSeq() == Seq1 )
+          Scene00008( quest, player );
+        else if( quest.getSeq() == Seq2 )
+          Scene00016( quest, player );
+        break;
+      }
+      case Actor6:
+      {
+        break;
+      }
+      case Actor7:
+      {
+        if( quest.getSeq() == Seq1 )
+          Scene00010( quest, player );
+        else if( quest.getSeq() == Seq2 )
+          Scene00018( quest, player );
+        break;
+      }
+      case Actor8:
+      {
+        if( quest.getSeq() == SeqFinish )
+          Scene00020( quest, player );
+        break;
+      }
+      case Actor9:
+      {
+        if( quest.getSeq() == SeqFinish )
+          Scene00021( quest, player );
+        break;
+      }
+      case Eobject0:
+      {
+        //Scene00011( quest, player );
+        quest.setSeq( SeqFinish );
+        eventMgr().sendEventNotice( player, getId(), 1, 0 );
+        playerMgr().sendUrgent( player, "QuestBattle Unimplemented. Skipping..." );
+        break;
+      }
+    }
+  }
+
+  void onEventItem( World::Quest& quest, Entity::Player& player, uint64_t actorId ) override
+  {
+    if( actorId == Eobject0 )
+      Scene00012( quest, player );
+  }
+
+  void onEmote( World::Quest& quest, uint64_t actorId, uint32_t emoteId, Entity::Player& player ) override
+  {
+    if( actorId == Actor1 )
+    {
+      if( emoteId == 59 )
+        Scene00003( quest, player );
+      else
+        Scene00004( quest, player );
+    }
+  }
+
+
+private:
+  //////////////////////////////////////////////////////////////////////
+  // Available Scenes in this quest, not necessarly all are used
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00000( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00000Return ) );
+  }
+
+  void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    if( result.getResult( 0 ) == 1 )// accept quest
+    {
+      Scene00001( quest, player );
+    }
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00001( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00001Return ) );
+  }
+
+  void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    quest.setSeq( Seq1 );
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00002( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 2, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00002Return ) );
+  }
+
+  void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00003( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00003Return ) );
+  }
+
+  void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    eventMgr().sendEventNotice( player, getId(), 0, 0 );
+    quest.setSeq( Seq2 );
+    quest.setUI8BH( 1 );
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00004( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00004Return ) );
+  }
+
+  void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00005( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 5, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00005Return ) );
+  }
+
+  void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00006( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00006Return ) );
+  }
+
+  void Scene00006Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00007( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00007Return ) );
+  }
+
+  void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00008( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 8, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00008Return ) );
+  }
+
+  void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00009( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 9, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00009Return ) );
+  }
+
+  void Scene00009Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00010( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 10, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00010Return ) );
+  }
+
+  void Scene00010Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00011( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 11, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00011Return ) );
+  }
+
+  void Scene00011Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    //Opens KeyItem Inventory
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00012( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 12, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00012Return ) );
+  }
+
+  void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    if( result.getResult(0) == 1 )
+    {
+      auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
+
+      eventMgr().eventFinish( player, result.eventId, 0 );
+      pTeriMgr.createAndJoinQuestBattle( player, Questbattle0 );
+    }
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00013( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 13, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00013Return ) );
+  }
+
+  void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00014( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 14, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00014Return ) );
+  }
+
+  void Scene00014Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00015( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 15, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00015Return ) );
+  }
+
+  void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00016( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 16, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00016Return ) );
+  }
+
+  void Scene00016Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00017( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 17, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00017Return ) );
+  }
+
+  void Scene00017Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00018( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 18, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00018Return ) );
+  }
+
+  void Scene00018Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00019( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 19, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00019Return ) );
+  }
+
+  void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00020( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 20, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00020Return ) );
+  }
+
+  void Scene00020Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+
+    if( result.getResult( 0 ) == 1 )
+    {
+      player.finishQuest( getId() );
+    }
+  }
+
+  //////////////////////////////////////////////////////////////////////
+
+  void Scene00021( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 21, HIDE_HOTBAR, bindSceneReturn( &GaiUsc604::Scene00021Return ) );
+  }
+
+  void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    if( result.getResult( 0 ) == 1 )
+    {
+      auto& objectCache = Common::Service< Sapphire::InstanceObjectCache >::ref();
+
+      auto popRangeInfo = objectCache.getPopRangeInfo( Poprange0 );
+
+      if( popRangeInfo )
+      {
+        auto pTeri = teriMgr().getZoneByTerritoryTypeId( popRangeInfo->m_territoryTypeId );
+        warpMgr().requestMoveTerritory( player, Common::WarpType::WARP_TYPE_NORMAL, pTeri->getGuId(), popRangeInfo->m_pos, popRangeInfo->m_rotation );
+      }
+    }
+  }
+};
+
+EXPOSE_SCRIPT( GaiUsc604 );