diff options
Diffstat (limited to 'src/server/scripts')
13 files changed, 24 insertions, 24 deletions
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 9960143f455..dce7d2cb339 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -268,10 +268,10 @@ public: handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUID().ToString().c_str(), factionid, flag, std::to_string(npcflag).c_str(), dyflag); target->SetFaction(factionid); - target->SetUnitFlags(UnitFlags(flag)); - target->SetNpcFlags(NPCFlags(npcflag & 0xFFFFFFFF)); - target->SetNpcFlags2(NPCFlags2(npcflag >> 32)); - target->SetDynamicFlags(dyflag); + target->ReplaceAllUnitFlags(UnitFlags(flag)); + target->ReplaceAllNpcFlags(NPCFlags(npcflag & 0xFFFFFFFF)); + target->ReplaceAllNpcFlags2(NPCFlags2(npcflag >> 32)); + target->ReplaceAllDynamicFlags(dyflag); return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index e90ded28df5..e7198d0afff 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -412,8 +412,8 @@ public: return false; } - creature->SetNpcFlags(npcFlags); - creature->SetNpcFlags2(npcFlags2); + creature->ReplaceAllNpcFlags(npcFlags); + creature->ReplaceAllNpcFlags2(npcFlags2); WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_NPCFLAG); diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index 2cddb813ac1..139f25b5226 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -114,9 +114,9 @@ public: if (player->GetShapeshiftForm() == FORM_NONE) player->InitDisplayIds(); - player->SetPvpFlags(UNIT_BYTE2_FLAG_PVP); + player->ReplaceAllPvpFlags(UNIT_BYTE2_FLAG_PVP); - player->SetUnitFlags(UNIT_FLAG_PLAYER_CONTROLLED); + player->ReplaceAllUnitFlags(UNIT_FLAG_PLAYER_CONTROLLED); //-1 is default value player->SetWatchedFactionIndex(-1); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp index e3af3869ce8..e2e2908c5ab 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp @@ -159,9 +159,9 @@ class boss_doomrel : public CreatureScript me->SetImmuneToPC(true); if (_instance->GetData(DATA_GHOSTKILL) >= 7) - me->SetNpcFlags(UNIT_NPC_FLAG_NONE); + me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); else - me->SetNpcFlags(UNIT_NPC_FLAG_GOSSIP); + me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_GOSSIP); } void JustEngagedWith(Unit* /*who*/) override diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 311a1e338bd..49f3f827d78 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -1256,7 +1256,7 @@ public: Julianne->GetMotionMaster()->Clear(); Julianne->setDeathState(JUST_DIED); Julianne->CombatStop(true); - Julianne->SetDynamicFlags(UNIT_DYNFLAG_LOOTABLE); + Julianne->ReplaceAllDynamicFlags(UNIT_DYNFLAG_LOOTABLE); } return; } @@ -1525,7 +1525,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32& dama Romulo->GetMotionMaster()->Clear(); Romulo->setDeathState(JUST_DIED); Romulo->CombatStop(true); - Romulo->SetDynamicFlags(UNIT_DYNFLAG_LOOTABLE); + Romulo->ReplaceAllDynamicFlags(UNIT_DYNFLAG_LOOTABLE); } return; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 8cb1f2242cd..ff59dc0a512 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -122,7 +122,7 @@ class instance_uldaman : public InstanceMapScript case GO_ANCIENT_VAULT_DOOR: go->SetGoState(GO_STATE_READY); - go->SetFlags(GameObjectFlags(GO_FLAG_IN_USE | GO_FLAG_NODESPAWN)); + go->ReplaceAllFlags(GameObjectFlags(GO_FLAG_IN_USE | GO_FLAG_NODESPAWN)); ancientVaultDoor = go->GetGUID(); if (m_auiEncounter[1] == DONE) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index c055c800ed3..471baa612c3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -109,7 +109,7 @@ class npc_voljin_zulaman : public CreatureScript _events.Reset(); me->SetMountDisplayId(0); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); - me->SetDynamicFlags(UNIT_DYNFLAG_NONE); + me->ReplaceAllDynamicFlags(UNIT_DYNFLAG_NONE); _events.ScheduleEvent(EVENT_INTRO_MOVEPOINT_1, 1s); Talk(SAY_INTRO_1, player); me->SetWalk(true); diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 850693e3159..54cee126e70 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -219,7 +219,7 @@ public: Initialize(); me->SetFaction(NormFaction); - me->SetNpcFlags(NpcFlags); + me->ReplaceAllNpcFlags(NpcFlags); } void JustEngagedWith(Unit* who) override diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 7680b078110..6bcaaaee5e0 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -985,7 +985,7 @@ public: if (Merithra) { - Merithra->SetNpcFlags(UNIT_NPC_FLAG_NONE); + Merithra->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); Merithra->SetStandState(UNIT_STAND_STATE_STAND); Merithra->SetDisplayId(MERITHRA_NIGHT_ELF_FORM); Merithra->SetFaction(FACTION_FRIENDLY); @@ -993,7 +993,7 @@ public: if (Caelestrasz) { - Caelestrasz->SetNpcFlags(UNIT_NPC_FLAG_NONE); + Caelestrasz->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); Caelestrasz->SetStandState(UNIT_STAND_STATE_STAND); Caelestrasz->SetDisplayId(CAELESTRASZ_NIGHT_ELF_FORM); Caelestrasz->SetFaction(FACTION_FRIENDLY); @@ -1001,7 +1001,7 @@ public: if (Arygos) { - Arygos->SetNpcFlags(UNIT_NPC_FLAG_NONE); + Arygos->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); Arygos->SetStandState(UNIT_STAND_STATE_STAND); Arygos->SetDisplayId(ARYGOS_GNOME_FORM); Arygos->SetFaction(FACTION_FRIENDLY); 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 53caef97401..82ea3018c92 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -637,7 +637,7 @@ class boss_flame_leviathan_seat : public CreatureScript if (Creature* turret = turretPassenger->ToCreature()) { turret->SetFaction(me->GetVehicleBase()->GetFaction()); - turret->SetUnitFlags(UnitFlags(0)); // unselectable + turret->ReplaceAllUnitFlags(UnitFlags(0)); // unselectable turret->AI()->AttackStart(who); } if (Unit* devicePassenger = me->GetVehicleKit()->GetPassenger(SEAT_DEVICE)) @@ -657,7 +657,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->SetUnitFlags(UnitFlags(0)); // unselectable + device->ReplaceAllUnitFlags(UnitFlags(0)); // unselectable } } } diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 8e94bdef929..9a69cb7ce23 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -1458,7 +1458,7 @@ public: me->SetEmoteState(uiEmoteState); if (uiNpcFlags) - me->SetNpcFlags(uiNpcFlags); + me->ReplaceAllNpcFlags(uiNpcFlags); Initialize(); @@ -1470,7 +1470,7 @@ public: void DoAction(int32 /*iParam*/) override { me->StopMoving(); - me->SetNpcFlags(UNIT_NPC_FLAG_NONE); + me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); me->SetEmoteState(EMOTE_ONESHOT_NONE); if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID)) me->SetFacingToObject(player); diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index febb0674067..f03923a39a1 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -674,7 +674,7 @@ public: me->RemoveAurasDueToSpell(SPELL_JAWS_OF_DEATH_PERIODIC); me->RemoveAurasDueToSpell(SPELL_PRY_JAWS_OPEN); - me->SetNpcFlags(UNIT_NPC_FLAG_NONE); + me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); me->GetMotionMaster()->MoveFall(POINT_FALL); }); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 0ed60bfafbf..a17bf98c310 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -367,7 +367,7 @@ public: if (!Spawned) { - me->SetUnitFlags(UNIT_FLAG_IMMUNE_TO_PC); + me->ReplaceAllUnitFlags(UNIT_FLAG_IMMUNE_TO_PC); // spawn adds for (uint8 i = 0; i < 9; ++i) if (Creature* summoned = me->SummonCreature(i < 6 ? NPC_COILFANG_AMBUSHER : NPC_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN)) |