Skip to content

Commit

Permalink
[2275] Ulduar - Clearify chest enums, and unscramble a few to proper IDs
Browse files Browse the repository at this point in the history 
IDs were changed for Thorim and Algalon, check your loot
  • Loading branch information
@Schmoozerd
Schmoozerd committed Sep 7, 2011
1 parent 8f0dfbf commit 5f1c784
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 42 deletions.
48 changes: 24 additions & 24 deletions scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
View file
Expand Up @@ -218,30 +218,30 @@ void instance_ulduar::OnObjectCreate(GameObject* pGo)

// ----------------- Chests -----------------
// Kologarn
case GO_CACHE_OF_LIVING_STONE:
case GO_CACHE_OF_LIVING_STONE_H:
case GO_CACHE_OF_LIVING_STONE_10:
case GO_CACHE_OF_LIVING_STONE_25:

// Hodir
case GO_CACHE_OF_WINTER:
case GO_CACHE_OF_WINTER_H:
case GO_CACHE_OF_RARE_WINTER:
case GO_CACHE_OF_RARE_WINTER_H:
case GO_CACHE_OF_WINTER_10:
case GO_CACHE_OF_WINTER_25:
case GO_CACHE_OF_RARE_WINTER_10:
case GO_CACHE_OF_RARE_WINTER_25:

// Thorim
case GO_CACHE_OF_STORMS:
case GO_CACHE_OF_STORMS_H:
case GO_CACHE_OF_RARE_STORMS:
case GO_CACHE_OF_RARE_STORMS_H:
case GO_CACHE_OF_STORMS_10:
case GO_CACHE_OF_STORMS_25:
case GO_CACHE_OF_STORMS_10_H:
case GO_CACHE_OF_STORMS_25_H:

// Mimiron
case GO_CACHE_OF_INOV:
case GO_CACHE_OF_INOV_H:
case GO_CACHE_OF_INOV_HARD:
case GO_CACHE_OF_INOV_HARD_H:
case GO_CACHE_OF_INOV_10:
case GO_CACHE_OF_INOV_25:
case GO_CACHE_OF_INOV_10_H:
case GO_CACHE_OF_INOV_25_H:

// Alagon
case GO_GIFT_OF_OBSERVER:
case GO_GIFT_OF_OBSERVER_H:
case GO_GIFT_OF_OBSERVER_10:
case GO_GIFT_OF_OBSERVER_25:
break;

default:
Expand Down Expand Up @@ -294,7 +294,7 @@ void instance_ulduar::SetData(uint32 uiType, uint32 uiData)
DoUseDoorOrButton(GO_SHATTERED_DOOR);
if (uiData == DONE)
{
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_LIVING_STONE : GO_CACHE_OF_LIVING_STONE_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_LIVING_STONE_10 : GO_CACHE_OF_LIVING_STONE_25, 30*MINUTE);
if (GameObject* pBridge = GetSingleGameObjectFromStorage(GO_KOLOGARN_BRIDGE))
pBridge->SetGoState(GO_STATE_READY);
}
Expand All @@ -311,7 +311,7 @@ void instance_ulduar::SetData(uint32 uiType, uint32 uiData)
if (uiData == DONE)
{
if (GetData(TYPE_MIMIRON_HARD) != DONE)
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_INOV : GO_CACHE_OF_INOV_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_INOV_10 : GO_CACHE_OF_INOV_25, 30*MINUTE);
SpawnFriendlyKeeper(NPC_MIMIRON_IMAGE);
}
break;
Expand All @@ -322,7 +322,7 @@ void instance_ulduar::SetData(uint32 uiType, uint32 uiData)
{
DoUseDoorOrButton(GO_HODIR_ICE_WALL);
DoUseDoorOrButton(GO_HODIR_EXIT);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_WINTER : GO_CACHE_OF_WINTER_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_WINTER_10 : GO_CACHE_OF_WINTER_25, 30*MINUTE);
SpawnFriendlyKeeper(NPC_HODIR_IMAGE);
}
break;
Expand All @@ -334,7 +334,7 @@ void instance_ulduar::SetData(uint32 uiType, uint32 uiData)
if (uiData == DONE)
{
if (GetData(TYPE_THORIM_HARD) != DONE)
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_STORMS : GO_CACHE_OF_STORMS_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_STORMS_10 : GO_CACHE_OF_STORMS_25, 30*MINUTE);
SpawnFriendlyKeeper(NPC_THORIM_IMAGE);
}
break;
Expand All @@ -361,7 +361,7 @@ void instance_ulduar::SetData(uint32 uiType, uint32 uiData)
DoUseDoorOrButton(GO_CELESTIAL_DOOR);
DoUseDoorOrButton(GO_UNIVERSE_FLOOR_CELESTIAL);
if (uiData == DONE)
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_GIFT_OF_OBSERVER : GO_GIFT_OF_OBSERVER_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_GIFT_OF_OBSERVER_10 : GO_GIFT_OF_OBSERVER_25, 30*MINUTE);
break;

