Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 16:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15523 from Treeston/3.3.5-thaddius

Browse Source 
Scripts/Naxxramas: Thaddius: Complete rewrite
This commit is contained in:
MitchesD
2015-11-12 19:46:46 +01:00
parent a1150ce20f 29feae5901
commit e14e291ef6
4 changed files with 1196 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
sql/updates/world/2015_10_PR15523_world.sql Normal file
View File

@@ -0,0 +1,93 @@
-- creature (2 entries)
SET @CGUID = 49818;
-- gameobject (2 entries)
SET @OGUID = 5747;
-- ensure spell data for difficulties is there
DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (28134,28135,28167);
INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`,`spellid2`,`spellid3`) VALUES
(28134,54529,28134,0,0), -- Stalagg - Power Surge (yes, these are supposed to be backwards)
(28135,28135,54528,0,0), -- Feugen - Static Field
(28167,28167,54531,0,0); -- Thaddius - Chain Lightning
-- magnetic pull
DELETE FROM `spell_scripts` WHERE `id`=54517;
DELETE FROM `spell_script_names` WHERE `spell_id`=54517;
INSERT INTO `spell_script_names` (`spell_id`,`scriptname`) VALUES (54517,"spell_thaddius_magnetic_pull");
-- thaddius
UPDATE `creature_template` set `unit_flags`=64 WHERE `entry`=15928;
UPDATE `creature` set `MovementType`=0 WHERE `id`=15928;
-- tesla coil
UPDATE `creature_template` set `inhabittype`=4,`unit_flags`=33554688,`unit_flags2`=2048,`ScriptName`="npc_tesla",`MovementType`=0,`flags_extra`=0 WHERE `entry`=16218;
DELETE FROM `creature_addon` WHERE `guid` IN (select `guid` from `creature` WHERE `id` = 16218);
DELETE FROM `creature` WHERE `id` = 16218;
INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`movementtype`,`VerifiedBuild`) VALUES
(@CGUID+0,16218,533,3,1,3527.807,-2952.382,319.3258,3.909538,0,0,0,0),
(@CGUID+1,16218,533,3,1,3487.762,-2911.198,319.4061,3.909538,0,0,0,0);
INSERT INTO `creature_addon` (`guid`,`auras`) VALUES
(@CGUID+0,28109),
(@CGUID+1,28097);
-- tesla coil search trigger range (index 30 is 500 yards)
UPDATE `spell_dbc` set `EffectRadiusIndex1`=30, `AttributesEx2`=0 WHERE `Id` IN (28098,28110);
-- tesla coil search ignores LoS
DELETE FROM `disables` WHERE `sourceType`=0 AND `entry` IN (28096,28098,28110,28111);
INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`comment`) VALUES
(0,28098,64,"Stalagg Tesla Periodic - Ignore LoS"),
(0,28096,64,"Stalagg Tesla Visual - Ignore LoS"),
(0,28110,64,"Feugen Tesla Periodic - Ignore LoS"),
(0,28111,64,"Feugen Tesla Visual - Ignore LoS");
-- tesla coil shock visual needs implicit target
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (28096,28111,28159);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES
(13,1,28096,0,0,31,0,3,15929,0,0,"Stalagg Chain Visual - Target Stalagg"),
(13,1,28111,0,0,31,0,3,15930,0,0,"Feugen Chain Visual - Target Feugen"),
(13,1,28159,0,0,31,0,3,15928,0,0,"Thaddius Shock Visual - Target Thaddius");
-- tesla coil visual
DELETE FROM `gameobject` WHERE `id` IN (181477,181478);
INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`VerifiedBuild`) VALUES
(@OGUID+0,181477,533,3,1,3527.94,-2952.263,318.8983,3.141593,0,0,-1,0,0,0),
(@OGUID+1,181478,533,3,1,3487.324,-2911.383,318.8983,3.141593,0,0,-1,0,0,0);
-- polarity shift scripts
DELETE FROM `spell_scripts` WHERE `id` IN (28059,28062,28084,28085,28089,29659,29660);
DELETE FROM `spell_script_names` WHERE `spell_id` IN (28059,28062,28084,28085,28089,29659,29660);
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(28062,"spell_thaddius_polarity_charge"),
(28085,"spell_thaddius_polarity_charge"),
(28089,"spell_thaddius_polarity_shift");
-- shocking! achievement
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (7604,7605);
INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
(7604,11,0,0,"achievement_thaddius_shocking"),
(7604,12,0,0,""),
(7605,11,0,0,"achievement_thaddius_shocking"),
(7605,12,1,0,"");
-- move 20% trigger rate for "killed target" texts from script to DB
UPDATE `creature_text` set `probability`=20 WHERE `entry`=15929 AND `groupid`=1;
UPDATE `creature_text` set `probability`=20 WHERE `entry`=15930 AND `groupid`=1;
UPDATE `creature_text` set `probability`=20 WHERE `entry`=15928 AND `groupid`=2;
-- add missing creature_text entries for thaddius, feugen, stalagg and tesla coil
DELETE FROM `creature_text` WHERE `entry`=15928 AND `groupid`=6;
DELETE FROM `creature_text` WHERE `entry` IN (15929,15930) AND `groupid` IN (3,4);
DELETE FROM `creature_text` WHERE `entry`=16218;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`probability`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
(15928,6,0,"The polarity has shifted!",41,100,32324,3,"Thaddius EMOTE_POLARITY_SHIFTED"),
(15929,3,0,"%s dies.",16,100,10453,3,"Stalagg EMOTE_FEIGN_DEATH"),
(15930,3,0,"%s dies.",16,100,10453,3,"Feugen EMOTE_FEIGN_DEATH"),
(15929,4,0,"%s is jolted back to life!",16,100,12155,3,"Stalagg EMOTE_FEIGN_REVIVE"),
(15930,4,0,"%s is jolted back to life!",16,100,12155,3,"Feugen EMOTE_FEIGN_REVIVE"),
(16218,0,0,"%s loses its link!",41,100,12156,3,"Tesla Coil EMOTE_TESLA_LINK_BREAKS"),
(16218,1,0,"%s overloads!",41,100,12178,3,"Tesla Coil EMOTE_TESLA_OVERLOAD");
-- trigger when entering thaddius' room
DELETE FROM `areatrigger_scripts` WHERE `entry`=4113;
INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
(4113,"at_thaddius_entrance");

1441
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
View File

File diff suppressed because it is too large Load Diff

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

@@ -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 */

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

@@ -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,