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

Scripts/Icecrown Citadel: Added Professor Putricide script

Browse Source 
Scripts/Icecrown Citadel: Fixed Professor Putricide gate opening when both Rotface and Festergut are dead
Scripts/Icecrown Citadel: Added script updating entries of NPCs at Light's Hammer depending on faction
Scripts/Icecrown Citadel: Rotface should not pick main tank as target for Slime Spray (removed debugging code)
Core/Spells/Conditions : Spell script target condition now accepts ConditionValue3 as affecting effect mask (only search targets with matching mask)

--HG--
branch : trunk
extra : rebase_source : 943e3bac5d9063974d7f7132f144e91946f825d4
This commit is contained in:
Shauren
2010-10-16 16:34:21 +02:00
parent 222d1cd211
commit 8a17d95647
18 changed files with 1412 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1124
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

File diff suppressed because it is too large Load Diff

10
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
View File

@@ -186,15 +186,13 @@ class boss_rotface : public CreatureScript
switch (eventId)
{
case EVENT_SLIME_SPRAY:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0/*1*/, 0.0f, true))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
{
Position pos;
target->GetPosition(&pos);
if (DoSummon(NPC_OOZE_SPRAY_STALKER, pos, 8000, TEMPSUMMON_TIMED_DESPAWN))
{
DoScriptText(EMOTE_SLIME_SPRAY, me);
DoCastAOE(SPELL_SLIME_SPRAY);
}
DoSummon(NPC_OOZE_SPRAY_STALKER, pos, 8000, TEMPSUMMON_TIMED_DESPAWN);
DoScriptText(EMOTE_SLIME_SPRAY, me);
DoCastAOE(SPELL_SLIME_SPRAY);
}
events.ScheduleEvent(EVENT_SLIME_SPRAY, 20000);
break;

96
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
View File

