Merge pull request #15523 from Treeston/3.3.5-thaddius

Scripts/Naxxramas: Thaddius: Complete rewrite
This commit is contained in:
MitchesD committed 2015-11-12 19:46:46 +01:00
commit e14e291ef6
4 files changed
+1196 -385

No files matched your search

File diff suppressed because it is too large. Load diff
@@ -127,6 +127,7 @@ class instance_naxxramas : public InstanceMapScript
AbominationCount = 0;
hadAnubRekhanGreet = false;
hadFaerlinaGreet = false;
hadThaddiusGreet = false;
CurrentWingTaunt = SAY_KELTHUZAD_FIRST_WING_TAUNT;
playerDied = 0;
@@ -154,12 +155,12 @@ class instance_naxxramas : public InstanceMapScript
case NPC_SIR:
SirGUID = creature->GetGUID();
break;
case NPC_THADDIUS:
ThaddiusGUID = creature->GetGUID();
break;
case NPC_HEIGAN:
HeiganGUID = creature->GetGUID();
break;
case NPC_THADDIUS:
ThaddiusGUID = creature->GetGUID();
break;
case NPC_FEUGEN:
FeugenGUID = creature->GetGUID();
break;
@@ -187,6 +188,18 @@ class instance_naxxramas : public InstanceMapScript
AddMinion(creature, false);
}
void ProcessEvent(WorldObject* source, uint32 eventId) override
{
switch (eventId)
{
case EVENT_THADDIUS_BEGIN_RESET:
if (!source->ToCreature() || source->ToCreature()->GetEntry() != NPC_THADDIUS)
return;
events.ScheduleEvent(EVENT_THADDIUS_RESET, 30 * IN_MILLISECONDS);
break;
}
}
void OnGameObjectCreate(GameObject* go) override
{
if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287)
@@ -329,6 +342,9 @@ class instance_naxxramas : public InstanceMapScript
case DATA_HAD_FAERLINA_GREET:
hadFaerlinaGreet = (value == 1u);
break;
case DATA_HAD_THADDIUS_GREET:
hadThaddiusGreet = (value == 1u);
break;
default:
break;
}
@@ -341,9 +357,11 @@ class instance_naxxramas : public InstanceMapScript
case DATA_ABOMINATION_KILLED:
return AbominationCount;
case DATA_HAD_ANUBREKHAN_GREET:
return (uint32)hadAnubRekhanGreet;
return hadAnubRekhanGreet ? 1u : 0u;
case DATA_HAD_FAERLINA_GREET:
return (uint32)hadFaerlinaGreet;
return hadFaerlinaGreet ? 1u : 0u;
case DATA_HAD_THADDIUS_GREET:
return hadThaddiusGreet ? 1u : 0u;
default:
break;
}
@@ -367,14 +385,14 @@ class instance_naxxramas : public InstanceMapScript
return BaronGUID;
case DATA_SIR:
return SirGUID;
case DATA_THADDIUS:
return ThaddiusGUID;
case DATA_HEIGAN:
return HeiganGUID;
case DATA_FEUGEN:
return FeugenGUID;
case DATA_STALAGG:
return StalaggGUID;
case DATA_THADDIUS:
return ThaddiusGUID;
case DATA_KELTHUZAD:
return KelthuzadGUID;
case DATA_KELTHUZAD_PORTAL01:
@@ -543,6 +561,11 @@ class instance_naxxramas : public InstanceMapScript
kelthuzad->AI()->Talk(SAY_DIALOGUE_SAPPHIRON_KELTHUZAD4);
HandleGameObject(KelthuzadDoorGUID, true);
break;
case EVENT_THADDIUS_RESET:
if (GetBossState(BOSS_THADDIUS) != DONE)
if (Creature* thaddius = instance->GetCreature(ThaddiusGUID))
thaddius->AI()->DoAction(-1);
break;
default:
break;
}
@@ -657,6 +680,7 @@ class instance_naxxramas : public InstanceMapScript
uint8 AbominationCount;
bool hadAnubRekhanGreet;
bool hadFaerlinaGreet;
bool hadThaddiusGreet;
uint8 CurrentWingTaunt;
/* The Immortal / The Undying */
@@ -47,8 +47,8 @@ enum Data
DATA_GOTHIK_GATE,
DATA_SAPPHIRON_BIRTH,
DATA_HAD_ANUBREKHAN_GREET,
DATA_HAD_FAERLINA_GREET,
DATA_HAD_THADDIUS_GREET,
DATA_HORSEMEN0,
DATA_HORSEMEN1,
@@ -91,10 +91,11 @@ enum CreaturesIds
NPC_LADY = 16065,
NPC_BARON = 30549,
NPC_SIR = 16063,
NPC_THADDIUS = 15928,
NPC_HEIGAN = 15936,
NPC_THADDIUS = 15928,
NPC_FEUGEN = 15930,
NPC_STALAGG = 15929,
NPC_TESLA = 16218,
NPC_SAPPHIRON = 15989,
NPC_KEL_THUZAD = 15990,
NPC_CRYPT_GUARD = 16573,
@@ -174,6 +175,10 @@ enum InstanceEvents
EVENT_DIALOGUE_GOTHIK_KORTHAZZ2,
EVENT_DIALOGUE_GOTHIK_RIVENDARE2,
// Thaddius AI requesting timed encounter respawn
EVENT_THADDIUS_BEGIN_RESET,
EVENT_THADDIUS_RESET,
// Dialogue that happens after each wing.
EVENT_KELTHUZAD_WING_TAUNT,