[z0472] Backport: Improve some things in Deadmines. Thanks stfx

* Mr. Smite: Fix delay handling after he "used" his chest
* Cannon event: Improve timed handling, make code more default, fix say types

Signed-off-by: Salja <[email protected]>

Author: Salja

scripts/eastern_kingdoms/deadmines/deadmines.cpp

@@ -148,7 +148,7 @@ struct MANGOS_DLL_DECL boss_mr_smiteAI : public ScriptedAI
 
         m_creature->SetStandState(UNIT_STAND_STATE_STAND);
         m_uiPhase = PHASE_EQUIP_END;
-        m_uiEquipTimer = 5000;
+        m_uiEquipTimer = 1000;
 
         Unit* pVictim = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0);
 
@@ -157,14 +157,6 @@ struct MANGOS_DLL_DECL boss_mr_smiteAI : public ScriptedAI
             EnterEvadeMode();
             return;
         }
-
-        // Takes longer to run further distance. Not accurate, but will probably be sufficient for most cases
-        if (m_creature->IsWithinDistInMap(pVictim, ATTACK_DISTANCE))
-            m_uiEquipTimer -= 1000;
-        else if (m_creature->IsWithinDistInMap(pVictim, 2*ATTACK_DISTANCE))
-            m_uiEquipTimer -= 2000;
-        else
-            m_uiEquipTimer -= 3000;
     }
 
     void PhaseEquipEnd()
@@ -251,6 +243,7 @@ struct MANGOS_DLL_DECL boss_mr_smiteAI : public ScriptedAI
                         m_uiPhase = PHASE_EQUIP_START;
                         m_uiEquipTimer = 2500;
 
+                        // will clear getVictim (m_attacking)
                         m_creature->AttackStop(true);
                         m_creature->RemoveAurasDueToSpell(SPELL_THRASH);
                     }

scripts/eastern_kingdoms/deadmines/deadmines.h

@@ -71,7 +71,6 @@ class MANGOS_DLL_DECL instance_deadmines : public ScriptedInstance
         uint32 m_auiEncounter[MAX_ENCOUNTER];
 
         uint32 m_uiIronDoorTimer;
-        uint32 m_uiDoorStep;
 };
 
 #endif

scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp

@@ -28,8 +28,7 @@ EndScriptData */
 #include "deadmines.h"
 
 instance_deadmines::instance_deadmines(Map* pMap) : ScriptedInstance(pMap),
-    m_uiIronDoorTimer(0),
-    m_uiDoorStep(0)
+    m_uiIronDoorTimer(0)
 {
     Initialize();
 }
@@ -124,12 +123,29 @@ void instance_deadmines::SetData(uint32 uiType, uint32 uiData)
         {
             if (uiData == IN_PROGRESS)
             {
-                if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_IRON_CLAD_DOOR))
+                DoUseDoorOrButton(GO_IRON_CLAD_DOOR, 0, true);
+                m_uiIronDoorTimer = 15000;
+
+                if (Creature* pMrSmite = GetSingleCreatureFromStorage(NPC_MR_SMITE))
+                    DoScriptText(INST_SAY_ALARM1, pMrSmite);
+
+                if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_IRON_CLAD_DOOR))
                 {
-                    pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
-                    m_uiIronDoorTimer = 3000;
+                    // should be static spawns, fetch the closest ones at the pier
+                    if (Creature* pi1 = GetClosestCreatureWithEntry(pDoor, NPC_PIRATE, 40.0f))
+                    {
+                        pi1->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
+                        pi1->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
+                    }
+
+                    if (Creature* pi2 = GetClosestCreatureWithEntry(pDoor, NPC_SQUALLSHAPER, 40.0f))
+                    {
+                        pi2->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
+                        pi2->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
+                    }
                 }
             }
+
             m_auiEncounter[0] = uiData;
             break;
         }
@@ -160,46 +176,9 @@ void instance_deadmines::Update(uint32 uiDiff)
         if (m_uiIronDoorTimer <= uiDiff)
         {
             if (Creature* pMrSmite = GetSingleCreatureFromStorage(NPC_MR_SMITE))
-            {
-                switch(m_uiDoorStep)
-                {
-                    case 0:
-                        DoScriptText(INST_SAY_ALARM1,pMrSmite);
-                        m_uiIronDoorTimer = 2000;
-                        ++m_uiDoorStep;
-                        break;
-                    case 1:
-                    {
-                        if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_IRON_CLAD_DOOR))
-                        {
-                            // should be static spawns, fetch the closest ones at the pier
-                            if (Creature* pi1 = GetClosestCreatureWithEntry(pDoor, NPC_PIRATE, 40.0f))
-                            {
-                                pi1->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
-                                pi1->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
-                            }
-
-                            if (Creature* pi2 = GetClosestCreatureWithEntry(pDoor, NPC_SQUALLSHAPER, 40.0f))
-                            {
-                                pi2->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
-                                pi2->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
-                            }
-                        }
-
-                        ++m_uiDoorStep;
-                        m_uiIronDoorTimer = 10000;
-                        break;
-                    }
-                    case 2:
-                        DoScriptText(INST_SAY_ALARM2,pMrSmite);
-                        m_uiDoorStep = 0;
-                        m_uiIronDoorTimer = 0;
-                        debug_log("SD2: Instance Deadmines: Iron door event reached end.");
-                        break;
-                }
-            }
-            else
-                m_uiIronDoorTimer = 0;
+                DoScriptText(INST_SAY_ALARM2, pMrSmite);
+
+            m_uiIronDoorTimer = 0;
         }
         else
             m_uiIronDoorTimer -= uiDiff;

sql/Updates/z0472_r2300_scriptdevzero.sql

@@ -0,0 +1,3 @@
+DELETE FROM script_texts WHERE entry=-1000716;
+INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+(-1000716,'To Nighthaven! Keep your army close, champion. ',0,0,0,0,'remulos SAY_REMULOS_INTRO_2'),

sql/scriptdevzero_script_full.sql

@@ -843,8 +843,8 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
 
 -- -1 036 000 DEADMINES
 INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1036000,'You there, check out that noise.',5775,1,7,0,'smite INST_SAY_ALARM1'),
-(-1036001,'We\'re under attack! A vast, ye swabs! Repel the invaders!',5777,1,7,0,'smite INST_SAY_ALARM2'),
+(-1036000,'You there, check out that noise.',5775,6,7,0,'smite INST_SAY_ALARM1'),
+(-1036001,'We\'re under attack! A vast, ye swabs! Repel the invaders!',5777,6,7,0,'smite INST_SAY_ALARM2'),
 (-1036002,'You land lubbers are tougher than I thought! I\'ll have to improvise!',5778,0,0,21,'smite SAY_PHASE_2'),
 (-1036003,'D\'ah! Now you\'re making me angry!',5779,0,0,15,'smite SAY_PHASE_3');
 

system/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "0471"
+ #define REVISION_NR "0472"
 #endif // __REVISION_NR_H__