diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2021-09-15 01:04:03 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-15 23:03:26 +0100 |
| commit | c4906ce60be52c9a678287672a6461c3068beea3 (patch) | |
| tree | 6a34ae52e80e49aa3048c6b6684c4ae0fea508b3 /src/server/scripts/Outland/TempestKeep | |
| parent | 6a5f3835f3588a1f1d6fa406f4b384869770b34a (diff) | |
Core/Misc: Rename UNIT_FLAG_NOT_SELECTABLE to UNIT_FLAG_UNINTERACTIBLE (#26913)
(cherry picked from commit c4741a131a0a28b69c228d3637beab7090e5f1e3)
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
3 files changed, 17 insertions, 17 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 9047b6cde0e..24b23eb1b35 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -333,7 +333,7 @@ class boss_alar : public CreatureScript for (uint8 i = 0; i < 2; ++i) DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5s); me->SetBoundingRadius(10); - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetDisplayId(me->GetNativeDisplayId()); DoCast(me, SPELL_REBIRTH_2, true); break; @@ -416,7 +416,7 @@ class boss_alar : public CreatureScript { me->AttackStop(); me->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]); - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetBoundingRadius(50); WaitEvent = WE_METEOR; WaitTimer = 0; @@ -433,7 +433,7 @@ class boss_alar : public CreatureScript Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2min); if (Summoned) { - Summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + Summoned->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); Summoned->SetObjectScale(Summoned->GetObjectScale() * 2.5f); Summoned->SetDisplayId(11686); Summoned->SetFaction(me->GetFaction()); @@ -523,7 +523,7 @@ class npc_ember_of_alar : public CreatureScript damage = 0; DoCast(me, SPELL_EMBER_BLAST, true); me->SetDisplayId(11686); - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); if (instance->GetBossState(DATA_ALAR) == IN_PROGRESS) { if (Unit* Alar = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_ALAR))) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 8ad3633910d..1fa1b8c2b85 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -147,7 +147,7 @@ class boss_high_astromancer_solarian : public CreatureScript Initialize(); _Reset(); me->SetArmor(defaultarmor, 0); - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetVisible(true); me->SetDisplayId(MODEL_HUMAN); @@ -212,7 +212,7 @@ class boss_high_astromancer_solarian : public CreatureScript AppearDelay = false; if (Phase == 2) { - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetVisible(false); } AppearDelay_Timer = 2s; @@ -315,7 +315,7 @@ class boss_high_astromancer_solarian : public CreatureScript { if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer + Phase3_Timer + AppearDelay_Timer + 1700ms)) { - Summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + Summoned->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false); } } @@ -359,7 +359,7 @@ class boss_high_astromancer_solarian : public CreatureScript if (j != i) SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]); - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetVisible(true); Talk(SAY_SUMMON2); @@ -394,7 +394,7 @@ class boss_high_astromancer_solarian : public CreatureScript { Phase = 4; //To make sure she wont be invisible or not selecatble - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetVisible(true); Talk(SAY_VOIDA); Talk(SAY_VOIDB); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index cb6490b171e..76229496473 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -333,7 +333,7 @@ struct boss_kaelthas : public BossAI { Initialize(); DoAction(ACTION_PREPARE_ADVISORS); - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetEmoteState(EMOTE_ONESHOT_NONE); me->SetDisableGravity(false); me->SetTarget(ObjectGuid::Empty); @@ -362,7 +362,7 @@ struct boss_kaelthas : public BossAI { case ACTION_START_ENCOUNTER: Talk(SAY_INTRO); - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); _advisorGuid[ADVISOR_THALADRED] = instance->GetGuidData(DATA_THALADRED); _advisorGuid[ADVISOR_SANGUINAR] = instance->GetGuidData(DATA_SANGUINAR); @@ -481,7 +481,7 @@ struct boss_kaelthas : public BossAI case POINT_TRANSITION_CENTER_ASCENDING: me->SetFacingTo(float(M_PI)); Talk(SAY_PHASE5_NUTS); - me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetDisableGravity(true); //me->SetHover(true); -- Set in sniffs, but breaks his visual. events.ScheduleEvent(EVENT_TRANSITION_2, 2s); @@ -500,7 +500,7 @@ struct boss_kaelthas : public BossAI case POINT_END_TRANSITION: me->SetReactState(REACT_AGGRESSIVE); me->InterruptNonMeleeSpells(false); - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->RemoveAurasDueToSpell(SPELL_FULLPOWER); if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0)) @@ -590,7 +590,7 @@ struct boss_kaelthas : public BossAI // Sometimes people can collect Aggro in Phase 1-3. Reset threat before releasing Kael. ResetThreatList(); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED)); + me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED)); if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); @@ -767,7 +767,7 @@ struct advisorbase_ai : public ScriptedAI me->SetStandState(UNIT_STAND_STATE_STAND); me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED)); + me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); //reset encounter if (instance->GetBossState(DATA_KAELTHAS) == IN_PROGRESS) @@ -796,7 +796,7 @@ struct advisorbase_ai : public ScriptedAI if (spellInfo->Id == SPELL_RESSURECTION) { _hasRessurrected = true; - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED)); + me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); me->SetStandState(UNIT_STAND_STATE_STAND); events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2s); } @@ -817,7 +817,7 @@ struct advisorbase_ai : public ScriptedAI me->ModifyAuraState(AURA_STATE_WOUNDED_25_PERCENT, false); me->ModifyAuraState(AURA_STATE_WOUNDED_35_PERCENT, false); me->ModifyAuraState(AURA_STATE_WOUND_HEALTH_20_80, false); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED)); + me->AddUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); me->SetTarget(ObjectGuid::Empty); me->SetStandState(UNIT_STAND_STATE_DEAD); me->GetMotionMaster()->Clear(); |