@@ -43,43 +43,73 @@ enum eData
DATA_BONED_ACHIEVEMENT = 13,
DATA_OOZE_DANCE_ACHIEVEMENT = 14,
DATA_PUTRICIDE_TABLE = 15,
DATA_NAUSEA___ACHIEVEMENT = 16,
};
#define MAX_ENCOUNTER 12
enum eCreatures
{
NPC_LORD_MARROWGAR = 36612,
NPC_COLDFLAME = 36672,
NPC_BONE_SPIKE = 36619,
// At Light's Hammer
NPC_KOR_KRON_GENERAL = 37189,
NPC_ALLIANCE_COMMANDER = 37190,
NPC_TORTUNOK = 37992, // Druid Armor H
NPC_ALANA_MOONSTRIKE = 37999, // Druid Armor A
NPC_GERARDO_THE_SUAVE = 37993, // Hunter Armor H
NPC_TALAN_MOONSTRIKE = 37998, // Hunter Armor A
NPC_UVLUS_BANEFIRE = 38284, // Mage Armor H
NPC_MALFUS_GRIMFROST = 38283, // Mage Armor A
NPC_IKFIRUS_THE_VILE = 37991, // Rogue Armor H
NPC_YILI = 37997, // Rogue Armor A
NPC_VOL_GUK = 38841, // Shaman Armor H
NPC_JEDEBIA = 38840, // Shaman Armor A
NPC_HARAGG_THE_UNSEEN = 38181, // Warlock Armor H
NPC_NIBY_THE_ALMIGHTY = 38182, // Warlock Armor N
NPC_LADY_DEATHWHISPER = 36855,
NPC_CULT_FANATIC = 37890,
NPC_DEFORMED_FANATIC = 38135,
NPC_REANIMATED_FANATIC = 38009,
NPC_CULT_ADHERENT = 37949,
NPC_EMPOWERED_ADHERENT = 38136,
NPC_REANIMATED_ADHERENT = 38010,
NPC_VENGEFUL_SHADE = 38222,
// Lord Marrowgar
NPC_LORD_MARROWGAR = 36612,
NPC_COLDFLAME = 36672,
NPC_BONE_SPIKE = 36619,
NPC_DEATHBRINGER_SAURFANG = 37813,
NPC_BLOOD_BEAST = 38508,
NPC_SE_JAINA_PROUDMOORE = 37188, // SE means Saurfang Event
NPC_SE_MURADIN_BRONZEBEARD = 37200,
NPC_SE_KING_VARIAN_WRYNN = 37879,
NPC_SE_HIGH_OVERLORD_SAURFANG = 37187,
NPC_SE_KOR_KRON_REAVER = 37920,
NPC_SE_SKYBREAKER_MARINE = 37830,
// Lady Deathwhisper
NPC_LADY_DEATHWHISPER = 36855,
NPC_CULT_FANATIC = 37890,
NPC_DEFORMED_FANATIC = 38135,
NPC_REANIMATED_FANATIC = 38009,
NPC_CULT_ADHERENT = 37949,
NPC_EMPOWERED_ADHERENT = 38136,
NPC_REANIMATED_ADHERENT = 38010,
NPC_VENGEFUL_SHADE = 38222,
NPC_FESTERGUT = 36626,
NPC_GAS_DUMMY = 36659,
// Deathbringer Saurfang
NPC_DEATHBRINGER_SAURFANG = 37813,
NPC_BLOOD_BEAST = 38508,
NPC_SE_JAINA_PROUDMOORE = 37188, // SE means Saurfang Event
NPC_SE_MURADIN_BRONZEBEARD = 37200,
NPC_SE_KING_VARIAN_WRYNN = 37879,
NPC_SE_HIGH_OVERLORD_SAURFANG = 37187,
NPC_SE_KOR_KRON_REAVER = 37920,
NPC_SE_SKYBREAKER_MARINE = 37830,
NPC_ROTFACE = 36627,
NPC_OOZE_SPRAY_STALKER = 37986,
NPC_PUDDLE_STALKER = 37013,
NPC_UNSTABLE_EXPLOSION_STALKER = 38107,
// Festergut
NPC_FESTERGUT = 36626,
NPC_GAS_DUMMY = 36659,
NPC_PROFESSOR_PUTRICIDE = 36678,
// Rotface
NPC_ROTFACE = 36627,
NPC_OOZE_SPRAY_STALKER = 37986,
NPC_PUDDLE_STALKER = 37013,
NPC_UNSTABLE_EXPLOSION_STALKER = 38107,
// Professor Putricide
NPC_PROFESSOR_PUTRICIDE = 36678,
NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER = 37824,
NPC_GROWING_OOZE_PUDDLE = 37690,
NPC_GAS_CLOUD = 37562,
NPC_VOLATILE_OOZE = 37697,
NPC_CHOKING_GAS_BOMB = 38159,
NPC_TEAR_GAS_TARGET_STALKER = 38317,
};
enum eGameobjects
@@ -103,18 +133,23 @@ enum eGameobjects
GO_DOODAD_ICECROWN_ORANGETUBES02 = 201617,
GO_DOODAD_ICECROWN_GREENTUBES02 = 201618,
GO_SCIENTIST_ENTRANCE = 201372,
GO_DRINK_ME = 201584,
};
enum eAchievementCriteria
{
CRITERIA_BONED_10N = 12775,
CRITERIA_BONED_25N = 12962,
CRITERIA_BONED_10H = 13393,
CRITERIA_BONED_25H = 13394,
CRITERIA_BONED_10N = 12775,
CRITERIA_BONED_25N = 12962,
CRITERIA_BONED_10H = 13393,
CRITERIA_BONED_25H = 13394,
CRITERIA_DANCES_WITH_OOZES_10N = 12984,
CRITERIA_DANCES_WITH_OOZES_25N = 12966,
CRITERIA_DANCES_WITH_OOZES_10H = 12985,
CRITERIA_DANCES_WITH_OOZES_25H = 12983,
CRITERIA_NAUSEA_10N = 12987,
CRITERIA_NAUSEA_25N = 12968,
CRITERIA_NAUSEA_10H = 12988,
CRITERIA_NAUSEA_25H = 12981,
};
enum ePutricideActions
@@ -125,6 +160,7 @@ enum ePutricideActions
ACTION_ROTFACE_COMBAT = -366270,
ACTION_ROTFACE_OOZE = -366271,
ACTION_ROTFACE_DEATH = -366272,
ACTION_CHANGE_PHASE = -366780
};
#endif // DEF_ICECROWN_CITADEL_H

