Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.5-gothik' into 3.3.5-base (PR #16142)

Browse Source 
(cherry picked from commit d23ef5d6d0)
This commit is contained in:
treeston
2016-01-19 21:38:24 +01:00
committed by Shauren
parent 7c3df3f5d3
commit 43c3b1b2e0
5 changed files with 865 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1158
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
View File

File diff suppressed because it is too large Load Diff

6
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
View File

@@ -179,6 +179,9 @@ class instance_naxxramas : public InstanceMapScript
case NPC_RAZUVIOUS:
RazuviousGUID = creature->GetGUID();
break;
case NPC_GOTHIK:
GothikGUID = creature->GetGUID();
break;
case NPC_THANE:
ThaneGUID = creature->GetGUID();
break;
@@ -416,6 +419,8 @@ class instance_naxxramas : public InstanceMapScript
return FaerlinaGUID;
case DATA_RAZUVIOUS:
return RazuviousGUID;
case DATA_GOTHIK:
return GothikGUID;
case DATA_THANE:
return ThaneGUID;
case DATA_LADY:
@@ -693,6 +698,7 @@ class instance_naxxramas : public InstanceMapScript
// Instructor Razuvious
ObjectGuid RazuviousGUID;
// Gothik the Harvester
ObjectGuid GothikGUID;
ObjectGuid GothikGateGUID;
// The Four Horsemen
ObjectGuid ThaneGUID;

2
src/server/scripts/Northrend/Naxxramas/naxxramas.h
View File

@@ -67,6 +67,7 @@ enum Data64
DATA_ANUBREKHAN,
DATA_FAERLINA,
DATA_RAZUVIOUS,
DATA_GOTHIK,
DATA_THANE,
DATA_LADY,
DATA_BARON,
@@ -89,6 +90,7 @@ enum CreaturesIds
NPC_ANUBREKHAN = 15956,
NPC_FAERLINA = 15953,
NPC_RAZUVIOUS = 16061,
NPC_GOTHIK = 16060,
NPC_THANE = 16064,
NPC_LADY = 16065,
NPC_BARON = 30549,