Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Unit: Named npc flags UNIT_NPC_FLAG_AREA_SPIRIT_HEALER and UNIT_NPC_FLAG_2_AREA_SPIRIT_HEALER_INDIVIDUAL

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/920b9a99bdd2d7eb9b7a787c4872a38b862f75c8)
This commit is contained in:
hondacrx
2023-05-21 17:09:28 -04:00
parent d146ab6568
commit 12c53d6182
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/CreatureConst.cs
+3 -2
View File
@@ -190,8 +190,8 @@ namespace Framework.Constants
VendorReagent = 0x800, // 100% VendorReagent = 0x800, // 100%
Repair = 0x1000, // 100% Repair = 0x1000, // 100%
FlightMaster = 0x2000, // 100% FlightMaster = 0x2000, // 100%
SpiritHealer = 0x4000, // Guessed SpiritHealer = 0x4000, // 100%
SpiritGuide = 0x8000, // Guessed AreaSpiritHealer = 0x8000, // 100%
Innkeeper = 0x10000, // 100% Innkeeper = 0x10000, // 100%
Banker = 0x20000, // 100% Banker = 0x20000, // 100%
Petitioner = 0x40000, // 100% 0xc0000 = Guild Petitions, 0x40000 = Arena Team Petitions Petitioner = 0x40000, // 100% 0xc0000 = Guild Petitions, 0x40000 = Arena Team Petitions
@@ -216,6 +216,7 @@ namespace Framework.Constants
ItemUpgradeMaster = 0x01, ItemUpgradeMaster = 0x01,
GarrisonArchitect = 0x02, GarrisonArchitect = 0x02,
Steering = 0x04, Steering = 0x04,
AreaSpiritHealerIndividual = 0x08,
ShipmentCrafter = 0x10, ShipmentCrafter = 0x10,
GarrisonMissionNpc = 0x20, GarrisonMissionNpc = 0x20,
TradeskillNpc = 0x40, TradeskillNpc = 0x40,
Source/Game/Entities/Creature/Creature.cs
+1 -1
View File
@@ -862,7 +862,7 @@ namespace Game.Entities
LastUsedScriptID = GetScriptId(); LastUsedScriptID = GetScriptId();
if (IsSpiritHealer() || IsSpiritGuide() || GetCreatureTemplate().FlagsExtra.HasAnyFlag(CreatureFlagsExtra.GhostVisibility)) if (IsSpiritHealer() || IsAreaSpiritHealer() || GetCreatureTemplate().FlagsExtra.HasAnyFlag(CreatureFlagsExtra.GhostVisibility))
{ {
m_serverSideVisibility.SetValue(ServerSideVisibilityType.Ghost, GhostVisibilityType.Ghost); m_serverSideVisibility.SetValue(ServerSideVisibilityType.Ghost, GhostVisibilityType.Ghost);
m_serverSideVisibilityDetect.SetValue(ServerSideVisibilityType.Ghost, GhostVisibilityType.Ghost); m_serverSideVisibilityDetect.SetValue(ServerSideVisibilityType.Ghost, GhostVisibilityType.Ghost);
Source/Game/Entities/Unit/Unit.cs
+3 -3
View File
@@ -821,7 +821,7 @@ namespace Game.Entities
public bool IsBanker() { return HasNpcFlag(NPCFlags.Banker); } public bool IsBanker() { return HasNpcFlag(NPCFlags.Banker); }
public bool IsInnkeeper() { return HasNpcFlag(NPCFlags.Innkeeper); } public bool IsInnkeeper() { return HasNpcFlag(NPCFlags.Innkeeper); }
public bool IsSpiritHealer() { return HasNpcFlag(NPCFlags.SpiritHealer); } public bool IsSpiritHealer() { return HasNpcFlag(NPCFlags.SpiritHealer); }
public bool IsSpiritGuide() { return HasNpcFlag(NPCFlags.SpiritGuide); } public bool IsAreaSpiritHealer() { return HasNpcFlag(NPCFlags.AreaSpiritHealer); }
public bool IsTabardDesigner() { return HasNpcFlag(NPCFlags.TabardDesigner); } public bool IsTabardDesigner() { return HasNpcFlag(NPCFlags.TabardDesigner); }
public bool IsAuctioner() { return HasNpcFlag(NPCFlags.Auctioneer); } public bool IsAuctioner() { return HasNpcFlag(NPCFlags.Auctioneer); }
public bool IsArmorer() { return HasNpcFlag(NPCFlags.Repair); } public bool IsArmorer() { return HasNpcFlag(NPCFlags.Repair); }
@@ -831,9 +831,9 @@ namespace Game.Entities
return HasNpcFlag(NPCFlags.Vendor | NPCFlags.Trainer | NPCFlags.FlightMaster | return HasNpcFlag(NPCFlags.Vendor | NPCFlags.Trainer | NPCFlags.FlightMaster |
NPCFlags.Petitioner | NPCFlags.BattleMaster | NPCFlags.Banker | NPCFlags.Petitioner | NPCFlags.BattleMaster | NPCFlags.Banker |
NPCFlags.Innkeeper | NPCFlags.SpiritHealer | NPCFlags.Innkeeper | NPCFlags.SpiritHealer |
NPCFlags.SpiritGuide | NPCFlags.TabardDesigner | NPCFlags.Auctioneer); NPCFlags.AreaSpiritHealer | NPCFlags.TabardDesigner | NPCFlags.Auctioneer);
} }
public bool IsSpiritService() { return HasNpcFlag(NPCFlags.SpiritHealer | NPCFlags.SpiritGuide); } public bool IsSpiritService() { return HasNpcFlag(NPCFlags.SpiritHealer | NPCFlags.AreaSpiritHealer); }
public bool IsCritter() { return GetCreatureType() == CreatureType.Critter; } public bool IsCritter() { return GetCreatureType() == CreatureType.Critter; }
public bool IsInFlight() { return HasUnitState(UnitState.InFlight); } public bool IsInFlight() { return HasUnitState(UnitState.InFlight); }
Source/Game/Handlers/NPCHandler.cs
+1 -1
View File
@@ -139,7 +139,7 @@ namespace Game
unit.SetHomePosition(unit.GetPosition()); unit.SetHomePosition(unit.GetPosition());
// If spiritguide, no need for gossip menu, just put player into resurrect queue // If spiritguide, no need for gossip menu, just put player into resurrect queue
if (unit.IsSpiritGuide()) if (unit.IsAreaSpiritHealer())
{ {
Battleground bg = GetPlayer().GetBattleground(); Battleground bg = GetPlayer().GetBattleground();
if (bg) if (bg)