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

Core/Gameobjects: Fixed GO_DYNFLAG_LO_HIGHLIGHT application

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/6bcef33bb1fb068ceac26e3ffc795e5098e55189)
This commit is contained in:
Hondacrx
2024-11-10 14:03:17 -05:00
parent a60dc0bd9e
commit c9e97985db
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/GameObjectConst.cs
+2 -1
View File
@@ -92,7 +92,8 @@ namespace Framework.Constants
Stopped = 0x40, Stopped = 0x40,
NoInterract = 0x80, NoInterract = 0x80,
InvertedMovement = 0x100, InvertedMovement = 0x100,
Highlight = 0x200 InteractCond = 0x200, // Cannot interact (requires GO_DYNFLAG_LO_ACTIVATE to enable interaction clientside)
Highlight = 0x4000 // Allows object highlight when GO_DYNFLAG_LO_ACTIVATE are set, not only when player is on quest determined by Data fields
} }
public enum GameObjectFlags public enum GameObjectFlags
Source/Game/Entities/Object/Update/UpdateFields.cs
+12 -6
View File
@@ -115,11 +115,8 @@ namespace Game.Entities
case GameObjectTypes.Button: case GameObjectTypes.Button:
case GameObjectTypes.Goober: case GameObjectTypes.Goober:
if (gameObject.HasConditionalInteraction() && gameObject.CanActivateForPlayer(receiver)) if (gameObject.HasConditionalInteraction() && gameObject.CanActivateForPlayer(receiver))
{
dynFlags |= GameObjectDynamicLowFlags.Highlight;
if (gameObject.GetGoStateFor(receiver.GetGUID()) != GameObjectState.Active) if (gameObject.GetGoStateFor(receiver.GetGUID()) != GameObjectState.Active)
dynFlags |= GameObjectDynamicLowFlags.Activate; dynFlags |= GameObjectDynamicLowFlags.Activate | GameObjectDynamicLowFlags.Highlight;
}
break; break;
case GameObjectTypes.QuestGiver: case GameObjectTypes.QuestGiver:
if (gameObject.CanActivateForPlayer(receiver)) if (gameObject.CanActivateForPlayer(receiver))
@@ -134,7 +131,7 @@ namespace Game.Entities
case GameObjectTypes.Generic: case GameObjectTypes.Generic:
case GameObjectTypes.SpellFocus: case GameObjectTypes.SpellFocus:
if (gameObject.HasConditionalInteraction() && gameObject.CanActivateForPlayer(receiver)) if (gameObject.HasConditionalInteraction() && gameObject.CanActivateForPlayer(receiver))
dynFlags |= GameObjectDynamicLowFlags.Sparkle | GameObjectDynamicLowFlags.Highlight; dynFlags |= GameObjectDynamicLowFlags.Sparkle;
break; break;
case GameObjectTypes.Transport: case GameObjectTypes.Transport:
case GameObjectTypes.MapObjTransport: case GameObjectTypes.MapObjTransport:
@@ -159,8 +156,17 @@ namespace Game.Entities
break; break;
} }
if (!receiver.IsGameMaster() && !gameObject.MeetsInteractCondition(receiver)) if (!receiver.IsGameMaster())
{
// GO_DYNFLAG_LO_INTERACT_COND should be applied to GOs with conditional interaction (without GO_FLAG_INTERACT_COND) to disable interaction
// (Ignore GAMEOBJECT_TYPE_GATHERING_NODE as some profession-related GOs may include quest loot and can always be interacted with)
if (gameObject.GetGoType() != GameObjectTypes.GatheringNode)
if (gameObject.HasConditionalInteraction() && !gameObject.HasFlag(GameObjectFlags.InteractCond))
dynFlags |= GameObjectDynamicLowFlags.InteractCond;
if (!gameObject.MeetsInteractCondition(receiver))
dynFlags |= GameObjectDynamicLowFlags.NoInterract; dynFlags |= GameObjectDynamicLowFlags.NoInterract;
}
unitDynFlags = ((uint)pathProgress << 16) | (uint)dynFlags; unitDynFlags = ((uint)pathProgress << 16) | (uint)dynFlags;
} }