Core/Units: Rename and change Get/SetVisibility to use a bool value instead of an unnecessary enum
Also replace some SetVisibility hacks to directly call UpdateObjectVisibility --HG-- branch : trunk
This commit is contained in:
1 parent
57c76407b0
commit
8fae0c176d
70 files changed
+181
-187
No files matched your search
@@ -318,7 +318,7 @@ public:
|
||||
break;
|
||||
case 4:
|
||||
CanWalk = true;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
SummonRingMob();
|
||||
Event_Timer = 8000;
|
||||
break;
|
||||
@@ -332,7 +332,7 @@ public:
|
||||
Event_Timer = 0;
|
||||
break;
|
||||
case 7:
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
HandleGameObject(DATA_ARENA1, false);
|
||||
DoScriptText(SCRIPT_TEXT6, me);//4
|
||||
CanWalk = true;
|
||||
@@ -343,7 +343,7 @@ public:
|
||||
Event_Timer = 5000;
|
||||
break;
|
||||
case 9:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
SummonRingBoss();
|
||||
Event_Timer = 0;
|
||||
break;
|
||||
|
||||
@@ -132,7 +132,7 @@ public:
|
||||
Mount_Timer = 0;
|
||||
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) {}
|
||||
@@ -174,7 +174,7 @@ public:
|
||||
if (Mount_Timer <= diff)
|
||||
{
|
||||
Mount_Timer = 0;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->GetMotionMaster()->MoveIdle();
|
||||
if (Unit *pAttumen = Unit::GetUnit(*me, Attumen))
|
||||
{
|
||||
@@ -239,10 +239,10 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff)
|
||||
if (pMidnight)
|
||||
{
|
||||
pMidnight->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
pMidnight->SetVisibility(VISIBILITY_ON);
|
||||
pMidnight->SetVisible(true);
|
||||
}
|
||||
Midnight = 0;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->Kill(me);
|
||||
}
|
||||
} else ResetTimer -= diff;
|
||||
|
||||
@@ -274,7 +274,7 @@ public:
|
||||
if (Unit *pInfernal = Unit::GetUnit(*me, *itr))
|
||||
if (pInfernal->isAlive())
|
||||
{
|
||||
pInfernal->SetVisibility(VISIBILITY_OFF);
|
||||
pInfernal->SetVisible(false);
|
||||
pInfernal->setDeathState(JUST_DIED);
|
||||
}
|
||||
|
||||
|
||||
@@ -593,7 +593,7 @@ public:
|
||||
me->MonsterYell(SAY_DIALOG_MEDIVH_9, LANG_UNIVERSAL, NULL);
|
||||
return 10000;
|
||||
case 14:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->ClearInCombat();
|
||||
|
||||
if (pMap->IsDungeon())
|
||||
|
||||
@@ -515,7 +515,7 @@ public:
|
||||
Eviscerate_Timer = 6000;
|
||||
Wait_Timer = 5000;
|
||||
InVanish = false;
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
boss_priestess_lackey_commonAI::Reset();
|
||||
}
|
||||
@@ -549,7 +549,7 @@ public:
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_BACKSTAB, true);
|
||||
DoCast(me->getVictim(), SPELL_KIDNEY_SHOT, true);
|
||||
me->SetVisibility(VISIBILITY_ON); // ...? Hacklike
|
||||
me->SetVisible(true); // ...? Hacklike
|
||||
InVanish = false;
|
||||
} else Wait_Timer -= diff;
|
||||
}
|
||||
|
||||
@@ -574,7 +574,7 @@ public:
|
||||
Phase = 2;
|
||||
break;
|
||||
case 2:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
PhaseTimer = 2000;
|
||||
Phase = 3;
|
||||
break;
|
||||
|
||||
@@ -390,7 +390,7 @@ public:
|
||||
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
me->Mount(25279);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
UpdateWorldState(me->GetMap(), WORLD_STATE_REMAINS, 0);
|
||||
//UpdateWorldState(me->GetMap(), WORLD_STATE_COUNTDOWN, 0);
|
||||
@@ -913,7 +913,7 @@ public:
|
||||
if (Creature* pTemp = Unit::GetCreature(*me, uiAlexandrosGUID)) // just hide him
|
||||
{
|
||||
DoScriptText(EMOTE_LIGHT_OF_DAWN09, pTemp);
|
||||
pTemp->SetVisibility(VISIBILITY_OFF);
|
||||
pTemp->SetVisible(false);
|
||||
}
|
||||
if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID))
|
||||
{
|
||||
@@ -1321,7 +1321,7 @@ public:
|
||||
i->getSource()->CastSpell(i->getSource(), SPELL_THE_LIGHT_OF_DAWN_Q, false);
|
||||
}
|
||||
}
|
||||
me->SetVisibility(VISIBILITY_OFF); // respawns another Darion for quest turn in
|
||||
me->SetVisible(false); // respawns another Darion for quest turn in
|
||||
me->SummonCreature(NPC_HIGHLORD_DARION_MOGRAINE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
|
||||
JumpToNextStep(1000);
|
||||
break;
|
||||
@@ -1648,7 +1648,7 @@ public:
|
||||
if (Creature* pTemp = Unit::GetCreature(*me, pGUID))
|
||||
if (pTemp->isAlive())
|
||||
{
|
||||
pTemp->SetVisibility(VISIBILITY_OFF);
|
||||
pTemp->SetVisible(false);
|
||||
pTemp->Kill(pTemp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
void Reset()
|
||||
{
|
||||
me->setActive(true);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->SetFlying(true);
|
||||
FlyBackTimer = 500;
|
||||
@@ -81,7 +81,7 @@ public:
|
||||
z += 2.5; x -= 2; y -= 1.5;
|
||||
me->GetMotionMaster()->MovePoint(0, x, y, z);
|
||||
me->SetUInt64Value(UNIT_FIELD_TARGET, plr->GetGUID());
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
FlyBackTimer = 4500;
|
||||
break;
|
||||
case 2:
|
||||
@@ -94,7 +94,7 @@ public:
|
||||
FlyBackTimer = 5000;
|
||||
break;
|
||||
case 3:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
FlyBackTimer = 3000;
|
||||
break;
|
||||
case 4:
|
||||
|
||||
@@ -426,7 +426,7 @@ public:
|
||||
|
||||
void FlyMode()
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING);
|
||||
me->SetSpeed(MOVE_WALK,5.0f,true);
|
||||
@@ -447,7 +447,7 @@ public:
|
||||
switch (id)
|
||||
{
|
||||
case 0:
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
break;
|
||||
case 1:
|
||||
{
|
||||
@@ -802,7 +802,7 @@ public:
|
||||
if (!debuffGUID) return;
|
||||
Unit *debuff = Unit::GetUnit((*me),debuffGUID);
|
||||
if (debuff)
|
||||
debuff->SetVisibility(VISIBILITY_OFF);
|
||||
debuff->SetVisible(false);
|
||||
debuffGUID = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -512,7 +512,7 @@ public:
|
||||
(*i)->GetPosition(x, y, z);
|
||||
me->SummonCreature(MOB_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
|
||||
}
|
||||
(*i)->SetVisibility(VISIBILITY_OFF);
|
||||
(*i)->SetVisible(false);
|
||||
(*i)->setDeathState(JUST_DIED);
|
||||
if ((*i)->getDeathState() == CORPSE)
|
||||
(*i)->RemoveCorpse();
|
||||
|
||||
@@ -163,7 +163,7 @@ public:
|
||||
{
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->SetStandState(UNIT_STAND_STATE_SLEEP);
|
||||
}
|
||||
me->SetFullHealth();//dunno why it does not resets health at evade..
|
||||
@@ -185,7 +185,7 @@ public:
|
||||
void EnterEvadeMode()
|
||||
{
|
||||
bJustReset = true;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
|
||||
ScriptedAI::EnterEvadeMode();
|
||||
}
|
||||
@@ -235,7 +235,7 @@ public:
|
||||
{
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->SetStandState(UNIT_STAND_STATE_SLEEP);
|
||||
ResetTimer = 10000;
|
||||
bJustReset = false;
|
||||
@@ -367,7 +367,7 @@ public:
|
||||
{
|
||||
if (type != POINT_MOTION_TYPE)
|
||||
return;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
if (isFriendly)
|
||||
{
|
||||
me->setDeathState(JUST_DIED);
|
||||
|
||||
@@ -239,7 +239,7 @@ public:
|
||||
Timer[TIMER_SENTINEL] = 31500;
|
||||
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
Summons.DespawnAll();
|
||||
|
||||
@@ -274,7 +274,7 @@ public:
|
||||
switch(summoned->GetEntry())
|
||||
{
|
||||
case BOSS_ENTROPIUS:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
break;
|
||||
case CREATURE_DARK_FIENDS:
|
||||
summoned->CastSpell(summoned,SPELL_DARKFIEND_VISUAL,false);
|
||||
|
||||
@@ -166,7 +166,7 @@ class boss_akilzon : public CreatureScript
|
||||
Unit* bird = Unit::GetUnit(*me,BirdGUIDs[i]);
|
||||
if (bird && bird->isAlive())
|
||||
{
|
||||
bird->SetVisibility(VISIBILITY_OFF);
|
||||
bird->SetVisible(false);
|
||||
bird->setDeathState(JUST_DIED);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -320,7 +320,7 @@ class boss_zuljin : public CreatureScript
|
||||
Temp = Unit::GetUnit(*me, SpiritGUID[i]);
|
||||
if (Temp)
|
||||
{
|
||||
Temp->SetVisibility(VISIBILITY_OFF);
|
||||
Temp->SetVisible(false);
|
||||
Temp->setDeathState(DEAD);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
if (Unit* CorrupterSpeaker = pPlayer->SummonCreature(1,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()-1,0,TEMPSUMMON_TIMED_DESPAWN,15000))
|
||||
{
|
||||
CorrupterSpeaker->SetName("Twilight Corrupter");
|
||||
CorrupterSpeaker->SetVisibility(VISIBILITY_ON);
|
||||
CorrupterSpeaker->SetVisible(true);
|
||||
CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...",0,pPlayer->GetGUID());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -463,15 +463,15 @@ public:
|
||||
if (pInstance)
|
||||
{
|
||||
// Do not let the raid skip straight to Archimonde. Visible and hostile ONLY if Azagalor is finished.
|
||||
if ((pInstance->GetData(DATA_AZGALOREVENT) < DONE) && ((me->GetVisibility() != VISIBILITY_OFF) || (me->getFaction() != 35)))
|
||||
if ((pInstance->GetData(DATA_AZGALOREVENT) < DONE) && (me->IsVisible() || (me->getFaction() != 35)))
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->setFaction(35);
|
||||
}
|
||||
else if ((pInstance->GetData(DATA_AZGALOREVENT) >= DONE) && ((me->GetVisibility() != VISIBILITY_ON) || (me->getFaction() == 35)))
|
||||
else if ((pInstance->GetData(DATA_AZGALOREVENT) >= DONE) && (!me->IsVisible() || (me->getFaction() == 35)))
|
||||
{
|
||||
me->setFaction(1720);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -526,7 +526,7 @@ public:
|
||||
Creature* Check = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 2000);
|
||||
if (Check)
|
||||
{
|
||||
Check->SetVisibility(VISIBILITY_OFF);
|
||||
Check->SetVisible(false);
|
||||
|
||||
if (me->IsWithinDistInMap(Check, 75))
|
||||
{
|
||||
|
||||
@@ -756,19 +756,19 @@ void hyjalAI::UpdateAI(const uint32 diff)
|
||||
case JAINA:
|
||||
if (pInstance && pInstance->GetData(DATA_ALLIANCE_RETREAT))
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
HideNearPos(me->GetPositionX(), me->GetPositionY());
|
||||
HideNearPos(5037.76f, -1889.71f);
|
||||
for (uint8 i = 0; i < 92; ++i)//summon fires
|
||||
me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0);
|
||||
|
||||
}
|
||||
else me->SetVisibility(VISIBILITY_ON);
|
||||
else me->SetVisible(true);
|
||||
break;
|
||||
case THRALL: //thrall
|
||||
if (pInstance && pInstance->GetData(DATA_HORDE_RETREAT))
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
HideNearPos(me->GetPositionX(), me->GetPositionY());
|
||||
HideNearPos(5563, -2763.19f);
|
||||
HideNearPos(5542.2f, -2629.36f);
|
||||
@@ -776,7 +776,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
|
||||
me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0);
|
||||
|
||||
}
|
||||
else me->SetVisibility(VISIBILITY_ON);
|
||||
else me->SetVisible(true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -794,10 +794,10 @@ void hyjalAI::UpdateAI(const uint32 diff)
|
||||
RespawnNearPos(5563, -2763.19f);
|
||||
RespawnNearPos(5542.2f, -2629.36f);
|
||||
}
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}else{
|
||||
RespawnTimer -= diff;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -821,7 +821,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
|
||||
HideNearPos(5603.75f, -2853.12f);
|
||||
break;
|
||||
}
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
} else RetreatTimer -= diff;
|
||||
}
|
||||
|
||||
@@ -914,7 +914,7 @@ void hyjalAI::JustDied(Unit* /*killer*/)
|
||||
{
|
||||
if (IsDummy)return;
|
||||
me->Respawn();
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
DoRespawn = true;
|
||||
RespawnTimer = 120000;
|
||||
Talk(DEATH);
|
||||
@@ -954,7 +954,7 @@ void hyjalAI::HideNearPos(float x, float y)
|
||||
{
|
||||
for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
|
||||
{
|
||||
(*itr)->SetVisibility(VISIBILITY_OFF);
|
||||
(*itr)->SetVisible(false);
|
||||
(*itr)->setFaction(35);//make them friendly so mobs won't attack them
|
||||
}
|
||||
}
|
||||
|
||||
@@ -457,7 +457,7 @@ public:
|
||||
Creature* trigger = me->SummonCreature(NPC_TRIGGER,x+8,y+8,z+25+rand()%10,me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,1000);
|
||||
if (trigger)
|
||||
{
|
||||
trigger->SetVisibility(VISIBILITY_OFF);
|
||||
trigger->SetVisible(false);
|
||||
trigger->setFaction(me->getFaction());
|
||||
trigger->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
trigger->CastSpell(me,SPELL_METEOR,true);
|
||||
|
||||
@@ -196,7 +196,7 @@ public:
|
||||
Map* pMap = pCreature->GetMap();
|
||||
if (pMap->IsDungeon() && pUnit)
|
||||
{
|
||||
pUnit->SetVisibility(VISIBILITY_OFF);
|
||||
pUnit->SetVisible(false);
|
||||
Map::PlayerList const &PlayerList = pMap->GetPlayers();
|
||||
if (PlayerList.isEmpty())
|
||||
return;
|
||||
|
||||
@@ -221,7 +221,7 @@ public:
|
||||
uiOutroTimer = 500;
|
||||
break;
|
||||
case 5:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->Kill(me);
|
||||
break;
|
||||
|
||||
|
||||
+1
-1
@@ -843,7 +843,7 @@ public:
|
||||
break;
|
||||
case 39:
|
||||
if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID))
|
||||
pMalganis->SetVisibility(VISIBILITY_OFF);
|
||||
pMalganis->SetVisible(false);
|
||||
DoScriptText(SAY_PHASE208, me);
|
||||
JumpToNextStep(7000);
|
||||
break;
|
||||
|
||||
@@ -462,7 +462,7 @@ public:
|
||||
break;
|
||||
case 108:
|
||||
//last waypoint, just set Thrall invisible, respawn is turned off
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,7 +219,7 @@ public:
|
||||
me->RemoveAurasDueToSpell(SPELL_RED_COLORATION);
|
||||
me->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
//Reset Phase
|
||||
if (pInst)
|
||||
@@ -404,7 +404,7 @@ public:
|
||||
//Remove any target
|
||||
me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
|
||||
me->SetHealth(0);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
break;
|
||||
|
||||
//Dead phase
|
||||
@@ -542,7 +542,7 @@ public:
|
||||
//Reset flags
|
||||
me->RemoveAurasDueToSpell(SPELL_TRANSFORM);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
|
||||
if (pInst)
|
||||
pInst->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED);
|
||||
@@ -670,7 +670,7 @@ public:
|
||||
DoCast(me, SPELL_TRANSFORM, false);
|
||||
me->SetFullHealth();
|
||||
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
|
||||
|
||||
//Emerging phase
|
||||
@@ -1062,7 +1062,7 @@ public:
|
||||
p->Kill(p);
|
||||
|
||||
//Dissapear and reappear at new position
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
|
||||
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
|
||||
if (!pTarget)
|
||||
@@ -1086,7 +1086,7 @@ public:
|
||||
AttackStart(pTarget);
|
||||
}
|
||||
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
} else EvadeTimer -= diff;
|
||||
}
|
||||
|
||||
@@ -1174,7 +1174,7 @@ public:
|
||||
p->Kill(p);
|
||||
|
||||
//Dissapear and reappear at new position
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
|
||||
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
|
||||
if (!pTarget)
|
||||
@@ -1198,7 +1198,7 @@ public:
|
||||
EvadeTimer = 5000;
|
||||
AttackStart(pTarget);
|
||||
}
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
} else EvadeTimer -= diff;
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ public:
|
||||
Invisible = false;
|
||||
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
if (IsImage)
|
||||
me->setDeathState(JUST_DIED);
|
||||
@@ -194,7 +194,7 @@ public:
|
||||
if (Invisible_Timer <= diff)
|
||||
{
|
||||
//Making Skeram visible after telporting
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
|
||||
Invisible_Timer = 2500;
|
||||
@@ -251,7 +251,7 @@ public:
|
||||
|
||||
me->RemoveAllAuras();
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->GetMap()->CreatureRelocation(me, bossc->x, bossc->y, bossc->z, bossc->r);
|
||||
Invisible = true;
|
||||
delete place1;
|
||||
|
||||
@@ -380,8 +380,8 @@ public:
|
||||
if (eventProgress == 11)
|
||||
{
|
||||
if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX)))
|
||||
naralex->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
naralex->SetVisible(false);
|
||||
me->SetVisible(false);
|
||||
pInstance->SetData(TYPE_NARALEX_PART3, DONE);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -595,7 +595,7 @@ public:
|
||||
break;
|
||||
case 14:
|
||||
DoScriptText(ARYGOS_SAY_1,Arygos);
|
||||
Merithra->SetVisibility(VISIBILITY_OFF);
|
||||
Merithra->SetVisible(false);
|
||||
break;
|
||||
case 15:
|
||||
Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10);
|
||||
@@ -625,7 +625,7 @@ public:
|
||||
break;
|
||||
case 23:
|
||||
Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10);
|
||||
Arygos->SetVisibility(VISIBILITY_OFF);
|
||||
Arygos->SetVisible(false);
|
||||
Arygos->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,10);
|
||||
break;
|
||||
case 24:
|
||||
@@ -655,7 +655,7 @@ public:
|
||||
DoScriptText(ANACHRONOS_SAY_3, me, Fandral);
|
||||
break;
|
||||
case 32:
|
||||
Caelestrasz->SetVisibility(VISIBILITY_OFF);
|
||||
Caelestrasz->SetVisible(false);
|
||||
Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42);
|
||||
Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77f,8);
|
||||
me->GetMotionMaster()->MoveCharge(-8113,1525,2.77f,8);
|
||||
@@ -745,7 +745,7 @@ public:
|
||||
DoScriptText(ANACHRONOS_EMOTE_2,me);
|
||||
break;
|
||||
case 55:
|
||||
Fandral->SetVisibility(VISIBILITY_OFF);
|
||||
Fandral->SetVisible(false);
|
||||
break;
|
||||
case 56:
|
||||
DoScriptText(ANACHRONOS_EMOTE_3, me);
|
||||
@@ -781,7 +781,7 @@ public:
|
||||
me->GetMotionMaster()->MoveCharge(-8000,1400,150,9);
|
||||
break;
|
||||
case 65:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
if (Creature* AnachronosQuestTrigger = (Unit::GetCreature(*me, AnachronosQuestTriggerGUID)))
|
||||
{
|
||||
DoScriptText(ARYGOS_YELL_1,me);
|
||||
@@ -968,7 +968,7 @@ public:
|
||||
Announced = false;
|
||||
Failed = false;
|
||||
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
|
||||
void SummonNextWave()
|
||||
|
||||
@@ -195,7 +195,7 @@ public:
|
||||
Creature* cr = instance->GetCreature(*itr);
|
||||
if (cr && cr->isAlive())
|
||||
{
|
||||
cr->SetVisibility(VISIBILITY_OFF);
|
||||
cr->SetVisible(false);
|
||||
cr->setDeathState(JUST_DIED);
|
||||
cr->RemoveCorpse();
|
||||
}
|
||||
|
||||
+2
-2
@@ -215,8 +215,8 @@ class npc_announcer_toc10 : public CreatureScript
|
||||
|
||||
m_pInstance->SetData(TYPE_ANUBARAK,NOT_STARTED);
|
||||
|
||||
if (pCreature->GetVisibility() == VISIBILITY_ON)
|
||||
pCreature->SetVisibility(VISIBILITY_OFF);
|
||||
if (pCreature->IsVisible())
|
||||
pCreature->SetVisible(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@ public:
|
||||
|
||||
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}
|
||||
|
||||
void DoAction(const int32 actionId)
|
||||
@@ -476,9 +476,9 @@ public:
|
||||
case EVENT_INTRO_LK_5:
|
||||
// summon Falric and Marwyn. then go back to the door
|
||||
if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
|
||||
pFalric->SetVisibility(VISIBILITY_ON);
|
||||
pFalric->SetVisible(true);
|
||||
if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN)))
|
||||
pMarwyn->SetVisibility(VISIBILITY_ON);
|
||||
pMarwyn->SetVisible(true);
|
||||
|
||||
if (Creature* pLichKing = me->GetCreature(*me, uiLichKing))
|
||||
{
|
||||
@@ -533,9 +533,9 @@ public:
|
||||
// TODO: implement
|
||||
|
||||
if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
|
||||
pFalric->SetVisibility(VISIBILITY_ON);
|
||||
pFalric->SetVisible(true);
|
||||
if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN)))
|
||||
pMarwyn->SetVisibility(VISIBILITY_ON);
|
||||
pMarwyn->SetVisible(true);
|
||||
|
||||
me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos);
|
||||
// TODO: Loralen/Koreln shall run also
|
||||
|
||||
@@ -91,7 +91,7 @@ struct boss_horAI : ScriptedAI
|
||||
void Reset()
|
||||
{
|
||||
events.Reset();
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
}
|
||||
@@ -108,7 +108,7 @@ struct boss_horAI : ScriptedAI
|
||||
{
|
||||
case ACTION_ENTER_COMBAT: // called by InstanceScript when boss shall enter in combat.
|
||||
// Just in case. Should have been done by InstanceScript
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
// Reset flags
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
|
||||
|
||||
+3
-3
@@ -377,9 +377,9 @@ public:
|
||||
pSylvanas->Respawn();
|
||||
|
||||
if (Creature* pFalric = instance->GetCreature(uiFalric))
|
||||
pFalric->SetVisibility(VISIBILITY_OFF);
|
||||
pFalric->SetVisible(false);
|
||||
if (Creature* pMarwyn = instance->GetCreature(uiMarwyn))
|
||||
pMarwyn->SetVisibility(VISIBILITY_OFF);
|
||||
pMarwyn->SetVisible(false);
|
||||
}
|
||||
|
||||
// spawn a wave on behalf of the summoner.
|
||||
@@ -387,7 +387,7 @@ public:
|
||||
{
|
||||
uint32 index;
|
||||
|
||||
pSummoner->SetVisibility(VISIBILITY_ON);
|
||||
pSummoner->SetVisible(true);
|
||||
|
||||
// TODO: do composition at random. # of spawn also depends on uiWaveCount
|
||||
// As of now, it is just one of each.
|
||||
|
||||
@@ -306,7 +306,7 @@ public:
|
||||
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
|
||||
Creature* GetIck()
|
||||
@@ -341,7 +341,7 @@ public:
|
||||
pIck->GetNearPosition(pos, 5.0f, 3.14f);
|
||||
me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), 0.0f);
|
||||
}
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
Creature* pJainaOrSylvanas = me->GetCreature(*me, pInstance->GetData64(DATA_JAINA_SYLVANAS_1));
|
||||
if (pJainaOrSylvanas) {
|
||||
|
||||
@@ -944,11 +944,11 @@ class npc_blood_queen_lana_thel : public CreatureScript
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == DONE)
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
bIntroDone = true;
|
||||
}
|
||||
else
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* who)
|
||||
@@ -975,7 +975,7 @@ class npc_blood_queen_lana_thel : public CreatureScript
|
||||
void MovementInform(uint32 type, uint32 id)
|
||||
{
|
||||
if (type == POINT_MOTION_TYPE && id == POINT_INTRO_DESPAWN)
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
|
||||
void UpdateAI(const uint32 diff)
|
||||
@@ -1135,7 +1135,7 @@ class npc_kinetic_bomb : public CreatureScript
|
||||
switch (eventId)
|
||||
{
|
||||
case EVENT_BOMB_DESPAWN:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
break;
|
||||
case EVENT_CONTINUE_FALLING:
|
||||
me->GetMotionMaster()->Clear();
|
||||
|
||||
@@ -343,7 +343,7 @@ class npc_big_ooze : public CreatureScript
|
||||
{
|
||||
bExploded = true;
|
||||
me->RemoveAllAuras();
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
events.Reset();
|
||||
events.ScheduleEvent(EVENT_UNSTABLE_DESPAWN, 60000);
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ public:
|
||||
float x, y, z;
|
||||
me->GetPosition(x, y, z);
|
||||
me->SummonGameObject(GO_BIRTH, x, y, z, 0, 0, 0, 0, 0, 0);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
|
||||
@@ -344,7 +344,7 @@ public:
|
||||
EnterPhaseGround();
|
||||
return;
|
||||
case EVENT_BIRTH:
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
return;
|
||||
|
||||
@@ -114,7 +114,7 @@ public:
|
||||
bIsWaitingToAppear = false;
|
||||
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
if (pInstance)
|
||||
pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED);
|
||||
@@ -225,7 +225,7 @@ public:
|
||||
me->GetMotionMaster()->Clear();
|
||||
me->GetMap()->CreatureRelocation(me, CenterOfRoom.GetPositionX(), CenterOfRoom.GetPositionY(), CenterOfRoom.GetPositionZ(), CenterOfRoom.GetOrientation());
|
||||
DoCast(me, SPELL_TELESTRA_BACK);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
if (Phase == 1)
|
||||
Phase = 2;
|
||||
if (Phase == 3)
|
||||
@@ -248,7 +248,7 @@ public:
|
||||
Phase = 1;
|
||||
me->CastStop();
|
||||
me->RemoveAllAuras();
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
|
||||
uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
|
||||
@@ -265,7 +265,7 @@ public:
|
||||
Phase = 3;
|
||||
me->CastStop();
|
||||
me->RemoveAllAuras();
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
|
||||
uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
|
||||
|
||||
@@ -1400,7 +1400,7 @@ public:
|
||||
{
|
||||
if(uiDespawnTimer < uiDiff)
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->Kill(me);
|
||||
uiDespawnTimer = 28000;
|
||||
return;
|
||||
@@ -1496,7 +1496,7 @@ public:
|
||||
{
|
||||
if(uiDespawnTimer < uiDiff)
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->Kill(me);
|
||||
uiDespawnTimer = 28000;
|
||||
return;
|
||||
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
pCreatureTarget->CastSpell(pCreatureTarget, SPELL_SUMMON_SPARK, true);
|
||||
|
||||
pCreatureTarget->AttackStop();
|
||||
pCreatureTarget->SetVisibility(VISIBILITY_OFF);
|
||||
pCreatureTarget->SetVisible(false);
|
||||
pCreatureTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE);
|
||||
|
||||
pCreatureTarget->GetMotionMaster()->Clear();
|
||||
@@ -137,8 +137,8 @@ public:
|
||||
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE);
|
||||
|
||||
if (me->GetVisibility() == VISIBILITY_OFF)
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
if (!me->IsVisible())
|
||||
me->SetVisible(true);
|
||||
|
||||
if (pInstance)
|
||||
pInstance->SetData(TYPE_IONAR, NOT_STARTED);
|
||||
@@ -195,7 +195,7 @@ public:
|
||||
|
||||
void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage)
|
||||
{
|
||||
if (me->GetVisibility() == VISIBILITY_OFF)
|
||||
if (!me->IsVisible())
|
||||
uiDamage = 0;
|
||||
}
|
||||
|
||||
@@ -230,7 +230,7 @@ public:
|
||||
return;
|
||||
|
||||
// Splitted
|
||||
if (me->GetVisibility() == VISIBILITY_OFF)
|
||||
if (!me->IsVisible())
|
||||
{
|
||||
if (uiSplitTimer <= uiDiff)
|
||||
{
|
||||
@@ -245,7 +245,7 @@ public:
|
||||
// Lightning effect and restore Ionar
|
||||
else if (lSparkList.empty())
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE);
|
||||
|
||||
DoCast(me, SPELL_SPARK_DESPAWN, false);
|
||||
|
||||
@@ -1204,7 +1204,7 @@ public:
|
||||
if (Creature* pLeviathan = instance->instance->GetCreature(instance->GetData64(TYPE_LEVIATHAN)))
|
||||
{
|
||||
CAST_AI(boss_flame_leviathan::boss_flame_leviathanAI, (pLeviathan->AI()))->DoAction(0); //enable hard mode activating the 4 additional events spawning additional vehicles
|
||||
pCreature->SetVisibility(VISIBILITY_OFF);
|
||||
pCreature->SetVisible(false);
|
||||
pCreature->AI()->DoAction(0); // spawn the vehicles
|
||||
if (Creature* Delorah = pCreature->FindNearestCreature(NPC_DELORAH, 1000, true))
|
||||
{
|
||||
|
||||
@@ -579,7 +579,7 @@ public:
|
||||
npc_mole_machine_triggerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
|
||||
{
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
|
||||
GameObject* MoleMachine;
|
||||
|
||||
@@ -344,7 +344,7 @@ public:
|
||||
uiResurectPhase = 1;
|
||||
break;
|
||||
case 2:
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->DealDamage(me,me->GetHealth());
|
||||
me->RemoveCorpse();
|
||||
break;
|
||||
|
||||
@@ -258,7 +258,7 @@ public:
|
||||
{
|
||||
mob_frozen_orb_stalkerAI(Creature* c) : Scripted_NoMovementAI(c)
|
||||
{
|
||||
c->SetVisibility(VISIBILITY_OFF);
|
||||
c->SetVisible(false);
|
||||
c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_DISABLE_MOVE);
|
||||
c->SetReactState(REACT_PASSIVE);
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ public:
|
||||
uiBubbleCheckerTimer = 1000;
|
||||
uiWaterBoltVolleyTimer = urand(10000, 15000);
|
||||
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
DespawnWaterElements();
|
||||
|
||||
if (pInstance)
|
||||
@@ -195,7 +195,7 @@ public:
|
||||
DoCast(me, SPELL_PROTECTIVE_BUBBLE, true);
|
||||
}
|
||||
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->GetMotionMaster()->MoveChase(me->getVictim());
|
||||
}
|
||||
|
||||
@@ -227,7 +227,7 @@ public:
|
||||
DoCast(me, SPELL_DRAINED);
|
||||
bIsExploded = true;
|
||||
me->AttackStop();
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
for (uint8 i = 0; i < 10; i++)
|
||||
{
|
||||
int tmp = urand(0, MAX_SPAWN_LOC-1);
|
||||
@@ -277,7 +277,7 @@ public:
|
||||
if (bIsExploded)
|
||||
{
|
||||
bIsExploded = false;
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}
|
||||
|
||||
DespawnWaterElements();
|
||||
|
||||
@@ -705,7 +705,7 @@ public:
|
||||
|
||||
if (Creature* pSinclari = instance->GetCreature(uiSinclari))
|
||||
{
|
||||
pSinclari->SetVisibility(VISIBILITY_ON);
|
||||
pSinclari->SetVisible(true);
|
||||
|
||||
std::list<Creature*> GuardList;
|
||||
pSinclari->GetCreatureListWithEntryInGrid(GuardList, NPC_VIOLET_HOLD_GUARD, 40.0f);
|
||||
@@ -715,7 +715,7 @@ public:
|
||||
{
|
||||
if (Creature* pGuard = *itr)
|
||||
{
|
||||
pGuard->SetVisibility(VISIBILITY_ON);
|
||||
pGuard->SetVisible(true);
|
||||
pGuard->SetReactState(REACT_AGGRESSIVE);
|
||||
pGuard->GetMotionMaster()->MovePoint(1,pGuard->GetHomePosition());
|
||||
}
|
||||
|
||||
@@ -332,7 +332,7 @@ public:
|
||||
{
|
||||
pGuard->DisappearAndDie();
|
||||
pGuard->Respawn();
|
||||
pGuard->SetVisibility(VISIBILITY_ON);
|
||||
pGuard->SetVisible(true);
|
||||
pGuard->SetReactState(REACT_AGGRESSIVE);
|
||||
}
|
||||
}
|
||||
@@ -380,7 +380,7 @@ public:
|
||||
{
|
||||
if (Creature* pGuard = *itr)
|
||||
{
|
||||
pGuard->SetVisibility(VISIBILITY_OFF);
|
||||
pGuard->SetVisible(false);
|
||||
pGuard->SetReactState(REACT_PASSIVE);
|
||||
}
|
||||
}
|
||||
@@ -609,7 +609,7 @@ public:
|
||||
uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR);
|
||||
DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN);
|
||||
}
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
} else uiSpawnTimer -= diff;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -575,7 +575,7 @@ public:
|
||||
|
||||
struct npc_nesingwary_trapperAI : public ScriptedAI
|
||||
{
|
||||
npc_nesingwary_trapperAI(Creature *c) : ScriptedAI(c) { c->SetVisibility(VISIBILITY_OFF); }
|
||||
npc_nesingwary_trapperAI(Creature *c) : ScriptedAI(c) { c->SetVisible(false); }
|
||||
|
||||
uint64 go_caribouGUID;
|
||||
uint8 Phase;
|
||||
@@ -583,7 +583,7 @@ public:
|
||||
|
||||
void Reset()
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
uiPhaseTimer = 2500;
|
||||
Phase = 1;
|
||||
go_caribouGUID = 0;
|
||||
@@ -613,7 +613,7 @@ public:
|
||||
switch (Phase)
|
||||
{
|
||||
case 1:
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
uiPhaseTimer = 2000;
|
||||
Phase = 2;
|
||||
break;
|
||||
|
||||
@@ -876,7 +876,7 @@ public:
|
||||
{
|
||||
if (GETUNIT(Glaive, GlaiveGUID[i]))
|
||||
{
|
||||
Glaive->SetVisibility(VISIBILITY_OFF);
|
||||
Glaive->SetVisible(false);
|
||||
Glaive->setDeathState(JUST_DIED); // Despawn the Glaive
|
||||
}
|
||||
GlaiveGUID[i] = 0;
|
||||
@@ -1229,7 +1229,7 @@ public:
|
||||
if (Timer[EVENT_MAIEV_STEALTH])
|
||||
{
|
||||
me->SetFullHealth();
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
Timer[EVENT_MAIEV_STEALTH] = 0;
|
||||
}
|
||||
me->InterruptNonMeleeSpells(false);
|
||||
@@ -1307,7 +1307,7 @@ public:
|
||||
case EVENT_MAIEV_STEALTH:
|
||||
{
|
||||
me->SetFullHealth();
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
Timer[EVENT_MAIEV_STEALTH] = 0;
|
||||
BlinkToPlayer();
|
||||
@@ -1349,7 +1349,7 @@ public:
|
||||
|
||||
if (HealthBelowPct(50))
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
if (GETCRE(Illidan, IllidanGUID))
|
||||
CAST_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, Illidan->AI())->DeleteFromThreatList(me->GetGUID());
|
||||
@@ -1446,7 +1446,7 @@ public:
|
||||
me->SetUInt32Value(UNIT_NPC_FLAGS, 0); // Database sometimes has strange values..
|
||||
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
|
||||
me->setActive(false);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
|
||||
// Do not call reset in Akama's evade mode, as this will stop him from summoning minions after he kills the first bit
|
||||
@@ -1529,7 +1529,7 @@ public:
|
||||
for (uint8 i = 0; i < 2; ++i)
|
||||
if (Creature* Spirit = me->SummonCreature(i ? SPIRIT_OF_OLUM : SPIRIT_OF_UDALO, SpiritSpawns[i].x, SpiritSpawns[i].y, SpiritSpawns[i].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
|
||||
{
|
||||
Spirit->SetVisibility(VISIBILITY_OFF);
|
||||
Spirit->SetVisible(false);
|
||||
SpiritGUID[i] = Spirit->GetGUID();
|
||||
}
|
||||
}
|
||||
@@ -1649,8 +1649,8 @@ public:
|
||||
Timer = 2000;
|
||||
break;
|
||||
case 1: // spirit appear
|
||||
Spirit[0]->SetVisibility(VISIBILITY_ON);
|
||||
Spirit[1]->SetVisibility(VISIBILITY_ON);
|
||||
Spirit[0]->SetVisible(true);
|
||||
Spirit[1]->SetVisible(true);
|
||||
Timer = 2000;
|
||||
break;
|
||||
case 2: // spirit help
|
||||
@@ -1675,8 +1675,8 @@ public:
|
||||
me->MonsterYell(SAY_AKAMA_BEWARE, LANG_UNIVERSAL, 0);
|
||||
DoPlaySoundToSet(me, SOUND_AKAMA_BEWARE);
|
||||
Channel->setDeathState(JUST_DIED);
|
||||
Spirit[0]->SetVisibility(VISIBILITY_OFF);
|
||||
Spirit[1]->SetVisibility(VISIBILITY_OFF);
|
||||
Spirit[0]->SetVisible(false);
|
||||
Spirit[1]->SetVisible(false);
|
||||
Timer = 3000;
|
||||
break;
|
||||
case 6:
|
||||
@@ -1718,12 +1718,12 @@ public:
|
||||
|
||||
void UpdateAI(const uint32 diff)
|
||||
{
|
||||
if (me->GetVisibility() == VISIBILITY_OFF)
|
||||
if (!me->IsVisible())
|
||||
{
|
||||
if (Check_Timer <= diff)
|
||||
{
|
||||
if (pInstance && pInstance->GetData(DATA_ILLIDARICOUNCILEVENT) == DONE)
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
Check_Timer = 5000;
|
||||
} else Check_Timer -= diff;
|
||||
@@ -1882,7 +1882,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su
|
||||
{
|
||||
if (Phase == PHASE_TALK_SEQUENCE)
|
||||
{
|
||||
summon->SetVisibility(VISIBILITY_OFF);
|
||||
summon->SetVisible(false);
|
||||
summon->setDeathState(JUST_DIED);
|
||||
return;
|
||||
}
|
||||
@@ -1903,7 +1903,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su
|
||||
break;
|
||||
case MAIEV_SHADOWSONG:
|
||||
{
|
||||
summon->SetVisibility(VISIBILITY_OFF); // Leave her invisible until she has to talk
|
||||
summon->SetVisible(false); // Leave her invisible until she has to talk
|
||||
summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
MaievGUID = summon->GetGUID();
|
||||
CAST_AI(boss_maiev_shadowsong::boss_maievAI, summon->AI())->GetIllidanGUID(me->GetGUID());
|
||||
@@ -1948,7 +1948,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence()
|
||||
case 11:
|
||||
if (GETUNIT(Maiev, MaievGUID))
|
||||
{
|
||||
Maiev->SetVisibility(VISIBILITY_ON); // Maiev is now visible
|
||||
Maiev->SetVisible(true); // Maiev is now visible
|
||||
Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true); // onoz she looks like she teleported!
|
||||
Maiev->SetInFront(me); // Have her face us
|
||||
me->SetInFront(Maiev); // Face her, so it's not rude =P
|
||||
@@ -2235,7 +2235,7 @@ public:
|
||||
AttackStart(pTarget);
|
||||
else
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->setDeathState(JUST_DIED);
|
||||
return;
|
||||
}
|
||||
@@ -2246,7 +2246,7 @@ public:
|
||||
GETUNIT(Illidan, IllidanGUID);
|
||||
if (!Illidan || CAST_CRE(Illidan)->IsInEvadeMode())
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->setDeathState(JUST_DIED);
|
||||
return;
|
||||
} else CheckTimer = 5000;
|
||||
|
||||
@@ -262,7 +262,7 @@ public:
|
||||
IsBanished = true;
|
||||
HasKilledAkama = false;
|
||||
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
//me->GetMotionMaster()->Clear();
|
||||
|
||||
@@ -72,7 +72,7 @@ public:
|
||||
float x, y, z;
|
||||
me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm()));
|
||||
me->GetMotionMaster()->MovePoint(0, x, y, z);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->CastSpell(me,SPELL_MOLTEN_FLAME,true);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -802,7 +802,7 @@ public:
|
||||
AppearEnvenomTimer = 150000;
|
||||
|
||||
HasVanished = false;
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
}
|
||||
|
||||
@@ -842,7 +842,7 @@ public:
|
||||
VanishTimer = 30000;
|
||||
AppearEnvenomTimer= 28000;
|
||||
HasVanished = true;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
DoResetThreat();
|
||||
// Chase a unit. Check before DoMeleeAttackIfReady prevents from attacking
|
||||
@@ -872,7 +872,7 @@ public:
|
||||
{
|
||||
me->GetMotionMaster()->Clear();
|
||||
me->GetMotionMaster()->MoveChase(me->getVictim());
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
AppearEnvenomTimer = 6000;
|
||||
} else AppearEnvenomTimer -= diff;
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ public:
|
||||
pInstance->SetData(DATA_STRANGE_POOL, NOT_STARTED);
|
||||
}
|
||||
DoCast(me, SPELL_SUBMERGE);//submerge anim
|
||||
me->SetVisibility(VISIBILITY_OFF);//we start invis under water, submerged
|
||||
me->SetVisible(false);//we start invis under water, submerged
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
}
|
||||
@@ -189,7 +189,7 @@ public:
|
||||
{
|
||||
if (Submerged)
|
||||
{
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
Submerged = false;
|
||||
WaitTimer2 = 500;
|
||||
}
|
||||
|
||||
+2
-2
@@ -338,7 +338,7 @@ class boss_vazruden_the_herald : public CreatureScript
|
||||
}
|
||||
summoned = false;
|
||||
me->clearUnitState(UNIT_STAT_ROOT);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -351,7 +351,7 @@ class boss_vazruden_the_herald : public CreatureScript
|
||||
if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
|
||||
NazanGUID = Nazan->GetGUID();
|
||||
summoned = true;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->addUnitState(UNIT_STAT_ROOT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ class mob_abyssal : public CreatureScript
|
||||
if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET)
|
||||
{
|
||||
DoCast(me, SPELL_BLAZE_TRAP, true);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
Despawn_Timer = 130000;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -266,7 +266,7 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
|
||||
//summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
//summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
summoned->SetVisibility(VISIBILITY_OFF);
|
||||
summoned->SetVisible(false);
|
||||
}
|
||||
|
||||
void KilledUnit(Unit* /*victim*/)
|
||||
|
||||
@@ -136,7 +136,7 @@ class boss_high_astromancer_solarian : public CreatureScript
|
||||
|
||||
me->SetArmor(defaultarmor);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize);
|
||||
me->SetDisplayId(MODEL_HUMAN);
|
||||
|
||||
@@ -207,7 +207,7 @@ class boss_high_astromancer_solarian : public CreatureScript
|
||||
if (Phase == 2)
|
||||
{
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
AppearDelay_Timer = 2000;
|
||||
}
|
||||
@@ -354,7 +354,7 @@ class boss_high_astromancer_solarian : public CreatureScript
|
||||
SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);
|
||||
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
|
||||
DoScriptText(SAY_SUMMON2, me);
|
||||
AppearDelay = true;
|
||||
@@ -389,7 +389,7 @@ class boss_high_astromancer_solarian : public CreatureScript
|
||||
Phase = 4;
|
||||
//To make sure she wont be invisible or not selecatble
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
DoScriptText(SAY_VOIDA, me);
|
||||
DoScriptText(SAY_VOIDB, me);
|
||||
me->SetArmor(WV_ARMOR);
|
||||
|
||||
@@ -618,7 +618,7 @@ public:
|
||||
case 9:
|
||||
Turn_to_eachother();
|
||||
//hide pathaleon, unit will despawn shortly
|
||||
pathaleon->SetVisibility(VISIBILITY_OFF);
|
||||
pathaleon->SetVisible(false);
|
||||
PhaseSubphase = 0;
|
||||
++Phase;
|
||||
Phase_Timer = 3000;
|
||||
|
||||
@@ -226,7 +226,7 @@ public:
|
||||
|
||||
FlyTimer = 10000;
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetVisibility(VISIBILITY_ON);
|
||||
me->SetVisible(true);
|
||||
}
|
||||
|
||||
void SpellHit(Unit* caster, const SpellEntry* spell)
|
||||
@@ -271,7 +271,7 @@ public:
|
||||
|
||||
PlayerGUID = 0;
|
||||
}
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
|
||||
me->RemoveCorpse();
|
||||
@@ -808,7 +808,7 @@ public:
|
||||
if (Illidan)
|
||||
{
|
||||
IllidanGUID = Illidan->GetGUID();
|
||||
Illidan->SetVisibility(VISIBILITY_OFF);
|
||||
Illidan->SetVisible(false);
|
||||
}
|
||||
if (PlayerGUID)
|
||||
{
|
||||
@@ -840,7 +840,7 @@ public:
|
||||
case 2: DoScriptText(OVERLORD_YELL_1, me, plr); return 4500; break;
|
||||
case 3: me->SetInFront(plr); return 3200; break;
|
||||
case 4: DoScriptText(OVERLORD_SAY_2, me, plr); return 2000; break;
|
||||
case 5: Illi->SetVisibility(VISIBILITY_ON);
|
||||
case 5: Illi->SetVisible(true);
|
||||
Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return 350; break;
|
||||
case 6:
|
||||
Illi->CastSpell(Illi, SPELL_ONE, true);
|
||||
@@ -876,7 +876,7 @@ public:
|
||||
return 500; break;
|
||||
case 21: DoScriptText(OVERLORD_SAY_5, me); return 500; break;
|
||||
case 22:
|
||||
Illi->SetVisibility(VISIBILITY_OFF);
|
||||
Illi->SetVisible(false);
|
||||
Illi->setDeathState(JUST_DIED);
|
||||
return 1000; break;
|
||||
case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); return 2000; break;
|
||||
@@ -1429,7 +1429,7 @@ public:
|
||||
Announced = false;
|
||||
Failed = false;
|
||||
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->SetVisible(false);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) {}
|
||||
|
||||
@@ -341,7 +341,7 @@ public:
|
||||
pGo->SummonGameObject(GO_HIGH_QUALITY_FUR, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 0, 0, 0, 0, 1000);
|
||||
if (TempSummon* summon = pPlayer->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, pGo->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000))
|
||||
{
|
||||
summon->SetVisibility(VISIBILITY_OFF);
|
||||
summon->SetVisible(false);
|
||||
summon->SetReactState(REACT_PASSIVE);
|
||||
summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user