From 442da7511f5d0b48947bb49d9a31ba6deb902b6a Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 30 May 2022 16:12:11 -0400 Subject: [PATCH] Core/Misc: Rename AddXXXFlag updatefield functions to SetXXXFlag Port From (https://github.com/TrinityCore/TrinityCore/commit/b47185cabfbdeeaf492bf2303635db07ce703785) --- Source/Game/AI/CoreAI/CreatureAI.cs | 4 +- Source/Game/AI/CoreAI/PetAI.cs | 2 +- Source/Game/AI/SmartScripts/SmartScript.cs | 14 ++--- Source/Game/BattleFields/BattleField.cs | 4 +- Source/Game/BattleGrounds/BattleGround.cs | 2 +- .../BattleGrounds/Zones/StrandofAncients.cs | 4 +- Source/Game/Combat/CombatManager.cs | 2 +- Source/Game/Entities/Corpse.cs | 2 +- Source/Game/Entities/Creature/Creature.cs | 8 +-- Source/Game/Entities/GameObject/GameObject.cs | 22 +++---- Source/Game/Entities/Item/Item.cs | 8 +-- Source/Game/Entities/Object/WorldObject.cs | 2 +- Source/Game/Entities/Pet.cs | 2 +- Source/Game/Entities/Player/Player.Combat.cs | 6 +- Source/Game/Entities/Player/Player.DB.cs | 6 +- Source/Game/Entities/Player/Player.Items.cs | 16 ++--- Source/Game/Entities/Player/Player.Map.cs | 2 +- Source/Game/Entities/Player/Player.cs | 48 +++++++-------- Source/Game/Entities/Player/RestMgr.cs | 2 +- Source/Game/Entities/Unit/Unit.Combat.cs | 2 +- Source/Game/Entities/Unit/Unit.Movement.cs | 8 +-- Source/Game/Entities/Unit/Unit.Pets.cs | 18 +++--- Source/Game/Entities/Unit/Unit.cs | 29 +++++---- Source/Game/Entities/Vehicle.cs | 4 +- Source/Game/Groups/Group.cs | 4 +- Source/Game/Handlers/AzeriteHandler.cs | 2 +- Source/Game/Handlers/CharacterHandler.cs | 2 +- Source/Game/Handlers/GuildHandler.cs | 2 +- Source/Game/Handlers/LogoutHandler.cs | 2 +- Source/Game/Handlers/MailHandler.cs | 2 +- Source/Game/Handlers/MiscHandler.cs | 10 ++-- Source/Game/Handlers/MovementHandler.cs | 2 +- .../Generators/ConfusedMovementGenerator.cs | 2 +- .../Generators/FleeingMovementGenerator.cs | 2 +- .../Generators/FlightPathMovementGenerator.cs | 2 +- Source/Game/Spells/Auras/AuraEffect.cs | 60 +++++++++---------- Source/Game/Spells/SpellEffects.cs | 8 +-- Source/Scripts/BattleField/WinterGrasp.cs | 4 +- Source/Scripts/Pets/DeathKnight.cs | 2 +- Source/Scripts/Spells/Generic.cs | 18 +++--- Source/Scripts/Spells/Quest.cs | 4 +- Source/Scripts/World/EmeraldDragons.cs | 2 +- Source/Scripts/World/NpcSpecial.cs | 26 ++++---- 43 files changed, 188 insertions(+), 185 deletions(-) diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs index 4948ba377..82715d099 100644 --- a/Source/Game/AI/CoreAI/CreatureAI.cs +++ b/Source/Game/AI/CoreAI/CreatureAI.cs @@ -383,10 +383,10 @@ namespace Game.AI if (point) { point.SetObjectScale(SharedConst.BoundaryVisualizeCreatureScale); - point.AddUnitFlag(UnitFlags.Stunned); + point.SetUnitFlag(UnitFlags.Stunned); point.SetImmuneToAll(true); if (!hasOutOfBoundsNeighbor) - point.AddUnitFlag(UnitFlags.Uninteractible); + point.SetUnitFlag(UnitFlags.Uninteractible); } Q.Remove(front); } diff --git a/Source/Game/AI/CoreAI/PetAI.cs b/Source/Game/AI/CoreAI/PetAI.cs index 90f260f60..4a9c05608 100644 --- a/Source/Game/AI/CoreAI/PetAI.cs +++ b/Source/Game/AI/CoreAI/PetAI.cs @@ -402,7 +402,7 @@ namespace Game.AI if (me.Attack(target, true)) { - me.AddUnitFlag(UnitFlags.PetInCombat); // on player pets, this flag indicates we're actively going after a target - that's what we're doing, so set it + me.SetUnitFlag(UnitFlags.PetInCombat); // on player pets, this flag indicates we're actively going after a target - that's what we're doing, so set it // Play sound to let the player know the pet is attacking something it picked on its own if (me.HasReactState(ReactStates.Aggressive) && !me.GetCharmInfo().IsCommandAttack()) diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs index 582522df5..9e99c2843 100644 --- a/Source/Game/AI/SmartScripts/SmartScript.cs +++ b/Source/Game/AI/SmartScripts/SmartScript.cs @@ -1589,7 +1589,7 @@ namespace Game.AI { foreach (var target in targets) if (IsUnit(target)) - target.ToUnit().AddNpcFlag((NPCFlags)e.Action.flag.flag); + target.ToUnit().SetNpcFlag((NPCFlags)e.Action.flag.flag); break; } case SmartActions.RemoveNpcFlag: @@ -1764,7 +1764,7 @@ namespace Game.AI // pet talent points break; case 2: - target.ToUnit().AddVisFlags((UnitVisFlags)e.Action.setunitByte.byte1); + target.ToUnit().SetVisFlag((UnitVisFlags)e.Action.setunitByte.byte1); break; case 3: target.ToUnit().SetAnimTier((AnimTier)e.Action.setunitByte.byte1); @@ -1789,7 +1789,7 @@ namespace Game.AI // pet talent points break; case 2: - target.ToUnit().RemoveVisFlags((UnitVisFlags)e.Action.setunitByte.byte1); + target.ToUnit().RemoveVisFlag((UnitVisFlags)e.Action.setunitByte.byte1); break; case 3: target.ToUnit().SetAnimTier(AnimTier.Ground); @@ -1810,7 +1810,7 @@ namespace Game.AI { foreach (var target in targets) if (IsUnit(target)) - target.ToUnit().AddDynamicFlag((UnitDynFlags)e.Action.flag.flag); + target.ToUnit().SetDynamicFlag((UnitDynFlags)e.Action.flag.flag); break; } case SmartActions.RemoveDynamicFlag: @@ -2368,7 +2368,7 @@ namespace Game.AI if (IsUnit(target)) { if (e.Action.setImmunePC.immunePC != 0) - target.ToUnit().AddUnitFlag(UnitFlags.ImmuneToPc); + target.ToUnit().SetUnitFlag(UnitFlags.ImmuneToPc); else target.ToUnit().RemoveUnitFlag(UnitFlags.ImmuneToPc); } @@ -2382,7 +2382,7 @@ namespace Game.AI if (IsUnit(target)) { if (e.Action.setImmuneNPC.immuneNPC != 0) - target.ToUnit().AddUnitFlag(UnitFlags.ImmuneToNpc); + target.ToUnit().SetUnitFlag(UnitFlags.ImmuneToNpc); else target.ToUnit().RemoveUnitFlag(UnitFlags.ImmuneToNpc); } @@ -2396,7 +2396,7 @@ namespace Game.AI if (IsUnit(target)) { if (e.Action.setUninteractible.uninteractible != 0) - target.ToUnit().AddUnitFlag(UnitFlags.Uninteractible); + target.ToUnit().SetUnitFlag(UnitFlags.Uninteractible); else target.ToUnit().RemoveUnitFlag(UnitFlags.Uninteractible); } diff --git a/Source/Game/BattleFields/BattleField.cs b/Source/Game/BattleFields/BattleField.cs index db0a823ef..b98d9a0eb 100644 --- a/Source/Game/BattleFields/BattleField.cs +++ b/Source/Game/BattleFields/BattleField.cs @@ -516,7 +516,7 @@ namespace Game.BattleFields { creature.CombatStop(); creature.SetReactState(ReactStates.Passive); - creature.AddUnitFlag(UnitFlags.NonAttackable | UnitFlags.Uninteractible); + creature.SetUnitFlag(UnitFlags.NonAttackable | UnitFlags.Uninteractible); creature.DisappearAndDie(); creature.SetVisible(false); } @@ -531,7 +531,7 @@ namespace Game.BattleFields creature.SetReactState(ReactStates.Aggressive); else { - creature.AddUnitFlag(UnitFlags.NonAttackable); + creature.SetUnitFlag(UnitFlags.NonAttackable); creature.SetReactState(ReactStates.Passive); } } diff --git a/Source/Game/BattleGrounds/BattleGround.cs b/Source/Game/BattleGrounds/BattleGround.cs index 4a4ed6c88..167fb8eb0 100644 --- a/Source/Game/BattleGrounds/BattleGround.cs +++ b/Source/Game/BattleGrounds/BattleGround.cs @@ -1718,7 +1718,7 @@ namespace Game.BattleGrounds if (!IsArena()) { // To be able to remove insignia -- ONLY IN Battlegrounds - victim.AddUnitFlag(UnitFlags.Skinnable); + victim.SetUnitFlag(UnitFlags.Skinnable); RewardXPAtKill(killer, victim); } } diff --git a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs index cfab014fd..2c9e717f4 100644 --- a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs +++ b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs @@ -691,7 +691,7 @@ namespace Game.BattleGrounds.Zones if (dem) { if (start) - dem.AddUnitFlag(UnitFlags.NonAttackable | UnitFlags.Uninteractible); + dem.SetUnitFlag(UnitFlags.NonAttackable | UnitFlags.Uninteractible); else dem.RemoveUnitFlag(UnitFlags.NonAttackable | UnitFlags.Uninteractible); } @@ -772,7 +772,7 @@ namespace Game.BattleGrounds.Zones if (CanInteractWithObject(objectId)) go.RemoveFlag(GameObjectFlags.NotSelectable); else - go.AddFlag(GameObjectFlags.NotSelectable); + go.SetFlag(GameObjectFlags.NotSelectable); } } diff --git a/Source/Game/Combat/CombatManager.cs b/Source/Game/Combat/CombatManager.cs index af0ba9707..0f1428386 100644 --- a/Source/Game/Combat/CombatManager.cs +++ b/Source/Game/Combat/CombatManager.cs @@ -299,7 +299,7 @@ namespace Game.Combat if (combatState) { - _owner.AddUnitFlag(UnitFlags.InCombat); + _owner.SetUnitFlag(UnitFlags.InCombat); _owner.AtEnterCombat(); if (!_owner.IsCreature()) _owner.AtEngage(GetAnyTarget()); diff --git a/Source/Game/Entities/Corpse.cs b/Source/Game/Entities/Corpse.cs index 67c7c1b07..29810c71c 100644 --- a/Source/Game/Entities/Corpse.cs +++ b/Source/Game/Entities/Corpse.cs @@ -286,7 +286,7 @@ namespace Game.Entities } public CorpseDynFlags GetCorpseDynamicFlags() { return (CorpseDynFlags)(uint)m_corpseData.DynamicFlags; } - public void AddCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); } + public void SetCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); } public void RemoveCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); } public void ReplaceAllCorpseDynamicFlags(CorpseDynFlags dynamicFlags) { SetUpdateFieldValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); } public override ObjectGuid GetOwnerGUID() { return m_corpseData.Owner; } diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index 7bcd706bd..5868ec689 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -414,7 +414,7 @@ namespace Game.Entities // trigger creature is always not selectable and can not be attacked if (IsTrigger()) - AddUnitFlag(UnitFlags.Uninteractible); + SetUnitFlag(UnitFlags.Uninteractible); InitializeReactState(); @@ -1228,7 +1228,7 @@ namespace Game.Entities else m_lootRecipientGroup = ObjectGuid.Empty; - AddDynamicFlag(UnitDynFlags.Tapped); + SetDynamicFlag(UnitDynFlags.Tapped); } public bool IsTappedBy(Player player) @@ -2601,7 +2601,7 @@ namespace Game.Entities // Check if the creature has UNIT_FLAG_CAN_SWIM and add it if it's missing // Creatures must be able to chase a target in water if they can enter water if (_isMissingCanSwimFlagOutOfCombat && CanEnterWater()) - AddUnitFlag(UnitFlags.CanSwim); + SetUnitFlag(UnitFlags.CanSwim); } public bool HasCanSwimFlagOutOfCombat() @@ -2613,7 +2613,7 @@ namespace Game.Entities { if (loot.loot_type != LootType.Skinning && !IsPet() && GetCreatureTemplate().SkinLootId != 0 && HasLootRecipient()) if (LootStorage.Skinning.HaveLootFor(GetCreatureTemplate().SkinLootId)) - AddUnitFlag(UnitFlags.Skinnable); + SetUnitFlag(UnitFlags.Skinnable); long now = GameTime.GetGameTime(); // Do not reset corpse remove time if corpse is already removed diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index 67cb287e3..108cd5765 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -363,7 +363,7 @@ namespace Game.Entities break; case GameObjectTypes.PhaseableMo: RemoveFlag((GameObjectFlags)0xF00); - AddFlag((GameObjectFlags)((m_goInfo.PhaseableMO.AreaNameSet & 0xF) << 8)); + SetFlag((GameObjectFlags)((m_goInfo.PhaseableMO.AreaNameSet & 0xF) << 8)); break; case GameObjectTypes.CapturePoint: SetUpdateFieldValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.SpellVisualID), m_goInfo.CapturePoint.SpellVisual1); @@ -1161,7 +1161,7 @@ namespace Game.Entities if (!GetGoInfo().GetDespawnPossibility() && !GetGoInfo().IsDespawnAtAction()) { - AddFlag(GameObjectFlags.NoDespawn); + SetFlag(GameObjectFlags.NoDespawn); m_respawnDelayTime = 0; m_respawnTime = 0; } @@ -1507,7 +1507,7 @@ namespace Game.Entities RemoveFlag(GameObjectFlags.Locked); break; case GameObjectActions.Lock: - AddFlag(GameObjectFlags.Locked); + SetFlag(GameObjectFlags.Locked); break; case GameObjectActions.Open: if (unitCaster) @@ -1538,14 +1538,14 @@ namespace Game.Entities DespawnOrUnsummon(); break; case GameObjectActions.MakeInert: - AddFlag(GameObjectFlags.NotSelectable); + SetFlag(GameObjectFlags.NotSelectable); break; case GameObjectActions.MakeActive: RemoveFlag(GameObjectFlags.NotSelectable); break; case GameObjectActions.CloseAndLock: ResetDoorOrButton(); - AddFlag(GameObjectFlags.Locked); + SetFlag(GameObjectFlags.Locked); break; case GameObjectActions.UseArtKit0: case GameObjectActions.UseArtKit1: @@ -1648,7 +1648,7 @@ namespace Game.Entities void SwitchDoorOrButton(bool activate, bool alternative = false) { if (activate) - AddFlag(GameObjectFlags.InUse); + SetFlag(GameObjectFlags.InUse); else RemoveFlag(GameObjectFlags.InUse); @@ -1861,7 +1861,7 @@ namespace Game.Entities if (trapEntry != 0) TriggeringLinkedGameObject(trapEntry, user); - AddFlag(GameObjectFlags.InUse); + SetFlag(GameObjectFlags.InUse); SetLootState(LootState.Activated, user); // this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389) @@ -2648,7 +2648,7 @@ namespace Game.Entities GetAI().Damaged(attackerOrHealer, m_goInfo.DestructibleBuilding.DamagedEvent); RemoveFlag(GameObjectFlags.Destroyed); - AddFlag(GameObjectFlags.Damaged); + SetFlag(GameObjectFlags.Damaged); uint modelId = m_goInfo.displayId; DestructibleModelDataRecord modelData = CliDB.DestructibleModelDataStorage.LookupByKey(m_goInfo.DestructibleBuilding.DestructibleModelRec); @@ -2682,7 +2682,7 @@ namespace Game.Entities } RemoveFlag(GameObjectFlags.Damaged); - AddFlag(GameObjectFlags.Destroyed); + SetFlag(GameObjectFlags.Destroyed); uint modelId = m_goInfo.displayId; DestructibleModelDataRecord modelData = CliDB.DestructibleModelDataStorage.LookupByKey(m_goInfo.DestructibleBuilding.DestructibleModelRec); @@ -3307,7 +3307,7 @@ namespace Game.Entities public uint GetRespawnDelay() { return m_respawnDelayTime; } public bool HasFlag(GameObjectFlags flags) { return (m_gameObjectData.Flags & (uint)flags) != 0; } - public void AddFlag(GameObjectFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); } + public void SetFlag(GameObjectFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); } public void RemoveFlag(GameObjectFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); } public void ReplaceAllFlags(GameObjectFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); } public void SetLevel(uint level) { SetUpdateFieldValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Level), level); } @@ -3415,7 +3415,7 @@ namespace Game.Entities { m_model = GameObjectModel.Create(new GameObjectModelOwnerImpl(this)); if (m_model != null && m_model.IsMapObject()) - AddFlag(GameObjectFlags.MapObject); + SetFlag(GameObjectFlags.MapObject); } // There's many places not ready for dynamic spawns. This allows them to live on for now. diff --git a/Source/Game/Entities/Item/Item.cs b/Source/Game/Entities/Item/Item.cs index d363aa92c..77dc2e53b 100644 --- a/Source/Game/Entities/Item/Item.cs +++ b/Source/Game/Entities/Item/Item.cs @@ -1466,7 +1466,7 @@ namespace Game.Entities public void SetSoulboundTradeable(List allowedLooters) { - AddItemFlag(ItemFieldFlags.BopTradeable); + SetItemFlag(ItemFieldFlags.BopTradeable); allowedGUIDs = allowedLooters; } @@ -2562,7 +2562,7 @@ namespace Game.Entities public void SetBinding(bool val) { if (val) - AddItemFlag(ItemFieldFlags.Soulbound); + SetItemFlag(ItemFieldFlags.Soulbound); else RemoveItemFlag(ItemFieldFlags.Soulbound); } @@ -2572,11 +2572,11 @@ namespace Game.Entities public bool IsBattlenetAccountBound() { return GetTemplate().HasFlag(ItemFlags2.BnetAccountTradeOk); } public bool HasItemFlag(ItemFieldFlags flag) { return (m_itemData.DynamicFlags & (uint)flag) != 0; } - public void AddItemFlag(ItemFieldFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); } + public void SetItemFlag(ItemFieldFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); } public void RemoveItemFlag(ItemFieldFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); } public void ReplaceAllItemFlags(ItemFieldFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); } public bool HasItemFlag2(ItemFieldFlags2 flag) { return (m_itemData.DynamicFlags2 & (uint)flag) != 0; } - public void AddItemFlag2(ItemFieldFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); } + public void SetItemFlag2(ItemFieldFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); } public void RemoveItemFlag2(ItemFieldFlags2 flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); } public void ReplaceAllItemFlags2(ItemFieldFlags2 flags) { SetUpdateFieldValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); } diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs index c605b5a50..6855cb697 100644 --- a/Source/Game/Entities/Object/WorldObject.cs +++ b/Source/Game/Entities/Object/WorldObject.cs @@ -2937,7 +2937,7 @@ namespace Game.Entities public UnitDynFlags GetDynamicFlags() { return (UnitDynFlags)(uint)m_objectData.DynamicFlags; } public bool HasDynamicFlag(UnitDynFlags flag) { return (m_objectData.DynamicFlags & (uint)flag) != 0; } - public void AddDynamicFlag(UnitDynFlags flag) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); } + public void SetDynamicFlag(UnitDynFlags flag) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); } public void RemoveDynamicFlag(UnitDynFlags flag) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); } public void ReplaceAllDynamicFlags(UnitDynFlags flag) { SetUpdateFieldValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); } diff --git a/Source/Game/Entities/Pet.cs b/Source/Game/Entities/Pet.cs index 5e7866215..17a882d45 100644 --- a/Source/Game/Entities/Pet.cs +++ b/Source/Game/Entities/Pet.cs @@ -1378,7 +1378,7 @@ namespace Game.Entities return false; // Force regen flag for player pets, just like we do for players themselves - AddUnitFlag2(UnitFlags2.RegeneratePower); + SetUnitFlag2(UnitFlags2.RegeneratePower); SetSheath(SheathState.Melee); GetThreatManager().Initialize(); diff --git a/Source/Game/Entities/Player/Player.Combat.cs b/Source/Game/Entities/Player/Player.Combat.cs index 7a3096a10..a6e233da8 100644 --- a/Source/Game/Entities/Player/Player.Combat.cs +++ b/Source/Game/Entities/Player/Player.Combat.cs @@ -584,7 +584,7 @@ namespace Game.Entities if (!HasUnitState(UnitState.AttackPlayer)) { AddUnitState(UnitState.AttackPlayer); - AddPlayerFlag(PlayerFlags.ContestedPVP); + SetPlayerFlag(PlayerFlags.ContestedPVP); // call MoveInLineOfSight for nearby contested guards AIRelocationNotifier notifier = new(this); Cell.VisitWorldObjects(this, notifier, GetVisibilityRange()); @@ -658,9 +658,9 @@ namespace Game.Entities { if (!IsFFAPvP()) { - AddPvpFlag(UnitPVPStateFlags.FFAPvp); + SetPvpFlag(UnitPVPStateFlags.FFAPvp); foreach (var unit in m_Controlled) - unit.AddPvpFlag(UnitPVPStateFlags.FFAPvp); + unit.SetPvpFlag(UnitPVPStateFlags.FFAPvp); } } else if (IsFFAPvP()) diff --git a/Source/Game/Entities/Player/Player.DB.cs b/Source/Game/Entities/Player/Player.DB.cs index 38678c168..2b3a92bce 100644 --- a/Source/Game/Entities/Player/Player.DB.cs +++ b/Source/Game/Entities/Player/Player.DB.cs @@ -1051,7 +1051,7 @@ namespace Game.Entities { _corpseLocation = new WorldLocation(result.Read(0), result.Read(1), result.Read(2), result.Read(3), result.Read(4)); if (!CliDB.MapStorage.LookupByKey(_corpseLocation.GetMapId()).Instanceable()) - AddPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); + SetPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); else RemovePlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); } @@ -1394,7 +1394,7 @@ namespace Game.Entities if (group) { if (group.IsLeader(GetGUID())) - AddPlayerFlag(PlayerFlags.GroupLeader); + SetPlayerFlag(PlayerFlags.GroupLeader); byte subgroup = group.GetMemberGroup(GetGUID()); SetGroup(group, subgroup); @@ -3310,7 +3310,7 @@ namespace Game.Entities // RaF stuff. if (GetSession().IsARecruiter() || (GetSession().GetRecruiterId() != 0)) - AddDynamicFlag(UnitDynFlags.ReferAFriend); + SetDynamicFlag(UnitDynFlags.ReferAFriend); _LoadDeclinedNames(holder.GetResult(PlayerLoginQueryLoad.DeclinedNames)); diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs index 3709e9465..a5559c418 100644 --- a/Source/Game/Entities/Player/Player.Items.cs +++ b/Source/Game/Entities/Player/Player.Items.cs @@ -1261,7 +1261,7 @@ namespace Game.Entities Item item = Item.CreateItem(itemId, count, context, this); if (item != null) { - item.AddItemFlag(ItemFieldFlags.NewItem); + item.SetItemFlag(ItemFieldFlags.NewItem); item.SetBonuses(bonusListIDs); @@ -1306,7 +1306,7 @@ namespace Game.Entities if (childItem) { childItem.SetCreator(item.GetGUID()); - childItem.AddItemFlag(ItemFieldFlags.Child); + childItem.SetItemFlag(ItemFieldFlags.Child); item.SetChildItem(childItem.GetGUID()); } } @@ -1586,7 +1586,7 @@ namespace Game.Entities } } - pItem.AddItemFlag2(ItemFieldFlags2.Equipped); + pItem.SetItemFlag2(ItemFieldFlags2.Equipped); if (IsInWorld && update) { @@ -1759,7 +1759,7 @@ namespace Game.Entities byte slot = (byte)(pos & 255); VisualizeItem(slot, pItem); - pItem.AddItemFlag2(ItemFieldFlags2.Equipped); + pItem.SetItemFlag2(ItemFieldFlags2.Equipped); if (IsInWorld) { @@ -2485,7 +2485,7 @@ namespace Game.Entities if (pProto.HasFlag(ItemFlags.ItemPurchaseRecord) && crItem.ExtendedCost != 0 && pProto.GetMaxStackSize() == 1) { - it.AddItemFlag(ItemFieldFlags.Refundable); + it.SetItemFlag(ItemFieldFlags.Refundable); it.SetRefundRecipient(GetGUID()); it.SetPaidMoney((uint)price); it.SetPaidExtendedCost(crItem.ExtendedCost); @@ -6079,7 +6079,7 @@ namespace Game.Entities return; // Now we must make bones lootable, and send player loot - bones.AddCorpseDynamicFlag(CorpseDynFlags.Lootable); + bones.SetCorpseDynamicFlag(CorpseDynFlags.Lootable); // We store the level of our player in the gold field // We retrieve this information at Player.SendLoot() @@ -6508,7 +6508,7 @@ namespace Game.Entities m_AELootView[loot.GetGUID()] = guid; if (loot_type == LootType.Corpse && !guid.IsItem()) - AddUnitFlag(UnitFlags.Looting); + SetUnitFlag(UnitFlags.Looting); } else SendLootError(loot.GetGUID(), guid, LootError.DidntKill); @@ -6607,7 +6607,7 @@ namespace Game.Entities //Void Storage public bool IsVoidStorageUnlocked() { return HasPlayerFlag(PlayerFlags.VoidUnlocked); } - public void UnlockVoidStorage() { AddPlayerFlag(PlayerFlags.VoidUnlocked); } + public void UnlockVoidStorage() { SetPlayerFlag(PlayerFlags.VoidUnlocked); } public void LockVoidStorage() { RemovePlayerFlag(PlayerFlags.VoidUnlocked); } public byte GetNextVoidStorageFreeSlot() diff --git a/Source/Game/Entities/Player/Player.Map.cs b/Source/Game/Entities/Player/Player.Map.cs index 18fba4007..d2f827de9 100644 --- a/Source/Game/Entities/Player/Player.Map.cs +++ b/Source/Game/Entities/Player/Player.Map.cs @@ -131,7 +131,7 @@ namespace Game.Entities pvpInfo.IsInNoPvPArea = false; if (area != null && area.IsSanctuary()) // in sanctuary { - AddPvpFlag(UnitPVPStateFlags.Sanctuary); + SetPvpFlag(UnitPVPStateFlags.Sanctuary); pvpInfo.IsInNoPvPArea = true; if (duel == null && GetCombatManager().HasPvPCombat()) CombatStopWithPets(); diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index a4cdcf0c6..e5ef4adc4 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -237,11 +237,11 @@ namespace Game.Entities InitDisplayIds(); if ((RealmType)WorldConfig.GetIntValue(WorldCfg.GameType) == RealmType.PVP || (RealmType)WorldConfig.GetIntValue(WorldCfg.GameType) == RealmType.RPPVP) { - AddPvpFlag(UnitPVPStateFlags.PvP); - AddUnitFlag(UnitFlags.PlayerControlled); + SetPvpFlag(UnitPVPStateFlags.PvP); + SetUnitFlag(UnitFlags.PlayerControlled); } - AddUnitFlag2(UnitFlags2.RegeneratePower); + SetUnitFlag2(UnitFlags2.RegeneratePower); SetHoverHeight(1.0f); // default for players in 3.0.3 SetWatchedFactionIndex(0xFFFFFFFF); @@ -2151,7 +2151,7 @@ namespace Game.Entities public void SetDeveloper(bool on) { if (on) - AddPlayerFlag(PlayerFlags.Developer); + SetPlayerFlag(PlayerFlags.Developer); else RemovePlayerFlag(PlayerFlags.Developer); } @@ -2172,8 +2172,8 @@ namespace Game.Entities { m_ExtraFlags |= PlayerExtraFlags.GMOn; SetFaction(35); - AddPlayerFlag(PlayerFlags.GM); - AddUnitFlag2(UnitFlags2.AllowCheatSpells); + SetPlayerFlag(PlayerFlags.GM); + SetUnitFlag2(UnitFlags2.AllowCheatSpells); Pet pet = GetPet(); if (pet != null) @@ -2202,7 +2202,7 @@ namespace Game.Entities // restore FFA PvP Server state if (Global.WorldMgr.IsFFAPvPRealm()) - AddPvpFlag(UnitPVPStateFlags.FFAPvp); + SetPvpFlag(UnitPVPStateFlags.FFAPvp); // restore FFA PvP area state, remove not allowed for GM mounts UpdateArea(m_areaUpdateId); @@ -4376,7 +4376,7 @@ namespace Game.Entities RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST if (GetSession().IsARecruiter() || (GetSession().GetRecruiterId() != 0)) - AddDynamicFlag(UnitDynFlags.ReferAFriend); + SetDynamicFlag(UnitDynFlags.ReferAFriend); SetDeathState(DeathState.Alive); @@ -4458,7 +4458,7 @@ namespace Game.Entities ReplaceAllDynamicFlags(UnitDynFlags.None); if (!CliDB.MapStorage.LookupByKey(GetMapId()).Instanceable() && !HasAuraType(AuraType.PreventResurrection)) - AddPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); + SetPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); else RemovePlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); @@ -5116,7 +5116,7 @@ namespace Game.Entities if (enabled) { - AddPlayerFlag(PlayerFlags.WarModeDesired); + SetPlayerFlag(PlayerFlags.WarModeDesired); TogglePvpTalents(true); SetPvP(true); } @@ -5133,7 +5133,7 @@ namespace Game.Entities void SetWarModeLocal(bool enabled) { if (enabled) - AddPlayerLocalFlag(PlayerLocalFlags.WarMode); + SetPlayerLocalFlag(PlayerLocalFlags.WarMode); else RemovePlayerLocalFlag(PlayerLocalFlags.WarMode); } @@ -5174,12 +5174,12 @@ namespace Game.Entities } else { - AddPlayerFlag(PlayerFlags.WarModeActive); + SetPlayerFlag(PlayerFlags.WarModeActive); RemoveAurasDueToSpell(auraInside); CastSpell(this, auraOutside, true); } SetWarModeLocal(true); - AddPvpFlag(UnitPVPStateFlags.PvP); + SetPvpFlag(UnitPVPStateFlags.PvP); } else { @@ -5312,7 +5312,7 @@ namespace Game.Entities { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.GuildGUID), ObjectGuid.Create(HighGuid.Guild, guildId)); SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.GuildClubMemberID), GetGUID().GetCounter()); - AddPlayerFlag(PlayerFlags.GuildLevelEnabled); + SetPlayerFlag(PlayerFlags.GuildLevelEnabled); } else { @@ -5450,7 +5450,7 @@ namespace Game.Entities if (IsAFK()) RemovePlayerFlag(PlayerFlags.AFK); else - AddPlayerFlag(PlayerFlags.AFK); + SetPlayerFlag(PlayerFlags.AFK); // afk player not allowed in Battleground if (!IsGameMaster() && IsAFK() && InBattleground() && !InArena()) @@ -5461,7 +5461,7 @@ namespace Game.Entities if (IsDND()) RemovePlayerFlag(PlayerFlags.DND); else - AddPlayerFlag(PlayerFlags.DND); + SetPlayerFlag(PlayerFlags.DND); } public bool IsAFK() { return HasPlayerFlag(PlayerFlags.AFK); } public bool IsDND() { return HasPlayerFlag(PlayerFlags.DND); } @@ -5994,14 +5994,14 @@ namespace Game.Entities UnitFlags.Stunned | UnitFlags.InCombat | UnitFlags.Disarmed | UnitFlags.Confused | UnitFlags.Fleeing | UnitFlags.Uninteractible | UnitFlags.Skinnable | UnitFlags.Mount | UnitFlags.OnTaxi); - AddUnitFlag(UnitFlags.PlayerControlled); // must be set + SetUnitFlag(UnitFlags.PlayerControlled); // must be set - AddUnitFlag2(UnitFlags2.RegeneratePower);// must be set + SetUnitFlag2(UnitFlags2.RegeneratePower);// must be set // cleanup player flags (will be re-applied if need at aura load), to avoid have ghost flag without ghost aura, for example. RemovePlayerFlag(PlayerFlags.AFK | PlayerFlags.DND | PlayerFlags.GM | PlayerFlags.Ghost); - RemoveVisFlags(UnitVisFlags.All); // one form stealth modified bytes + RemoveVisFlag(UnitVisFlags.All); // one form stealth modified bytes RemovePvpFlag(UnitPVPStateFlags.FFAPvp | UnitPVPStateFlags.Sanctuary); // restore if need some important flags @@ -7261,7 +7261,7 @@ namespace Game.Entities public void SetSemaphoreTeleportFar(bool semphsetting) { mSemaphoreTeleport_Far = semphsetting; } public bool IsReagentBankUnlocked() { return HasPlayerFlagEx(PlayerFlagsEx.ReagentBankUnlocked); } - public void UnlockReagentBank() { AddPlayerFlagEx(PlayerFlagsEx.ReagentBankUnlocked); } + public void UnlockReagentBank() { SetPlayerFlagEx(PlayerFlagsEx.ReagentBankUnlocked); } //new public uint DoRandomRoll(uint minimum, uint maximum) @@ -7596,12 +7596,12 @@ namespace Game.Entities } public bool HasPlayerFlag(PlayerFlags flags) { return (m_playerData.PlayerFlags & (uint)flags) != 0; } - public void AddPlayerFlag(PlayerFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); } + public void SetPlayerFlag(PlayerFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); } public void RemovePlayerFlag(PlayerFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); } public void ReplaceAllPlayerFlags(PlayerFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); } public bool HasPlayerFlagEx(PlayerFlagsEx flags) { return (m_playerData.PlayerFlagsEx & (uint)flags) != 0; } - public void AddPlayerFlagEx(PlayerFlagsEx flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); } + public void SetPlayerFlagEx(PlayerFlagsEx flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); } public void RemovePlayerFlagEx(PlayerFlagsEx flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); } public void ReplaceAllPlayerFlagsEx(PlayerFlagsEx flags) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); } @@ -7680,7 +7680,7 @@ namespace Game.Entities public ObjectGuid GetSummonedBattlePetGUID() { return m_activePlayerData.SummonedBattlePetGUID; } public void SetSummonedBattlePetGUID(ObjectGuid guid) { SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.SummonedBattlePetGUID), guid); } - public void AddTrackCreatureFlag(uint flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.TrackCreatureMask), flags); } + public void SetTrackCreatureFlag(uint flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.TrackCreatureMask), flags); } public void RemoveTrackCreatureFlag(uint flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.TrackCreatureMask), flags); } public void SetVersatilityBonus(float value) { SetUpdateFieldStatValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.VersatilityBonus), value); } @@ -7690,7 +7690,7 @@ namespace Game.Entities public void ApplyModOverrideAPBySpellPowerPercent(float mod, bool apply) { ApplyModUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.OverrideAPBySpellPowerPercent), mod, apply); } public bool HasPlayerLocalFlag(PlayerLocalFlags flags) { return (m_activePlayerData.LocalFlags & (int)flags) != 0; } - public void AddPlayerLocalFlag(PlayerLocalFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); } + public void SetPlayerLocalFlag(PlayerLocalFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); } public void RemovePlayerLocalFlag(PlayerLocalFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); } public void ReplaceAllPlayerLocalFlags(PlayerLocalFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); } diff --git a/Source/Game/Entities/Player/RestMgr.cs b/Source/Game/Entities/Player/RestMgr.cs index c6fc317f2..b9e596127 100644 --- a/Source/Game/Entities/Player/RestMgr.cs +++ b/Source/Game/Entities/Player/RestMgr.cs @@ -88,7 +88,7 @@ namespace Game.Entities if (oldRestMask == 0 && _restFlagMask != 0) // only set flag/time on the first rest state { _restTime = GameTime.GetGameTime(); - _player.AddPlayerFlag(PlayerFlags.Resting); + _player.SetPlayerFlag(PlayerFlags.Resting); } if (triggerId != 0) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index 4578d9bca..7f03bdf76 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -914,7 +914,7 @@ namespace Game.Entities { // must be after setDeathState which resets dynamic flags if (!creature.loot.IsLooted()) - creature.AddDynamicFlag(UnitDynFlags.Lootable); + creature.SetDynamicFlag(UnitDynFlags.Lootable); else creature.AllLootRemovedFromCorpse(); } diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs index 7504bc517..422052938 100644 --- a/Source/Game/Entities/Unit/Unit.Movement.cs +++ b/Source/Game/Entities/Unit/Unit.Movement.cs @@ -1271,7 +1271,7 @@ namespace Game.Entities if (apply) { SetTarget(ObjectGuid.Empty); - AddUnitFlag(UnitFlags.Stunned); + SetUnitFlag(UnitFlags.Stunned); StopMoving(); @@ -1405,7 +1405,7 @@ namespace Game.Entities if (mount != 0) SetMountDisplayId(mount); - AddUnitFlag(UnitFlags.Mount); + SetUnitFlag(UnitFlags.Mount); Player player = ToPlayer(); if (player != null) @@ -1429,7 +1429,7 @@ namespace Game.Entities Battleground bg = ToPlayer().GetBattleground(); // don't unsummon pet in arena but SetFlag UNIT_FLAG_STUNNED to disable pet's interface if (bg && bg.IsArena()) - pet.AddUnitFlag(UnitFlags.Stunned); + pet.SetUnitFlag(UnitFlags.Stunned); else player.UnsummonPetTemporaryIfAny(); } @@ -1438,7 +1438,7 @@ namespace Game.Entities Unit charm = player.GetCharmed(); if (charm) if (charm.GetTypeId() == TypeId.Unit) - charm.AddUnitFlag(UnitFlags.Stunned); + charm.SetUnitFlag(UnitFlags.Stunned); player.SendMovementSetCollisionHeight(player.GetCollisionHeight(), UpdateCollisionHeightReason.Mount); } diff --git a/Source/Game/Entities/Unit/Unit.Pets.cs b/Source/Game/Entities/Unit/Unit.Pets.cs index f2b06827b..d7cbb24e6 100644 --- a/Source/Game/Entities/Unit/Unit.Pets.cs +++ b/Source/Game/Entities/Unit/Unit.Pets.cs @@ -121,7 +121,7 @@ namespace Game.Entities if (IsTypeId(TypeId.Player)) { minion.m_ControlledByPlayer = true; - minion.AddUnitFlag(UnitFlags.PlayerControlled); + minion.SetUnitFlag(UnitFlags.PlayerControlled); } // Can only have one pet. If a new one is summoned, dismiss the old one. @@ -391,13 +391,13 @@ namespace Game.Entities switch (type) { case CharmType.Vehicle: - AddUnitFlag(UnitFlags.Possessed); + SetUnitFlag(UnitFlags.Possessed); playerCharmer.SetClientControl(this, true); playerCharmer.VehicleSpellInitialize(); break; case CharmType.Possess: - AddUnitFlag(UnitFlags.Possessed); - charmer.AddUnitFlag(UnitFlags.RemoveClientControl); + SetUnitFlag(UnitFlags.Possessed); + charmer.SetUnitFlag(UnitFlags.RemoveClientControl); playerCharmer.SetClientControl(this, true); playerCharmer.PossessSpellInitialize(); AddUnitState(UnitState.Possessed); @@ -583,7 +583,7 @@ namespace Game.Entities charm.m_ControlledByPlayer = true; // @todo maybe we can use this flag to check if controlled by player - charm.AddUnitFlag(UnitFlags.PlayerControlled); + charm.SetUnitFlag(UnitFlags.PlayerControlled); } else charm.m_ControlledByPlayer = false; @@ -621,13 +621,13 @@ namespace Game.Entities if (charm.IsTypeId(TypeId.Player)) { charm.m_ControlledByPlayer = true; - charm.AddUnitFlag(UnitFlags.PlayerControlled); + charm.SetUnitFlag(UnitFlags.PlayerControlled); charm.ToPlayer().UpdatePvPState(); } else if (player) { charm.m_ControlledByPlayer = true; - charm.AddUnitFlag(UnitFlags.PlayerControlled); + charm.SetUnitFlag(UnitFlags.PlayerControlled); charm.ReplaceAllPvpFlags(player.GetPvpFlags()); } else @@ -788,7 +788,7 @@ namespace Game.Entities pet.SetCreatedBySpell(spell_id); if (IsTypeId(TypeId.Player)) - pet.AddUnitFlag(UnitFlags.PlayerControlled); + pet.SetUnitFlag(UnitFlags.PlayerControlled); if (!pet.InitStatsForLevel(level)) { @@ -826,7 +826,7 @@ namespace Game.Entities } if (state) - AddUnitFlag(UnitFlags.PetInCombat); + SetUnitFlag(UnitFlags.PetInCombat); else RemoveUnitFlag(UnitFlags.PetInCombat); } diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index 858ed4a4f..a12b820ee 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -800,12 +800,15 @@ namespace Game.Entities m_areaTrigger[0].Remove(); } + public NPCFlags GetNpcFlags() { return (NPCFlags)m_unitData.NpcFlags[0]; } public bool HasNpcFlag(NPCFlags flags) { return (m_unitData.NpcFlags[0] & (uint)flags) != 0; } - public void AddNpcFlag(NPCFlags flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); } + public void SetNpcFlag(NPCFlags flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); } public void RemoveNpcFlag(NPCFlags flags) { RemoveUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); } public void ReplaceAllNpcFlags(NPCFlags flags) { SetUpdateFieldValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); } + + public NPCFlags2 GetNpcFlags2() { return (NPCFlags2)m_unitData.NpcFlags[1]; } public bool HasNpcFlag2(NPCFlags2 flags) { return (m_unitData.NpcFlags[1] & (uint)flags) != 0; } - public void AddNpcFlag2(NPCFlags2 flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); } + public void SetNpcFlag2(NPCFlags2 flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); } public void RemoveNpcFlag2(NPCFlags2 flags) { RemoveUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); } public void ReplaceAllNpcFlags2(NPCFlags2 flags) { SetUpdateFieldValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); } @@ -1982,15 +1985,15 @@ namespace Game.Entities public void SetWildBattlePetLevel(uint wildBattlePetLevel) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.WildBattlePetLevel), wildBattlePetLevel); } public bool HasUnitFlag(UnitFlags flags) { return (m_unitData.Flags & (uint)flags) != 0; } - public void AddUnitFlag(UnitFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); } + public void SetUnitFlag(UnitFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); } public void RemoveUnitFlag(UnitFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); } public void ReplaceAllUnitFlags(UnitFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); } public bool HasUnitFlag2(UnitFlags2 flags) { return (m_unitData.Flags2 & (uint)flags) != 0; } - public void AddUnitFlag2(UnitFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); } + public void SetUnitFlag2(UnitFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); } public void RemoveUnitFlag2(UnitFlags2 flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); } public void ReplaceAllUnitFlags2(UnitFlags2 flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); } public bool HasUnitFlag3(UnitFlags3 flags) { return (m_unitData.Flags3 & (uint)flags) != 0; } - public void AddUnitFlag3(UnitFlags3 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); } + public void SetUnitFlag3(UnitFlags3 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); } public void RemoveUnitFlag3(UnitFlags3 flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); } public void ReplaceAllUnitFlags3(UnitFlags3 flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); } @@ -2003,7 +2006,7 @@ namespace Game.Entities public UnitPVPStateFlags GetPvpFlags() { return (UnitPVPStateFlags)(byte)m_unitData.PvpFlags; } public bool HasPvpFlag(UnitPVPStateFlags flags) { return (m_unitData.PvpFlags & (uint)flags) != 0; } - public void AddPvpFlag(UnitPVPStateFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); } + public void SetPvpFlag(UnitPVPStateFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); } public void RemovePvpFlag(UnitPVPStateFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); } public void ReplaceAllPvpFlags(UnitPVPStateFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); } public bool IsInSanctuary() { return HasPvpFlag(UnitPVPStateFlags.Sanctuary); } @@ -2015,7 +2018,7 @@ namespace Game.Entities return (UnitPetFlags)(byte)m_unitData.PetFlags; } public bool HasPetFlag(UnitPetFlags flags) { return (m_unitData.PetFlags & (byte)flags) != 0; } - public void AddPetFlag(UnitPetFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); } + public void SetPetFlag(UnitPetFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); } public void RemovePetFlag(UnitPetFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); } public void ReplaceAllPetFlags(UnitPetFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); } @@ -2163,8 +2166,8 @@ namespace Game.Entities } public UnitStandStateType GetStandState() { return (UnitStandStateType)(byte)m_unitData.StandState; } - public void AddVisFlags(UnitVisFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); } - public void RemoveVisFlags(UnitVisFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); } + public void SetVisFlag(UnitVisFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); } + public void RemoveVisFlag(UnitVisFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); } public void ReplaceAllVisFlags(UnitVisFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); } public bool IsSitState() @@ -2983,7 +2986,7 @@ namespace Game.Entities { if (apply) { - AddUnitFlag(UnitFlags.ImmuneToPc | UnitFlags.ImmuneToNpc); + SetUnitFlag(UnitFlags.ImmuneToPc | UnitFlags.ImmuneToNpc); ValidateAttackersAndOwnTarget(); if (!keepCombat) m_combatManager.EndAllCombat(); @@ -3000,7 +3003,7 @@ namespace Game.Entities { if (apply) { - AddUnitFlag(UnitFlags.ImmuneToPc); + SetUnitFlag(UnitFlags.ImmuneToPc); ValidateAttackersAndOwnTarget(); if (!keepCombat) { @@ -3029,7 +3032,7 @@ namespace Game.Entities { if (apply) { - AddUnitFlag(UnitFlags.ImmuneToNpc); + SetUnitFlag(UnitFlags.ImmuneToNpc); ValidateAttackersAndOwnTarget(); if (!keepCombat) { @@ -3221,7 +3224,7 @@ namespace Game.Entities public virtual void SetPvP(bool state) { if (state) - AddPvpFlag(UnitPVPStateFlags.PvP); + SetPvpFlag(UnitPVPStateFlags.PvP); else RemovePvpFlag(UnitPVPStateFlags.PvP); } diff --git a/Source/Game/Entities/Vehicle.cs b/Source/Game/Entities/Vehicle.cs index c50ed1960..de50becc9 100644 --- a/Source/Game/Entities/Vehicle.cs +++ b/Source/Game/Entities/Vehicle.cs @@ -55,7 +55,7 @@ namespace Game.Entities // Set or remove correct flags based on available seats. Will overwrite db data (if wrong). if (UsableSeatNum != 0) - _me.AddNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick); + _me.SetNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick); else _me.RemoveNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick); @@ -367,7 +367,7 @@ namespace Game.Entities unit.GetName(), _me.GetEntry(), _vehicleInfo.Id, _me.GetGUID().ToString(), seat.Key); if (seat.Value.SeatInfo.CanEnterOrExit() && ++UsableSeatNum != 0) - _me.AddNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick); + _me.SetNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick); // Enable gravity for passenger when he did not have it active before entering the vehicle if (seat.Value.SeatInfo.HasFlag(VehicleSeatFlags.DisableGravity) && !seat.Value.Passenger.IsGravityDisabled) diff --git a/Source/Game/Groups/Group.cs b/Source/Game/Groups/Group.cs index 38bbf4124..da4dc86af 100644 --- a/Source/Game/Groups/Group.cs +++ b/Source/Game/Groups/Group.cs @@ -108,7 +108,7 @@ namespace Game.Groups m_guid = ObjectGuid.Create(HighGuid.Party, Global.GroupMgr.GenerateGroupId()); m_leaderGuid = leaderGuid; m_leaderName = leader.GetName(); - leader.AddPlayerFlag(PlayerFlags.GroupLeader); + leader.SetPlayerFlag(PlayerFlags.GroupLeader); if (IsBGGroup() || IsBFGroup()) { @@ -729,7 +729,7 @@ namespace Game.Groups if (oldLeader) oldLeader.RemovePlayerFlag(PlayerFlags.GroupLeader); - newLeader.AddPlayerFlag(PlayerFlags.GroupLeader); + newLeader.SetPlayerFlag(PlayerFlags.GroupLeader); m_leaderGuid = newLeader.GetGUID(); m_leaderName = newLeader.GetName(); ToggleGroupMemberFlag(slot, GroupMemberFlags.Assistant, false); diff --git a/Source/Game/Handlers/AzeriteHandler.cs b/Source/Game/Handlers/AzeriteHandler.cs index bbf8e9e92..9cdee6c91 100644 --- a/Source/Game/Handlers/AzeriteHandler.cs +++ b/Source/Game/Handlers/AzeriteHandler.cs @@ -184,7 +184,7 @@ namespace Game if (item == null || !item.IsAzeriteEmpoweredItem()) return; - item.AddItemFlag(ItemFieldFlags.AzeriteEmpoweredItemViewed); + item.SetItemFlag(ItemFieldFlags.AzeriteEmpoweredItemViewed); item.SetState(ItemUpdateState.Changed, _player); } diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index a5e047da6..d7fbc2744 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -937,7 +937,7 @@ namespace Game // Set FFA PvP for non GM in non-rest mode if (Global.WorldMgr.IsFFAPvPRealm() && !pCurrChar.IsGameMaster() && !pCurrChar.HasPlayerFlag(PlayerFlags.Resting)) - pCurrChar.AddPvpFlag(UnitPVPStateFlags.FFAPvp); + pCurrChar.SetPvpFlag(UnitPVPStateFlags.FFAPvp); if (pCurrChar.HasPlayerFlag(PlayerFlags.ContestedPVP)) pCurrChar.SetContestedPvP(); diff --git a/Source/Game/Handlers/GuildHandler.cs b/Source/Game/Handlers/GuildHandler.cs index 16a793258..afbfea7d9 100644 --- a/Source/Game/Handlers/GuildHandler.cs +++ b/Source/Game/Handlers/GuildHandler.cs @@ -606,7 +606,7 @@ namespace Game void HandleDeclineGuildInvites(DeclineGuildInvites packet) { if (packet.Allow) - GetPlayer().AddPlayerFlag(PlayerFlags.AutoDeclineGuild); + GetPlayer().SetPlayerFlag(PlayerFlags.AutoDeclineGuild); else GetPlayer().RemovePlayerFlag(PlayerFlags.AutoDeclineGuild); } diff --git a/Source/Game/Handlers/LogoutHandler.cs b/Source/Game/Handlers/LogoutHandler.cs index 1d993c353..1757181f7 100644 --- a/Source/Game/Handlers/LogoutHandler.cs +++ b/Source/Game/Handlers/LogoutHandler.cs @@ -68,7 +68,7 @@ namespace Game if (pl.GetStandState() == UnitStandStateType.Stand) pl.SetStandState(UnitStandStateType.Sit); pl.SetRooted(true); - pl.AddUnitFlag(UnitFlags.Stunned); + pl.SetUnitFlag(UnitFlags.Stunned); } SetLogoutStartTime(GameTime.GetGameTime()); diff --git a/Source/Game/Handlers/MailHandler.cs b/Source/Game/Handlers/MailHandler.cs index 92beb3e10..4500fe061 100644 --- a/Source/Game/Handlers/MailHandler.cs +++ b/Source/Game/Handlers/MailHandler.cs @@ -621,7 +621,7 @@ namespace Game if (m.messageType == MailMessageType.Normal) bodyItem.SetCreator(ObjectGuid.Create(HighGuid.Player, m.sender)); - bodyItem.AddItemFlag(ItemFieldFlags.Readable); + bodyItem.SetItemFlag(ItemFieldFlags.Readable); Log.outInfo(LogFilter.Network, "HandleMailCreateTextItem mailid={0}", createTextItem.MailID); diff --git a/Source/Game/Handlers/MiscHandler.cs b/Source/Game/Handlers/MiscHandler.cs index 690adaee8..c8fd31d10 100644 --- a/Source/Game/Handlers/MiscHandler.cs +++ b/Source/Game/Handlers/MiscHandler.cs @@ -509,7 +509,7 @@ namespace Game { if (!GetPlayer().HasPlayerFlag(PlayerFlags.InPVP)) { - GetPlayer().AddPlayerFlag(PlayerFlags.InPVP); + GetPlayer().SetPlayerFlag(PlayerFlags.InPVP); GetPlayer().RemovePlayerFlag(PlayerFlags.PVPTimer); if (!GetPlayer().IsPvP() || GetPlayer().pvpInfo.EndTimer != 0) GetPlayer().UpdatePvP(true, true); @@ -517,7 +517,7 @@ namespace Game else if (!GetPlayer().IsWarModeLocalActive()) { GetPlayer().RemovePlayerFlag(PlayerFlags.InPVP); - GetPlayer().AddPlayerFlag(PlayerFlags.PVPTimer); + GetPlayer().SetPlayerFlag(PlayerFlags.PVPTimer); if (!GetPlayer().pvpInfo.IsHostile && GetPlayer().IsPvP()) GetPlayer().pvpInfo.EndTimer = GameTime.GetGameTime(); // start toggle-off } @@ -528,7 +528,7 @@ namespace Game { if (packet.EnablePVP) { - GetPlayer().AddPlayerFlag(PlayerFlags.InPVP); + GetPlayer().SetPlayerFlag(PlayerFlags.InPVP); GetPlayer().RemovePlayerFlag(PlayerFlags.PVPTimer); if (!GetPlayer().IsPvP() || GetPlayer().pvpInfo.EndTimer != 0) GetPlayer().UpdatePvP(true, true); @@ -536,7 +536,7 @@ namespace Game else if (!GetPlayer().IsWarModeLocalActive()) { GetPlayer().RemovePlayerFlag(PlayerFlags.InPVP); - GetPlayer().AddPlayerFlag(PlayerFlags.PVPTimer); + GetPlayer().SetPlayerFlag(PlayerFlags.PVPTimer); if (!GetPlayer().pvpInfo.IsHostile && GetPlayer().IsPvP()) GetPlayer().pvpInfo.EndTimer = GameTime.GetGameTime(); // start toggle-off } @@ -759,7 +759,7 @@ namespace Game void HandleSetTaxiBenchmark(SetTaxiBenchmarkMode packet) { if (packet.Enable) - _player.AddPlayerFlag(PlayerFlags.TaxiBenchmark); + _player.SetPlayerFlag(PlayerFlags.TaxiBenchmark); else _player.RemovePlayerFlag(PlayerFlags.TaxiBenchmark); } diff --git a/Source/Game/Handlers/MovementHandler.cs b/Source/Game/Handlers/MovementHandler.cs index c95572da0..e6e882205 100644 --- a/Source/Game/Handlers/MovementHandler.cs +++ b/Source/Game/Handlers/MovementHandler.cs @@ -191,7 +191,7 @@ namespace Game if (plrMover.IsAlive()) { Log.outDebug(LogFilter.Player, $"FALLDAMAGE Below map. Map min height: {plrMover.GetMap().GetMinHeight(plrMover.GetPhaseShift(), movementInfo.Pos.GetPositionX(), movementInfo.Pos.GetPositionY())}, Player debug info:\n{plrMover.GetDebugInfo()}"); - plrMover.AddPlayerFlag(PlayerFlags.IsOutOfBounds); + plrMover.SetPlayerFlag(PlayerFlags.IsOutOfBounds); plrMover.EnvironmentalDamage(EnviromentalDamage.FallToVoid, (uint)GetPlayer().GetMaxHealth()); // player can be alive if GM/etc // change the death state to CORPSE to prevent the death timer from diff --git a/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs b/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs index ec7620c7a..4b84597cf 100644 --- a/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs +++ b/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs @@ -43,7 +43,7 @@ namespace Game.Movement return; // TODO: UNIT_FIELD_FLAGS should not be handled by generators - owner.AddUnitFlag(UnitFlags.Confused); + owner.SetUnitFlag(UnitFlags.Confused); owner.StopMoving(); _timer.Reset(0); diff --git a/Source/Game/Movement/Generators/FleeingMovementGenerator.cs b/Source/Game/Movement/Generators/FleeingMovementGenerator.cs index 23896d072..10b19478a 100644 --- a/Source/Game/Movement/Generators/FleeingMovementGenerator.cs +++ b/Source/Game/Movement/Generators/FleeingMovementGenerator.cs @@ -47,7 +47,7 @@ namespace Game.Movement return; // TODO: UNIT_FIELD_FLAGS should not be handled by generators - owner.AddUnitFlag(UnitFlags.Fleeing); + owner.SetUnitFlag(UnitFlags.Fleeing); _path = null; SetTargetLocation(owner); } diff --git a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs index 36ed47f06..6c83a28e0 100644 --- a/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs +++ b/Source/Game/Movement/Generators/FlightPathMovementGenerator.cs @@ -50,7 +50,7 @@ namespace Game.Movement RemoveFlag(MovementGeneratorFlags.Deactivated); owner.CombatStopWithPets(); - owner.AddUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.OnTaxi); + owner.SetUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.OnTaxi); uint end = GetPathAtMapEnd(); uint currentNodeId = GetCurrentNode(); diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs index be2b8ccc4..797862892 100644 --- a/Source/Game/Spells/Auras/AuraEffect.cs +++ b/Source/Game/Spells/Auras/AuraEffect.cs @@ -1057,7 +1057,7 @@ namespace Game.Spells { target.m_stealth.AddFlag(type); target.m_stealth.AddValue(type, GetAmount()); - target.AddVisFlags(UnitVisFlags.Creep); + target.SetVisFlag(UnitVisFlags.Creep); Player playerTarget = target.ToPlayer(); if (playerTarget != null) playerTarget.AddAuraVision(PlayerFieldByte2Flags.Stealth); @@ -1070,7 +1070,7 @@ namespace Game.Spells { target.m_stealth.DelFlag(type); - target.RemoveVisFlags(UnitVisFlags.Creep); + target.RemoveVisFlag(UnitVisFlags.Creep); Player playerTarget = target.ToPlayer(); if (playerTarget != null) playerTarget.RemoveAuraVision(PlayerFieldByte2Flags.Stealth); @@ -1183,7 +1183,7 @@ namespace Game.Spells if (apply) { - target.AddPlayerFlag(PlayerFlags.Ghost); + target.SetPlayerFlag(PlayerFlags.Ghost); target.m_serverSideVisibility.SetValue(ServerSideVisibilityType.Ghost, GhostVisibilityType.Ghost); target.m_serverSideVisibilityDetect.SetValue(ServerSideVisibilityType.Ghost, GhostVisibilityType.Ghost); } @@ -1640,7 +1640,7 @@ namespace Game.Spells // What must be cloned? at least display and scale target.SetDisplayId(caster.GetDisplayId()); //target.SetObjectScale(caster.GetFloatValue(OBJECT_FIELD_SCALE_X)); // we need retail info about how scaling is handled (aura maybe?) - target.AddUnitFlag2(UnitFlags2.MirrorImage); + target.SetUnitFlag2(UnitFlags2.MirrorImage); } else { @@ -1704,9 +1704,9 @@ namespace Game.Spells if (aurApp.HasRemoveMode()) return; - target.AddUnitFlag(UnitFlags.PreventEmotesFromChatText); - target.AddUnitFlag2(UnitFlags2.FeignDeath); - target.AddDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag(UnitFlags.PreventEmotesFromChatText); + target.SetUnitFlag2(UnitFlags2.FeignDeath); + target.SetDynamicFlag(UnitDynFlags.Dead); target.AddUnitState(UnitState.Died); Creature creature = target.ToCreature(); @@ -1739,7 +1739,7 @@ namespace Game.Spells return; if (apply) - target.AddUnitFlag(UnitFlags.NonAttackable2); + target.SetUnitFlag(UnitFlags.NonAttackable2); else target.RemoveUnitFlag(UnitFlags.NonAttackable2); @@ -1779,7 +1779,7 @@ namespace Game.Spells { case AuraType.ModDisarm: if (apply) - flagChangeFunc = unit => { unit.AddUnitFlag(UnitFlags.Disarmed); }; + flagChangeFunc = unit => { unit.SetUnitFlag(UnitFlags.Disarmed); }; else flagChangeFunc = unit => { unit.RemoveUnitFlag(UnitFlags.Disarmed); }; slot = EquipmentSlot.MainHand; @@ -1787,7 +1787,7 @@ namespace Game.Spells break; case AuraType.ModDisarmOffhand: if (apply) - flagChangeFunc = unit => { unit.AddUnitFlag2(UnitFlags2.DisarmOffhand); }; + flagChangeFunc = unit => { unit.SetUnitFlag2(UnitFlags2.DisarmOffhand); }; else flagChangeFunc = unit => { unit.RemoveUnitFlag2(UnitFlags2.DisarmOffhand); }; slot = EquipmentSlot.OffHand; @@ -1795,7 +1795,7 @@ namespace Game.Spells break; case AuraType.ModDisarmRanged: if (apply) - flagChangeFunc = unit => { unit.AddUnitFlag2(UnitFlags2.DisarmRanged); }; + flagChangeFunc = unit => { unit.SetUnitFlag2(UnitFlags2.DisarmRanged); }; else flagChangeFunc = unit => { unit.RemoveUnitFlag2(UnitFlags2.DisarmRanged); }; slot = EquipmentSlot.MainHand; @@ -1842,7 +1842,7 @@ namespace Game.Spells if (apply) { - target.AddUnitFlag(UnitFlags.Silenced); + target.SetUnitFlag(UnitFlags.Silenced); // call functions which may have additional effects after changing state of unit // Stop cast only spells vs PreventionType & SPELL_PREVENTION_TYPE_SILENCE @@ -1874,7 +1874,7 @@ namespace Game.Spells Unit target = aurApp.GetTarget(); if (apply) - target.AddUnitFlag(UnitFlags.Pacified); + target.SetUnitFlag(UnitFlags.Pacified); else { // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit @@ -1897,7 +1897,7 @@ namespace Game.Spells if (m_spellInfo.Id == 45839) { if (apply) - target.AddUnitFlag(UnitFlags.NonAttackable); + target.SetUnitFlag(UnitFlags.NonAttackable); else target.RemoveUnitFlag(UnitFlags.NonAttackable); } @@ -1921,7 +1921,7 @@ namespace Game.Spells if (apply) { - target.AddUnitFlag2(UnitFlags2.NoActions); + target.SetUnitFlag2(UnitFlags2.NoActions); // call functions which may have additional effects after changing state of unit // Stop cast only spells vs PreventionType & SPELL_PREVENTION_TYPE_SILENCE @@ -1958,7 +1958,7 @@ namespace Game.Spells return; if (apply) - target.AddTrackCreatureFlag(1u << (GetMiscValue() - 1)); + target.SetTrackCreatureFlag(1u << (GetMiscValue() - 1)); else target.RemoveTrackCreatureFlag(1u << (GetMiscValue() - 1)); } @@ -1980,7 +1980,7 @@ namespace Game.Spells return; } if (apply) - target.AddPlayerLocalFlag(PlayerLocalFlags.TrackStealthed); + target.SetPlayerLocalFlag(PlayerLocalFlags.TrackStealthed); else target.RemovePlayerLocalFlag(PlayerLocalFlags.TrackStealthed); } @@ -1995,7 +1995,7 @@ namespace Game.Spells // used by spells: Hunter's Mark, Mind Vision, Syndicate Tracker (MURP) DND if (apply) - target.AddDynamicFlag(UnitDynFlags.TrackUnit); + target.SetDynamicFlag(UnitDynFlags.TrackUnit); else { // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit @@ -2019,13 +2019,13 @@ namespace Game.Spells return; if (apply) - target.AddVisFlags(UnitVisFlags.Untrackable); + target.SetVisFlag(UnitVisFlags.Untrackable); else { // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit if (target.HasAuraType(GetAuraType())) return; - target.RemoveVisFlags(UnitVisFlags.Untrackable); + target.RemoveVisFlag(UnitVisFlags.Untrackable); } } @@ -2063,7 +2063,7 @@ namespace Game.Spells return; if (apply) - target.AddUnitFlag2(UnitFlags2.AllowChangingTalents); + target.SetUnitFlag2(UnitFlags2.AllowChangingTalents); else if (!target.HasAuraType(GetAuraType())) target.RemoveUnitFlag2(UnitFlags2.AllowChangingTalents); } @@ -2273,7 +2273,7 @@ namespace Game.Spells Unit target = aurApp.GetTarget(); if (apply) - target.AddUnitFlag2(UnitFlags2.ForceMovement); + target.SetUnitFlag2(UnitFlags2.ForceMovement); else { // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit @@ -2843,7 +2843,7 @@ namespace Game.Spells if (apply) { - target.AddUnitFlag(UnitFlags.Immune); + target.SetUnitFlag(UnitFlags.Immune); target.GetThreatManager().EvaluateSuppressed(); } else @@ -2867,7 +2867,7 @@ namespace Game.Spells if (apply) { - target.AddUnitFlag(UnitFlags.Immune); + target.SetUnitFlag(UnitFlags.Immune); target.GetThreatManager().EvaluateSuppressed(); } else @@ -4128,7 +4128,7 @@ namespace Game.Spells Unit target = aurApp.GetTarget(); if (apply) - target.AddUnitFlag(UnitFlags.Preparation); + target.SetUnitFlag(UnitFlags.Preparation); else { // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit @@ -4553,7 +4553,7 @@ namespace Game.Spells if (target.GetCreatureType() == CreatureType.Beast) { if (apply) - target.AddDynamicFlag(UnitDynFlags.SpecialInfo); + target.SetDynamicFlag(UnitDynFlags.SpecialInfo); else target.RemoveDynamicFlag(UnitDynFlags.SpecialInfo); } @@ -4577,7 +4577,7 @@ namespace Game.Spells { target.RestoreFaction(); if (target.IsTypeId(TypeId.Player)) - target.AddUnitFlag(UnitFlags.PlayerControlled); + target.SetUnitFlag(UnitFlags.PlayerControlled); } } @@ -4606,7 +4606,7 @@ namespace Game.Spells Unit target = aurApp.GetTarget(); if (apply) - target.AddUnitFlag2(UnitFlags2.ComprehendLang); + target.SetUnitFlag2(UnitFlags2.ComprehendLang); else { if (target.HasAuraType(GetAuraType())) @@ -4865,7 +4865,7 @@ namespace Game.Spells if (apply) target.RemovePlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); else if (!target.GetMap().Instanceable()) - target.AddPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); + target.SetPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer); } [AuraEffectHandler(AuraType.Mastery)] @@ -5616,7 +5616,7 @@ namespace Game.Spells return; if (apply) - target.AddPlayerLocalFlag(PlayerLocalFlags.CanUseObjectsMounted); + target.SetPlayerLocalFlag(PlayerLocalFlags.CanUseObjectsMounted); else if (!target.HasAuraType(AuraType.AllowUsingGameobjectsWhileMounted)) target.RemovePlayerLocalFlag(PlayerLocalFlags.CanUseObjectsMounted); } diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs index 9305ab492..e24a07232 100644 --- a/Source/Game/Spells/SpellEffects.cs +++ b/Source/Game/Spells/SpellEffects.cs @@ -1342,7 +1342,7 @@ namespace Game.Spells SendLoot(guid, LootType.Skinning); else if (itemTarget != null) { - itemTarget.AddItemFlag(ItemFieldFlags.Unlocked); + itemTarget.SetItemFlag(ItemFieldFlags.Unlocked); itemTarget.SetState(ItemUpdateState.Changed, itemTarget.GetOwner()); } @@ -3534,7 +3534,7 @@ namespace Game.Spells SkillType skill = creature.GetCreatureTemplate().GetRequiredLootSkill(); creature.RemoveUnitFlag(UnitFlags.Skinnable); - creature.AddDynamicFlag(UnitDynFlags.Lootable); + creature.SetDynamicFlag(UnitDynFlags.Lootable); player.SendLoot(creature.GetGUID(), LootType.Skinning); if (skill == SkillType.Skinning) @@ -4680,7 +4680,7 @@ namespace Game.Spells !unitTarget.IsPet() || unitTarget.ToPet().GetPetType() != PetType.Hunter) return; - unitTarget.AddPetFlag(UnitPetFlags.CanBeRenamed); + unitTarget.SetPetFlag(UnitPetFlags.CanBeRenamed); } [SpellEffectHandler(SpellEffectName.PlayMusic)] @@ -5220,7 +5220,7 @@ namespace Game.Spells return; Player player = unitTarget.ToPlayer(); - player.AddPlayerFlag(PlayerFlags.PetBattlesUnlocked); + player.SetPlayerFlag(PlayerFlags.PetBattlesUnlocked); player.GetSession().GetBattlePetMgr().UnlockSlot(BattlePetSlots.Slot0); } diff --git a/Source/Scripts/BattleField/WinterGrasp.cs b/Source/Scripts/BattleField/WinterGrasp.cs index 3ec0883a4..26a4c3b83 100644 --- a/Source/Scripts/BattleField/WinterGrasp.cs +++ b/Source/Scripts/BattleField/WinterGrasp.cs @@ -189,7 +189,7 @@ namespace Game.BattleFields // Update faction of relic, only attacker can click on relic.SetFaction(WGConst.WintergraspFaction[GetAttackerTeam()]); // Set in use (not allow to click on before last door is broken) - relic.AddFlag(GameObjectFlags.InUse | GameObjectFlags.NotSelectable); + relic.SetFlag(GameObjectFlags.InUse | GameObjectFlags.NotSelectable); m_titansRelicGUID = relic.GetGUID(); } else @@ -576,7 +576,7 @@ namespace Game.BattleFields { HandlePromotion(killer, victim); // Allow to Skin non-released corpse - victim.AddUnitFlag(UnitFlags.Skinnable); + victim.SetUnitFlag(UnitFlags.Skinnable); } // @todo Recent PvP activity worldstate diff --git a/Source/Scripts/Pets/DeathKnight.cs b/Source/Scripts/Pets/DeathKnight.cs index 35eee3b21..4092124d6 100644 --- a/Source/Scripts/Pets/DeathKnight.cs +++ b/Source/Scripts/Pets/DeathKnight.cs @@ -82,7 +82,7 @@ namespace Scripts.Pets return; // Stop Fighting - me.AddUnitFlag(UnitFlags.NonAttackable); + me.SetUnitFlag(UnitFlags.NonAttackable); // Sanctuary me.CastSpell(me, SpellIds.Sanctuary, true); diff --git a/Source/Scripts/Spells/Generic.cs b/Source/Scripts/Spells/Generic.cs index dd3028d9a..dd50d389d 100644 --- a/Source/Scripts/Spells/Generic.cs +++ b/Source/Scripts/Spells/Generic.cs @@ -1705,9 +1705,9 @@ namespace Scripts.Spells.Generic void HandleEffectApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.AddDynamicFlag(UnitDynFlags.Dead); - target.AddUnitFlag2(UnitFlags2.FeignDeath); - target.AddUnitFlag(UnitFlags.PreventEmotesFromChatText); + target.SetDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag2(UnitFlags2.FeignDeath); + target.SetUnitFlag(UnitFlags.PreventEmotesFromChatText); Creature creature = target.ToCreature(); if (creature != null) @@ -1740,8 +1740,8 @@ namespace Scripts.Spells.Generic void HandleEffectApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.AddUnitFlag2(UnitFlags2.FeignDeath); - target.AddUnitFlag(UnitFlags.PreventEmotesFromChatText); + target.SetUnitFlag2(UnitFlags2.FeignDeath); + target.SetUnitFlag(UnitFlags.PreventEmotesFromChatText); Creature creature = target.ToCreature(); if (creature != null) @@ -1772,8 +1772,8 @@ namespace Scripts.Spells.Generic void HandleEffectApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.AddDynamicFlag(UnitDynFlags.Dead); - target.AddUnitFlag2(UnitFlags2.FeignDeath); + target.SetDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag2(UnitFlags2.FeignDeath); Creature creature = target.ToCreature(); if (creature != null) @@ -2382,7 +2382,7 @@ namespace Scripts.Spells.Generic void HandleEffectApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.AddUnitFlag(UnitFlags.PreventEmotesFromChatText); + target.SetUnitFlag(UnitFlags.PreventEmotesFromChatText); } void OnRemove(AuraEffect aurEff, AuraEffectHandleModes mode) @@ -3514,7 +3514,7 @@ namespace Scripts.Spells.Generic player.CombatStop(); if (player.IsNonMeleeSpellCast(true)) player.InterruptNonMeleeSpells(true); - player.AddUnitFlag(UnitFlags.NonAttackable); + player.SetUnitFlag(UnitFlags.NonAttackable); // if player class = hunter || warlock Remove pet if alive if ((player.GetClass() == Class.Hunter) || (player.GetClass() == Class.Warlock)) diff --git a/Source/Scripts/Spells/Quest.cs b/Source/Scripts/Spells/Quest.cs index d10f5b98c..601652f95 100644 --- a/Source/Scripts/Spells/Quest.cs +++ b/Source/Scripts/Spells/Quest.cs @@ -1307,8 +1307,8 @@ namespace Scripts.Spells.Quest void HandleApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.AddDynamicFlag(UnitDynFlags.Dead); - target.AddUnitFlag2(UnitFlags2.FeignDeath); + target.SetDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag2(UnitFlags2.FeignDeath); Creature creature = target.ToCreature(); if (creature != null) diff --git a/Source/Scripts/World/EmeraldDragons.cs b/Source/Scripts/World/EmeraldDragons.cs index bf04151be..1a234297d 100644 --- a/Source/Scripts/World/EmeraldDragons.cs +++ b/Source/Scripts/World/EmeraldDragons.cs @@ -453,7 +453,7 @@ namespace Scripts.World.EmeraldDragons _shades += (byte)SpellIds.TaerarShadeSpells.Length; DoCast(SpellIds.Shade); - me.AddUnitFlag(UnitFlags.Uninteractible | UnitFlags.NonAttackable); + me.SetUnitFlag(UnitFlags.Uninteractible | UnitFlags.NonAttackable); me.SetReactState(ReactStates.Passive); ++_stage; diff --git a/Source/Scripts/World/NpcSpecial.cs b/Source/Scripts/World/NpcSpecial.cs index 9be4f8313..5e67e2c25 100644 --- a/Source/Scripts/World/NpcSpecial.cs +++ b/Source/Scripts/World/NpcSpecial.cs @@ -577,7 +577,7 @@ namespace Scripts.World.NpcSpecial case TextEmotes.Chicken: if (player.GetQuestStatus(QuestConst.Cluck) == QuestStatus.None && RandomHelper.Rand32() % 30 == 1) { - me.AddNpcFlag(NPCFlags.QuestGiver); + me.SetNpcFlag(NPCFlags.QuestGiver); me.SetFaction(Misc.FactionFriendly); Talk(player.GetTeam() == Team.Horde ? TextIds.EmoteHelloH : TextIds.EmoteHelloA); } @@ -585,7 +585,7 @@ namespace Scripts.World.NpcSpecial case TextEmotes.Cheer: if (player.GetQuestStatus(QuestConst.Cluck) == QuestStatus.Complete) { - me.AddNpcFlag(NPCFlags.QuestGiver); + me.SetNpcFlag(NPCFlags.QuestGiver); me.SetFaction(Misc.FactionFriendly); Talk(TextIds.EmoteCluck); } @@ -835,7 +835,7 @@ namespace Scripts.World.NpcSpecial } Event = true; - me.AddUnitFlag(UnitFlags.Uninteractible); + me.SetUnitFlag(UnitFlags.Uninteractible); } public void PatientDied(Position point) @@ -932,7 +932,7 @@ namespace Scripts.World.NpcSpecial if (Patient) { //303, this flag appear to be required for client side item.spell to work (TARGET_SINGLE_FRIEND) - Patient.AddUnitFlag(UnitFlags.PlayerControlled); + Patient.SetUnitFlag(UnitFlags.PlayerControlled); Patients.Add(Patient.GetGUID()); ((npc_injured_patient)Patient.GetAI()).DoctorGUID = me.GetGUID(); @@ -995,7 +995,7 @@ namespace Scripts.World.NpcSpecial me.RemoveUnitFlag(UnitFlags.Uninteractible); //no regen health - me.AddUnitFlag(UnitFlags.InCombat); + me.SetUnitFlag(UnitFlags.InCombat); //to make them lay with face down me.SetStandState(UnitStandStateType.Dead); @@ -1038,7 +1038,7 @@ namespace Scripts.World.NpcSpecial } //make not selectable - me.AddUnitFlag(UnitFlags.Uninteractible); + me.SetUnitFlag(UnitFlags.Uninteractible); //regen health me.RemoveUnitFlag(UnitFlags.InCombat); @@ -1075,9 +1075,9 @@ namespace Scripts.World.NpcSpecial if (me.IsAlive() && me.GetHealth() <= 6) { me.RemoveUnitFlag(UnitFlags.InCombat); - me.AddUnitFlag(UnitFlags.Uninteractible); + me.SetUnitFlag(UnitFlags.Uninteractible); me.SetDeathState(DeathState.JustDied); - me.AddDynamicFlag(UnitDynFlags.Dead); + me.SetDynamicFlag(UnitDynFlags.Dead); if (!DoctorGUID.IsEmpty()) { @@ -1232,7 +1232,7 @@ namespace Scripts.World.NpcSpecial public override void Reset() { - me.AddUnitFlag(UnitFlags.NonAttackable); + me.SetUnitFlag(UnitFlags.NonAttackable); } public override void JustEngagedWith(Unit who) { } @@ -1439,7 +1439,7 @@ namespace Scripts.World.NpcSpecial player.RemovePlayerFlag(PlayerFlags.NoXPGain); // turn on XP gain break; case eTradeskill.GossipActionInfoDef + 2:// XP OFF selected - player.AddPlayerFlag(PlayerFlags.NoXPGain); // turn off XP gain + player.SetPlayerFlag(PlayerFlags.NoXPGain); // turn off XP gain break; } @@ -1936,7 +1936,7 @@ namespace Scripts.World.NpcSpecial { case GossipMenus.OptionIdBank: { - me.AddNpcFlag(NPCFlags.Banker); + me.SetNpcFlag(NPCFlags.Banker); uint _bankAura = IsArgentSquire() ? SpellIds.AuraBankS : SpellIds.AuraBankG; if (!me.HasAura(_bankAura)) DoCastSelf(_bankAura); @@ -1947,7 +1947,7 @@ namespace Scripts.World.NpcSpecial } case GossipMenus.OptionIdShop: { - me.AddNpcFlag(NPCFlags.Vendor); + me.SetNpcFlag(NPCFlags.Vendor); uint _shopAura = IsArgentSquire() ? SpellIds.AuraShopS : SpellIds.AuraShopG; if (!me.HasAura(_shopAura)) DoCastSelf(_shopAura); @@ -1958,7 +1958,7 @@ namespace Scripts.World.NpcSpecial } case GossipMenus.OptionIdMail: { - me.AddNpcFlag(NPCFlags.Mailbox); + me.SetNpcFlag(NPCFlags.Mailbox); player.GetSession().SendShowMailBox(me.GetGUID()); uint _mailAura = IsArgentSquire() ? SpellIds.AuraPostmanS : SpellIds.AuraPostmanG;