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/Northrend | |
| parent | 4eba9786708dd3b22d9053c1a14eac7e6d03242e (diff) | |
Core/Misc: Rename AddXXXFlag updatefield functions to SetXXXFlag
Diffstat (limited to 'src/server/scripts/Northrend')
74 files changed, 192 insertions, 192 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index fd242394c59..542ccb8d697 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -225,7 +225,7 @@ struct boss_volazj : public BossAI Talk(SAY_INSANITY); DoCastSelf(SPELL_WHISPER_INSANITY, true); // Unattackable - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetControlled(true, UNIT_STATE_STUNNED); } // phase mask diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index f41bab21f14..237c5e9af10 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -328,7 +328,7 @@ struct boss_jedoga_shadowseeker : public BossAI me->SetReactState(REACT_PASSIVE); me->AttackStop(); me->InterruptNonMeleeSpells(true); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->GetMotionMaster()->MovePoint(POINT_PHASE_TWO, JedogaGroundPosition); break; case EVENT_FLY_DELAY: diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index abca1479257..8975ec6c774 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -386,7 +386,7 @@ struct go_prince_taldaram_sphere : public GameObjectAI Creature* princeTaldaram = instance->GetCreature(DATA_PRINCE_TALDARAM); if (princeTaldaram && princeTaldaram->IsAlive()) { - me->AddFlag(GO_FLAG_NOT_SELECTABLE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE); me->SetGoState(GO_STATE_ACTIVE); switch (me->GetEntry()) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 3880fc32de2..3eb08a405e0 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -83,7 +83,7 @@ class instance_ahnkahet : public InstanceMapScript if (SpheresState[0]) { go->SetGoState(GO_STATE_ACTIVE); - go->AddFlag(GO_FLAG_NOT_SELECTABLE); + go->SetFlag(GO_FLAG_NOT_SELECTABLE); } else go->RemoveFlag(GO_FLAG_NOT_SELECTABLE); @@ -92,7 +92,7 @@ class instance_ahnkahet : public InstanceMapScript if (SpheresState[1]) { go->SetGoState(GO_STATE_ACTIVE); - go->AddFlag(GO_FLAG_NOT_SELECTABLE); + go->SetFlag(GO_FLAG_NOT_SELECTABLE); } else go->RemoveFlag(GO_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 1d33a86b27f..ffd3f8b58f5 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -117,7 +117,7 @@ struct boss_anub_arak : public BossAI void Reset() override { BossAI::Reset(); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); instance->DoStopCriteriaTimer(CriteriaStartEvent::SendEvent, ACHIEV_GOTTA_GO_START_EVENT); _nextSubmerge = 75; _petCount = 0; @@ -328,7 +328,7 @@ struct boss_anub_arak : public BossAI { me->RemoveAurasDueToSpell(SPELL_SUBMERGE); me->RemoveAurasDueToSpell(SPELL_IMPALE_AURA); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); DoCastSelf(SPELL_EMERGE); events.SetPhase(PHASE_EMERGE); events.ScheduleEvent(EVENT_POUND, 13s, 18s, 0, PHASE_EMERGE); @@ -358,7 +358,7 @@ struct boss_anub_arak : public BossAI { if (spellInfo->Id == SPELL_SUBMERGE) { - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->RemoveAurasDueToSpell(SPELL_LEECHING_SWARM); DoCastSelf(SPELL_IMPALE_AURA, true); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 740da982559..52b5d3c1746 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -293,7 +293,7 @@ struct boss_sartharion : public BossAI } fetchTene->GetMotionMaster()->MovePoint(POINT_ID_INIT, TenebronPositions[0]); - fetchTene->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + fetchTene->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } } @@ -310,7 +310,7 @@ struct boss_sartharion : public BossAI } fetchShad->GetMotionMaster()->MovePoint(POINT_ID_INIT, ShadronPositions[0]); - fetchShad->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + fetchShad->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } } @@ -327,7 +327,7 @@ struct boss_sartharion : public BossAI } fetchVesp->GetMotionMaster()->MovePoint(POINT_ID_INIT, VesperonPositions[0]); - fetchVesp->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + fetchVesp->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp index 991edd2fafa..7b791385242 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp @@ -794,7 +794,7 @@ struct npc_flame_tsunami : public ScriptedAI me->SetReactState(REACT_PASSIVE); events.ScheduleEvent(EVENT_TSUNAMI_TIMER, 100ms); events.ScheduleEvent(EVENT_TSUNAMI_BUFF, 1s); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); } void UpdateAI(uint32 diff) override @@ -840,7 +840,7 @@ struct npc_twilight_fissure : public ScriptedAI void Reset() override { - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->AddAura(46265, me); // Wrong, can't find proper visual me->AddAura(69422, me); events.ScheduleEvent(EVENT_VOID_BLAST, 5s); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 170eebe9978..347a874d2d4 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -290,7 +290,7 @@ class boss_halion : public CreatureScript Talk(SAY_PHASE_TWO); me->CastStop(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); DoCastSelf(SPELL_TWILIGHT_PHASING); if (Creature* controller = instance->GetCreature(DATA_HALION_CONTROLLER)) @@ -418,7 +418,7 @@ class boss_twilight_halion : public CreatureScript me->SetHealth(halion->GetHealth()); PhasingHandler::AddPhase(me, 174, false); me->SetReactState(REACT_DEFENSIVE); - me->AddUnitFlag(UNIT_FLAG_IN_COMBAT); + me->SetUnitFlag(UNIT_FLAG_IN_COMBAT); events.ScheduleEvent(EVENT_TAIL_LASH, 12s); events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, 15s); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 80b6a1f7931..75761b20a2e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -125,7 +125,7 @@ struct npc_xerestrasza : public ScriptedAI Talk(SAY_XERESTRASZA_EVENT_6); break; case EVENT_XERESTRASZA_EVENT_7: - me->AddNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); + me->SetNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); Talk(SAY_XERESTRASZA_EVENT_7); me->setActive(false); me->SetFarVisible(false); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index fb8b71c8d96..2b5a4b47940 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -163,7 +163,7 @@ public: Initialize(); instance = creature->GetInstanceScript(); creature->SetReactState(REACT_PASSIVE); - creature->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } void Initialize() @@ -274,7 +274,7 @@ public: instance = creature->GetInstanceScript(); creature->SetReactState(REACT_PASSIVE); - creature->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); creature->RestoreFaction(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 73ffae9afbf..1e478a87d9a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -328,7 +328,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); } @@ -466,7 +466,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); } @@ -610,7 +610,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); } @@ -762,7 +762,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); } @@ -923,7 +923,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 6c3aa8bf6e4..a970518ff33 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -171,7 +171,7 @@ public: if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); - pAnnouncer->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + pAnnouncer->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); pAnnouncer->SummonGameObject(instance->IsHeroic() ? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, QuaternionData::fromEulerAnglesZYX(1.42f, 0.0f, 0.0f), 25h); } } @@ -183,7 +183,7 @@ public: if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); - pAnnouncer->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + pAnnouncer->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); pAnnouncer->SummonGameObject(instance->IsHeroic() ? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, QuaternionData(), 25h); } } @@ -194,7 +194,7 @@ public: if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); - pAnnouncer->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + pAnnouncer->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); pAnnouncer->SummonGameObject(instance->IsHeroic() ? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, QuaternionData(), 25h); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index e7e76e911e1..b34e27a9c7d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -92,8 +92,8 @@ public: uiTimer = 0; me->SetReactState(REACT_PASSIVE); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); SetGrandChampionsForEncounter(); SetArgentChampion(); @@ -431,7 +431,7 @@ public: { if (instance->GetBossState(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { - summon->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + summon->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); summon->SetReactState(REACT_PASSIVE); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 80f606a59f4..b460ce13e92 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -188,7 +188,7 @@ struct boss_anubarak_trial : public BossAI events.ScheduleEvent(EVENT_SUMMON_FROST_SPHERE, 20s); Initialize(); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); // clean up spawned Frost Spheres std::list<Creature*> FrostSphereList; me->GetCreatureListWithEntryInGrid(FrostSphereList, NPC_FROST_SPHERE, 150.0f); @@ -268,7 +268,7 @@ struct boss_anubarak_trial : public BossAI { BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); // Despawn Scarab Swarms neutral EntryCheckPredicate pred(NPC_SCARAB); @@ -331,7 +331,7 @@ struct boss_anubarak_trial : public BossAI { DoCast(me, SPELL_SUBMERGE_ANUBARAK); DoCast(me, SPELL_CLEAR_ALL_DEBUFFS); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); Talk(EMOTE_BURROWER); events.SetPhase(PHASE_SUBMERGED); events.ScheduleEvent(EVENT_PURSUING_SPIKE, 2s, 0, PHASE_SUBMERGED); @@ -367,7 +367,7 @@ struct boss_anubarak_trial : public BossAI DoCast(SPELL_SPIKE_TELE); summons.DespawnEntry(NPC_SPIKE); me->RemoveAurasDueToSpell(SPELL_SUBMERGE_ANUBARAK); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); DoCast(me, SPELL_EMERGE_ANUBARAK); Talk(EMOTE_EMERGE); events.SetPhase(PHASE_MELEE); @@ -563,7 +563,7 @@ struct npc_nerubian_burrower : public ScriptedAI if (!me->HasAura(SPELL_PERMAFROST_HELPER)) { DoCast(me, SPELL_SUBMERGE_EFFECT); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); DoCast(me, SPELL_PERSISTENT_DIRT, true); } } @@ -604,7 +604,7 @@ struct npc_frost_sphere : public ScriptedAI { // we are close to the ground me->GetMotionMaster()->MoveIdle(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->RemoveAurasDueToSpell(SPELL_FROST_SPHERE); DoCast(SPELL_PERMAFROST_MODEL); DoCast(SPELL_PERMAFROST); @@ -614,7 +614,7 @@ struct npc_frost_sphere : public ScriptedAI { // we are in air me->GetMotionMaster()->MoveIdle(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); //At hit the ground me->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); me->GetMotionMaster()->MoveFall(POINT_FALL_GROUND); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index f4ec2f3c4db..0cc2f909a6e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -477,7 +477,7 @@ struct boss_toc_champion_controller : public BossAI { summons.Summon(champion); champion->SetReactState(REACT_PASSIVE); - champion->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + champion->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); champion->SetImmuneToPC(false); if (playerTeam == ALLIANCE) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 5b6bc1effac..f0a364b28e4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -380,7 +380,7 @@ struct boss_gormok : public boss_northrend_beastsAI if (Unit* snobold = me->GetVehicleKit()->GetPassenger(i)) { snobold->ExitVehicle(); - snobold->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + snobold->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); snobold->GetAI()->DoAction(ACTION_DISABLE_FIRE_BOMB); snobold->CastSpell(me, SPELL_JUMP_TO_HAND, true); break; @@ -484,7 +484,7 @@ struct npc_snobold_vassal : public ScriptedAI } else { - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); _events.CancelEvent(EVENT_CHECK_MOUNT); _events.CancelEvent(EVENT_FIRE_BOMB); me->AttackStop(); @@ -743,7 +743,7 @@ struct boss_jormungarAI : public boss_northrend_beastsAI DoCastSelf(SPELL_GROUND_VISUAL_0, true); events.SetPhase(PHASE_SUBMERGED); events.ScheduleEvent(EVENT_EMERGE, 5s, 0, PHASE_SUBMERGED); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); } else { @@ -755,7 +755,7 @@ struct boss_jormungarAI : public boss_northrend_beastsAI events.SetPhase(PHASE_SUBMERGED); me->SetControlled(false, UNIT_STATE_ROOT); events.ScheduleEvent(EVENT_EMERGE, 6s, 0, PHASE_SUBMERGED); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); } me->GetMotionMaster()->MovePoint(0, ToCCommonLoc[1].GetPositionX() + frand(-40.0f, 40.0f), ToCCommonLoc[1].GetPositionY() + frand(-40.0f, 40.0f), ToCCommonLoc[1].GetPositionZ() + me->GetCollisionHeight()); } @@ -768,7 +768,7 @@ struct boss_jormungarAI : public boss_northrend_beastsAI me->RemoveAurasDueToSpell(SPELL_GROUND_VISUAL_0); DoCastSelf(SPELL_EMERGE); DoCastAOE(SPELL_HATE_TO_ZERO, true); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetReactState(REACT_AGGRESSIVE); if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index b5aff9d6ed3..16ee193658e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -242,8 +242,8 @@ struct boss_twin_baseAI : public BossAI { if (!pSister->IsAlive()) { - me->AddDynamicFlag(UNIT_DYNFLAG_LOOTABLE); - pSister->AddDynamicFlag(UNIT_DYNFLAG_LOOTABLE); + me->SetDynamicFlag(UNIT_DYNFLAG_LOOTABLE); + pSister->SetDynamicFlag(UNIT_DYNFLAG_LOOTABLE); events.Reset(); summons.DespawnAll(); HandleRemoveAuras(); @@ -556,7 +556,7 @@ struct npc_unleashed_ballAI : public ScriptedAI void Reset() override { - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetReactState(REACT_PASSIVE); me->SetDisableGravity(true); me->SetCanFly(true); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index cbfe6ff65bd..9977d0bd8f1 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -204,7 +204,7 @@ private: } else { - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); DoCast(SPELL_ARCANE_FIELD); } } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index f5262706cb5..486b65cdea6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -81,7 +81,7 @@ struct npc_sylvanas_fos : public ScriptedAI { Initialize(); instance = me->GetInstanceScript(); - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); } void Initialize() @@ -168,7 +168,7 @@ struct npc_jaina_fos: public ScriptedAI { Initialize(); instance = me->GetInstanceScript(); - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); } void Initialize() diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index b2198546d65..922fa9c9384 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -381,12 +381,12 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript case 0: CloseGossipMenuFor(player); _events.ScheduleEvent(EVENT_START_INTRO, 1s); - me->RemoveNpcFlag(NPCFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER)); + me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); break; case 1: CloseGossipMenuFor(player); _events.ScheduleEvent(EVENT_SKIP_INTRO, 1s); - me->RemoveNpcFlag(NPCFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER)); + me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); break; default: break; @@ -401,7 +401,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript _utherGUID.Clear(); _lichkingGUID.Clear(); - me->RemoveNpcFlag(NPCFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER)); + me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); me->SetStandState(UNIT_STAND_STATE_STAND); _events.ScheduleEvent(EVENT_WALK_INTRO1, 3s); } @@ -434,7 +434,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript Talk(SAY_JAINA_INTRO_2); else Talk(SAY_SYLVANAS_INTRO_2); - me->AddNpcFlag(NPCFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER)); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); break; case EVENT_START_INTRO: if (Creature* korelnOrLoralen = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_KORELN_LORALEN))) @@ -965,7 +965,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript me->RemoveAurasDueToSpell(SPELL_JAINA_ICE_BARRIER); else me->RemoveAurasDueToSpell(SPELL_SYLVANAS_CLOAK_OF_DARKNESS); - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); me->SetHealth(JAINA_SYLVANAS_MAX_HEALTH); me->SetFacingTo(SylvanasShadowThroneDoorPosition.GetOrientation()); break; @@ -1012,7 +1012,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript lichking->AI()->AttackStart(me); } me->SetHealth(JAINA_SYLVANAS_MAX_HEALTH); - me->RemoveNpcFlag(NPCFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER)); + me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); break; case EVENT_ESCAPE_1: if (Creature* lichking = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING_ESCAPE))) @@ -1037,7 +1037,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript if (Creature* lichking = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING_ESCAPE))) { lichking->SetReactState(REACT_PASSIVE); - lichking->AddUnitFlag(UNIT_FLAG_PACIFIED); + lichking->SetUnitFlag(UNIT_FLAG_PACIFIED); } _events.ScheduleEvent(EVENT_ESCAPE_3, 1500ms); @@ -1155,7 +1155,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript else Talk(SAY_SYLVANAS_ESCAPE_9); DoCast(me, SPELL_CREDIT_ESCAPING_ARTHAS); - me->AddNpcFlag(NPCFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER)); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); break; default: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 968895b9184..15b13cb6353 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -321,7 +321,7 @@ class instance_halls_of_reflection : public InstanceMapScript bunny->CastSpell(bunny, SPELL_START_HALLS_OF_REFLECTION_QUEST_AE, true); if (Creature* korelnOrLoralen = instance->GetCreature(KorelnOrLoralenGUID)) - korelnOrLoralen->AddNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); + korelnOrLoralen->SetNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); HandleGameObject(EntranceDoorGUID, true); HandleGameObject(ImpenetrableDoorGUID, true); @@ -344,7 +344,7 @@ class instance_halls_of_reflection : public InstanceMapScript break; case DONE: if (GameObject* chest = instance->GetGameObject(CaptainsChestGUID)) - chest->RemoveFlag(GameObjectFlags(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN)); + chest->RemoveFlag(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN); DoUseDoorOrButton(CaveInGUID, 15); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 8b37456df9d..fae90261770 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -318,7 +318,7 @@ struct boss_krick : public ScriptedAI Initialize(); me->SetReactState(REACT_PASSIVE); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } void KilledUnit(Unit* victim) override diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 50e4c64b905..86f56279dff 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -147,7 +147,7 @@ struct boss_tyrannus : public BossAI events.Reset(); events.SetPhase(PHASE_NONE); me->SetReactState(REACT_PASSIVE); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); instance->SetBossState(DATA_TYRANNUS, NOT_STARTED); } @@ -300,7 +300,7 @@ struct boss_rimefang : public ScriptedAI Initialize(); me->SetCanFly(true); me->SetReactState(REACT_PASSIVE); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } void JustReachedHome() override diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 42800babb12..49eb21f8f72 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -357,7 +357,7 @@ struct go_gundrak_altar : public GameObjectAI bool OnGossipHello(Player* /*player*/) override { - me->AddFlag(GO_FLAG_NOT_SELECTABLE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE); me->SetGoState(GO_STATE_ACTIVE); instance->SetData(DATA_STATUE_ACTIVATE, me->GetEntry()); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 507f6a81cc0..afc5777638c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -528,7 +528,7 @@ struct BloodPrincesBossAI : public BossAI _isEmpowered = false; if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_BLOOD_PRINCES_CONTROL))) { - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); controller->AI()->SetData(DATA_PRINCE_EVADE, 1); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index c37d4d5df2a..c6cba70f3ed 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -364,7 +364,7 @@ struct boss_deathbringer_saurfang : public BossAI _dead = true; _JustDied(); _EnterEvadeMode(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(true); me->RemoveAurasOnEvade(); DoCastAOE(SPELL_REMOVE_MARKS_OF_THE_FALLEN_CHAMPION); @@ -729,7 +729,7 @@ struct npc_high_overlord_saurfang_icc : public ScriptedAI if (Creature* deathbringer = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_DEATHBRINGER_SAURFANG))) { deathbringer->CastSpell(me, SPELL_RIDE_VEHICLE, true); // for the packet logs. - deathbringer->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + deathbringer->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); deathbringer->SetEmoteState(EMOTE_STATE_DROWNED); } _events.ScheduleEvent(EVENT_OUTRO_HORDE_5, 1s); // move diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index d8abdc5246f..a8e7cf3cb47 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -644,7 +644,7 @@ struct npc_cult_fanatic : public ScriptedAI DoCastSelf(SPELL_PERMANENT_FEIGN_DEATH); DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS); DoCastSelf(SPELL_FULL_HEAL, true); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); }) .Schedule(Seconds(6), [this](TaskContext /*context*/) { @@ -735,7 +735,7 @@ struct npc_cult_adherent : public ScriptedAI DoCastSelf(SPELL_PERMANENT_FEIGN_DEATH); DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS); DoCastSelf(SPELL_FULL_HEAL, true); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); }) .Schedule(Seconds(6), [this](TaskContext /*context*/) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 9d742bd133c..31e1d23e11f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -325,7 +325,7 @@ struct boss_sindragosa : public BossAI me->SetCanFly(true); me->SetDisableGravity(true); me->SetSpeedRate(MOVE_FLIGHT, 4.0f); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); Milliseconds moveTime = Milliseconds(uint64(me->GetExactDist(&SindragosaFlyPos) / (me->GetSpeed(MOVE_FLIGHT) * 0.001f))); me->m_Events.AddEvent(new FrostwyrmLandEvent(*me, SindragosaLandPos), me->m_Events.CalculateTime(moveTime + 250ms)); me->GetMotionMaster()->MovePoint(POINT_FROSTWYRM_FLY_IN, SindragosaFlyPos); @@ -695,7 +695,7 @@ struct npc_spinestalker : public ScriptedAI me->setActive(true); me->SetFarVisible(true); me->SetSpeedRate(MOVE_FLIGHT, 2.0f); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); Milliseconds moveTime = Milliseconds(uint64(me->GetExactDist(&SpinestalkerFlyPos) / (me->GetSpeed(MOVE_FLIGHT) * 0.001f))); me->m_Events.AddEvent(new FrostwyrmLandEvent(*me, SpinestalkerLandPos), me->m_Events.CalculateTime(moveTime + 250ms)); me->SetDefaultMovementType(IDLE_MOTION_TYPE); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp index 428f8a44a13..1ace5e6e7f3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp @@ -456,7 +456,7 @@ struct boss_sister_svalna : public BossAI CastSpellExtraArgs args; args.AddSpellBP0(1); summon->CastSpell(target, VEHICLE_SPELL_RIDE_HARDCODED, args); - summon->AddUnitFlag2(UNIT_FLAG2_INTERACT_WHILE_HOSTILE); + summon->SetUnitFlag2(UNIT_FLAG2_INTERACT_WHILE_HOSTILE); } break; default: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 489800274d5..4e428ab041c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1714,7 +1714,7 @@ struct npc_terenas_menethil : public ScriptedAI damage = me->GetHealth() - 1; if (!me->HasAura(SPELL_TERENAS_LOSES_INSIDE) && !IsHeroic()) { - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); DoCast(SPELL_TERENAS_LOSES_INSIDE); _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1s); if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) @@ -1775,7 +1775,7 @@ struct npc_terenas_menethil : public ScriptedAI } break; case EVENT_DESTROY_SOUL: - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) warden->CastSpell(nullptr, SPELL_DESTROY_SOUL, TRIGGERED_NONE); DoCast(SPELL_TERENAS_LOSES_INSIDE); @@ -2529,7 +2529,7 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScript summoner->GetAI()->SetData(DATA_VILE, 1); GetCaster()->CastSpell(nullptr, SPELL_SPIRIT_BURST, true); GetCaster()->ToCreature()->DespawnOrUnsummon(3s); - GetCaster()->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + GetCaster()->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index a27d5da42b2..6b08bf1717d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -380,7 +380,7 @@ struct boss_valithria_dreamwalker : public ScriptedAI DoCastSelf(SPELL_REPUTATION_BOSS_KILL, true); // this display id was found in sniff instead of the one on aura me->SetDisplayId(11686); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->DespawnOrUnsummon(4s); if (Creature* trigger = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_TRIGGER))) Unit::Kill(me, trigger); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index d3a57140b30..4da7988aa3a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -754,7 +754,7 @@ struct npc_icc_orb_controller : public ScriptedAI UpdateValidGuids(); ScheduleVisualChannel(true); if (GameObject* orb = me->FindNearestGameObject(GO_EMPOWERING_BLOOD_ORB, 5.0f)) - orb->AddFlag(GO_FLAG_NOT_SELECTABLE); + orb->SetFlag(GO_FLAG_NOT_SELECTABLE); } } @@ -1129,7 +1129,7 @@ struct go_empowering_blood_orb : public GameObjectAI void HandleObjectUse() { - me->AddFlag(GO_FLAG_IN_USE); + me->SetFlag(GO_FLAG_IN_USE); me->SetGoAnimProgress(255); me->SetGoState(GO_STATE_DESTROYED); if (Creature* trigger = ObjectAccessor::GetCreature(*me, _triggerGuid)) @@ -1310,7 +1310,7 @@ class spell_icc_stoneform : public AuraScript if (Creature* target = GetTarget()->ToCreature()) { target->SetReactState(REACT_PASSIVE); - target->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + target->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); target->SetImmuneToPC(true); target->SetEmoteState(EMOTE_STATE_CUSTOM_SPELL_02); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 89aef0c3866..cedebba8633 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -172,7 +172,7 @@ class instance_icecrown_citadel : public InstanceMapScript } else { - go->AddFlag(GO_FLAG_NOT_SELECTABLE); + go->SetFlag(GO_FLAG_NOT_SELECTABLE); go->SetGoState(GO_STATE_READY); } } @@ -647,7 +647,7 @@ class instance_icecrown_citadel : public InstanceMapScript case GO_CACHE_OF_THE_DREAMWALKER_25H: if (Creature* valithria = instance->GetCreature(ValithriaDreamwalkerGUID)) go->SetLootRecipient(valithria->GetLootRecipient(), valithria->GetLootRecipientGroup()); - go->RemoveFlag(GameObjectFlags(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN)); + go->RemoveFlag(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN); break; case GO_ARTHAS_PLATFORM: ArthasPlatformGUID = go->GetGUID(); @@ -887,7 +887,7 @@ class instance_icecrown_citadel : public InstanceMapScript SetTeleporterState(teleporter, true); if (GameObject* loot = instance->GetGameObject(GunshipArmoryGUID)) - loot->RemoveFlag(GameObjectFlags(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN)); + loot->RemoveFlag(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN); } else if (state == FAIL) Events.ScheduleEvent(EVENT_RESPAWN_GUNSHIP, 30s); @@ -901,7 +901,7 @@ class instance_icecrown_citadel : public InstanceMapScript { if (Creature* deathbringer = instance->GetCreature(DeathbringerSaurfangGUID)) loot->SetLootRecipient(deathbringer->GetLootRecipient(), deathbringer->GetLootRecipientGroup()); - loot->RemoveFlag(GameObjectFlags(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN)); + loot->RemoveFlag(GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN); } if (GameObject* teleporter = instance->GetGameObject(TeleporterUpperSpireGUID)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 15ccb12e2e9..6dbc99e7d01 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -223,7 +223,7 @@ struct boss_kelthuzad : public BossAI return; _Reset(); me->SetReactState(REACT_PASSIVE); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(true); _skeletonCount = 0; _bansheeCount = 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 709aabbaca4..5f05694c84b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -233,7 +233,7 @@ struct boss_noth : public BossAI case EVENT_BALCONY: events.SetPhase(PHASE_BALCONY); me->SetReactState(REACT_PASSIVE); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->AttackStop(); me->StopMoving(); me->RemoveAllAuras(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 05e4f7cff0d..aa5bb49af45 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -141,7 +141,7 @@ struct boss_sapphiron : public BossAI if (!instance->GetData(DATA_HAD_SAPPHIRON_BIRTH)) { me->SetVisible(false); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetReactState(REACT_PASSIVE); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 0f36f21fdfd..71aef922a5f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -316,7 +316,7 @@ public: me->DespawnOrUnsummon(0s, 30s); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED); me->SetImmuneToPC(true); me->setActive(false); me->SetFarVisible(false); @@ -575,7 +575,7 @@ public: if (Creature* thaddius = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THADDIUS))) thaddius->AI()->DoAction(ACTION_STALAGG_DIED); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->RemoveAllAuras(); me->SetReactState(REACT_PASSIVE); me->AttackStop(); @@ -814,7 +814,7 @@ public: if (Creature* thaddius = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THADDIUS))) thaddius->AI()->DoAction(ACTION_FEUGEN_DIED); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->RemoveAllAuras(); me->SetReactState(REACT_PASSIVE); me->AttackStop(); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 08396457484..8d1478e32e2 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -680,7 +680,7 @@ struct boss_malygos : public BossAI if (!_firstCyclicMovementStarted) { _firstCyclicMovementStarted = true; - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); if (Creature* alexstraszaBunny = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ALEXSTRASZA_BUNNY_GUID))) me->SetFacingToObject(alexstraszaBunny); events.ScheduleEvent(EVENT_SUMMON_ARCANE_BOMB, 1s, 0, PHASE_TWO); @@ -1159,7 +1159,7 @@ struct npc_melee_hover_disk : public VehicleAI if (vehicleTemp->GetPassenger(0) && vehicleTemp->GetPassenger(0)->GetTypeId() == TYPEID_PLAYER) { vehicleTemp->RemoveAllPassengers(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); } } @@ -1897,7 +1897,7 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScript Creature* caster = GetCaster()->ToCreature(); if (InstanceScript* instance = caster->GetInstanceScript()) if (GameObject* platform = caster->GetMap()->GetGameObject(instance->GetGuidData(DATA_PLATFORM))) - platform->AddFlag(GO_FLAG_DESTROYED); + platform->SetFlag(GO_FLAG_DESTROYED); } void HandleScript(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 79d7d5a4dc1..ff852e4474f 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -167,7 +167,7 @@ public: alexstraszaBunny->CastSpell(alexstraszaBunny, SPELL_IRIS_OPENED); if (GameObject* iris = instance->GetGameObject(irisGUID)) - iris->AddFlag(GO_FLAG_IN_USE); + iris->SetFlag(GO_FLAG_IN_USE); if (Creature* malygos = instance->GetCreature(malygosGUID)) malygos->AI()->DoAction(0); // ACTION_LAND_ENCOUNTER_START diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 3b3a121e1ed..b0075cbef0c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -219,7 +219,7 @@ struct containment_sphere : public GameObjectAI if (keristrasza && keristrasza->IsAlive()) { // maybe these are hacks :( - me->AddFlag(GO_FLAG_NOT_SELECTABLE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE); me->SetGoState(GO_STATE_ACTIVE); ENSURE_AI(boss_keristrasza, keristrasza->AI())->CheckContainmentSpheres(true); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 43d7094dec1..5afea688814 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -274,7 +274,7 @@ struct boss_magus_telestra : public ScriptedAI me->CastStop(); me->RemoveAllAuras(); me->SetVisible(false); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); uiFireMagusGUID = SplitPersonality(NPC_FIRE_MAGUS); uiFrostMagusGUID = SplitPersonality(NPC_FROST_MAGUS); uiArcaneMagusGUID = SplitPersonality(NPC_ARCANE_MAGUS); @@ -291,7 +291,7 @@ struct boss_magus_telestra : public ScriptedAI me->CastStop(); me->RemoveAllAuras(); me->SetVisible(false); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); uiFireMagusGUID = SplitPersonality(NPC_FIRE_MAGUS); uiFrostMagusGUID = SplitPersonality(NPC_FROST_MAGUS); uiArcaneMagusGUID = SplitPersonality(NPC_ARCANE_MAGUS); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 2f713ef7ebf..5d3bd684604 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -90,7 +90,7 @@ class instance_oculus : public InstanceMapScript BelgaristraszGUID = creature->GetGUID(); if (GetBossState(DATA_DRAKOS) == DONE) { - creature->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + creature->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); creature->Relocate(BelgaristraszMove); } break; @@ -98,7 +98,7 @@ class instance_oculus : public InstanceMapScript EternosGUID = creature->GetGUID(); if (GetBossState(DATA_DRAKOS) == DONE) { - creature->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + creature->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); creature->Relocate(EternosMove); } break; @@ -106,7 +106,7 @@ class instance_oculus : public InstanceMapScript VerdisaGUID = creature->GetGUID(); if (GetBossState(DATA_DRAKOS) == DONE) { - creature->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + creature->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); creature->Relocate(VerdisaMove); } break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 81fccf23eac..44d18148dbb 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -194,7 +194,7 @@ struct npc_verdisa_beglaristrasz_eternos : public ScriptedAI Talk(SAY_BELGARISTRASZ); // The gossip flag should activate when Drakos die and not from DB - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 792647e43c7..db70544bcd0 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -107,7 +107,7 @@ struct boss_ionar : public ScriptedAI Initialize(); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetControlled(false, UNIT_STATE_ROOT); if (!me->IsVisible()) @@ -147,7 +147,7 @@ struct boss_ionar : public ScriptedAI me->AttackStop(); me->SetVisible(false); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetControlled(true, UNIT_STATE_ROOT); me->GetMotionMaster()->Clear(); @@ -231,7 +231,7 @@ struct boss_ionar : public ScriptedAI else if (lSparkList.empty()) { me->SetVisible(true); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetControlled(false, UNIT_STATE_ROOT); DoCast(me, SPELL_SPARK_DESPAWN, false); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index a4c856c58bd..80f35573d52 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -234,7 +234,7 @@ struct npc_tribuna_controller : public ScriptedAI if (Creature* summon = me->SummonCreature(NPC_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1s)) { summon->SetDisplayId(11686); - summon->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + summon->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); summon->CastSpell(target, SPELL_DARK_MATTER, true); } } @@ -250,7 +250,7 @@ struct npc_tribuna_controller : public ScriptedAI if (Creature* summon = me->SummonCreature(NPC_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1s)) { summon->SetDisplayId(11686); - summon->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + summon->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); summon->CastSpell(target, SPELL_SEARING_GAZE, true); } } @@ -650,7 +650,7 @@ struct npc_brann_hos : public EscortAI Player* player = GetPlayerForEscort(); if (player) player->GroupEventHappens(QUEST_HALLS_OF_STONE, me); - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); JumpToNextStep(180000); break; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index e082a44103b..ec5e8e161d7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -311,7 +311,7 @@ struct boss_algalon_the_observer : public BossAI { case ACTION_START_INTRO: { - me->AddUnitFlag2(UNIT_FLAG2_DONT_FADE_IN); + me->SetUnitFlag2(UNIT_FLAG2_DONT_FADE_IN); me->SetDisableGravity(true); DoCastSelf(SPELL_ARRIVAL, true); DoCastSelf(SPELL_RIDE_THE_LIGHTNING, true); @@ -341,7 +341,7 @@ struct boss_algalon_the_observer : public BossAI events.ScheduleEvent(EVENT_DESPAWN_ALGALON_2, 17s); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_3, 26s); me->DespawnOrUnsummon(34s); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToNPC(true); break; case ACTION_INIT_ALGALON: @@ -361,7 +361,7 @@ struct boss_algalon_the_observer : public BossAI void JustEngagedWith(Unit* who) override { Milliseconds introDelay = 0ms; - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToNPC(true); events.Reset(); events.SetPhase(PHASE_ROLE_PLAY); @@ -485,7 +485,7 @@ struct boss_algalon_the_observer : public BossAI events.SetPhase(PHASE_ROLE_PLAY); me->SetReactState(REACT_PASSIVE); me->AttackStop(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); DoCastSelf(SPELL_SELF_STUN); events.Reset(); summons.DespawnAll(); @@ -637,7 +637,7 @@ struct boss_algalon_the_observer : public BossAI me->RemoveAllAuras(); ResetThreatList(); me->SetFaction(FACTION_FRIENDLY); - me->AddUnitFlag(UNIT_FLAG_RENAME); + me->SetUnitFlag(UNIT_FLAG_RENAME); events.ScheduleEvent(EVENT_OUTRO_2, 2s); break; case EVENT_OUTRO_2: @@ -996,7 +996,7 @@ struct go_celestial_planetarium_access : public GameObjectAI return false; // Start Algalon event - me->AddFlag(GO_FLAG_IN_USE); + me->SetFlag(GO_FLAG_IN_USE); _events.ScheduleEvent(EVENT_DESPAWN_CONSOLE, 5s); if (Creature* brann = me->SummonCreature(NPC_BRANN_BRONZBEARD_ALG, BrannIntroSpawnPos)) brann->AI()->DoAction(ACTION_START_INTRO); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 83689f4ffa6..70f54d742c1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -449,7 +449,7 @@ struct npc_feral_defender : public ScriptedAI { me->SetReactState(REACT_PASSIVE); me->AttackStop(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->RemoveAurasDueToSpell(SPELL_RANDOM_AGRO_PERIODIC); DoCastSelf(SPELL_PERMANENT_FEIGN_DEATH, true); DoCastSelf(SPELL_FERAL_ESSENCE_APPLICATION_REMOVAL, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 82ea3018c92..0699f4de443 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -250,7 +250,7 @@ class boss_flame_leviathan : public CreatureScript DoCast(SPELL_INVIS_AND_STEALTH_DETECT); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED); me->SetReactState(REACT_PASSIVE); } @@ -570,7 +570,7 @@ class boss_flame_leviathan : public CreatureScript if (id != ACTION_MOVE_TO_CENTER_POSITION) return; me->SetReactState(REACT_AGGRESSIVE); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED); } private: @@ -643,11 +643,11 @@ class boss_flame_leviathan_seat : public CreatureScript if (Unit* devicePassenger = me->GetVehicleKit()->GetPassenger(SEAT_DEVICE)) if (Creature* device = devicePassenger->ToCreature()) { - device->AddNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); + device->SetNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); device->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); } - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); } else if (seatId == SEAT_TURRET) { @@ -656,7 +656,7 @@ class boss_flame_leviathan_seat : public CreatureScript if (Unit* device = ASSERT_NOTNULL(me->GetVehicleKit())->GetPassenger(SEAT_DEVICE)) { - device->AddNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); + device->SetNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); device->ReplaceAllUnitFlags(UnitFlags(0)); // unselectable } } @@ -773,7 +773,7 @@ class boss_flame_leviathan_overload_device : public CreatureScript if (me->GetVehicle()) { me->RemoveNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); if (Unit* player = me->GetVehicle()->GetPassenger(SEAT_PLAYER)) { @@ -969,7 +969,7 @@ class npc_thorims_hammer : public CreatureScript { npc_thorims_hammerAI(Creature* creature) : ScriptedAI(creature) { - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->CastSpell(me, AURA_DUMMY_BLUE, true); } @@ -1008,7 +1008,7 @@ public: npc_mimirons_infernoAI(Creature* creature) : EscortAI(creature) { Initialize(); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->CastSpell(me, AURA_DUMMY_YELLOW, true); me->SetReactState(REACT_PASSIVE); } @@ -1065,7 +1065,7 @@ class npc_hodirs_fury : public CreatureScript { npc_hodirs_furyAI(Creature* creature) : ScriptedAI(creature) { - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->CastSpell(me, AURA_DUMMY_GREEN, true); } @@ -1676,7 +1676,7 @@ class spell_systems_shutdown : public SpellScriptLoader //! This could probably in the SPELL_EFFECT_SEND_EVENT handler too: owner->AddUnitState(UNIT_STATE_STUNNED | UNIT_STATE_ROOT); - owner->AddUnitFlag(UNIT_FLAG_STUNNED); + owner->SetUnitFlag(UNIT_FLAG_STUNNED); owner->RemoveAurasDueToSpell(SPELL_GATHERING_SPEED); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index ca89a6fc8bd..7fa9f4d495e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -1364,7 +1364,7 @@ class npc_healthy_spore : public CreatureScript npc_healthy_sporeAI(Creature* creature) : ScriptedAI(creature) { SetCombatMovement(false); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE)); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); me->SetReactState(REACT_PASSIVE); DoCast(me, SPELL_HEALTHY_SPORE_VISUAL); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 2752c45e52d..cd9c171a4de 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -424,7 +424,7 @@ class npc_saronite_vapors : public CreatureScript if (damage >= me->GetHealth()) { damage = 0; - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetControlled(true, UNIT_STATE_ROOT); me->SetStandState(UNIT_STAND_STATE_DEAD); me->SetHealth(me->GetMaxHealth()); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 786fca32389..77c1d767971 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -190,7 +190,7 @@ class npc_flash_freeze : public CreatureScript Initialize(); instance = me->GetInstanceScript(); me->SetDisplayFromModel(1); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED)); + me->SetUnitFlag(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); me->SetControlled(true, UNIT_STATE_ROOT); } @@ -270,7 +270,7 @@ class npc_ice_block : public CreatureScript { instance = me->GetInstanceScript(); me->SetDisplayFromModel(1); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED)); + me->SetUnitFlag(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); me->SetControlled(true, UNIT_STATE_ROOT); } @@ -285,7 +285,7 @@ class npc_ice_block : public CreatureScript return; targetGUID = summoner->GetGUID(); - summoner->AddUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED)); + summoner->SetUnitFlag(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); summoner->SetControlled(true, UNIT_STATE_ROOT); me->SetInCombatWith(summoner); AddThreat(summoner, 250.0f); @@ -302,7 +302,7 @@ class npc_ice_block : public CreatureScript { if (Creature* helper = ObjectAccessor::GetCreature(*me, targetGUID)) { - helper->RemoveUnitFlag(UnitFlags(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED)); + helper->RemoveUnitFlag(UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); helper->SetControlled(false, UNIT_STATE_ROOT); if (Creature* hodir = instance->GetCreature(DATA_HODIR)) @@ -406,7 +406,7 @@ class boss_hodir : public CreatureScript me->RemoveAllAttackers(); me->AttackStop(); me->SetReactState(REACT_PASSIVE); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetControlled(true, UNIT_STATE_ROOT); me->InterruptNonMeleeSpells(true); me->StopMoving(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index ab0120c0421..2a5e48e15cf 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -182,7 +182,7 @@ class boss_ignis : public CreatureScript { summon->SetFaction(FACTION_MONSTER_2); summon->SetReactState(REACT_AGGRESSIVE); - summon->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED | UNIT_FLAG_STUNNED)); + summon->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED | UNIT_FLAG_STUNNED); summon->SetImmuneToPC(false); summon->SetControlled(false, UNIT_STATE_ROOT); } @@ -384,7 +384,7 @@ class npc_scorch_ground : public CreatureScript npc_scorch_groundAI(Creature* creature) : ScriptedAI(creature) { Initialize(); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED)); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED); me->SetControlled(true, UNIT_STATE_ROOT); creature->SetDisplayId(16925); //model 2 in db cannot overwrite wdb fields } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 67583f80c6f..5d39db1e50c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -148,7 +148,7 @@ class boss_kologarn : public CreatureScript Talk(SAY_DEATH); DoCast(SPELL_KOLOGARN_PACIFY); me->GetMotionMaster()->MoveTargetedHome(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetCorpseDelay(604800); // Prevent corpse from despawning. _JustDied(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index d7c7aff10da..9f3c029aedf 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -428,12 +428,12 @@ class boss_mimiron : public CreatureScript return; BossAI::JustEngagedWith(who); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveAurasDueToSpell(SPELL_WELD); DoCast(me->GetVehicleBase(), SPELL_SEAT_6); if (GameObject* button = instance->GetGameObject(DATA_MIMIRON_BUTTON)) - button->AddFlag(GO_FLAG_NOT_SELECTABLE); + button->SetFlag(GO_FLAG_NOT_SELECTABLE); if (_fireFighter) events.ScheduleEvent(EVENT_SUMMON_FLAMES, 3s); @@ -515,7 +515,7 @@ class boss_mimiron : public CreatureScript { DoCast(mkii, SPELL_SEAT_7); mkii->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM); - mkii->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + mkii->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); } events.ScheduleEvent(EVENT_INTRO_3, 2s); break; @@ -661,7 +661,7 @@ class boss_mimiron : public CreatureScript break; case EVENT_OUTTRO_3: DoCast(me, SPELL_TELEPORT_VISUAL); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->DespawnOrUnsummon(1s); // sniffs say 6 sec after, but it doesnt matter. break; default: @@ -703,7 +703,7 @@ class boss_leviathan_mk_ii : public CreatureScript if (damage >= me->GetHealth()) { damage = me->GetHealth() - 1; // Let creature fall to 1 hp, but do not let it die or damage itself with SetHealth(). - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); DoCast(me, SPELL_VEHICLE_DAMAGED, true); me->AttackStop(); me->SetReactState(REACT_PASSIVE); @@ -754,7 +754,7 @@ class boss_leviathan_mk_ii : public CreatureScript break; case DO_ASSEMBLED_COMBAT: me->SetStandState(UNIT_STAND_STATE_STAND); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetReactState(REACT_AGGRESSIVE); events.SetPhase(PHASE_VOL7RON); @@ -803,7 +803,7 @@ class boss_leviathan_mk_ii : public CreatureScript switch (point) { case WP_MKII_P1_IDLE: - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); DoCast(me, SPELL_HALF_HEAL); if (Creature* mimiron = instance->GetCreature(DATA_MIMIRON)) @@ -830,7 +830,7 @@ class boss_leviathan_mk_ii : public CreatureScript void Reset() override { _Reset(); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetReactState(REACT_PASSIVE); _fireFighter = false; _setupMine = true; @@ -942,7 +942,7 @@ class boss_vx_001 : public CreatureScript me->SetEmoteState(EMOTE_STATE_SPECIAL_UNARMED); // This is a hack to force the yet to be unfolded visual state. me->SetReactState(REACT_PASSIVE); _fireFighter = false; - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } void DamageTaken(Unit* who, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override @@ -957,7 +957,7 @@ class boss_vx_001 : public CreatureScript if (events.IsInPhase(PHASE_VX_001)) { me->CastStop(); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); // | UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); // | UNIT_FLAG_UNINTERACTIBLE); DoCast(me, SPELL_HALF_HEAL); // has no effect, wat DoCast(me, SPELL_TORSO_DISABLED); if (Creature* mimiron = instance->GetCreature(DATA_MIMIRON)) @@ -966,7 +966,7 @@ class boss_vx_001 : public CreatureScript else if (events.IsInPhase(PHASE_VOL7RON)) { me->SetStandState(UNIT_STAND_STATE_DEAD); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); Unit* ref = who ? who : me; if (IsEncounterFinished(ref)) @@ -990,7 +990,7 @@ class boss_vx_001 : public CreatureScript events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_VX, 6s); [[fallthrough]]; case DO_START_VX001: - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(false); me->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM); me->SetEmoteState(EMOTE_ONESHOT_NONE); // Remove emotestate. @@ -1004,7 +1004,7 @@ class boss_vx_001 : public CreatureScript break; case DO_ASSEMBLED_COMBAT: me->SetStandState(UNIT_STAND_STATE_STAND); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); events.SetPhase(PHASE_VOL7RON); events.ScheduleEvent(EVENT_ROCKET_STRIKE, 20s); @@ -1173,7 +1173,7 @@ class boss_aerial_command_unit : public CreatureScript case DO_START_AERIAL: me->SetDisableGravity(false); me->SetHover(true); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(false); me->SetReactState(REACT_AGGRESSIVE); @@ -1193,7 +1193,7 @@ class boss_aerial_command_unit : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); break; case DO_ASSEMBLED_COMBAT: - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetReactState(REACT_AGGRESSIVE); me->SetStandState(UNIT_STAND_STATE_STAND); events.SetPhase(PHASE_VOL7RON); @@ -1227,7 +1227,7 @@ class boss_aerial_command_unit : public CreatureScript if (type == POINT_MOTION_TYPE && point == WP_AERIAL_P4_POS) { me->SetFacingTo(VehicleRelocation[WP_AERIAL_P4_POS].GetOrientation()); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS); if (Creature* mimiron = instance->GetCreature(DATA_MIMIRON)) @@ -1694,7 +1694,7 @@ class go_mimiron_hardmode_button : public GameObjectScript computer->AI()->DoAction(DO_ACTIVATE_COMPUTER); me->SetGoState(GO_STATE_ACTIVE); - me->AddFlag(GO_FLAG_NOT_SELECTABLE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE); return true; } }; @@ -1727,7 +1727,7 @@ class spell_mimiron_bomb_bot : public SpellScriptLoader { if (Creature* target = GetHitCreature()) { - target->AddUnitFlag(UnitFlags(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED)); + target->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED); target->DespawnOrUnsummon(1s); } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 65693c7a4cf..e9772a31be5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -1513,7 +1513,7 @@ public: bool OnGossipHello(Player* /*player*/) override { - me->AddFlag(GO_FLAG_NOT_SELECTABLE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE); if (Creature* controller = me->FindNearestCreature(NPC_RAZORSCALE_CONTROLLER, 5.0f)) { // Prevent 2 players clicking at "same time" @@ -1553,7 +1553,7 @@ public: void Reset() override { - me->AddFlag(GO_FLAG_NOT_SELECTABLE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE); _scheduler.Schedule(Seconds(1), [this](TaskContext /*context*/) { me->UseDoorOrButton(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 59980325c56..2225ccf68c4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -485,7 +485,7 @@ class boss_thorim : public CreatureScript me->SummonCreature(s.entry, s.pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3s); if (GameObject* lever = instance->GetGameObject(DATA_THORIM_LEVER)) - lever->AddFlag(GO_FLAG_NOT_SELECTABLE); + lever->SetFlag(GO_FLAG_NOT_SELECTABLE); // Remove trigger auras if (Creature* pillar = ObjectAccessor::GetCreature(*me, _activePillarGUID)) @@ -557,7 +557,7 @@ class boss_thorim : public CreatureScript me->RemoveAllAttackers(); me->AttackStop(); me->SetFaction(FACTION_FRIENDLY); - me->AddUnitFlag(UNIT_FLAG_RENAME); + me->SetUnitFlag(UNIT_FLAG_RENAME); if (Creature* controller = instance->GetCreature(DATA_THORIM_CONTROLLER)) controller->RemoveAllAuras(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index c52bc7c6f8f..94e3493c504 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -347,7 +347,7 @@ struct boss_xt002 : public BossAI break; case EVENT_SUBMERGE: DoCastSelf(SPELL_SUBMERGE); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); Talk(EMOTE_HEART_OPENED); if (Creature* heart = instance->GetCreature(DATA_XT002_HEART)) heart->AI()->DoAction(ACTION_START_PHASE_HEART); @@ -411,12 +411,12 @@ struct npc_xt002_heart : public NullCreatureAI DoCast(xt002, SPELL_RIDE_VEHICLE_EXPOSED, true); DoCastSelf(SPELL_HEART_OVERLOAD); me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); - me->AddUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT); + me->SetUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT); } else if (action == ACTION_DISPOSE_HEART) { DoCast(xt002, SPELL_HEART_RIDE_VEHICLE, true); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->RemoveUnitFlag(UNIT_FLAG_PREVENT_EMOTES_FROM_CHAT_TEXT); } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index de682157d74..849f6ce7533 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1074,7 +1074,7 @@ class boss_brain_of_yogg_saron : public CreatureScript DoCastAOE(SPELL_SHATTERED_ILLUSION_REMOVE, true); DoCast(me, SPELL_MATCH_HEALTH_2, true); // it doesn't seem to hit Yogg-Saron here DoCast(me, SPELL_BRAIN_HURT_VISUAL, true); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(true); if (Creature* voice = _instance->GetCreature(DATA_VOICE_OF_YOGG_SARON)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 88cbf008fe8..74e3098192c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -516,7 +516,7 @@ class instance_ulduar : public InstanceMapScript case GO_CELESTIAL_PLANETARIUM_ACCESS_10: case GO_CELESTIAL_PLANETARIUM_ACCESS_25: if (_algalonSummoned) - gameObject->AddFlag(GO_FLAG_IN_USE); + gameObject->SetFlag(GO_FLAG_IN_USE); break; case GO_DOODAD_UL_SIGILDOOR_01: case GO_DOODAD_UL_SIGILDOOR_02: @@ -1036,7 +1036,7 @@ class instance_ulduar : public InstanceMapScript if (Vehicle* vehicle = vehicleCreature->GetVehicleKit()) { vehicle->RemoveAllPassengers(); - vehicleCreature->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + vehicleCreature->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); vehicleCreature->DespawnOrUnsummon(5min); } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index c5bea5c569f..1314a0c5e05 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -107,7 +107,7 @@ struct boss_ingvar_the_plunderer : public BossAI { if (me->GetEntry() != NPC_INGVAR) me->UpdateEntry(NPC_INGVAR); - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(false); _Reset(); @@ -124,7 +124,7 @@ struct boss_ingvar_the_plunderer : public BossAI me->StopMoving(); DoCast(me, SPELL_INGVAR_FEIGN_DEATH, true); - me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(true, true); Talk(SAY_DEATH); @@ -222,7 +222,7 @@ struct boss_ingvar_the_plunderer : public BossAI events.ScheduleEvent(EVENT_SMASH, 12s, 16s, 0, PHASE_HUMAN); break; case EVENT_JUST_TRANSFORMED: - me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); me->SetImmuneToPC(false); ScheduleSecondPhase(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 4d419a6d617..4794101ae14 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -243,7 +243,7 @@ struct npc_vrykul_skeleton : public ScriptedAI if (!me->HasUnitFlag(UNIT_FLAG_UNINTERACTIBLE)) { // from sniffs - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->SetStandState(UNIT_STAND_STATE_DEAD); events.Reset(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 68815a63b75..995b690d721 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -512,7 +512,7 @@ struct go_palehoof_sphere : public GameObjectAI { if (palehoof->IsAlive() && instance->GetBossState(DATA_GORTOK_PALEHOOF) != DONE) { - me->AddFlag(GO_FLAG_NOT_SELECTABLE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE); me->SetGoState(GO_STATE_ACTIVE); palehoof->AI()->DoAction(ACTION_START_ENCOUNTER); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 6fb669d149e..84a20182e5b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -226,7 +226,7 @@ struct boss_skadi : public BossAI { case ACTION_START_ENCOUNTER: instance->SetBossState(DATA_SKADI_THE_RUTHLESS, IN_PROGRESS); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); me->setActive(true); SpawnFirstWave(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 7ccf2abe096..b8d9fce5e4b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -158,7 +158,7 @@ struct boss_svala : public BossAI else { events.SetPhase(IDLE); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } me->SetDisableGravity(false); @@ -189,14 +189,14 @@ struct boss_svala : public BossAI if (events.IsInPhase(IDLE) && me->IsValidAttackTarget(who) && me->IsWithinDistInMap(who, 40)) { events.SetPhase(INTRO); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); if (GameObject* mirror = instance->GetGameObject(DATA_UTGARDE_MIRROR)) mirror->SetGoState(GO_STATE_READY); if (Creature* arthas = me->SummonCreature(NPC_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) { - arthas->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + arthas->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); _arthasGUID = arthas->GetGUID(); } events.ScheduleEvent(EVENT_INTRO_SVALA_TALK_0, 1s, 0, INTRO); @@ -290,7 +290,7 @@ struct boss_svala : public BossAI } me->RemoveAllAuras(); me->UpdateEntry(NPC_SVALA_SORROWGRAVE); - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); events.ScheduleEvent(EVENT_INTRO_SVALA_TALK_1, 2s, 0, INTRO); break; case EVENT_INTRO_SVALA_TALK_1: diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index c2304c9ab50..6e076395241 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -169,7 +169,7 @@ struct boss_ymiron : public BossAI { DoCast(ancestor, SPELL_CHANNEL_YMIRON_TO_SPIRIT); ancestor->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); - ancestor->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE)); + ancestor->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_UNINTERACTIBLE); ancestor->SetDisableGravity(true); ActiveAncestorGUID = ancestor->GetGUID(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 3fed30c572b..7b6cc204e86 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -78,7 +78,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript if (go->GetEntry() == GO_GORTOK_PALEHOOF_SPHERE) if (GetBossState(DATA_GORTOK_PALEHOOF) == DONE) - go->AddFlag(GO_FLAG_NOT_SELECTABLE); + go->SetFlag(GO_FLAG_NOT_SELECTABLE); } void SetGuidData(uint32 type, ObjectGuid data) override diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 28cd185b940..546c43245b9 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -291,8 +291,8 @@ class spell_ichoron_drained : public AuraScript void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - GetTarget()->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); - GetTarget()->AddUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); + GetTarget()->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + GetTarget()->SetUnitFlag2(UNIT_FLAG2_FEIGN_DEATH); } void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 00b320ea571..8f1416766e9 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -434,7 +434,7 @@ class instance_violet_hold : public InstanceMapScript for (uint8 i = 0; i < ActivationCrystalCount; ++i) if (GameObject* crystal = instance->GetGameObject(ActivationCrystalGUIDs[i])) - crystal->AddFlag(GO_FLAG_NOT_SELECTABLE); + crystal->SetFlag(GO_FLAG_NOT_SELECTABLE); } else if (data == DONE) { @@ -448,7 +448,7 @@ class instance_violet_hold : public InstanceMapScript for (uint8 i = 0; i < ActivationCrystalCount; ++i) if (GameObject* crystal = instance->GetGameObject(ActivationCrystalGUIDs[i])) - crystal->AddFlag(GO_FLAG_NOT_SELECTABLE); + crystal->SetFlag(GO_FLAG_NOT_SELECTABLE); if (Creature* sinclari = GetCreature(DATA_SINCLARI)) sinclari->AI()->DoAction(ACTION_SINCLARI_OUTRO); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index f74a455e74c..134da0dd127 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -369,7 +369,7 @@ struct npc_sinclari_vh : public ScriptedAI if (Creature* summon = me->SummonCreature(NPC_TELEPORTATION_PORTAL_INTRO, PortalIntroPositions[i], TEMPSUMMON_MANUAL_DESPAWN)) summon->AI()->SetData(DATA_PORTAL_LOCATION, i); - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); std::list<Creature*> guardList; me->GetCreatureListWithEntryInGrid(guardList, NPC_VIOLET_HOLD_GUARD, 100.0f); @@ -502,7 +502,7 @@ struct npc_sinclari_vh : public ScriptedAI if (GameObject* mainDoor = _instance->GetGameObject(DATA_MAIN_DOOR)) { mainDoor->SetGoState(GO_STATE_READY); - mainDoor->AddFlag(GO_FLAG_LOCKED); + mainDoor->SetFlag(GO_FLAG_LOCKED); } task.Repeat(Seconds(5)); break; @@ -512,7 +512,7 @@ struct npc_sinclari_vh : public ScriptedAI break; case 9: // We should teleport inside if event is in progress with GOSSIP_MENU_SEND_ME_IN - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); break; default: break; @@ -529,7 +529,7 @@ struct npc_sinclari_vh : public ScriptedAI task.Schedule(Seconds(10), [this](TaskContext /*task*/) { - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); }); }); } diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 9a69cb7ce23..ec736e4a9b4 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -447,7 +447,7 @@ public: if (Creature* arthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2min)) { arthasGUID = arthas->GetGUID(); - arthas->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + arthas->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); arthas->SetReactState(REACT_PASSIVE); arthas->SetWalk(true); arthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); @@ -504,7 +504,7 @@ public: { talbot->UpdateEntry(NPC_PRINCE_VALANAR); talbot->SetFaction(FACTION_MONSTER); - talbot->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + talbot->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); talbot->SetReactState(REACT_PASSIVE); } phaseTimer = 5000; @@ -544,7 +544,7 @@ public: leryssaGUID = leryssa->GetGUID(); leryssa->SetWalk(false); leryssa->SetReactState(REACT_PASSIVE); - leryssa->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + leryssa->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); leryssa->GetMotionMaster()->MovePoint(0, 3741.969971f, 3571.439941f, 477.441010f); } phaseTimer = 2000; @@ -620,7 +620,7 @@ public: break; case 16: - me->AddNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); + me->SetNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); phaseTimer = 20000; ++phase; break; @@ -1433,7 +1433,7 @@ public: { Initialize(); uiEmoteState = creature->GetEmoteState(); - uiNpcFlags = NPCFlags(creature->m_unitData->NpcFlags[0]); + uiNpcFlags = creature->GetNpcFlags(); } void Initialize() diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index e1833da856e..d8113c04d2e 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -540,7 +540,7 @@ class npc_wyrmrest_defender : public CreatureScript case SPELL_WYRMREST_DEFENDER_MOUNT: Talk(WHISPER_MOUNTED, me->GetCharmerOrOwner()); me->SetImmuneToAll(false); - me->AddUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); + me->SetUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); break; // Both below are for checking low hp warning case SPELL_DEFENDER_ON_LOW_HEALTH_EMOTE: diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index d9fd7f10819..053f31dbc78 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -372,7 +372,7 @@ public: { me->SetStandState(UNIT_STAND_STATE_DEAD); me->SetImmuneToPC(true); - me->AddDynamicFlag(UNIT_DYNFLAG_DEAD); + me->SetDynamicFlag(UNIT_DYNFLAG_DEAD); } _phase = 0; } @@ -626,7 +626,7 @@ public: { if (spellInfo->Id == SPELL_SMOKE_BOMB && caster->GetTypeId() == TYPEID_PLAYER) { - me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToPC(true); me->SetReactState(REACT_PASSIVE); me->CombatStop(false); @@ -726,7 +726,7 @@ public: _events.ScheduleEvent(EVENT_LAKEFROG_3, 3s); break; case EVENT_LAKEFROG_3: - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); _events.ScheduleEvent(EVENT_LAKEFROG_4, 25s); break; case EVENT_LAKEFROG_4: diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index f03923a39a1..9fefd7b1135 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -370,7 +370,7 @@ public: case EVENT_SCRIPT_1: if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID)) Talk(SAY_BRANN_1, player); - me->RemoveUnitFlag(UnitFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER)); + me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); if (Creature* voice = me->SummonCreature(NPC_A_DISTANT_VOICE, 7863.43f, -1396.585f, 1538.076f, 2.949606f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 49s)) voiceGUID = voice->GetGUID(); events.ScheduleEvent(EVENT_SCRIPT_2, 4s); @@ -848,7 +848,7 @@ public: playerGUID = who->GetGUID(); Talk(SAY_HOLD_ON, who); me->CastSpell(who, SPELL_JOKKUM_KILL_CREDIT, true); - me->AddUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC); + me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC); me->GetMotionMaster()->MovePath(PATH_JOKKUM, false); } } diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index bf9f0978261..05d99238f75 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -56,7 +56,7 @@ public: void Reset() override { _rageclawGUID.Clear(); - me->AddUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); float x, y, z; me->GetClosePoint(x, y, z, me->GetCombatReach() / 3, 0.1f); @@ -234,7 +234,7 @@ public: void Reset() override { - me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); me->SetEmoteState(EMOTE_STATE_COWER); Initialize(); } |