Skip to content

Instantly share code, notes, and snippets.

@MiLk

MiLk/ScriptDev2_2224_to_MaNGOS_one.patch

Created June 21, 2011 19:35
Show Gist options
  • Save MiLk/1038681 to your computer and use it in GitHub Desktop.
Save MiLk/1038681 to your computer and use it in GitHub Desktop.
Download ZIP
Update ScriptDev2_2224_to_MaNGOS_one.patch
Raw
ScriptDev2_2224_to_MaNGOS_one.patch
From 119469b62d86cf121adbe835d8ff33ba4f0f8b4b Mon Sep 17 00:00:00 2001
From: MiLk <[email protected]>
Date: Tue, 21 Jun 2011 21:33:12 +0200
Subject: [PATCH] Update TBC-patch
---
include/precompiled.h | 5 +
include/sc_instance.cpp | 22 --
include/sc_instance.h | 3 -
.../shadowfang_keep/shadowfang_keep.cpp | 8 +-
scripts/kalimdor/azuremyst_isle.cpp | 2 +-
scripts/kalimdor/onyxias_lair/boss_onyxia.cpp | 4 +-
.../onyxias_lair/instance_onyxias_lair.cpp | 3 -
scripts/kalimdor/onyxias_lair/onyxias_lair.h | 2 -
scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h | 2 -
.../azjol-nerub/ahnkahet/instance_ahnkahet.cpp | 6 +-
.../azjol-nerub/azjol-nerub/azjol-nerub.h | 32 +-
.../azjol-nerub/instance_azjol-nerub.cpp | 2 -
scripts/northrend/dragonblight.cpp | 2 +-
scripts/northrend/naxxramas/instance_naxxramas.cpp | 5 -
scripts/northrend/naxxramas/naxxramas.h | 4 -
.../ulduar/halls_of_lightning/halls_of_lightning.h | 4 +-
.../instance_halls_of_lightning.cpp | 2 -
.../ulduar/halls_of_stone/halls_of_stone.h | 2 -
.../halls_of_stone/instance_halls_of_stone.cpp | 2 -
.../auchenai_crypts/boss_exarch_maladaar.cpp | 8 +-
scripts/world/item_scripts.cpp | 2 +-
system/ScriptLoader.cpp | 316 ++-----------------
22 files changed, 69 insertions(+), 369 deletions(-)
diff --git a/include/precompiled.h b/include/precompiled.h
index 11b6b31..2f202a3 100644
--- a/include/precompiled.h
+++ b/include/precompiled.h
@@ -11,6 +11,11 @@
#include "sc_grid_searchers.h"
#include "sc_instance.h"
+enum backports
+{
+ UNIT_VIRTUAL_ITEM_SLOT_ID = UNIT_VIRTUAL_ITEM_SLOT_DISPLAY
+};
+
#ifdef WIN32
# include <windows.h>
BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
diff --git a/include/sc_instance.cpp b/include/sc_instance.cpp
index e93cb45..d7905cc 100644
--- a/include/sc_instance.cpp
+++ b/include/sc_instance.cpp
@@ -141,25 +141,3 @@ Creature* ScriptedInstance::GetSingleCreatureFromStorage(uint32 uiEntry, bool bS
return NULL;
}
-
-/**
- Helper function to start a timed achievement criteria for players in the map
-
- @param criteriaType The Type that is required to complete the criteria, see enum AchievementCriteriaTypes in MaNGOS
- @param uiTimedCriteriaMiscId The ID that identifies how the criteria is started
- */
-void ScriptedInstance::DoStartTimedAchievement(AchievementCriteriaTypes criteriaType, uint32 uiTimedCriteriaMiscId)
-{
- Map::PlayerList const& lPlayers = instance->GetPlayers();
-
- if (!lPlayers.isEmpty())
- {
- for(Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
- {
- if (Player* pPlayer = itr->getSource())
- pPlayer->StartTimedAchievementCriteria(criteriaType, uiTimedCriteriaMiscId);
- }
- }
- else
- debug_log("SD2: DoStartTimedAchievement attempt start achievements but no players in map.");
-}
diff --git a/include/sc_instance.h b/include/sc_instance.h
index d7e037e..3d1450a 100644
--- a/include/sc_instance.h
+++ b/include/sc_instance.h
@@ -54,9 +54,6 @@ class MANGOS_DLL_DECL ScriptedInstance : public InstanceData
DoOrSimulateScriptTextForMap(iTextEntry, uiCreatureEntry, instance, GetSingleCreatureFromStorage(uiCreatureEntry, true));
}
- // Starts a timed achievement criteria for all players in instance
- void DoStartTimedAchievement(AchievementCriteriaTypes criteriaType, uint32 uiTimedCriteriaMiscId);
-
protected:
// Storage for GO-Guids and NPC-Guids
EntryGuidMap m_mGoEntryGuidStore; ///< Store unique GO-Guids by entry
diff --git a/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
index c152e0e..090b8c3 100644
--- a/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
+++ b/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
@@ -89,10 +89,10 @@ struct MANGOS_DLL_DECL npc_shadowfang_prisonerAI : public npc_escortAI
else
DoScriptText(EMOTE_UNLOCK_DOOR_AD, m_creature);
break;
- case 12:
- if (m_uiNpcEntry != NPC_ASH)
- m_creature->HandleEmote(EMOTE_ONESHOT_USESTANDING);
- break;
+// case 12:
+// if (m_uiNpcEntry != NPC_ASH)
+// m_creature->HandleEmote(EMOTE_ONESHOT_USESTANDING);
+// break;
case 13:
if (m_uiNpcEntry == NPC_ASH)
DoScriptText(SAY_POST_DOOR_AS, m_creature);
diff --git a/scripts/kalimdor/azuremyst_isle.cpp b/scripts/kalimdor/azuremyst_isle.cpp
index f87a61e..79522f6 100644
--- a/scripts/kalimdor/azuremyst_isle.cpp
+++ b/scripts/kalimdor/azuremyst_isle.cpp
@@ -103,7 +103,7 @@ struct MANGOS_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
{
- if (pSpell->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x080000000))
+ if (pSpell->Id == 28880)
{
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
m_creature->SetStandState(UNIT_STAND_STATE_STAND);
diff --git a/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
index 0ad95ad..ef332f9 100644
--- a/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
+++ b/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
@@ -312,7 +312,7 @@ struct MANGOS_DLL_DECL boss_onyxiaAI : public ScriptedAI
DoScriptText(SAY_PHASE_2_TRANS, m_creature);
// sort of a hack, it is unclear how this really work but the values appear to be valid
- m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_UNK_2);
+ m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND/* | UNIT_BYTE1_FLAG_UNK_2*/);
m_creature->AddSplineFlag(SPLINEFLAG_FLYING);
if (m_pPointData)
@@ -438,7 +438,7 @@ struct MANGOS_DLL_DECL boss_onyxiaAI : public ScriptedAI
return;
// All and only the Onyxia Deep Breath Spells have these visuals
- if (pSpell->SpellVisual[0] == SPELL_VISUAL_BREATH_A || pSpell->SpellVisual[0] == SPELL_VISUAL_BREATH_B)
+ if (pSpell->SpellVisual == SPELL_VISUAL_BREATH_A || pSpell->SpellVisual == SPELL_VISUAL_BREATH_B)
m_pInstance->SetData(TYPE_ONYXIA, DATA_PLAYER_TOASTED);
}
};
diff --git a/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp b/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
index cec7e97..f7dde0a 100644
--- a/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
+++ b/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
@@ -62,10 +62,7 @@ void instance_onyxias_lair::SetData(uint32 uiType, uint32 uiData)
m_uiEncounter = uiData;
if (uiData == IN_PROGRESS)
- {
- DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_ONYXIA_ID);
m_uiAchievWhelpsCount = 0;
- }
if (uiData == DATA_LIFTOFF)
m_tPhaseTwoStart = time(NULL);
diff --git a/scripts/kalimdor/onyxias_lair/onyxias_lair.h b/scripts/kalimdor/onyxias_lair/onyxias_lair.h
index f869ca9..2f493a7 100644
--- a/scripts/kalimdor/onyxias_lair/onyxias_lair.h
+++ b/scripts/kalimdor/onyxias_lair/onyxias_lair.h
@@ -24,8 +24,6 @@ enum
ACHIEV_CRIT_MANY_WHELPS_H = 12568,
ACHIEV_CRIT_NO_BREATH_N = 12566, // Acheivements 4404, 4407
ACHIEV_CRIT_NO_BREATH_H = 12569,
-
- ACHIEV_START_ONYXIA_ID = 6601,
};
class MANGOS_DLL_DECL instance_onyxias_lair : public ScriptedInstance
diff --git a/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h b/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
index 114e535..bc6a5fc 100644
--- a/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
+++ b/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
@@ -28,8 +28,6 @@ enum
NPC_ELDER_NADOX = 29309,
//NPC_JEDOGA_SHADOWSEEKER = 29310,
-
- ACHIEV_START_VOLAZJ_ID = 20382,
};
class MANGOS_DLL_DECL instance_ahnkahet : public ScriptedInstance
diff --git a/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp b/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
index 8036455..a82d755 100644
--- a/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
+++ b/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
@@ -101,13 +101,9 @@ void instance_ahnkahet::SetData(uint32 uiType, uint32 uiData)
}
break;
case TYPE_JEDOGA:
- case TYPE_AMANITAR:
- m_auiEncounter[uiType] = uiData;
- break;
case TYPE_VOLAZJ:
+ case TYPE_AMANITAR:
m_auiEncounter[uiType] = uiData;
- if (uiData == IN_PROGRESS)
- DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_VOLAZJ_ID);
break;
default:
diff --git a/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h b/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
index 7d75103..c39cf3a 100644
--- a/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
+++ b/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
@@ -7,28 +7,26 @@
enum
{
- MAX_ENCOUNTER = 3,
+ MAX_ENCOUNTER = 3,
- TYPE_KRIKTHIR = 0,
- TYPE_HADRONOX = 1,
- TYPE_ANUBARAK = 2,
+ TYPE_KRIKTHIR = 0,
+ TYPE_HADRONOX = 1,
+ TYPE_ANUBARAK = 2,
- NPC_KRIKTHIR = 28684,
+ NPC_KRIKTHIR = 28684,
- SAY_SEND_GROUP_1 = -1601004,
- SAY_SEND_GROUP_2 = -1601005,
- SAY_SEND_GROUP_3 = -1601006,
+ SAY_SEND_GROUP_1 = -1601004,
+ SAY_SEND_GROUP_2 = -1601005,
+ SAY_SEND_GROUP_3 = -1601006,
- NPC_GASHRA = 28730,
- NPC_NARJIL = 28729,
- NPC_SILTHIK = 28731,
+ NPC_GASHRA = 28730,
+ NPC_NARJIL = 28729,
+ NPC_SILTHIK = 28731,
- GO_DOOR_KRIKTHIR = 192395,
- GO_DOOR_ANUBARAK_1 = 192396,
- GO_DOOR_ANUBARAK_2 = 192397,
- GO_DOOR_ANUBARAK_3 = 192398,
-
- ACHIEV_START_ANUB_ID = 20381,
+ GO_DOOR_KRIKTHIR = 192395,
+ GO_DOOR_ANUBARAK_1 = 192396,
+ GO_DOOR_ANUBARAK_2 = 192397,
+ GO_DOOR_ANUBARAK_3 = 192398
};
static const uint32 aWatchers[] = {NPC_GASHRA, NPC_NARJIL, NPC_SILTHIK};
diff --git a/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp b/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
index 80faf81..9bd8e67 100644
--- a/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
+++ b/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
@@ -177,8 +177,6 @@ void instance_azjol_nerub::SetData(uint32 uiType, uint32 uiData)
DoUseDoorOrButton(GO_DOOR_ANUBARAK_1);
DoUseDoorOrButton(GO_DOOR_ANUBARAK_2);
DoUseDoorOrButton(GO_DOOR_ANUBARAK_3);
- if (uiData == IN_PROGRESS)
- DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_ANUB_ID);
break;
}
diff --git a/scripts/northrend/dragonblight.cpp b/scripts/northrend/dragonblight.cpp
index a69dbc6..0bde6be 100644
--- a/scripts/northrend/dragonblight.cpp
+++ b/scripts/northrend/dragonblight.cpp
@@ -101,7 +101,7 @@ bool GossipSelect_npc_alexstrasza_wr_gate(Player* pPlayer, Creature* pCreature,
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->CLOSE_GOSSIP_MENU();
- pPlayer->SendMovieStart(MOVIE_ID_GATES);
+// pPlayer->SendMovieStart(MOVIE_ID_GATES);
}
return true;
diff --git a/scripts/northrend/naxxramas/instance_naxxramas.cpp b/scripts/northrend/naxxramas/instance_naxxramas.cpp
index 58a83c5..37c44a1 100644
--- a/scripts/northrend/naxxramas/instance_naxxramas.cpp
+++ b/scripts/northrend/naxxramas/instance_naxxramas.cpp
@@ -220,10 +220,7 @@ void instance_naxxramas::SetData(uint32 uiType, uint32 uiData)
m_auiEncounter[uiType] = uiData;
DoUseDoorOrButton(GO_ARAC_ANUB_DOOR);
if (uiData == DONE)
- {
DoUseDoorOrButton(GO_ARAC_ANUB_GATE);
- DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_MAEXXNA_ID);
- }
break;
case TYPE_FAERLINA:
DoUseDoorOrButton(GO_ARAC_FAER_WEB);
@@ -325,8 +322,6 @@ void instance_naxxramas::SetData(uint32 uiType, uint32 uiData)
break;
case TYPE_PATCHWERK:
m_auiEncounter[uiType] = uiData;
- if (uiData == IN_PROGRESS)
- DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_PATCHWERK_ID);
if (uiData == DONE)
DoUseDoorOrButton(GO_CONS_PATH_EXIT_DOOR);
break;
diff --git a/scripts/northrend/naxxramas/naxxramas.h b/scripts/northrend/naxxramas/naxxramas.h
index 3ae6d95..41db6fe 100644
--- a/scripts/northrend/naxxramas/naxxramas.h
+++ b/scripts/northrend/naxxramas/naxxramas.h
@@ -165,10 +165,6 @@ enum
ACHIEV_CRIT_UNDYING_MAEX = 13238,
ACHIEV_CRIT_UNDYING_LOA = 13239,
ACHIEV_CRIT_UNDYING_THAD = 13240,
-
- // Timed achievement criterias
- ACHIEV_START_PATCHWERK_ID = 10286,
- ACHIEV_START_MAEXXNA_ID = 9891,
};
struct GothTrigger
diff --git a/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h b/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
index ba0fe82..60d6895 100644
--- a/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
+++ b/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
@@ -22,9 +22,7 @@ enum
GO_VOLKHAN_DOOR = 191325, //_doors07
GO_IONAR_DOOR = 191326, //_doors05
GO_LOKEN_DOOR = 191324, //_doors02
- GO_LOKEN_THRONE = 192654,
-
- ACHIEV_START_LOKEN_ID = 20384,
+ GO_LOKEN_THRONE = 192654
};
class MANGOS_DLL_DECL instance_halls_of_lightning : public ScriptedInstance
diff --git a/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
index 989eeb9..5c8269f 100644
--- a/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
+++ b/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
@@ -95,8 +95,6 @@ void instance_halls_of_lightning::SetData(uint32 uiType, uint32 uiData)
m_auiEncounter[uiType] = uiData;
break;
case TYPE_LOKEN:
- if (uiData == IN_PROGRESS)
- DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_LOKEN_ID);
if (uiData == DONE)
{
DoUseDoorOrButton(GO_LOKEN_DOOR);
diff --git a/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h b/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
index 9fd2637..1a4b58a 100644
--- a/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
+++ b/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
@@ -41,8 +41,6 @@ enum
FACE_MARNAK = 0,
FACE_ABEDNEUM = 1,
FACE_KADDRAK = 2,
-
- ACHIEV_START_MAIDEN_ID = 20383,
};
struct Face
diff --git a/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
index 1e4f4d3..59c9ee8 100644
--- a/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+++ b/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
@@ -133,8 +133,6 @@ void instance_halls_of_stone::SetData(uint32 uiType, uint32 uiData)
break;
case TYPE_MAIDEN:
m_auiEncounter[1] = uiData;
- if (uiData == IN_PROGRESS)
- DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_MAIDEN_ID);
break;
case TYPE_KRYSTALLUS:
m_auiEncounter[2] = uiData;
diff --git a/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
index 1aae4d2..862938b 100644
--- a/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
+++ b/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
@@ -107,10 +107,10 @@ struct MANGOS_DLL_DECL mob_stolen_soulAI : public ScriptedAI
DoCastSpellIfCan(m_creature->getVictim(), SPELL_MOONFIRE);
m_uiSpellTimer = 10000;
break;
- case CLASS_DEATH_KNIGHT:
- DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE);
- m_uiSpellTimer = 10000;
- break;
+// case CLASS_DEATH_KNIGHT:
+// DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE);
+// m_uiSpellTimer = 10000;
+// break;
}
}
else
diff --git a/scripts/world/item_scripts.cpp b/scripts/world/item_scripts.cpp
index 4474aa7..8a70bbc 100644
--- a/scripts/world/item_scripts.cpp
+++ b/scripts/world/item_scripts.cpp
@@ -47,7 +47,7 @@ bool ItemUse_item_arcane_charges(Player* pPlayer, Item* pItem, const SpellCastTa
pPlayer->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_ARCANE_CHARGES))
- Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
+ Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_ERROR);
return true;
}
diff --git a/system/ScriptLoader.cpp b/system/ScriptLoader.cpp
index 0959568..02a269f 100644
--- a/system/ScriptLoader.cpp
+++ b/system/ScriptLoader.cpp
@@ -98,7 +98,22 @@ extern void AddSC_boss_majordomo();
extern void AddSC_boss_ragnaros();
extern void AddSC_instance_molten_core();
extern void AddSC_molten_core();
-extern void AddSC_ebon_hold(); // scarlet_enclave
+extern void AddSC_boss_anubrekhan(); // naxxramas
+extern void AddSC_boss_four_horsemen();
+extern void AddSC_boss_faerlina();
+extern void AddSC_boss_gluth();
+extern void AddSC_boss_gothik();
+extern void AddSC_boss_grobbulus();
+extern void AddSC_boss_kelthuzad();
+extern void AddSC_boss_loatheb();
+extern void AddSC_boss_maexxna();
+extern void AddSC_boss_noth();
+extern void AddSC_boss_heigan();
+extern void AddSC_boss_patchwerk();
+extern void AddSC_boss_razuvious();
+extern void AddSC_boss_sapphiron();
+extern void AddSC_boss_thaddius();
+extern void AddSC_instance_naxxramas();
extern void AddSC_boss_arcanist_doan(); // scarlet_monastery
extern void AddSC_boss_azshir_the_sleepless();
extern void AddSC_boss_bloodmage_thalnos();
@@ -210,8 +225,6 @@ extern void AddSC_boss_epoch_hunter();
extern void AddSC_boss_lieutenant_drake();
extern void AddSC_instance_old_hillsbrad();
extern void AddSC_old_hillsbrad();
-extern void AddSC_culling_of_stratholme(); // COT, culling_of_stratholme
-extern void AddSC_instance_culling_of_stratholme();
extern void AddSC_dire_maul(); // dire_maul
extern void AddSC_instance_dire_maul();
extern void AddSC_boss_celebras_the_cursed(); // maraudon
@@ -269,144 +282,7 @@ extern void AddSC_ungoro_crater();
extern void AddSC_winterspring();
// northrend
-extern void AddSC_boss_jedoga(); // azjol-nerub, ahnkahet
-extern void AddSC_boss_nadox();
-extern void AddSC_boss_taldaram();
-extern void AddSC_boss_volazj();
-extern void AddSC_instance_ahnkahet();
-extern void AddSC_boss_anubarak(); // azjol-nerub, azjol-nerub
-extern void AddSC_boss_hadronox();
-extern void AddSC_boss_krikthir();
-extern void AddSC_instance_azjol_nerub();
-extern void AddSC_trial_of_the_champion(); // CC, trial_of_the_champion
-extern void AddSC_boss_grand_champions();
-extern void AddSC_instance_trial_of_the_champion();
-extern void AddSC_boss_anubarak_trial(); // CC, trial_of_the_crusader
-extern void AddSC_boss_faction_champions();
-extern void AddSC_boss_jaraxxus();
-extern void AddSC_instance_trial_of_the_crusader();
-extern void AddSC_northrend_beasts();
-extern void AddSC_trial_of_the_crusader();
-extern void AddSC_twin_valkyr();
-extern void AddSC_boss_novos(); // draktharon_keep
-extern void AddSC_boss_tharonja();
-extern void AddSC_boss_trollgore();
-extern void AddSC_instance_draktharon_keep();
-extern void AddSC_boss_colossus(); // gundrak
-extern void AddSC_boss_eck();
-extern void AddSC_boss_galdarah();
-extern void AddSC_boss_moorabi();
-extern void AddSC_boss_sladran();
-extern void AddSC_instance_gundrak();
-extern void AddSC_boss_bronjahm(); // ICC, forge_of_souls
-extern void AddSC_boss_devourer_of_souls();
-extern void AddSC_instance_forge_of_souls();
-extern void AddSC_boss_falric(); // ICC, halls_of_reflection
-extern void AddSC_boss_lich_king();
-extern void AddSC_boss_marwyn();
-extern void AddSC_halls_of_reflection();
-extern void AddSC_instance_halls_of_reflection();
-extern void AddSC_boss_garfrost(); // ICC, pit_of_saron
-extern void AddSC_boss_krick_and_ick();
-extern void AddSC_boss_tyrannus();
-extern void AddSC_instance_pit_of_saron();
-extern void AddSC_pit_of_saron();
-extern void AddSC_blood_prince_council(); // ICC, icecrown_citadel
-extern void AddSC_boss_blood_queen_lanathel();
-extern void AddSC_boss_deathbringer_saurfang();
-extern void AddSC_boss_festergut();
-extern void AddSC_boss_lady_deathwhisper();
-extern void AddSC_boss_lord_marrowgar();
-extern void AddSC_boss_professor_putricide();
-extern void AddSC_boss_rotface();
-extern void AddSC_boss_sindragosa();
-extern void AddSC_boss_the_lich_king();
-extern void AddSC_boss_valithria_dreamwalker();
-extern void AddSC_gunship_battle();
-extern void AddSC_instance_icecrown_citadel();
-extern void AddSC_boss_anubrekhan(); // naxxramas
-extern void AddSC_boss_four_horsemen();
-extern void AddSC_boss_faerlina();
-extern void AddSC_boss_gluth();
-extern void AddSC_boss_gothik();
-extern void AddSC_boss_grobbulus();
-extern void AddSC_boss_kelthuzad();
-extern void AddSC_boss_loatheb();
-extern void AddSC_boss_maexxna();
-extern void AddSC_boss_noth();
-extern void AddSC_boss_heigan();
-extern void AddSC_boss_patchwerk();
-extern void AddSC_boss_razuvious();
-extern void AddSC_boss_sapphiron();
-extern void AddSC_boss_thaddius();
-extern void AddSC_instance_naxxramas();
-extern void AddSC_boss_malygos(); // nexus, eye_of_eternity
-extern void AddSC_boss_anomalus(); // nexus, nexus
-extern void AddSC_boss_keristrasza();
-extern void AddSC_boss_ormorok();
-extern void AddSC_boss_telestra();
-extern void AddSC_instance_nexus();
-extern void AddSC_boss_sartharion(); // obsidian_sanctum
-extern void AddSC_instance_obsidian_sanctum();
-extern void AddSC_boss_baltharus(); // ruby_sanctum
-extern void AddSC_boss_halion();
-extern void AddSC_boss_saviana();
-extern void AddSC_boss_zarithrian();
-extern void AddSC_instance_ruby_sanctum();
-extern void AddSC_boss_bjarngrim(); // ulduar, halls_of_lightning
-extern void AddSC_boss_ionar();
-extern void AddSC_boss_loken();
-extern void AddSC_boss_volkhan();
-extern void AddSC_instance_halls_of_lightning();
-extern void AddSC_boss_maiden_of_grief(); // ulduar, halls_of_stone
-extern void AddSC_boss_sjonnir();
-extern void AddSC_halls_of_stone();
-extern void AddSC_instance_halls_of_stone();
-extern void AddSC_boss_assembly_of_iron(); // ulduar, ulduar
-extern void AddSC_boss_algalon();
-extern void AddSC_boss_auriaya();
-extern void AddSC_boss_flame_leviathan();
-extern void AddSC_boss_freya();
-extern void AddSC_boss_general_vezax();
-extern void AddSC_boss_hodir();
-extern void AddSC_boss_ignis();
-extern void AddSC_boss_kologarn();
-extern void AddSC_boss_mimiron();
-extern void AddSC_boss_razorscale();
-extern void AddSC_boss_thorim();
-extern void AddSC_boss_xt_002();
-extern void AddSC_boss_yogg_saron();
-extern void AddSC_instance_ulduar();
-extern void AddSC_ulduar();
-extern void AddSC_boss_ingvar(); // utgarde_keep, utgarde_keep
-extern void AddSC_boss_keleseth();
-extern void AddSC_boss_skarvald_and_dalronn();
-extern void AddSC_instance_utgarde_keep();
-extern void AddSC_utgarde_keep();
-extern void AddSC_boss_gortok(); // utgarde_keep, utgarde_pinnacle
-extern void AddSC_boss_skadi();
-extern void AddSC_boss_svala();
-extern void AddSC_boss_ymiron();
-extern void AddSC_instance_pinnacle();
-extern void AddSC_boss_archavon(); // vault_of_archavon
-extern void AddSC_boss_emalon();
-extern void AddSC_boss_koralon();
-extern void AddSC_boss_toravon();
-extern void AddSC_instance_vault_of_archavon();
-extern void AddSC_boss_erekem(); // violet_hold
-extern void AddSC_boss_ichoron();
-extern void AddSC_instance_violet_hold();
-extern void AddSC_violet_hold();
-
-extern void AddSC_borean_tundra();
-extern void AddSC_dalaran();
-extern void AddSC_dragonblight();
-extern void AddSC_grizzly_hills();
-extern void AddSC_howling_fjord();
-extern void AddSC_icecrown();
-extern void AddSC_sholazar_basin();
-extern void AddSC_storm_peaks();
-extern void AddSC_zuldrak();
+// removed
// outland
extern void AddSC_boss_exarch_maladaar(); // auchindoun, auchenai_crypts
@@ -587,7 +463,22 @@ void AddScripts()
AddSC_boss_ragnaros();
AddSC_instance_molten_core();
AddSC_molten_core();
- AddSC_ebon_hold(); // scarlet_enclave
+ AddSC_boss_anubrekhan(); // naxxramas
+ AddSC_boss_four_horsemen();
+ AddSC_boss_faerlina();
+ AddSC_boss_gluth();
+ AddSC_boss_gothik();
+ AddSC_boss_grobbulus();
+ AddSC_boss_kelthuzad();
+ AddSC_boss_loatheb();
+ AddSC_boss_maexxna();
+ AddSC_boss_noth();
+ AddSC_boss_heigan();
+ AddSC_boss_patchwerk();
+ AddSC_boss_razuvious();
+ AddSC_boss_sapphiron();
+ AddSC_boss_thaddius();
+ AddSC_instance_naxxramas();
AddSC_boss_arcanist_doan(); // scarlet_monastery
AddSC_boss_azshir_the_sleepless();
AddSC_boss_bloodmage_thalnos();
@@ -699,8 +590,6 @@ void AddScripts()
AddSC_boss_lieutenant_drake();
AddSC_instance_old_hillsbrad();
AddSC_old_hillsbrad();
- AddSC_culling_of_stratholme(); // CoT, culling_of_stratholme
- AddSC_instance_culling_of_stratholme();
AddSC_dire_maul(); // dire_maul
AddSC_instance_dire_maul();
AddSC_boss_celebras_the_cursed(); // maraudon
@@ -758,144 +647,7 @@ void AddScripts()
AddSC_winterspring();
// northrend
- AddSC_boss_jedoga(); // azjol-nerub, ahnkahet
- AddSC_boss_nadox();
- AddSC_boss_taldaram();
- AddSC_boss_volazj();
- AddSC_instance_ahnkahet();
- AddSC_boss_anubarak(); // azjol-nerub, azjol-nerub
- AddSC_boss_hadronox();
- AddSC_boss_krikthir();
- AddSC_instance_azjol_nerub();
- AddSC_boss_grand_champions(); // CC, trial_of_the_champion
- AddSC_instance_trial_of_the_champion();
- AddSC_trial_of_the_champion();
- AddSC_boss_anubarak_trial(); // CC, trial_of_the_crusader
- AddSC_boss_faction_champions();
- AddSC_boss_jaraxxus();
- AddSC_instance_trial_of_the_crusader();
- AddSC_northrend_beasts();
- AddSC_trial_of_the_crusader();
- AddSC_twin_valkyr();
- AddSC_boss_novos(); // draktharon_keep
- AddSC_boss_tharonja();
- AddSC_boss_trollgore();
- AddSC_instance_draktharon_keep();
- AddSC_boss_colossus(); // gundrak
- AddSC_boss_eck();
- AddSC_boss_galdarah();
- AddSC_boss_moorabi();
- AddSC_boss_sladran();
- AddSC_instance_gundrak();
- AddSC_boss_bronjahm(); // ICC, FH, forge_of_souls
- AddSC_boss_devourer_of_souls();
- AddSC_instance_forge_of_souls();
- AddSC_boss_falric(); // ICC, FH, halls_of_reflection
- AddSC_boss_lich_king();
- AddSC_boss_marwyn();
- AddSC_halls_of_reflection();
- AddSC_instance_halls_of_reflection();
- AddSC_boss_garfrost(); // ICC, FH, pit_of_saron
- AddSC_boss_krick_and_ick();
- AddSC_boss_tyrannus();
- AddSC_instance_pit_of_saron();
- AddSC_pit_of_saron();
- AddSC_blood_prince_council(); // ICC, icecrown_citadel
- AddSC_boss_blood_queen_lanathel();
- AddSC_boss_deathbringer_saurfang();
- AddSC_boss_festergut();
- AddSC_boss_lady_deathwhisper();
- AddSC_boss_lord_marrowgar();
- AddSC_boss_professor_putricide();
- AddSC_boss_rotface();
- AddSC_boss_sindragosa();
- AddSC_boss_the_lich_king();
- AddSC_boss_valithria_dreamwalker();
- AddSC_gunship_battle();
- AddSC_instance_icecrown_citadel();
- AddSC_boss_anubrekhan(); // naxxramas
- AddSC_boss_four_horsemen();
- AddSC_boss_faerlina();
- AddSC_boss_gluth();
- AddSC_boss_gothik();
- AddSC_boss_grobbulus();
- AddSC_boss_kelthuzad();
- AddSC_boss_loatheb();
- AddSC_boss_maexxna();
- AddSC_boss_noth();
- AddSC_boss_heigan();
- AddSC_boss_patchwerk();
- AddSC_boss_razuvious();
- AddSC_boss_sapphiron();
- AddSC_boss_thaddius();
- AddSC_instance_naxxramas();
- AddSC_boss_malygos(); // nexus, eye_of_eternity
- AddSC_boss_anomalus(); // nexus, nexus
- AddSC_boss_keristrasza();
- AddSC_boss_ormorok();
- AddSC_boss_telestra();
- AddSC_instance_nexus();
- AddSC_boss_sartharion(); // obsidian_sanctum
- AddSC_instance_obsidian_sanctum();
- AddSC_boss_baltharus(); // ruby_sanctum
- AddSC_boss_halion();
- AddSC_boss_saviana();
- AddSC_boss_zarithrian();
- AddSC_instance_ruby_sanctum();
- AddSC_boss_bjarngrim(); // ulduar, halls_of_lightning
- AddSC_boss_ionar();
- AddSC_boss_loken();
- AddSC_boss_volkhan();
- AddSC_instance_halls_of_lightning();
- AddSC_boss_maiden_of_grief(); // ulduar, halls_of_stone
- AddSC_boss_sjonnir();
- AddSC_halls_of_stone();
- AddSC_instance_halls_of_stone();
- AddSC_boss_assembly_of_iron(); // ulduar, ulduar
- AddSC_boss_algalon();
- AddSC_boss_auriaya();
- AddSC_boss_flame_leviathan();
- AddSC_boss_freya();
- AddSC_boss_general_vezax();
- AddSC_boss_hodir();
- AddSC_boss_ignis();
- AddSC_boss_kologarn();
- AddSC_boss_mimiron();
- AddSC_boss_razorscale();
- AddSC_boss_thorim();
- AddSC_boss_xt_002();
- AddSC_boss_yogg_saron();
- AddSC_instance_ulduar();
- AddSC_ulduar();
- AddSC_boss_ingvar(); // UK, utgarde_keep
- AddSC_boss_keleseth();
- AddSC_boss_skarvald_and_dalronn();
- AddSC_instance_utgarde_keep();
- AddSC_utgarde_keep();
- AddSC_boss_gortok(); // UK, utgarde_pinnacle
- AddSC_boss_skadi();
- AddSC_boss_svala();
- AddSC_boss_ymiron();
- AddSC_instance_pinnacle();
- AddSC_boss_archavon(); // vault_of_archavon
- AddSC_boss_emalon();
- AddSC_boss_koralon();
- AddSC_boss_toravon();
- AddSC_instance_vault_of_archavon();
- AddSC_boss_erekem(); // violet_hold
- AddSC_boss_ichoron();
- AddSC_instance_violet_hold();
- AddSC_violet_hold();
-
- AddSC_borean_tundra();
- AddSC_dalaran();
- AddSC_dragonblight();
- AddSC_grizzly_hills();
- AddSC_howling_fjord();
- AddSC_icecrown();
- AddSC_sholazar_basin();
- AddSC_storm_peaks();
- AddSC_zuldrak();
+ // removed
// outland
AddSC_boss_exarch_maladaar(); // auchindoun, auchenai_crypts
--
1.6.4.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment