diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-03-27 18:14:47 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-27 18:14:47 +0200 |
| commit | b47185cabfbdeeaf492bf2303635db07ce703785 (patch) | |
| tree | a162947c7357e964ef991471fe5a40b44f6bbbcf /src/server/scripts/Outland/TempestKeep | |
| parent | 4eba9786708dd3b22d9053c1a14eac7e6d03242e (diff) | |
Core/Misc: Rename AddXXXFlag updatefield functions to SetXXXFlag
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
5 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 50d1b152a22..bc6cb55ffe0 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -201,7 +201,7 @@ struct boss_alar : public BossAI me->SetHealth(0); me->InterruptNonMeleeSpells(true); me->RemoveAllAuras(); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->AttackStop(); me->SetTarget(ObjectGuid::Empty); me->SetSpeedRate(MOVE_RUN, 5.0f); @@ -411,7 +411,7 @@ struct boss_alar : public BossAI { me->AttackStop(); me->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetBoundingRadius(50); WaitEvent = WE_METEOR; WaitTimer = 0; @@ -428,7 +428,7 @@ struct boss_alar : public BossAI 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_UNINTERACTIBLE); + Summoned->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); Summoned->SetObjectScale(Summoned->GetObjectScale() * 2.5f); Summoned->SetDisplayId(11686); Summoned->SetFaction(me->GetFaction()); @@ -507,7 +507,7 @@ struct npc_ember_of_alar : public ScriptedAI damage = 0; DoCast(me, SPELL_EMBER_BLAST, true); me->SetDisplayId(11686); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(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 47f8ddd7493..31a73111749 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -206,7 +206,7 @@ struct boss_high_astromancer_solarian : public BossAI AppearDelay = false; if (Phase == 2) { - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetVisible(false); } AppearDelay_Timer = 2s; @@ -309,7 +309,7 @@ struct boss_high_astromancer_solarian : public BossAI { 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_UNINTERACTIBLE); + Summoned->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false); } } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 81e2624aad4..3efe09c3af3 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -382,7 +382,7 @@ struct boss_kaelthas : public BossAI { case ACTION_START_ENCOUNTER: Talk(SAY_INTRO); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); _advisorGuid[ADVISOR_THALADRED] = instance->GetGuidData(DATA_THALADRED); _advisorGuid[ADVISOR_SANGUINAR] = instance->GetGuidData(DATA_SANGUINAR); @@ -399,7 +399,7 @@ struct boss_kaelthas : public BossAI if (Creature* creature = ObjectAccessor::GetCreature(*me, _advisorGuid[i])) { creature->Respawn(true); - creature->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); creature->AI()->EnterEvadeMode(); } } @@ -501,7 +501,7 @@ struct boss_kaelthas : public BossAI case POINT_TRANSITION_CENTER_ASCENDING: me->SetFacingTo(float(M_PI)); Talk(SAY_PHASE5_NUTS); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetDisableGravity(true); //me->SetHover(true); -- Set in sniffs, but breaks his visual. events.ScheduleEvent(EVENT_TRANSITION_2, 2s); @@ -574,7 +574,7 @@ struct boss_kaelthas : public BossAI switch (eventId) { case EVENT_START_ENCOUNTER: - me->AddUnitFlag(UNIT_FLAG_PACIFIED); + me->SetUnitFlag(UNIT_FLAG_PACIFIED); DoAction(ACTION_ACTIVE_ADVISOR); break; case EVENT_ACTIVE_ADVISOR: @@ -602,7 +602,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_UNINTERACTIBLE | UNIT_FLAG_PACIFIED)); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED); if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); @@ -778,8 +778,8 @@ struct advisorbase_ai : public ScriptedAI Initialize(); me->SetStandState(UNIT_STAND_STATE_STAND); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED); //reset encounter if (instance->GetBossState(DATA_KAELTHAS) == IN_PROGRESS) @@ -808,7 +808,7 @@ struct advisorbase_ai : public ScriptedAI if (spellInfo->Id == SPELL_RESSURECTION) { _hasRessurrected = true; - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED); me->SetStandState(UNIT_STAND_STATE_STAND); events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2s); } @@ -829,7 +829,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_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED); me->SetTarget(ObjectGuid::Empty); me->SetStandState(UNIT_STAND_STATE_DEAD); me->GetMotionMaster()->Clear(); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 3ba6c1685fc..765d655a6c9 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -289,7 +289,7 @@ struct npc_warden_mellichar : public ScriptedAI { Initialize(); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); DoCast(me, SPELL_TARGET_OMEGA); instance->SetBossState(DATA_HARBINGER_SKYRISS, NOT_STARTED); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 2316974c8b0..df75ec83c98 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -274,7 +274,7 @@ struct boss_harbinger_skyriss_illusion : public ScriptedAI void Reset() override { me->SetImmuneToPC(false); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE)); + me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE); } void JustEngagedWith(Unit* /*who*/) override { } |
