Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)
Conflicts: src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/DataStores/DBCStructure.h src/server/game/DataStores/DBCfmt.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Groups/Group.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Miscellaneous/Language.h src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
This commit is contained in:
commit
ec0688ade3
96 files changed
+4872
-788
No files matched your search
@@ -482,7 +482,7 @@ public:
|
||||
char* arg3 = strtok(NULL, " ");
|
||||
bool isAccountNameGiven = true;
|
||||
|
||||
if (arg1 && !arg3)
|
||||
if (!arg3)
|
||||
{
|
||||
if (!handler->getSelectedPlayer())
|
||||
return false;
|
||||
|
||||
@@ -320,7 +320,7 @@ public:
|
||||
// check online security
|
||||
if (handler->HasLowerSecurity(target, 0))
|
||||
return false;
|
||||
|
||||
|
||||
playerOldName = target->GetName();
|
||||
}
|
||||
else
|
||||
@@ -345,7 +345,7 @@ public:
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (WorldSession* session = handler->GetSession())
|
||||
{
|
||||
if (!session->HasPermission(RBAC_PERM_SKIP_CHECK_CHARACTER_CREATION_RESERVEDNAME) && sObjectMgr->IsReservedName(newName))
|
||||
|
||||
@@ -45,20 +45,20 @@ public:
|
||||
|
||||
ChatCommand* GetCommands() const
|
||||
{
|
||||
static ChatCommand deserterInstanceCommandTable[] =
|
||||
static ChatCommand deserterInstanceCommandTable[] =
|
||||
{
|
||||
{ "add", SEC_ADMINISTRATOR, false, &HandleDeserterInstanceAdd, "", NULL },
|
||||
{ "remove", SEC_ADMINISTRATOR, false, &HandleDeserterInstanceRemove, "", NULL },
|
||||
{ NULL, SEC_PLAYER, false, NULL, "", NULL }
|
||||
};
|
||||
static ChatCommand deserterBGCommandTable[] =
|
||||
static ChatCommand deserterBGCommandTable[] =
|
||||
{
|
||||
{ "add", SEC_ADMINISTRATOR, false, &HandleDeserterBGAdd, "", NULL },
|
||||
{ "remove", SEC_ADMINISTRATOR, false, &HandleDeserterBGRemove, "", NULL },
|
||||
{ NULL, SEC_PLAYER, false, NULL, "", NULL }
|
||||
};
|
||||
|
||||
static ChatCommand deserterCommandTable[] =
|
||||
static ChatCommand deserterCommandTable[] =
|
||||
{
|
||||
{ "instance", SEC_ADMINISTRATOR, false, NULL, "", deserterInstanceCommandTable },
|
||||
{ "bg", SEC_ADMINISTRATOR, false, NULL, "", deserterBGCommandTable },
|
||||
|
||||
@@ -518,7 +518,7 @@ public:
|
||||
uint32 copp = (money % GOLD) % SILVER;
|
||||
std::string receiverStr = handler->playerLink(receiver);
|
||||
std::string senderStr = handler->playerLink(sender);
|
||||
handler->PSendSysMessage(LANG_LIST_MAIL_INFO_1 , messageId, subject.c_str(),gold, silv, copp);
|
||||
handler->PSendSysMessage(LANG_LIST_MAIL_INFO_1, messageId, subject.c_str(), gold, silv, copp);
|
||||
handler->PSendSysMessage(LANG_LIST_MAIL_INFO_2, senderStr.c_str(), senderId, receiverStr.c_str(), receiverId);
|
||||
handler->PSendSysMessage(LANG_LIST_MAIL_INFO_3, TimeToTimestampStr(deliverTime).c_str(), TimeToTimestampStr(expireTime).c_str());
|
||||
if (hasItem == 1)
|
||||
@@ -541,7 +541,7 @@ public:
|
||||
uint32 item_entry = fields[0].GetUInt32();
|
||||
uint32 item_count = fields[1].GetUInt32();
|
||||
QueryResult result4;
|
||||
result4 = WorldDatabase.PQuery("SELECT name,quality FROM item_template WHERE entry = '%u'", item_entry);
|
||||
result4 = WorldDatabase.PQuery("SELECT name, quality FROM item_template WHERE entry = '%u'", item_entry);
|
||||
Field* fields1 = result4->Fetch();
|
||||
std::string item_name = fields1[0].GetString();
|
||||
int item_quality = fields1[1].GetUInt8();
|
||||
|
||||
@@ -869,12 +869,7 @@ public:
|
||||
|
||||
uint32 id = atoi((char*)args);
|
||||
|
||||
bool found = false;
|
||||
uint32 count = 0;
|
||||
uint32 maxResults = 1;
|
||||
|
||||
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(id);
|
||||
if (spellInfo)
|
||||
if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(id))
|
||||
{
|
||||
int locale = handler->GetSessionDbcLocale();
|
||||
std::string name = spellInfo->SpellName;
|
||||
@@ -884,14 +879,6 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
if (locale < TOTAL_LOCALES)
|
||||
{
|
||||
if (maxResults && count++ == maxResults)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_LOOKUP_MAX_RESULTS, maxResults);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool known = target && target->HasSpell(id);
|
||||
bool learn = (spellInfo->Effects[0].Effect == SPELL_EFFECT_LEARN_SPELL);
|
||||
|
||||
@@ -935,13 +922,8 @@ public:
|
||||
ss << handler->GetTrinityString(LANG_ACTIVE);
|
||||
|
||||
handler->SendSysMessage(ss.str().c_str());
|
||||
|
||||
if (!found)
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!found)
|
||||
else
|
||||
handler->SendSysMessage(LANG_COMMAND_NOSPELLFOUND);
|
||||
|
||||
return true;
|
||||
|
||||
@@ -1070,9 +1070,7 @@ public:
|
||||
Player* player = handler->GetSession()->GetPlayer();
|
||||
uint32 zone_id = player->GetZoneId();
|
||||
|
||||
WorldSafeLocsEntry const* graveyard = sObjectMgr->GetClosestGraveYard(
|
||||
player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), team);
|
||||
|
||||
WorldSafeLocsEntry const* graveyard = sObjectMgr->GetClosestGraveYard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), team);
|
||||
if (graveyard)
|
||||
{
|
||||
uint32 graveyardId = graveyard->ID;
|
||||
@@ -1102,14 +1100,12 @@ public:
|
||||
{
|
||||
std::string team_name;
|
||||
|
||||
if (team == 0)
|
||||
team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_ANY);
|
||||
else if (team == HORDE)
|
||||
if (team == HORDE)
|
||||
team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_HORDE);
|
||||
else if (team == ALLIANCE)
|
||||
team_name = handler->GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
|
||||
|
||||
if (team == ~uint32(0))
|
||||
if (!team)
|
||||
handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id);
|
||||
else
|
||||
handler->PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str());
|
||||
@@ -2046,6 +2042,70 @@ public:
|
||||
if (!*args)
|
||||
return false;
|
||||
|
||||
char* str = strtok((char*)args, " ");
|
||||
|
||||
if (strcmp(str, "go") == 0)
|
||||
{
|
||||
char* guidStr = strtok(NULL, " ");
|
||||
if (!guidStr)
|
||||
{
|
||||
handler->SendSysMessage(LANG_BAD_VALUE);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
int32 guid = atoi(guidStr);
|
||||
if (!guid)
|
||||
{
|
||||
handler->SendSysMessage(LANG_BAD_VALUE);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
char* damageStr = strtok(NULL, " ");
|
||||
if (!damageStr)
|
||||
{
|
||||
handler->SendSysMessage(LANG_BAD_VALUE);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
int32 damage = atoi(damageStr);
|
||||
if (!damage)
|
||||
{
|
||||
handler->SendSysMessage(LANG_BAD_VALUE);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (Player* player = handler->GetSession()->GetPlayer())
|
||||
{
|
||||
GameObject* go = NULL;
|
||||
|
||||
if (GameObjectData const* goData = sObjectMgr->GetGOData(guid))
|
||||
go = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(guid, goData->id);
|
||||
|
||||
if (!go)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, guid);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!go->IsDestructibleBuilding())
|
||||
{
|
||||
handler->SendSysMessage(LANG_INVALID_GAMEOBJECT_TYPE);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
go->ModifyHealth(-damage, player);
|
||||
handler->PSendSysMessage(LANG_GAMEOBJECT_DAMAGED, go->GetName().c_str(), guid, -damage, go->GetGOValue()->Building.Health);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Unit* target = handler->getSelectedUnit();
|
||||
if (!target || !handler->GetSession()->GetPlayer()->GetSelection())
|
||||
{
|
||||
@@ -2084,7 +2144,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
uint32 school = schoolStr ? atoi((char*)schoolStr) : SPELL_SCHOOL_NORMAL;
|
||||
uint32 school = atoi((char*)schoolStr);
|
||||
if (school >= MAX_SPELL_SCHOOL)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -128,7 +128,7 @@ public:
|
||||
int32 gy = 32 - player->GetPositionY() / SIZE_OF_GRIDS;
|
||||
|
||||
handler->PSendSysMessage("%03u%02i%02i.mmtile", player->GetMapId(), gy, gx);
|
||||
handler->PSendSysMessage("gridloc [%i,%i]", gx, gy);
|
||||
handler->PSendSysMessage("gridloc [%i, %i]", gx, gy);
|
||||
|
||||
// calculate navmesh tile location
|
||||
dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId());
|
||||
@@ -148,7 +148,7 @@ public:
|
||||
int32 tilex = int32((y - min[0]) / SIZE_OF_GRIDS);
|
||||
int32 tiley = int32((x - min[2]) / SIZE_OF_GRIDS);
|
||||
|
||||
handler->PSendSysMessage("Calc [%02i,%02i]", tilex, tiley);
|
||||
handler->PSendSysMessage("Calc [%02i, %02i]", tilex, tiley);
|
||||
|
||||
// navmesh poly -> navmesh tile location
|
||||
dtQueryFilter filter = dtQueryFilter();
|
||||
@@ -156,16 +156,16 @@ public:
|
||||
navmeshquery->findNearestPoly(location, extents, &filter, &polyRef, NULL);
|
||||
|
||||
if (polyRef == INVALID_POLYREF)
|
||||
handler->PSendSysMessage("Dt [??,??] (invalid poly, probably no tile loaded)");
|
||||
handler->PSendSysMessage("Dt [??, ??] (invalid poly, probably no tile loaded)");
|
||||
else
|
||||
{
|
||||
dtMeshTile const* tile;
|
||||
dtPoly const* poly;
|
||||
navmesh->getTileAndPolyByRef(polyRef, &tile, &poly);
|
||||
if (tile)
|
||||
handler->PSendSysMessage("Dt [%02i,%02i]", tile->header->x, tile->header->y);
|
||||
handler->PSendSysMessage("Dt [%02i, %02i]", tile->header->x, tile->header->y);
|
||||
else
|
||||
handler->PSendSysMessage("Dt [??,??] (no tile loaded)");
|
||||
handler->PSendSysMessage("Dt [??, ??] (no tile loaded)");
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -190,7 +190,7 @@ public:
|
||||
if (!tile || !tile->header)
|
||||
continue;
|
||||
|
||||
handler->PSendSysMessage("[%02i,%02i]", tile->header->x, tile->header->y);
|
||||
handler->PSendSysMessage("[%02i, %02i]", tile->header->x, tile->header->y);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -310,24 +310,14 @@ public:
|
||||
|
||||
if (!pfactionid)
|
||||
{
|
||||
if (target)
|
||||
{
|
||||
uint32 factionid = target->getFaction();
|
||||
uint32 flag = target->GetUInt32Value(UNIT_FIELD_FLAGS);
|
||||
uint32 npcflag = target->GetUInt32Value(UNIT_NPC_FLAGS);
|
||||
uint32 dyflag = target->GetUInt32Value(UNIT_DYNAMIC_FLAGS);
|
||||
handler->PSendSysMessage(LANG_CURRENT_FACTION, target->GetGUIDLow(), factionid, flag, npcflag, dyflag);
|
||||
}
|
||||
uint32 factionid = target->getFaction();
|
||||
uint32 flag = target->GetUInt32Value(UNIT_FIELD_FLAGS);
|
||||
uint32 npcflag = target->GetUInt32Value(UNIT_NPC_FLAGS);
|
||||
uint32 dyflag = target->GetUInt32Value(UNIT_DYNAMIC_FLAGS);
|
||||
handler->PSendSysMessage(LANG_CURRENT_FACTION, target->GetGUIDLow(), factionid, flag, npcflag, dyflag);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!target)
|
||||
{
|
||||
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 factionid = atoi(pfactionid);
|
||||
uint32 flag;
|
||||
|
||||
@@ -341,7 +331,7 @@ public:
|
||||
|
||||
uint32 npcflag;
|
||||
if (!pnpcflag)
|
||||
npcflag = target->GetUInt32Value(UNIT_NPC_FLAGS);
|
||||
npcflag = target->GetUInt32Value(UNIT_NPC_FLAGS);
|
||||
else
|
||||
npcflag = atoi(pnpcflag);
|
||||
|
||||
@@ -349,7 +339,7 @@ public:
|
||||
|
||||
uint32 dyflag;
|
||||
if (!pdyflag)
|
||||
dyflag = target->GetUInt32Value(UNIT_DYNAMIC_FLAGS);
|
||||
dyflag = target->GetUInt32Value(UNIT_DYNAMIC_FLAGS);
|
||||
else
|
||||
dyflag = atoi(pdyflag);
|
||||
|
||||
|
||||
@@ -254,7 +254,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 vendor_entry = vendor ? vendor->GetEntry() : 0;
|
||||
uint32 vendor_entry = vendor->GetEntry();
|
||||
|
||||
if (!sObjectMgr->IsVendorItemValid(vendor_entry, itemId, maxcount, incrtime, extendedcost, type, handler->GetSession()->GetPlayer()))
|
||||
{
|
||||
|
||||
@@ -32,6 +32,12 @@ EndScriptData */
|
||||
struct RBACCommandData
|
||||
{
|
||||
RBACCommandData(): id(0), realmId(0), rbac(NULL), needDelete(false) { }
|
||||
~RBACCommandData()
|
||||
{
|
||||
if (needDelete)
|
||||
delete rbac;
|
||||
}
|
||||
|
||||
uint32 id;
|
||||
int32 realmId;
|
||||
RBACData* rbac;
|
||||
@@ -230,8 +236,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -266,8 +271,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -295,8 +299,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -335,8 +338,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -375,8 +377,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -411,8 +412,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -453,8 +453,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -493,8 +492,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -533,8 +531,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -569,8 +566,7 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -613,8 +609,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -643,8 +638,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
if (command->needDelete)
|
||||
delete command;
|
||||
delete command;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -800,7 +800,7 @@ public:
|
||||
if (show == "info")
|
||||
{
|
||||
// Check if the user did specify a visual waypoint
|
||||
if (target->GetEntry() != VISUAL_WAYPOINT)
|
||||
if (target && target->GetEntry() != VISUAL_WAYPOINT)
|
||||
{
|
||||
handler->PSendSysMessage(LANG_WAYPOINT_VP_SELECT);
|
||||
handler->SetSentErrorMessage(true);
|
||||
|
||||
@@ -146,49 +146,51 @@ class boss_kirtonos_the_herald : public CreatureScript
|
||||
{
|
||||
events.Update(diff);
|
||||
|
||||
while (uint32 eventId = events.ExecuteEvent() && !UpdateVictim())
|
||||
{
|
||||
switch (eventId)
|
||||
{
|
||||
case INTRO_1:
|
||||
me->GetMotionMaster()->MovePath(KIRTONOS_PATH, false);
|
||||
break;
|
||||
case INTRO_2:
|
||||
me->GetMotionMaster()->MovePoint(0, PosMove[0]);
|
||||
events.ScheduleEvent(INTRO_3, 1000);
|
||||
break;
|
||||
case INTRO_3:
|
||||
if (GameObject* gate = me->GetMap()->GetGameObject(instance->GetData64(GO_GATE_KIRTONOS)))
|
||||
gate->SetGoState(GO_STATE_READY);
|
||||
me->SetFacingTo(0.01745329f);
|
||||
events.ScheduleEvent(INTRO_4, 3000);
|
||||
break;
|
||||
case INTRO_4:
|
||||
if (GameObject* brazier = me->GetMap()->GetGameObject(instance->GetData64(GO_BRAZIER_OF_THE_HERALD)))
|
||||
brazier->SetGoState(GO_STATE_READY);
|
||||
me->SetWalk(true);
|
||||
me->SetDisableGravity(false);
|
||||
DoCast(me, SPELL_KIRTONOS_TRANSFORM);
|
||||
me->SetCanFly(false);
|
||||
events.ScheduleEvent(INTRO_5, 1000);
|
||||
break;
|
||||
case INTRO_5:
|
||||
me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
|
||||
me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(WEAPON_KIRTONOS_STAFF));
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
events.ScheduleEvent(INTRO_6, 5000);
|
||||
break;
|
||||
case INTRO_6:
|
||||
me->GetMotionMaster()->MovePoint(0, PosMove[1]);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!UpdateVictim())
|
||||
{
|
||||
while (uint32 eventId = events.ExecuteEvent())
|
||||
{
|
||||
switch (eventId)
|
||||
{
|
||||
case INTRO_1:
|
||||
me->GetMotionMaster()->MovePath(KIRTONOS_PATH, false);
|
||||
break;
|
||||
case INTRO_2:
|
||||
me->GetMotionMaster()->MovePoint(0, PosMove[0]);
|
||||
events.ScheduleEvent(INTRO_3, 1000);
|
||||
break;
|
||||
case INTRO_3:
|
||||
if (GameObject* gate = me->GetMap()->GetGameObject(instance->GetData64(GO_GATE_KIRTONOS)))
|
||||
gate->SetGoState(GO_STATE_READY);
|
||||
me->SetFacingTo(0.01745329f);
|
||||
events.ScheduleEvent(INTRO_4, 3000);
|
||||
break;
|
||||
case INTRO_4:
|
||||
if (GameObject* brazier = me->GetMap()->GetGameObject(instance->GetData64(GO_BRAZIER_OF_THE_HERALD)))
|
||||
brazier->SetGoState(GO_STATE_READY);
|
||||
me->SetWalk(true);
|
||||
me->SetDisableGravity(false);
|
||||
DoCast(me, SPELL_KIRTONOS_TRANSFORM);
|
||||
me->SetCanFly(false);
|
||||
events.ScheduleEvent(INTRO_5, 1000);
|
||||
break;
|
||||
case INTRO_5:
|
||||
me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
|
||||
me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(WEAPON_KIRTONOS_STAFF));
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
events.ScheduleEvent(INTRO_6, 5000);
|
||||
break;
|
||||
case INTRO_6:
|
||||
me->GetMotionMaster()->MovePoint(0, PosMove[1]);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (me->HasUnitState(UNIT_STATE_CASTING))
|
||||
return;
|
||||
|
||||
@@ -773,7 +773,7 @@ public:
|
||||
void JustSummoned(Creature* summon)
|
||||
{
|
||||
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true);
|
||||
if (target && summon)
|
||||
if (target)
|
||||
summon->Attack(target, false);
|
||||
summons.Summon(summon);
|
||||
}
|
||||
|
||||
@@ -34,13 +34,13 @@ enum Spells
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_STINGER_SPRAY = 0,
|
||||
EVENT_POISON_STINGER = 1,
|
||||
EVENT_SUMMON_SWARMER = 2,
|
||||
EVENT_SWARMER_ATTACK = 3,
|
||||
EVENT_PARALYZE = 4,
|
||||
EVENT_LASH = 5,
|
||||
EVENT_TRASH = 6
|
||||
EVENT_STINGER_SPRAY = 1,
|
||||
EVENT_POISON_STINGER = 2,
|
||||
EVENT_SUMMON_SWARMER = 3,
|
||||
EVENT_SWARMER_ATTACK = 4,
|
||||
EVENT_PARALYZE = 5,
|
||||
EVENT_LASH = 6,
|
||||
EVENT_TRASH = 7
|
||||
};
|
||||
|
||||
enum Emotes
|
||||
|
||||
@@ -42,11 +42,11 @@ enum Spells
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_DISMEMBER = 0,
|
||||
EVENT_GATHERING_SPEED = 1,
|
||||
EVENT_FULL_SPEED = 2,
|
||||
EVENT_CREEPING_PLAGUE = 3,
|
||||
EVENT_RESPAWN_EGG = 4
|
||||
EVENT_DISMEMBER = 1,
|
||||
EVENT_GATHERING_SPEED = 2,
|
||||
EVENT_FULL_SPEED = 3,
|
||||
EVENT_CREEPING_PLAGUE = 4,
|
||||
EVENT_RESPAWN_EGG = 5
|
||||
};
|
||||
|
||||
enum Phases
|
||||
|
||||
@@ -40,10 +40,10 @@ enum Spells
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_ARCANE_EXPLOSION = 0,
|
||||
EVENT_FULLFILMENT = 1,
|
||||
EVENT_BLINK = 2,
|
||||
EVENT_EARTH_SHOCK = 3
|
||||
EVENT_ARCANE_EXPLOSION = 1,
|
||||
EVENT_FULLFILMENT = 2,
|
||||
EVENT_BLINK = 3,
|
||||
EVENT_EARTH_SHOCK = 4
|
||||
};
|
||||
|
||||
uint32 const BlinkSpells[3] = { 4801, 8195, 20449 };
|
||||
|
||||
@@ -58,8 +58,8 @@ enum HauntingWitchHill
|
||||
NPC_RISEN_SPIRIT = 23554,
|
||||
|
||||
// Events
|
||||
EVENT_CONSUME_FLESH = 0,
|
||||
EVENT_INTANGIBLE_PRESENCE = 1,
|
||||
EVENT_CONSUME_FLESH = 1,
|
||||
EVENT_INTANGIBLE_PRESENCE = 2,
|
||||
};
|
||||
|
||||
class mobs_risen_husk_spirit : public CreatureScript
|
||||
|
||||
@@ -154,14 +154,14 @@ struct DialogueEntry
|
||||
class DialogueHelper
|
||||
{
|
||||
public:
|
||||
// The array MUST be terminated by {0,0,0}
|
||||
// The array MUST be terminated by {0, 0, 0}
|
||||
DialogueHelper(DialogueEntry const* dialogueArray) :
|
||||
_dialogueArray(dialogueArray),
|
||||
_currentEntry(NULL),
|
||||
_actionTimer(0),
|
||||
_isFirstSide(true)
|
||||
{}
|
||||
// The array MUST be terminated by {0,0,0,0,0}
|
||||
// The array MUST be terminated by {0, 0, 0, 0, 0}
|
||||
|
||||
/// Function to initialize the dialogue helper for instances. If not used with instances, GetSpeakerByEntry MUST be overwritten to obtain the speakers
|
||||
/// Set if take first entries or second entries
|
||||
@@ -182,9 +182,7 @@ public:
|
||||
}
|
||||
|
||||
if (!found)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
DoNextDialogueStep();
|
||||
}
|
||||
@@ -210,7 +208,7 @@ private:
|
||||
void DoNextDialogueStep()
|
||||
{
|
||||
// Last Dialogue Entry done?
|
||||
if (_currentEntry && !_currentEntry->TextEntry)
|
||||
if (!_currentEntry || !_currentEntry->TextEntry)
|
||||
{
|
||||
_actionTimer = 0;
|
||||
return;
|
||||
@@ -400,7 +398,7 @@ public:
|
||||
|
||||
void WaypointReached(uint32 pointId)
|
||||
{
|
||||
switch(pointId)
|
||||
switch (pointId)
|
||||
{
|
||||
case 3:
|
||||
Talk(SAY_ENTER_OWL_THICKET);
|
||||
@@ -439,7 +437,7 @@ public:
|
||||
SetEscortPaused(true);
|
||||
DoSummonPriestess();
|
||||
Talk(SAY_RANSHALLA_ALTAR_2);
|
||||
events.ScheduleEvent(EVENT_RESUME,2000);
|
||||
events.ScheduleEvent(EVENT_RESUME, 2000);
|
||||
break;
|
||||
case 44:
|
||||
// Stop the escort and turn towards the altar
|
||||
|
||||
@@ -26,7 +26,7 @@ set(scripts_STAT_SRCS
|
||||
Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
|
||||
Northrend/Ulduar/Ulduar/instance_ulduar.cpp
|
||||
Northrend/Ulduar/Ulduar/boss_auriaya.cpp
|
||||
Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
|
||||
Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
|
||||
Northrend/Ulduar/Ulduar/boss_hodir.cpp
|
||||
Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
|
||||
Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
|
||||
|
||||
+3
@@ -149,6 +149,9 @@ class npc_announcer_toc10 : public CreatureScript
|
||||
}
|
||||
}
|
||||
|
||||
if (i >= NUM_MESSAGES)
|
||||
return false;
|
||||
|
||||
player->SEND_GOSSIP_MENU(_GossipMessage[i].msgnum, creature->GetGUID());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -33,10 +33,10 @@ enum Spells
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_BERSERK = 0,
|
||||
EVENT_CLOUD = 1,
|
||||
EVENT_INJECT = 2,
|
||||
EVENT_SPRAY = 3
|
||||
EVENT_BERSERK = 1,
|
||||
EVENT_CLOUD = 2,
|
||||
EVENT_INJECT = 3,
|
||||
EVENT_SPRAY = 4
|
||||
};
|
||||
|
||||
enum CreatureId
|
||||
@@ -46,7 +46,8 @@ enum CreatureId
|
||||
|
||||
class boss_grobbulus : public CreatureScript
|
||||
{
|
||||
public: boss_grobbulus() : CreatureScript("boss_grobbulus") { }
|
||||
public:
|
||||
boss_grobbulus() : CreatureScript("boss_grobbulus") { }
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
|
||||
@@ -754,7 +754,7 @@ public:
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
{
|
||||
if (!UpdateVictim() && _phase != PHASE_NOT_STARTED && _phase != PHASE_TWO)
|
||||
if (!instance || (!UpdateVictim() && _phase != PHASE_NOT_STARTED && _phase != PHASE_TWO))
|
||||
return;
|
||||
|
||||
events.Update(diff);
|
||||
@@ -854,7 +854,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
if (_arcaneReinforcements && instance)
|
||||
if (_arcaneReinforcements)
|
||||
{
|
||||
for (uint8 rangeDisks = 0; rangeDisks < (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL ? 4 : 5); rangeDisks++)
|
||||
{
|
||||
|
||||
@@ -110,103 +110,107 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript
|
||||
public:
|
||||
npc_verdisa_beglaristrasz_eternos() : CreatureScript("npc_verdisa_beglaristrasz_eternos") { }
|
||||
|
||||
InstanceScript* instance;
|
||||
|
||||
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
|
||||
{
|
||||
player->PlayerTalkClass->ClearMenus();
|
||||
switch (creature->GetEntry())
|
||||
{
|
||||
case NPC_VERDISA: //Verdisa
|
||||
switch (action)
|
||||
case NPC_VERDISA: //Verdisa
|
||||
{
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
if (!HAS_ESSENCE(player))
|
||||
switch (action)
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, creature->GetGUID());
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
if (!HAS_ESSENCE(player))
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, creature->GetGUID());
|
||||
}
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
{
|
||||
ItemPosCountVec dest;
|
||||
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_EMERALD_ESSENCE, 1);
|
||||
if (msg == EQUIP_ERR_OK)
|
||||
player->StoreNewItem(dest, ITEM_EMERALD_ESSENCE, true);
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
break;
|
||||
}
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
{
|
||||
ItemPosCountVec dest;
|
||||
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_EMERALD_ESSENCE, 1);
|
||||
if (msg == EQUIP_ERR_OK)
|
||||
player->StoreNewItem(dest, ITEM_EMERALD_ESSENCE, true);
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
break;
|
||||
}
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case NPC_BELGARISTRASZ: //Belgaristrasz
|
||||
switch (action)
|
||||
case NPC_BELGARISTRASZ: //Belgaristrasz
|
||||
{
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
if (!HAS_ESSENCE(player))
|
||||
switch (action)
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, creature->GetGUID());
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
if (!HAS_ESSENCE(player))
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, creature->GetGUID());
|
||||
}
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
{
|
||||
ItemPosCountVec dest;
|
||||
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_RUBY_ESSENCE, 1);
|
||||
if (msg == EQUIP_ERR_OK)
|
||||
player->StoreNewItem(dest, ITEM_RUBY_ESSENCE, true);
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
break;
|
||||
}
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
{
|
||||
ItemPosCountVec dest;
|
||||
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_RUBY_ESSENCE, 1);
|
||||
if (msg == EQUIP_ERR_OK)
|
||||
player->StoreNewItem(dest, ITEM_RUBY_ESSENCE, true);
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
break;
|
||||
}
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case NPC_ETERNOS: //Eternos
|
||||
switch (action)
|
||||
case NPC_ETERNOS: //Eternos
|
||||
{
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
if (!HAS_ESSENCE(player))
|
||||
switch (action)
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, creature->GetGUID());
|
||||
case GOSSIP_ACTION_INFO_DEF + 1:
|
||||
if (!HAS_ESSENCE(player))
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, creature->GetGUID());
|
||||
}
|
||||
else
|
||||
{
|
||||
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, creature->GetGUID());
|
||||
}
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
{
|
||||
ItemPosCountVec dest;
|
||||
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_AMBER_ESSENCE, 1);
|
||||
if (msg == EQUIP_ERR_OK)
|
||||
player->StoreNewItem(dest, ITEM_AMBER_ESSENCE, true);
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
break;
|
||||
}
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF + 2:
|
||||
{
|
||||
ItemPosCountVec dest;
|
||||
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_AMBER_ESSENCE, 1);
|
||||
if (msg == EQUIP_ERR_OK)
|
||||
player->StoreNewItem(dest, ITEM_AMBER_ESSENCE, true);
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
break;
|
||||
}
|
||||
case GOSSIP_ACTION_INFO_DEF + 3:
|
||||
player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, creature->GetGUID());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -235,15 +239,15 @@ public:
|
||||
|
||||
void MovementInform(uint32 /*type*/, uint32 id)
|
||||
{
|
||||
if (id)
|
||||
return;
|
||||
|
||||
// When Belgaristraz finish his moving say grateful text
|
||||
if (me->GetEntry() == NPC_BELGARISTRASZ)
|
||||
if (id == 0)
|
||||
{
|
||||
Talk(SAY_BELGARISTRASZ);
|
||||
}
|
||||
Talk(SAY_BELGARISTRASZ);
|
||||
|
||||
// The gossip flag should activate when Drakos die and not from DB
|
||||
if (id == 0)
|
||||
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
|
||||
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "ScriptMgr.h"
|
||||
#include "ulduar.h"
|
||||
|
||||
enum Sara
|
||||
{
|
||||
// text
|
||||
YELL_SARA_PREFIGHT = 0,
|
||||
YELL_COMBAT_PHASE_1 = 1,
|
||||
YELL_COMBAT_PHASE_2 = 2,
|
||||
YELL_SLAY = 3,
|
||||
|
||||
// Phase 1 spells
|
||||
SPELL_SARAS_ANGER_1 = 63147, // Target Entry 33136
|
||||
SPELL_SARAS_ANGER_2 = 63744, // Target Entry 33136
|
||||
SPELL_SARAS_FEVOR_1 = 63138, // Target Player
|
||||
SPELL_SARAS_FEVOR_2 = 63747, // Target Player
|
||||
SPELL_SARAS_BLESSING_1 = 63134, // Target Player
|
||||
SPELL_SARAS_BLESSING_2 = 63745, // Target Self
|
||||
|
||||
// Phase 2 spells
|
||||
SPELL_PHYCHOSIS = 63795, // Target Self
|
||||
SPELL_MALADY_OF_THE_MIND = 63830, // Target Self
|
||||
SPELL_DEATH_RAY = 63891, // Target Self
|
||||
SPELL_BRAIN_LINK = 63802, // Target Self
|
||||
};
|
||||
|
||||
enum YoggSaron_Yells
|
||||
{
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
ACHIEV_TIMED_START_EVENT = 21001,
|
||||
};
|
||||
//not in scriptloader yet just to remove warning boss_yoggsaron.obj : warning LNK4221: no public symbols found; archive member will be inaccessible
|
||||
void AddSC_boss_yoggsaron()
|
||||
{
|
||||
}
|
||||
@@ -24,14 +24,15 @@
|
||||
|
||||
static DoorData const doorData[] =
|
||||
{
|
||||
{GO_LEVIATHAN_DOOR, BOSS_LEVIATHAN, DOOR_TYPE_ROOM, BOUNDARY_S },
|
||||
{GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S },
|
||||
{GO_DOODAD_UL_SIGILDOOR_03, BOSS_ALGALON, DOOR_TYPE_ROOM, BOUNDARY_W },
|
||||
{GO_DOODAD_UL_UNIVERSEFLOOR_01, BOSS_ALGALON, DOOR_TYPE_ROOM, BOUNDARY_NONE },
|
||||
{GO_DOODAD_UL_UNIVERSEFLOOR_02, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE },
|
||||
{GO_DOODAD_UL_UNIVERSEGLOBE01, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE },
|
||||
{GO_DOODAD_UL_ULDUAR_TRAPDOOR_03, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE },
|
||||
{0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE },
|
||||
{GO_LEVIATHAN_DOOR, BOSS_LEVIATHAN, DOOR_TYPE_ROOM, BOUNDARY_S },
|
||||
{GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S },
|
||||
{GO_YOGG_SARON_DOOR, BOSS_YOGG_SARON, DOOR_TYPE_ROOM, BOUNDARY_S },
|
||||
{GO_DOODAD_UL_SIGILDOOR_03, BOSS_ALGALON, DOOR_TYPE_ROOM, BOUNDARY_W },
|
||||
{GO_DOODAD_UL_UNIVERSEFLOOR_01, BOSS_ALGALON, DOOR_TYPE_ROOM, BOUNDARY_NONE },
|
||||
{GO_DOODAD_UL_UNIVERSEFLOOR_02, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE },
|
||||
{GO_DOODAD_UL_UNIVERSEGLOBE01, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE },
|
||||
{GO_DOODAD_UL_ULDUAR_TRAPDOOR_03, BOSS_ALGALON, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_NONE },
|
||||
{0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE },
|
||||
};
|
||||
|
||||
MinionData const minionData[] =
|
||||
@@ -56,7 +57,6 @@ class instance_ulduar : public InstanceMapScript
|
||||
uint64 IgnisGUID;
|
||||
uint64 RazorscaleGUID;
|
||||
uint64 RazorscaleController;
|
||||
uint64 RazorHarpoonGUIDs[4];
|
||||
uint64 ExpeditionCommanderGUID;
|
||||
uint64 XT002GUID;
|
||||
uint64 XTToyPileGUIDs[4];
|
||||
@@ -67,14 +67,18 @@ class instance_ulduar : public InstanceMapScript
|
||||
uint64 HodirGUID;
|
||||
uint64 ThorimGUID;
|
||||
uint64 FreyaGUID;
|
||||
uint64 KeeperGUIDs[3];
|
||||
uint64 ElderGUIDs[3];
|
||||
uint64 VezaxGUID;
|
||||
uint64 YoggSaronGUID;
|
||||
uint64 VoiceOfYoggSaronGUID;
|
||||
uint64 SaraGUID;
|
||||
uint64 BrainOfYoggSaronGUID;
|
||||
uint64 AlgalonGUID;
|
||||
uint64 LeviathanGateGUID;
|
||||
uint64 VezaxDoorGUID;
|
||||
uint64 BrannBronzebeardAlgGUID;
|
||||
|
||||
// GameObjects
|
||||
uint64 LeviathanGateGUID;
|
||||
uint64 RazorHarpoonGUIDs[4];
|
||||
uint64 KologarnChestGUID;
|
||||
uint64 KologarnBridgeGUID;
|
||||
uint64 KologarnDoorGUID;
|
||||
@@ -84,11 +88,13 @@ class instance_ulduar : public InstanceMapScript
|
||||
uint64 HodirDoorGUID;
|
||||
uint64 HodirIceDoorGUID;
|
||||
uint64 ArchivumDoorGUID;
|
||||
uint64 VezaxDoorGUID;
|
||||
uint64 BrainRoomDoorGUIDs[3];
|
||||
uint64 KeeperGUIDs[4];
|
||||
uint64 AlgalonSigilDoorGUID[3];
|
||||
uint64 AlgalonFloorGUID[2];
|
||||
uint64 AlgalonUniverseGUID;
|
||||
uint64 AlgalonTrapdoorGUID;
|
||||
uint64 BrannBronzebeardAlgGUID;
|
||||
uint64 GiftOfTheObserverGUID;
|
||||
|
||||
// Miscellaneous
|
||||
@@ -96,8 +102,11 @@ class instance_ulduar : public InstanceMapScript
|
||||
uint32 HodirRareCacheData;
|
||||
uint32 ColossusData;
|
||||
uint8 elderCount;
|
||||
uint8 illusion;
|
||||
uint8 keepersCount;
|
||||
bool conSpeedAtory;
|
||||
bool Unbroken;
|
||||
bool IsDriveMeCrazyEligible;
|
||||
|
||||
std::set<uint64> mRubbleSpawns;
|
||||
|
||||
@@ -119,6 +128,9 @@ class instance_ulduar : public InstanceMapScript
|
||||
FreyaGUID = 0;
|
||||
VezaxGUID = 0;
|
||||
YoggSaronGUID = 0;
|
||||
VoiceOfYoggSaronGUID = 0;
|
||||
SaraGUID = 0;
|
||||
BrainOfYoggSaronGUID = 0;
|
||||
AlgalonGUID = 0;
|
||||
KologarnChestGUID = 0;
|
||||
KologarnBridgeGUID = 0;
|
||||
@@ -141,6 +153,8 @@ class instance_ulduar : public InstanceMapScript
|
||||
HodirRareCacheData = 0;
|
||||
ColossusData = 0;
|
||||
elderCount = 0;
|
||||
illusion = 0;
|
||||
keepersCount = 0;
|
||||
conSpeedAtory = false;
|
||||
Unbroken = true;
|
||||
_algalonSummoned = false;
|
||||
@@ -151,7 +165,11 @@ class instance_ulduar : public InstanceMapScript
|
||||
memset(XTToyPileGUIDs, 0, sizeof(XTToyPileGUIDs));
|
||||
memset(AssemblyGUIDs, 0, sizeof(AssemblyGUIDs));
|
||||
memset(RazorHarpoonGUIDs, 0, sizeof(RazorHarpoonGUIDs));
|
||||
memset(ElderGUIDs, 0, sizeof(ElderGUIDs));
|
||||
memset(BrainRoomDoorGUIDs, 0, sizeof(BrainRoomDoorGUIDs));
|
||||
memset(KeeperGUIDs, 0, sizeof(KeeperGUIDs));
|
||||
memset(_summonObservationRingKeeper, false, sizeof(_summonObservationRingKeeper));
|
||||
memset(_summonYSKeeper, false, sizeof(_summonYSKeeper));
|
||||
}
|
||||
|
||||
void FillInitialWorldStates(WorldPacket& packet)
|
||||
@@ -174,6 +192,38 @@ class instance_ulduar : public InstanceMapScript
|
||||
else
|
||||
algalon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
}
|
||||
|
||||
// Keepers at Observation Ring
|
||||
if (GetBossState(BOSS_FREYA) == DONE && _summonObservationRingKeeper[0] && !KeeperGUIDs[0])
|
||||
{
|
||||
_summonObservationRingKeeper[0] = false;
|
||||
instance->SummonCreature(NPC_FREYA_OBSERVATION_RING, ObservationRingKeepersPos[0]);
|
||||
}
|
||||
if (GetBossState(BOSS_HODIR) == DONE && _summonObservationRingKeeper[1] && !KeeperGUIDs[1])
|
||||
{
|
||||
_summonObservationRingKeeper[1] = false;
|
||||
instance->SummonCreature(NPC_HODIR_OBSERVATION_RING, ObservationRingKeepersPos[1]);
|
||||
}
|
||||
if (GetBossState(BOSS_THORIM) == DONE && _summonObservationRingKeeper[2] && !KeeperGUIDs[2])
|
||||
{
|
||||
_summonObservationRingKeeper[2] = false;
|
||||
instance->SummonCreature(NPC_THORIM_OBSERVATION_RING, ObservationRingKeepersPos[2]);
|
||||
}
|
||||
if (GetBossState(BOSS_MIMIRON) == DONE && _summonObservationRingKeeper[3] && !KeeperGUIDs[3])
|
||||
{
|
||||
_summonObservationRingKeeper[3] = false;
|
||||
instance->SummonCreature(NPC_MIMIRON_OBSERVATION_RING, ObservationRingKeepersPos[3]);
|
||||
}
|
||||
|
||||
// Keepers in Yogg-Saron's room
|
||||
if (_summonYSKeeper[0])
|
||||
instance->SummonCreature(NPC_FREYA_YS, YSKeepersPos[0]);
|
||||
if (_summonYSKeeper[1])
|
||||
instance->SummonCreature(NPC_HODIR_YS, YSKeepersPos[1]);
|
||||
if (_summonYSKeeper[2])
|
||||
instance->SummonCreature(NPC_THORIM_YS, YSKeepersPos[2]);
|
||||
if (_summonYSKeeper[3])
|
||||
instance->SummonCreature(NPC_MIMIRON_YS, YSKeepersPos[3]);
|
||||
}
|
||||
|
||||
void OnCreatureCreate(Creature* creature)
|
||||
@@ -194,6 +244,8 @@ class instance_ulduar : public InstanceMapScript
|
||||
case NPC_IGNIS:
|
||||
IgnisGUID = creature->GetGUID();
|
||||
break;
|
||||
|
||||
// Razorscale
|
||||
case NPC_RAZORSCALE:
|
||||
RazorscaleGUID = creature->GetGUID();
|
||||
break;
|
||||
@@ -203,6 +255,8 @@ class instance_ulduar : public InstanceMapScript
|
||||
case NPC_EXPEDITION_COMMANDER:
|
||||
ExpeditionCommanderGUID = creature->GetGUID();
|
||||
break;
|
||||
|
||||
// XT-002 Deconstructor
|
||||
case NPC_XT002:
|
||||
XT002GUID = creature->GetGUID();
|
||||
break;
|
||||
@@ -229,24 +283,6 @@ class instance_ulduar : public InstanceMapScript
|
||||
AddMinion(creature, true);
|
||||
break;
|
||||
|
||||
// Freya's Keeper
|
||||
case NPC_IRONBRANCH:
|
||||
KeeperGUIDs[0] = creature->GetGUID();
|
||||
if (GetBossState(BOSS_FREYA) == DONE)
|
||||
creature->DespawnOrUnsummon();
|
||||
break;
|
||||
case NPC_BRIGHTLEAF:
|
||||
KeeperGUIDs[1] = creature->GetGUID();
|
||||
if (GetBossState(BOSS_FREYA) == DONE)
|
||||
creature->DespawnOrUnsummon();
|
||||
break;
|
||||
case NPC_STONEBARK:
|
||||
KeeperGUIDs[2] = creature->GetGUID();
|
||||
if (GetBossState(BOSS_FREYA) == DONE)
|
||||
creature->DespawnOrUnsummon();
|
||||
break;
|
||||
|
||||
// Kologarn
|
||||
case NPC_KOLOGARN:
|
||||
KologarnGUID = creature->GetGUID();
|
||||
break;
|
||||
@@ -256,25 +292,11 @@ class instance_ulduar : public InstanceMapScript
|
||||
case NPC_MIMIRON:
|
||||
MimironGUID = creature->GetGUID();
|
||||
break;
|
||||
|
||||
// Hodir
|
||||
case NPC_HODIR:
|
||||
HodirGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_THORIM:
|
||||
ThorimGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_FREYA:
|
||||
FreyaGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_VEZAX:
|
||||
VezaxGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_YOGGSARON:
|
||||
YoggSaronGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_ALGALON:
|
||||
AlgalonGUID = creature->GetGUID();
|
||||
break;
|
||||
// Hodir's Helper NPCs
|
||||
case NPC_EIVI_NIGHTFEATHER:
|
||||
if (TeamInInstance == HORDE)
|
||||
creature->UpdateEntry(NPC_TOR_GREYCLOUD, HORDE);
|
||||
@@ -307,6 +329,80 @@ class instance_ulduar : public InstanceMapScript
|
||||
if (TeamInInstance == HORDE)
|
||||
creature->UpdateEntry(NPC_BATTLE_PRIEST_GINA, HORDE);
|
||||
break;
|
||||
|
||||
case NPC_THORIM:
|
||||
ThorimGUID = creature->GetGUID();
|
||||
break;
|
||||
|
||||
// Freya
|
||||
case NPC_FREYA:
|
||||
FreyaGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_IRONBRANCH:
|
||||
ElderGUIDs[0] = creature->GetGUID();
|
||||
if (GetBossState(BOSS_FREYA) == DONE)
|
||||
creature->DespawnOrUnsummon();
|
||||
break;
|
||||
case NPC_BRIGHTLEAF:
|
||||
ElderGUIDs[1] = creature->GetGUID();
|
||||
if (GetBossState(BOSS_FREYA) == DONE)
|
||||
creature->DespawnOrUnsummon();
|
||||
break;
|
||||
case NPC_STONEBARK:
|
||||
ElderGUIDs[2] = creature->GetGUID();
|
||||
if (GetBossState(BOSS_FREYA) == DONE)
|
||||
creature->DespawnOrUnsummon();
|
||||
break;
|
||||
|
||||
case NPC_VEZAX:
|
||||
VezaxGUID = creature->GetGUID();
|
||||
break;
|
||||
|
||||
// Yogg-Saron
|
||||
case NPC_YOGG_SARON:
|
||||
YoggSaronGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_VOICE_OF_YOGG_SARON:
|
||||
VoiceOfYoggSaronGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_BRAIN_OF_YOGG_SARON:
|
||||
BrainOfYoggSaronGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_SARA:
|
||||
SaraGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_FREYA_YS:
|
||||
KeeperGUIDs[0] = creature->GetGUID();
|
||||
_summonYSKeeper[0] = false;
|
||||
SaveToDB();
|
||||
++keepersCount;
|
||||
break;
|
||||
case NPC_HODIR_YS:
|
||||
KeeperGUIDs[1] = creature->GetGUID();
|
||||
_summonYSKeeper[1] = false;
|
||||
SaveToDB();
|
||||
++keepersCount;
|
||||
break;
|
||||
case NPC_THORIM_YS:
|
||||
KeeperGUIDs[2] = creature->GetGUID();
|
||||
_summonYSKeeper[2] = false;
|
||||
SaveToDB();
|
||||
++keepersCount;
|
||||
break;
|
||||
case NPC_MIMIRON_YS:
|
||||
KeeperGUIDs[3] = creature->GetGUID();
|
||||
_summonYSKeeper[3] = false;
|
||||
SaveToDB();
|
||||
++keepersCount;
|
||||
break;
|
||||
case NPC_SANITY_WELL:
|
||||
creature->SetReactState(REACT_PASSIVE);
|
||||
break;
|
||||
|
||||
// Algalon
|
||||
case NPC_ALGALON:
|
||||
AlgalonGUID = creature->GetGUID();
|
||||
break;
|
||||
case NPC_BRANN_BRONZBEARD_ALG:
|
||||
BrannBronzebeardAlgGUID = creature->GetGUID();
|
||||
break;
|
||||
@@ -418,6 +514,18 @@ class instance_ulduar : public InstanceMapScript
|
||||
if (GetBossState(BOSS_ASSEMBLY_OF_IRON) != DONE)
|
||||
HandleGameObject(ArchivumDoorGUID, false);
|
||||
break;
|
||||
case GO_YOGG_SARON_DOOR:
|
||||
AddDoor(gameObject, true);
|
||||
break;
|
||||
case GO_BRAIN_ROOM_DOOR_1:
|
||||
BrainRoomDoorGUIDs[0] = gameObject->GetGUID();
|
||||
break;
|
||||
case GO_BRAIN_ROOM_DOOR_2:
|
||||
BrainRoomDoorGUIDs[1] = gameObject->GetGUID();
|
||||
break;
|
||||
case GO_BRAIN_ROOM_DOOR_3:
|
||||
BrainRoomDoorGUIDs[2] = gameObject->GetGUID();
|
||||
break;
|
||||
case GO_CELESTIAL_PLANETARIUM_ACCESS_10:
|
||||
case GO_CELESTIAL_PLANETARIUM_ACCESS_25:
|
||||
if (_algalonSummoned)
|
||||
@@ -509,27 +617,36 @@ class instance_ulduar : public InstanceMapScript
|
||||
{
|
||||
// Flame Leviathan's Tower Event triggers
|
||||
Creature* FlameLeviathan = instance->GetCreature(LeviathanGUID);
|
||||
if (FlameLeviathan && FlameLeviathan->isAlive()) // No leviathan, no event triggering ;)
|
||||
|
||||
switch (eventId)
|
||||
{
|
||||
switch (eventId)
|
||||
{
|
||||
case EVENT_TOWER_OF_STORM_DESTROYED:
|
||||
case EVENT_TOWER_OF_STORM_DESTROYED:
|
||||
if (FlameLeviathan && FlameLeviathan->isAlive())
|
||||
FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_STORM_DESTROYED);
|
||||
break;
|
||||
case EVENT_TOWER_OF_FROST_DESTROYED:
|
||||
break;
|
||||
case EVENT_TOWER_OF_FROST_DESTROYED:
|
||||
if (FlameLeviathan && FlameLeviathan->isAlive())
|
||||
FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_FROST_DESTROYED);
|
||||
break;
|
||||
case EVENT_TOWER_OF_FLAMES_DESTROYED:
|
||||
break;
|
||||
case EVENT_TOWER_OF_FLAMES_DESTROYED:
|
||||
if (FlameLeviathan && FlameLeviathan->isAlive())
|
||||
FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_FLAMES_DESTROYED);
|
||||
break;
|
||||
case EVENT_TOWER_OF_LIFE_DESTROYED:
|
||||
break;
|
||||
case EVENT_TOWER_OF_LIFE_DESTROYED:
|
||||
if (FlameLeviathan && FlameLeviathan->isAlive())
|
||||
FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_LIFE_DESTROYED);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case EVENT_ACTIVATE_SANITY_WELL:
|
||||
if (Creature* freya = instance->GetCreature(KeeperGUIDs[0]))
|
||||
freya->AI()->DoAction(4/*ACTION_SANITY_WELLS*/);
|
||||
break;
|
||||
case EVENT_HODIRS_PROTECTIVE_GAZE_PROC:
|
||||
if (Creature* hodir = instance->GetCreature(KeeperGUIDs[1]))
|
||||
hodir->AI()->DoAction(5/*ACTION_FLASH_FREEZE*/);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool SetBossState(uint32 type, EncounterState state)
|
||||
{
|
||||
if (!InstanceScript::SetBossState(type, state))
|
||||
@@ -542,8 +659,14 @@ class instance_ulduar : public InstanceMapScript
|
||||
case BOSS_RAZORSCALE:
|
||||
case BOSS_XT002:
|
||||
case BOSS_AURIAYA:
|
||||
break;
|
||||
case BOSS_MIMIRON:
|
||||
if (state == DONE)
|
||||
instance->SummonCreature(NPC_MIMIRON_OBSERVATION_RING, ObservationRingKeepersPos[3]);
|
||||
break;
|
||||
case BOSS_FREYA:
|
||||
if (state == DONE)
|
||||
instance->SummonCreature(NPC_FREYA_OBSERVATION_RING, ObservationRingKeepersPos[0]);
|
||||
break;
|
||||
case BOSS_ASSEMBLY_OF_IRON:
|
||||
if (state == DONE)
|
||||
@@ -553,7 +676,7 @@ class instance_ulduar : public InstanceMapScript
|
||||
if (state == DONE)
|
||||
HandleGameObject(VezaxDoorGUID, true);
|
||||
break;
|
||||
case BOSS_YOGGSARON:
|
||||
case BOSS_YOGG_SARON:
|
||||
break;
|
||||
case BOSS_KOLOGARN:
|
||||
if (state == DONE)
|
||||
@@ -576,12 +699,18 @@ class instance_ulduar : public InstanceMapScript
|
||||
HodirChest->SetRespawnTime(HodirChest->GetRespawnDelay());
|
||||
HandleGameObject(HodirDoorGUID, true);
|
||||
HandleGameObject(HodirIceDoorGUID, true);
|
||||
|
||||
instance->SummonCreature(NPC_HODIR_OBSERVATION_RING, ObservationRingKeepersPos[1]);
|
||||
}
|
||||
break;
|
||||
case BOSS_THORIM:
|
||||
if (state == DONE)
|
||||
{
|
||||
if (GameObject* gameObject = instance->GetGameObject(ThorimChestGUID))
|
||||
gameObject->SetRespawnTime(gameObject->GetRespawnDelay());
|
||||
|
||||
instance->SummonCreature(NPC_THORIM_OBSERVATION_RING, ObservationRingKeepersPos[2]);
|
||||
}
|
||||
break;
|
||||
case BOSS_ALGALON:
|
||||
if (state == DONE)
|
||||
@@ -661,6 +790,12 @@ class instance_ulduar : public InstanceMapScript
|
||||
case DATA_UNBROKEN:
|
||||
Unbroken = bool(data);
|
||||
break;
|
||||
case DATA_ILLUSION:
|
||||
illusion = data;
|
||||
break;
|
||||
case DATA_DRIVE_ME_CRAZY:
|
||||
IsDriveMeCrazyEligible = data ? true : false;
|
||||
break;
|
||||
case EVENT_DESPAWN_ALGALON:
|
||||
DoUpdateWorldState(WORLD_STATE_ALGALON_TIMER_ENABLED, 1);
|
||||
DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, 60);
|
||||
@@ -688,37 +823,12 @@ class instance_ulduar : public InstanceMapScript
|
||||
return LeviathanGUID;
|
||||
case BOSS_IGNIS:
|
||||
return IgnisGUID;
|
||||
|
||||
// Razorscale
|
||||
case BOSS_RAZORSCALE:
|
||||
return RazorscaleGUID;
|
||||
case DATA_RAZORSCALE_CONTROL:
|
||||
return RazorscaleController;
|
||||
case BOSS_XT002:
|
||||
return XT002GUID;
|
||||
case DATA_TOY_PILE_0:
|
||||
case DATA_TOY_PILE_1:
|
||||
case DATA_TOY_PILE_2:
|
||||
case DATA_TOY_PILE_3:
|
||||
return XTToyPileGUIDs[data - DATA_TOY_PILE_0];
|
||||
case BOSS_KOLOGARN:
|
||||
return KologarnGUID;
|
||||
case BOSS_AURIAYA:
|
||||
return AuriayaGUID;
|
||||
case BOSS_MIMIRON:
|
||||
return MimironGUID;
|
||||
case BOSS_HODIR:
|
||||
return HodirGUID;
|
||||
case BOSS_THORIM:
|
||||
return ThorimGUID;
|
||||
case BOSS_FREYA:
|
||||
return FreyaGUID;
|
||||
case BOSS_VEZAX:
|
||||
return VezaxGUID;
|
||||
case BOSS_YOGGSARON:
|
||||
return YoggSaronGUID;
|
||||
case BOSS_ALGALON:
|
||||
return AlgalonGUID;
|
||||
|
||||
// Razorscale expedition commander
|
||||
case DATA_EXPEDITION_COMMANDER:
|
||||
return ExpeditionCommanderGUID;
|
||||
case GO_RAZOR_HARPOON_1:
|
||||
@@ -730,6 +840,15 @@ class instance_ulduar : public InstanceMapScript
|
||||
case GO_RAZOR_HARPOON_4:
|
||||
return RazorHarpoonGUIDs[3];
|
||||
|
||||
// XT-002 Deconstructor
|
||||
case BOSS_XT002:
|
||||
return XT002GUID;
|
||||
case DATA_TOY_PILE_0:
|
||||
case DATA_TOY_PILE_1:
|
||||
case DATA_TOY_PILE_2:
|
||||
case DATA_TOY_PILE_3:
|
||||
return XTToyPileGUIDs[data - DATA_TOY_PILE_0];
|
||||
|
||||
// Assembly of Iron
|
||||
case DATA_STEELBREAKER:
|
||||
return AssemblyGUIDs[0];
|
||||
@@ -738,13 +857,57 @@ class instance_ulduar : public InstanceMapScript
|
||||
case DATA_BRUNDIR:
|
||||
return AssemblyGUIDs[2];
|
||||
|
||||
// Freya's Keepers
|
||||
case BOSS_KOLOGARN:
|
||||
return KologarnGUID;
|
||||
case BOSS_AURIAYA:
|
||||
return AuriayaGUID;
|
||||
case BOSS_MIMIRON:
|
||||
return MimironGUID;
|
||||
case BOSS_HODIR:
|
||||
return HodirGUID;
|
||||
case BOSS_THORIM:
|
||||
return ThorimGUID;
|
||||
|
||||
// Freya
|
||||
case BOSS_FREYA:
|
||||
return FreyaGUID;
|
||||
case BOSS_BRIGHTLEAF:
|
||||
return KeeperGUIDs[0];
|
||||
return ElderGUIDs[0];
|
||||
case BOSS_IRONBRANCH:
|
||||
return KeeperGUIDs[1];
|
||||
return ElderGUIDs[1];
|
||||
case BOSS_STONEBARK:
|
||||
return ElderGUIDs[2];
|
||||
|
||||
case BOSS_VEZAX:
|
||||
return VezaxGUID;
|
||||
|
||||
// Yogg-Saron
|
||||
case BOSS_YOGG_SARON:
|
||||
return YoggSaronGUID;
|
||||
case DATA_VOICE_OF_YOGG_SARON:
|
||||
return VoiceOfYoggSaronGUID;
|
||||
case DATA_BRAIN_OF_YOGG_SARON:
|
||||
return BrainOfYoggSaronGUID;
|
||||
case DATA_SARA:
|
||||
return SaraGUID;
|
||||
case GO_BRAIN_ROOM_DOOR_1:
|
||||
return BrainRoomDoorGUIDs[0];
|
||||
case GO_BRAIN_ROOM_DOOR_2:
|
||||
return BrainRoomDoorGUIDs[1];
|
||||
case GO_BRAIN_ROOM_DOOR_3:
|
||||
return BrainRoomDoorGUIDs[2];
|
||||
case DATA_FREYA_YS:
|
||||
return KeeperGUIDs[0];
|
||||
case DATA_HODIR_YS:
|
||||
return KeeperGUIDs[1];
|
||||
case DATA_THORIM_YS:
|
||||
return KeeperGUIDs[2];
|
||||
case DATA_MIMIRON_YS:
|
||||
return KeeperGUIDs[3];
|
||||
|
||||
// Algalon
|
||||
case BOSS_ALGALON:
|
||||
return AlgalonGUID;
|
||||
case DATA_SIGILDOOR_01:
|
||||
return AlgalonSigilDoorGUID[0];
|
||||
case DATA_SIGILDOOR_02:
|
||||
@@ -776,6 +939,10 @@ class instance_ulduar : public InstanceMapScript
|
||||
return HodirRareCacheData;
|
||||
case DATA_UNBROKEN:
|
||||
return uint32(Unbroken);
|
||||
case DATA_ILLUSION:
|
||||
return illusion;
|
||||
case DATA_KEEPERS_COUNT:
|
||||
return keepersCount;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -789,6 +956,30 @@ class instance_ulduar : public InstanceMapScript
|
||||
{
|
||||
case CRITERIA_HERALD_OF_TITANS:
|
||||
return _maxArmorItemLevel <= MAX_HERALD_ARMOR_ITEMLEVEL && _maxWeaponItemLevel <= MAX_HERALD_WEAPON_ITEMLEVEL;
|
||||
case CRITERIA_WAITS_DREAMING_STORMWIND_25:
|
||||
case CRITERIA_WAITS_DREAMING_STORMWIND_10:
|
||||
return illusion == STORMWIND_ILLUSION;
|
||||
case CRITERIA_WAITS_DREAMING_CHAMBER_25:
|
||||
case CRITERIA_WAITS_DREAMING_CHAMBER_10:
|
||||
return illusion == CHAMBER_ILLUSION;
|
||||
case CRITERIA_WAITS_DREAMING_ICECROWN_25:
|
||||
case CRITERIA_WAITS_DREAMING_ICECROWN_10:
|
||||
return illusion == ICECROWN_ILLUSION;
|
||||
case CRITERIA_DRIVE_ME_CRAZY_10:
|
||||
case CRITERIA_DRIVE_ME_CRAZY_25:
|
||||
return IsDriveMeCrazyEligible;
|
||||
case CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_10:
|
||||
case CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_25:
|
||||
return keepersCount <= 3;
|
||||
case CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_10:
|
||||
case CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_25:
|
||||
return keepersCount <= 2;
|
||||
case CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_10:
|
||||
case CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_25:
|
||||
return keepersCount <= 1;
|
||||
case CRITERIA_ALONE_IN_THE_DARKNESS_10:
|
||||
case CRITERIA_ALONE_IN_THE_DARKNESS_25:
|
||||
return keepersCount == 0;
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -801,6 +992,9 @@ class instance_ulduar : public InstanceMapScript
|
||||
std::ostringstream saveStream;
|
||||
saveStream << "U U " << GetBossSaveData() << GetData(DATA_COLOSSUS) << ' ' << _algalonTimer << ' ' << (_algalonSummoned ? 1 : 0);
|
||||
|
||||
for (uint8 i = 0; i < 4; ++i)
|
||||
saveStream << ' ' << (KeeperGUIDs[i] ? 1 : 0);
|
||||
|
||||
OUT_SAVE_INST_DATA_COMPLETE;
|
||||
return saveStream.str();
|
||||
}
|
||||
@@ -851,6 +1045,21 @@ class instance_ulduar : public InstanceMapScript
|
||||
DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, _algalonTimer);
|
||||
}
|
||||
}
|
||||
|
||||
for (uint8 i = 0; i < 4; ++i)
|
||||
{
|
||||
loadStream >> tempState;
|
||||
_summonYSKeeper[i] = tempState != 0;
|
||||
}
|
||||
|
||||
if (GetBossState(BOSS_FREYA) == DONE && !_summonYSKeeper[0])
|
||||
_summonObservationRingKeeper[0] = true;
|
||||
if (GetBossState(BOSS_HODIR) == DONE && !_summonYSKeeper[1])
|
||||
_summonObservationRingKeeper[1] = true;
|
||||
if (GetBossState(BOSS_THORIM) == DONE && !_summonYSKeeper[2])
|
||||
_summonObservationRingKeeper[2] = true;
|
||||
if (GetBossState(BOSS_MIMIRON) == DONE && !_summonYSKeeper[3])
|
||||
_summonObservationRingKeeper[3] = true;
|
||||
}
|
||||
|
||||
OUT_LOAD_INST_DATA_COMPLETE;
|
||||
@@ -889,6 +1098,8 @@ class instance_ulduar : public InstanceMapScript
|
||||
uint32 _algalonTimer;
|
||||
bool _summonAlgalon;
|
||||
bool _algalonSummoned;
|
||||
bool _summonObservationRingKeeper[4];
|
||||
bool _summonYSKeeper[4];
|
||||
uint32 _maxArmorItemLevel;
|
||||
uint32 _maxWeaponItemLevel;
|
||||
};
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
#include "ObjectMgr.h"
|
||||
#define UlduarScriptName "instance_ulduar"
|
||||
|
||||
extern Position const ObservationRingKeepersPos[4];
|
||||
extern Position const YSKeepersPos[4];
|
||||
extern Position const AlgalonLandPos;
|
||||
|
||||
enum UlduarBosses
|
||||
@@ -42,7 +44,7 @@ enum UlduarBosses
|
||||
BOSS_IRONBRANCH = 12,
|
||||
BOSS_STONEBARK = 13,
|
||||
BOSS_VEZAX = 14,
|
||||
BOSS_YOGGSARON = 15,
|
||||
BOSS_YOGG_SARON = 15,
|
||||
BOSS_ALGALON = 16,
|
||||
};
|
||||
|
||||
@@ -74,7 +76,7 @@ enum UlduarNPCs
|
||||
NPC_THORIM = 32865,
|
||||
NPC_FREYA = 32906,
|
||||
NPC_VEZAX = 33271,
|
||||
NPC_YOGGSARON = 33288,
|
||||
NPC_YOGG_SARON = 33288,
|
||||
NPC_ALGALON = 32871,
|
||||
|
||||
// Mimiron
|
||||
@@ -115,6 +117,39 @@ enum UlduarNPCs
|
||||
NPC_NATURES_BLADE = 33527,
|
||||
NPC_GUARDIAN_OF_LIFE = 33528,
|
||||
|
||||
// Yogg-Saron
|
||||
NPC_SARA = 33134,
|
||||
NPC_GUARDIAN_OF_YOGG_SARON = 33136,
|
||||
NPC_HODIR_OBSERVATION_RING = 33213,
|
||||
NPC_FREYA_OBSERVATION_RING = 33241,
|
||||
NPC_THORIM_OBSERVATION_RING = 33242,
|
||||
NPC_MIMIRON_OBSERVATION_RING = 33244,
|
||||
NPC_VOICE_OF_YOGG_SARON = 33280,
|
||||
NPC_OMINOUS_CLOUD = 33292,
|
||||
NPC_FREYA_YS = 33410,
|
||||
NPC_HODIR_YS = 33411,
|
||||
NPC_MIMIRON_YS = 33412,
|
||||
NPC_THORIM_YS = 33413,
|
||||
NPC_SUIT_OF_ARMOR = 33433,
|
||||
NPC_KING_LLANE = 33437,
|
||||
NPC_THE_LICH_KING = 33441,
|
||||
NPC_IMMOLATED_CHAMPION = 33442,
|
||||
NPC_YSERA = 33495,
|
||||
NPC_NELTHARION = 33523,
|
||||
NPC_MALYGOS = 33535,
|
||||
NPC_DEATH_RAY = 33881,
|
||||
NPC_DEATH_ORB = 33882,
|
||||
NPC_BRAIN_OF_YOGG_SARON = 33890,
|
||||
NPC_INFLUENCE_TENTACLE = 33943,
|
||||
NPC_TURNED_CHAMPION = 33962,
|
||||
NPC_CRUSHER_TENTACLE = 33966,
|
||||
NPC_CONSTRICTOR_TENTACLE = 33983,
|
||||
NPC_CORRUPTOR_TENTACLE = 33985,
|
||||
NPC_IMMORTAL_GUARDIAN = 33988,
|
||||
NPC_SANITY_WELL = 33991,
|
||||
NPC_DESCEND_INTO_MADNESS = 34072,
|
||||
NPC_MARKED_IMMORTAL_GUARDIAN = 36064,
|
||||
|
||||
// Algalon the Observer
|
||||
NPC_BRANN_BRONZBEARD_ALG = 34064,
|
||||
NPC_AZEROTH = 34246,
|
||||
@@ -155,6 +190,12 @@ enum UlduarGameObjects
|
||||
GO_HODIR_ICE_DOOR = 194441,
|
||||
GO_ARCHIVUM_DOOR = 194556,
|
||||
|
||||
// Yogg-Saron
|
||||
GO_YOGG_SARON_DOOR = 194773,
|
||||
GO_BRAIN_ROOM_DOOR_1 = 194635,
|
||||
GO_BRAIN_ROOM_DOOR_2 = 194636,
|
||||
GO_BRAIN_ROOM_DOOR_3 = 194637,
|
||||
|
||||
// Algalon the Observer
|
||||
GO_CELESTIAL_PLANETARIUM_ACCESS_10 = 194628,
|
||||
GO_CELESTIAL_PLANETARIUM_ACCESS_25 = 194752,
|
||||
@@ -169,12 +210,18 @@ enum UlduarGameObjects
|
||||
GO_GIFT_OF_THE_OBSERVER_25 = 194822,
|
||||
};
|
||||
|
||||
enum LeviathanData
|
||||
enum EventIds
|
||||
{
|
||||
EVENT_TOWER_OF_STORM_DESTROYED = 21031,
|
||||
EVENT_TOWER_OF_FROST_DESTROYED = 21032,
|
||||
EVENT_TOWER_OF_FLAMES_DESTROYED = 21033,
|
||||
EVENT_TOWER_OF_LIFE_DESTROYED = 21030,
|
||||
EVENT_ACTIVATE_SANITY_WELL = 21432,
|
||||
EVENT_HODIRS_PROTECTIVE_GAZE_PROC = 21437,
|
||||
};
|
||||
|
||||
enum LeviathanActions
|
||||
{
|
||||
ACTION_TOWER_OF_STORM_DESTROYED = 1,
|
||||
ACTION_TOWER_OF_FROST_DESTROYED = 2,
|
||||
ACTION_TOWER_OF_FLAMES_DESTROYED = 3,
|
||||
@@ -184,14 +231,30 @@ enum LeviathanData
|
||||
|
||||
enum UlduarAchievementCriteriaIds
|
||||
{
|
||||
CRITERIA_CON_SPEED_ATORY = 21597,
|
||||
CRITERIA_DISARMED = 21687,
|
||||
CRITERIA_HERALD_OF_TITANS = 10678,
|
||||
CRITERIA_CON_SPEED_ATORY = 21597,
|
||||
CRITERIA_DISARMED = 21687,
|
||||
CRITERIA_WAITS_DREAMING_STORMWIND_25 = 10321,
|
||||
CRITERIA_WAITS_DREAMING_CHAMBER_25 = 10322,
|
||||
CRITERIA_WAITS_DREAMING_ICECROWN_25 = 10323,
|
||||
CRITERIA_WAITS_DREAMING_STORMWIND_10 = 10324,
|
||||
CRITERIA_WAITS_DREAMING_CHAMBER_10 = 10325,
|
||||
CRITERIA_WAITS_DREAMING_ICECROWN_10 = 10326,
|
||||
CRITERIA_DRIVE_ME_CRAZY_10 = 10185,
|
||||
CRITERIA_DRIVE_ME_CRAZY_25 = 10296,
|
||||
CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_10 = 10410,
|
||||
CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_25 = 10414,
|
||||
CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_10 = 10388,
|
||||
CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_25 = 10415,
|
||||
CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_10 = 10409,
|
||||
CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_25 = 10416,
|
||||
CRITERIA_ALONE_IN_THE_DARKNESS_10 = 10412,
|
||||
CRITERIA_ALONE_IN_THE_DARKNESS_25 = 10417,
|
||||
CRITERIA_HERALD_OF_TITANS = 10678,
|
||||
};
|
||||
|
||||
enum UlduarData
|
||||
{
|
||||
// Collosus (Leviathan)
|
||||
// Colossus (Leviathan)
|
||||
DATA_COLOSSUS = 20,
|
||||
|
||||
// Razorscale
|
||||
@@ -212,6 +275,18 @@ enum UlduarData
|
||||
// Hodir
|
||||
DATA_HODIR_RARE_CACHE,
|
||||
|
||||
// Yogg-Saron
|
||||
DATA_VOICE_OF_YOGG_SARON,
|
||||
DATA_SARA,
|
||||
DATA_BRAIN_OF_YOGG_SARON,
|
||||
DATA_FREYA_YS,
|
||||
DATA_HODIR_YS,
|
||||
DATA_THORIM_YS,
|
||||
DATA_MIMIRON_YS,
|
||||
DATA_ILLUSION,
|
||||
DATA_DRIVE_ME_CRAZY,
|
||||
DATA_KEEPERS_COUNT,
|
||||
|
||||
// Algalon the Observer
|
||||
DATA_ALGALON_SUMMON_STATE,
|
||||
DATA_SIGILDOOR_01,
|
||||
@@ -245,6 +320,13 @@ enum UlduarEvents
|
||||
ACTION_INIT_ALGALON = 6,
|
||||
};
|
||||
|
||||
enum YoggSaronIllusions
|
||||
{
|
||||
CHAMBER_ILLUSION = 0,
|
||||
ICECROWN_ILLUSION = 1,
|
||||
STORMWIND_ILLUSION = 2,
|
||||
};
|
||||
|
||||
template<class AI>
|
||||
CreatureAI* GetUlduarAI(Creature* creature)
|
||||
{
|
||||
|
||||
@@ -23,6 +23,7 @@ SDComment:
|
||||
SDCategory:
|
||||
Script Data End */
|
||||
|
||||
#include <algorithm>
|
||||
#include "ScriptMgr.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "utgarde_pinnacle.h"
|
||||
@@ -105,20 +106,25 @@ public:
|
||||
uint32 uiWaitingTimer;
|
||||
Phase currentPhase;
|
||||
uint8 AddCount;
|
||||
bool DoneAdds[4];
|
||||
Phase Sequence[4];
|
||||
|
||||
InstanceScript* instance;
|
||||
|
||||
void Reset()
|
||||
{
|
||||
/// There is a good reason to store them like this, we are going to shuffle the order.
|
||||
for (uint32 i = PHASE_FRENZIED_WORGEN; i < PHASE_GORTOK_PALEHOOF; ++i)
|
||||
Sequence[i] = Phase(i);
|
||||
|
||||
/// This ensures a random order and only executes each phase once.
|
||||
std::random_shuffle(Sequence, Sequence + PHASE_GORTOK_PALEHOOF);
|
||||
|
||||
uiArcingSmashTimer = 15000;
|
||||
uiImpaleTimer = 12000;
|
||||
uiWhiteringRoarTimer = 10000;
|
||||
|
||||
me->GetMotionMaster()->MoveTargetedHome();
|
||||
|
||||
for (uint32 i = 0; i < 4; i++)
|
||||
DoneAdds[i] = false;
|
||||
AddCount = 0;
|
||||
|
||||
currentPhase = PHASE_NONE;
|
||||
@@ -235,26 +241,7 @@ public:
|
||||
if (AddCount >= DUNGEON_MODE(2, 4))
|
||||
move = PHASE_GORTOK_PALEHOOF;
|
||||
else
|
||||
{
|
||||
//select random not yet defeated add
|
||||
uint8 next = urand(0, 3);
|
||||
for (uint8 i = 0; i < 16; i++)
|
||||
{
|
||||
if (!DoneAdds[i % 4])
|
||||
{
|
||||
if (next == 0)
|
||||
{
|
||||
move = (Phase)(i % 4);
|
||||
break;
|
||||
}
|
||||
else if (next > 0)
|
||||
--next;
|
||||
}
|
||||
}
|
||||
++AddCount;
|
||||
DoneAdds[move] = true;
|
||||
move = (Phase)(move % 4);
|
||||
}
|
||||
move = Sequence[AddCount++];
|
||||
//send orb to summon spot
|
||||
Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0);
|
||||
if (pOrb && pOrb->isAlive())
|
||||
|
||||
@@ -921,7 +921,7 @@ class npc_frostbrood_skytalon : public CreatureScript
|
||||
if (id == POINT_GRAB_DECOY)
|
||||
if (TempSummon* summon = me->ToTempSummon())
|
||||
if (Unit* summoner = summon->GetSummoner())
|
||||
DoCast(summoner, SPELL_GRAB);
|
||||
DoCast(summoner, SPELL_GRAB);
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff)
|
||||
|
||||
@@ -62,6 +62,8 @@ OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP* pvp, OutdoorPvPHPTowerType ty
|
||||
OutdoorPvPHP::OutdoorPvPHP()
|
||||
{
|
||||
m_TypeId = OUTDOOR_PVP_HP;
|
||||
m_AllianceTowersControlled = 0;
|
||||
m_HordeTowersControlled = 0;
|
||||
}
|
||||
|
||||
bool OutdoorPvPHP::SetupOutdoorPvP()
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
OutdoorPvPNA::OutdoorPvPNA()
|
||||
{
|
||||
m_TypeId = OUTDOOR_PVP_NA;
|
||||
m_obj = NULL;
|
||||
}
|
||||
|
||||
void OutdoorPvPNA::HandleKillImpl(Player* player, Unit* killed)
|
||||
@@ -216,8 +217,8 @@ bool OutdoorPvPNA::SetupOutdoorPvP()
|
||||
m_obj = new OPvPCapturePointNA(this);
|
||||
if (!m_obj)
|
||||
return false;
|
||||
AddCapturePoint(m_obj);
|
||||
|
||||
AddCapturePoint(m_obj);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,17 @@
|
||||
OutdoorPvPTF::OutdoorPvPTF()
|
||||
{
|
||||
m_TypeId = OUTDOOR_PVP_TF;
|
||||
|
||||
m_IsLocked = false;
|
||||
m_LockTimer = TF_LOCK_TIME;
|
||||
m_LockTimerUpdate = 0;
|
||||
|
||||
m_AllianceTowersControlled = 0;
|
||||
m_HordeTowersControlled = 0;
|
||||
|
||||
hours_left = 6;
|
||||
second_digit = 0;
|
||||
first_digit = 0;
|
||||
}
|
||||
|
||||
OPvPCapturePointTF::OPvPCapturePointTF(OutdoorPvP* pvp, OutdoorPvPTF_TowerType type)
|
||||
|
||||
@@ -45,9 +45,9 @@ enum Spells
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_STREAM_OF_MACHINE_FLUID = 0,
|
||||
EVENT_SAW_BLADE = 1,
|
||||
EVENT_SHADOW_POWER = 2
|
||||
EVENT_STREAM_OF_MACHINE_FLUID = 1,
|
||||
EVENT_SAW_BLADE = 2,
|
||||
EVENT_SHADOW_POWER = 3
|
||||
};
|
||||
|
||||
class boss_gatewatcher_gyrokill : public CreatureScript
|
||||
|
||||
@@ -52,11 +52,11 @@ enum Spells
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_FROST_ATTACK = 0,
|
||||
EVENT_ARCANE_BLAST = 1,
|
||||
EVENT_DRAGONS_BREATH = 2,
|
||||
EVENT_KNOCKBACK = 3,
|
||||
EVENT_SOLARBURN = 4
|
||||
EVENT_FROST_ATTACK = 1,
|
||||
EVENT_ARCANE_BLAST = 2,
|
||||
EVENT_DRAGONS_BREATH = 3,
|
||||
EVENT_KNOCKBACK = 4,
|
||||
EVENT_SOLARBURN = 5
|
||||
};
|
||||
|
||||
class boss_nethermancer_sepethrea : public CreatureScript
|
||||
|
||||
@@ -54,11 +54,11 @@ enum Spells
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_SUMMON = 0,
|
||||
EVENT_MANA_TAP = 1,
|
||||
EVENT_ARCANE_TORRENT = 2,
|
||||
EVENT_DOMINATION = 3,
|
||||
EVENT_ARCANE_EXPLOSION = 4
|
||||
EVENT_SUMMON = 1,
|
||||
EVENT_MANA_TAP = 2,
|
||||
EVENT_ARCANE_TORRENT = 3,
|
||||
EVENT_DOMINATION = 4,
|
||||
EVENT_ARCANE_EXPLOSION = 5
|
||||
};
|
||||
|
||||
enum Creatures
|
||||
|
||||
@@ -918,7 +918,7 @@ class spell_mage_ring_of_frost : public SpellScriptLoader
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandleEffectPeriodic(AuraEffect const* aurEff)
|
||||
void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
|
||||
{
|
||||
if (ringOfFrost)
|
||||
if (GetMaxDuration() - (int32)ringOfFrost->GetTimer() >= sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_DUMMY)->GetDuration())
|
||||
@@ -1018,7 +1018,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader
|
||||
return true;
|
||||
}
|
||||
|
||||
void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
|
||||
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
|
||||
{
|
||||
if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE)
|
||||
if (GetCaster())
|
||||
|
||||
@@ -1745,7 +1745,7 @@ public:
|
||||
{
|
||||
me->HandleEmoteCommand(emote);
|
||||
Unit* owner = me->GetOwner();
|
||||
if (emote != TEXT_EMOTE_KISS || owner || owner->GetTypeId() != TYPEID_PLAYER ||
|
||||
if (emote != TEXT_EMOTE_KISS || !owner || owner->GetTypeId() != TYPEID_PLAYER ||
|
||||
owner->ToPlayer()->GetTeam() != player->GetTeam())
|
||||
{
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user