From c9d5eefa8b6d63e82a414ac2e0704e0d8c46ef88 Mon Sep 17 00:00:00 2001
From: Dinkledork <118951051+Day36512@users.noreply.github.com>
Date: Mon, 29 Jan 2024 14:18:58 -0700
Subject: [PATCH 1/2] Update aq_scripts.cpp

Make gate and gong automatically unseen for players beyond AQ40.
---
 src/vanillaScripts/aq_scripts.cpp | 113 +++++++++++++++++++++---------
 1 file changed, 78 insertions(+), 35 deletions(-)

diff --git a/src/vanillaScripts/aq_scripts.cpp b/src/vanillaScripts/aq_scripts.cpp
index 5e96e04..6eaa303 100644
--- a/src/vanillaScripts/aq_scripts.cpp
+++ b/src/vanillaScripts/aq_scripts.cpp
@@ -1,3 +1,4 @@
+#include "IndividualProgression.h"
 #include "ScriptMgr.h"
 #include "Player.h"
 #include "GameObjectAI.h"
@@ -61,17 +62,32 @@ public:
                 {
                     switch (eventStage)
                     {
-                        case STAGE_OPEN_GATES:
-                            return HandleOpeningStage();
-                        case STAGE_WAR:
-                            return HandleWarStage();
-                        case STAGE_RESET:
-                            return ResetAQGates();
+                    case STAGE_OPEN_GATES:
+                        HandleOpeningStage();
+                        break;
+                    case STAGE_WAR:
+                        HandleWarStage();
+                        break;
+                    case STAGE_RESET:
+                        ResetAQGates();
+                        break;
                     }
-                } else
+                }
+                else
                     eventTimer -= diff;
             }
-        };
+        }
+
+        bool CanBeSeen(Player const* player) override
+        {
+            Player* target = ObjectAccessor::FindConnectedPlayer(player->GetGUID());
+            if (!target)
+            {
+                return false; 
+            }
+
+            return sIndividualProgression->isBeforeProgression(target, PROGRESSION_AQ);
+        }
 
         void NextStage(uint32 timeUntil = 100)
         {
@@ -84,28 +100,26 @@ public:
         {
             switch (eventStep)
             {
-                case 0:
-                    go_aq_gate_roots->ResetDoorOrButton();
-                    go_aq_gate_roots->UseDoorOrButton();
-                    me->PlayDirectSound(SOUND_ROOTS_OPEN);
+            case 0:
+                go_aq_gate_roots->ResetDoorOrButton();
+                go_aq_gate_roots->UseDoorOrButton();
+                me->PlayDirectSound(SOUND_ROOTS_OPEN);
+                eventTimer = 5000;
+                break;
 
-                    eventTimer = 5000;
-                    break;
+            case 1:
+                go_aq_gate_runes->ResetDoorOrButton();
+                go_aq_gate_runes->UseDoorOrButton();
+                me->PlayDirectSound(SOUND_RUNES_OPEN);
+                eventTimer = 8000;
+                break;
 
-                case 1:
-                    go_aq_gate_runes->ResetDoorOrButton();
-                    go_aq_gate_runes->UseDoorOrButton();
-                    me->PlayDirectSound(SOUND_RUNES_OPEN);
-
-                    eventTimer = 8000;
-                    break;
-                case 2:
-                    go_aq_barrier->ResetDoorOrButton();
-                    go_aq_barrier->UseDoorOrButton();
-                    me->PlayDirectSound(SOUND_DOOR_OPEN);
-
-                    NextStage(10000);
-                    return;
+            case 2:
+                go_aq_barrier->ResetDoorOrButton();
+                go_aq_barrier->UseDoorOrButton();
+                me->PlayDirectSound(SOUND_DOOR_OPEN);
+                NextStage(10000);
+                return;
             }
 
             eventStep++;
@@ -117,15 +131,8 @@ public:
             NextStage(5 * MINUTE * IN_MILLISECONDS);
         }
 
-        void EventDone()
-        {
-            NextStage(0);
-            eventStage = STAGE_OPEN_GATES;
-        }
-
         void ResetAQGates()
         {
-//            go_aq_ghost_gate->SetGoState(GO_STATE_READY);
             go_aq_barrier->SetGoState(GO_STATE_READY);
             go_aq_gate_runes->SetGoState(GO_STATE_READY);
             go_aq_gate_roots->ResetDoorOrButton();
@@ -134,6 +141,13 @@ public:
             EventDone();
         }
 
+        void EventDone()
+        {
+            NextStage(0);
+            eventStage = STAGE_OPEN_GATES; // Reset to the initial stage for potential future events
+        }
+
+
         void OpenGate(Player *player, bool announce)
         {
             go_aq_barrier = GetClosestGameObjectWithEntry(me, GO_GATE_OF_AHN_QIRAJ, 150);
@@ -188,8 +202,37 @@ public:
     }
 };
 
+class aq_gate : public GameObjectScript
+{
+public:
+    aq_gate() : GameObjectScript("aq_gate") {}
+
+    struct aq_gateAI : public GameObjectAI
+    {
+        explicit aq_gateAI(GameObject* go) : GameObjectAI(go) {}
+
+        bool CanBeSeen(Player const* player) override
+        {
+
+            Player* target = ObjectAccessor::FindConnectedPlayer(player->GetGUID());
+            if (!target)
+            {
+                return false; 
+            }
+
+            return sIndividualProgression->isBeforeProgression(target, PROGRESSION_AQ);
+        }
+    };
+
+    GameObjectAI* GetAI(GameObject* go) const override
+    {
+        return new aq_gateAI(go);
+    }
+};
+
 void AddSC_aq_scripts()
 {
+    new aq_gate();
     new gobject_scarab_gong();
 }
 

From 803638a76777a4e4df8ebc570933f5c085c8943a Mon Sep 17 00:00:00 2001
From: Dinkledork <118951051+Day36512@users.noreply.github.com>
Date: Mon, 29 Jan 2024 14:20:44 -0700
Subject: [PATCH 2/2] Open Gates for players beyond Stage 5

---
 sql/world/base/aq_gate.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 sql/world/base/aq_gate.sql

diff --git a/sql/world/base/aq_gate.sql b/sql/world/base/aq_gate.sql
new file mode 100644
index 0000000..a51aac0
--- /dev/null
+++ b/sql/world/base/aq_gate.sql
@@ -0,0 +1,3 @@
+UPDATE `acore_world`.`gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176148;
+UPDATE `acore_world`.`gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176147;
+UPDATE `acore_world`.`gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176146;
\ No newline at end of file