// Hard modes
Expand All @@ -374,17 +374,17 @@ void instance_ulduar::SetData(uint32 uiType, uint32 uiData)
case TYPE_HODIR_HARD:
m_auiHardBoss[2] = uiData;
if (uiData == DONE)
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_RARE_WINTER : GO_CACHE_OF_RARE_WINTER_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_RARE_WINTER_10 : GO_CACHE_OF_RARE_WINTER_25, 30*MINUTE);
break;
case TYPE_THORIM_HARD:
m_auiHardBoss[3] = uiData;
if (uiData == DONE)
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_RARE_STORMS : GO_CACHE_OF_RARE_STORMS_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_STORMS_10_H : GO_CACHE_OF_STORMS_25_H, 30*MINUTE);
break;
case TYPE_MIMIRON_HARD:
m_auiHardBoss[4] = uiData;
if (uiData == DONE)
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_INOV_HARD : GO_CACHE_OF_INOV_HARD_H, 30*MINUTE);
DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_INOV_10_H : GO_CACHE_OF_INOV_25_H, 30*MINUTE);
break;
case TYPE_VEZAX_HARD:
m_auiHardBoss[5] = uiData; // TODO: add extra loot
Expand Down
33 changes: 16 additions & 17 deletions scripts/northrend/ulduar/ulduar/ulduar.h
View file
Expand Up @@ -103,31 +103,30 @@ enum

// Loot chests
// Kologarn
GO_CACHE_OF_LIVING_STONE = 195046,
GO_CACHE_OF_LIVING_STONE_H = 195047,
GO_CACHE_OF_LIVING_STONE_10 = 195046,
GO_CACHE_OF_LIVING_STONE_25 = 195047,

// Hodir
GO_CACHE_OF_WINTER = 194307,
GO_CACHE_OF_WINTER_H = 194308,
GO_CACHE_OF_RARE_WINTER = 194200,
GO_CACHE_OF_RARE_WINTER_H = 194201,
GO_CACHE_OF_WINTER_10 = 194307,
GO_CACHE_OF_WINTER_25 = 194308,
GO_CACHE_OF_RARE_WINTER_10 = 194200,
GO_CACHE_OF_RARE_WINTER_25 = 194201,

// Mimiron
GO_CACHE_OF_INOV = 194789,
GO_CACHE_OF_INOV_H = 194956,
GO_CACHE_OF_INOV_HARD = 194957,
GO_CACHE_OF_INOV_HARD_H = 194958,
GO_CACHE_OF_INOV_10 = 194789,
GO_CACHE_OF_INOV_25 = 194956,
GO_CACHE_OF_INOV_10_H = 194957,
GO_CACHE_OF_INOV_25_H = 194958,

// Thorim
GO_CACHE_OF_STORMS = 194312,
GO_CACHE_OF_STORMS_H = 194314,
GO_CACHE_OF_RARE_STORMS = 194313,
GO_CACHE_OF_RARE_STORMS_H = 194315,
GO_CACHE_OF_STORMS_10 = 194312,
GO_CACHE_OF_STORMS_25 = 194315,
GO_CACHE_OF_STORMS_10_H = 194313,
GO_CACHE_OF_STORMS_25_H = 194314,

// Alagon
GO_GIFT_OF_OBSERVER_H = 194821,
GO_GIFT_OF_OBSERVER = 194822,
GO_GIFT_OF_OBSERVER_HH = 194823, // Purpose Unknown
GO_GIFT_OF_OBSERVER_10 = 194821,
GO_GIFT_OF_OBSERVER_25 = 194822,

// Doors and other Objects
// The siege
Expand Down
2 changes: 1 addition & 1 deletion sd2_revision_nr.h
View file
@@ -1,4 +1,4 @@
#ifndef __SD2_REVISION_NR_H__
#define __SD2_REVISION_NR_H__
#define SD2_REVISION_NR "2274"
#define SD2_REVISION_NR "2275"
#endif // __SD2_REVISION_NR_H__

0 comments on commit 5f1c784

Please sign in to comment.