Halls of Stone: Maiden of Grief blink exploiting fix & fix compile again
--HG-- branch : trunk
This commit is contained in:
@@ -65,7 +65,12 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI
|
|||||||
AchievTimer = 0;
|
AchievTimer = 0;
|
||||||
|
|
||||||
if (pInstance)
|
if (pInstance)
|
||||||
|
{
|
||||||
pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED);
|
pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED);
|
||||||
|
if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR)))
|
||||||
|
if (pDoor->GetGoState() == GO_STATE_READY)
|
||||||
|
EnterEvadeMode();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void EnterCombat(Unit* who)
|
void EnterCombat(Unit* who)
|
||||||
|
|||||||
@@ -115,8 +115,8 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
|
|||||||
if (pInstance)
|
if (pInstance)
|
||||||
{
|
{
|
||||||
pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
|
pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
|
||||||
if (GameObject pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)) &&
|
if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)))
|
||||||
pDoor->GetGoState() == GO_STATE_READY)
|
if (pDoor->GetGoState() == GO_STATE_READY)
|
||||||
EnterEvadeMode();
|
EnterEvadeMode();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ enum Texts
|
|||||||
TEXT_ID_PROGRESS = 13101
|
TEXT_ID_PROGRESS = 13101
|
||||||
};
|
};
|
||||||
|
|
||||||
enum Creatures
|
enum BrannCreatures
|
||||||
{
|
{
|
||||||
CREATURE_TRIBUNAL_OF_THE_AGES = 28234,
|
CREATURE_TRIBUNAL_OF_THE_AGES = 28234,
|
||||||
CREATURE_BRANN_BRONZEBEARD = 28070,
|
CREATURE_BRANN_BRONZEBEARD = 28070,
|
||||||
@@ -80,7 +80,6 @@ enum Creatures
|
|||||||
CREATURE_DARK_RUNE_PROTECTOR = 27983,
|
CREATURE_DARK_RUNE_PROTECTOR = 27983,
|
||||||
CREATURE_DARK_RUNE_STORMCALLER = 27984,
|
CREATURE_DARK_RUNE_STORMCALLER = 27984,
|
||||||
CREATURE_IRON_GOLEM_CUSTODIAN = 27985,
|
CREATURE_IRON_GOLEM_CUSTODIAN = 27985,
|
||||||
CREATURE_KADDRAK = 30898
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum Spells
|
enum Spells
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ enum Data64
|
|||||||
DATA_GO_MARNAK,
|
DATA_GO_MARNAK,
|
||||||
DATA_GO_ABEDNEUM,
|
DATA_GO_ABEDNEUM,
|
||||||
DATA_GO_SKY_FLOOR,
|
DATA_GO_SKY_FLOOR,
|
||||||
DATA_SJONNIR_DOOR
|
DATA_SJONNIR_DOOR,
|
||||||
|
DATA_MAIDEN_DOOR
|
||||||
};
|
};
|
||||||
enum Creatures
|
enum Creatures
|
||||||
{
|
{
|
||||||
|
|||||||
+1
@@ -187,6 +187,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
|
|||||||
case DATA_GO_MARNAK: return uiMarnakGo;
|
case DATA_GO_MARNAK: return uiMarnakGo;
|
||||||
case DATA_GO_SKY_FLOOR: return uiTribunalSkyFloor;
|
case DATA_GO_SKY_FLOOR: return uiTribunalSkyFloor;
|
||||||
case DATA_SJONNIR_DOOR: return uiSjonnirDoor;
|
case DATA_SJONNIR_DOOR: return uiSjonnirDoor;
|
||||||
|
case DATA_MAIDEN_DOOR: return uiMaidenOfGriefDoor;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user