57
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -53,8 +53,10 @@ class instance_icecrown_citadel : public InstanceMapScript
uiFestergut = 0;
uiRotface = 0;
uiProfessorPutricide = 0;
uiPutricideTable;
isBonedEligible = true;
isOozeDanceEligible = true;
isNauseaEligible = true;
}
void OnCreatureCreate(Creature* creature, bool /*add*/)
@@ -70,6 +72,34 @@ class instance_icecrown_citadel : public InstanceMapScript
switch (creature->GetEntry())
{
case NPC_KOR_KRON_GENERAL:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALLIANCE_COMMANDER, ALLIANCE);
break;
case NPC_TORTUNOK:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALANA_MOONSTRIKE, ALLIANCE);
break;
case NPC_GERARDO_THE_SUAVE:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_TALAN_MOONSTRIKE, ALLIANCE);
break;
case NPC_UVLUS_BANEFIRE:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_MALFUS_GRIMFROST, ALLIANCE);
break;
case NPC_IKFIRUS_THE_VILE:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_YILI, ALLIANCE);
break;
case NPC_VOL_GUK:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_JEDEBIA, ALLIANCE);
break;
case NPC_HARAGG_THE_UNSEEN:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_NIBY_THE_ALMIGHTY, ALLIANCE);
break;
case NPC_DEATHBRINGER_SAURFANG:
uiDeathbringerSaurfang = creature->GetGUID();
break;
@@ -160,6 +190,9 @@ class instance_icecrown_citadel : public InstanceMapScript
if (GetBossState(DATA_ROTFACE) == DONE)
HandleGameObject(uiPutricidePipes[1], true, pGo);
break;
case GO_DRINK_ME:
uiPutricideTable = pGo->GetGUID();
break;
default:
break;
}
@@ -183,6 +216,9 @@ class instance_icecrown_citadel : public InstanceMapScript
return uiRotface;
case DATA_PROFESSOR_PUTRICIDE:
return uiProfessorPutricide;
case DATA_PUTRICIDE_TABLE:
return uiPutricideTable;
break;
default:
break;
}
@@ -225,12 +261,13 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_FESTERGUT:
if (state == DONE)
{
if (GetBossState(DATA_ROTFACE) == DONE)
HandleGameObject(uiPutricideCollision, true);
if (GetBossState(DATA_ROTFACE) == DONE)
{
HandleGameObject(uiPutricideCollision, true);
if (GameObject* pGo = instance->GetGameObject(uiPutricideGates[0]))
pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
if (GameObject* pGo = instance->GetGameObject(uiPutricideGates[1]))
pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
}
else
HandleGameObject(uiPutricideGates[0], false);
@@ -240,10 +277,11 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_ROTFACE:
if (state == DONE)
{
if (GetBossState(DATA_FESTERGUT) == DONE)
HandleGameObject(uiPutricideCollision, true);
if (GetBossState(DATA_FESTERGUT) == DONE)
{
HandleGameObject(uiPutricideCollision, true);
if (GameObject* pGo = instance->GetGameObject(uiPutricideGates[0]))
pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
if (GameObject* pGo = instance->GetGameObject(uiPutricideGates[1]))
pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
}
@@ -273,6 +311,10 @@ class instance_icecrown_citadel : public InstanceMapScript
break;
case DATA_OOZE_DANCE_ACHIEVEMENT:
isOozeDanceEligible = data ? true : false;
break;
case DATA_NAUSEA___ACHIEVEMENT:
isNauseaEligible = data ? true : false;
break;
default:
break;
}
@@ -292,6 +334,11 @@ class instance_icecrown_citadel : public InstanceMapScript
case CRITERIA_DANCES_WITH_OOZES_10H:
case CRITERIA_DANCES_WITH_OOZES_25H:
return isOozeDanceEligible;
case CRITERIA_NAUSEA_10N:
case CRITERIA_NAUSEA_25N:
case CRITERIA_NAUSEA_10H:
case CRITERIA_NAUSEA_25H:
return isNauseaEligible;
default:
break;
}
@@ -353,8 +400,10 @@ class instance_icecrown_citadel : public InstanceMapScript
uint64 uiFestergut;
uint64 uiRotface;
uint64 uiProfessorPutricide;
uint64 uiPutricideTable;
bool isBonedEligible;
bool isOozeDanceEligible;
bool isNauseaEligible;
};
InstanceScript* GetInstanceScript(InstanceMap* pMap) const