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

Core/Creature: Create & use CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/baa374a76bb753e4b7fb904a0febffc099881ed1)
This commit is contained in:
hondacrx
2022-05-26 16:44:21 -04:00
parent a880cd8327
commit 30aaad290f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/CreatureConst.cs
+2 -2
View File
@@ -229,7 +229,7 @@ namespace Framework.Constants
IgnoreCombat = 0x2000, // creature is not allowed to enter combat IgnoreCombat = 0x2000, // creature is not allowed to enter combat
Worldevent = 0x4000, // Custom Flag For World Event Creatures (Left Room For Merging) Worldevent = 0x4000, // Custom Flag For World Event Creatures (Left Room For Merging)
Guard = 0x8000, // Creature Is Guard Guard = 0x8000, // Creature Is Guard
Unused16 = 0x00010000, IgnoreFeighDeath = 0x10000, // creature ignores feign death
NoCrit = 0x20000, // Creature Can'T Do Critical Strikes NoCrit = 0x20000, // Creature Can'T Do Critical Strikes
NoSkillGains = 0x40000, // creature won't increase weapon skills NoSkillGains = 0x40000, // creature won't increase weapon skills
ObeysTauntDiminishingReturns = 0x80000, // Taunt is subject to diminishing returns on this creature ObeysTauntDiminishingReturns = 0x80000, // Taunt is subject to diminishing returns on this creature
@@ -247,7 +247,7 @@ namespace Framework.Constants
Unused31 = 0x80000000, Unused31 = 0x80000000,
// Masks // Masks
AllUnused = (Unused16 | Unused22 | Unused23 | Unused24 | Unused25 | Unused26 | Unused27 | Unused31), AllUnused = (Unused22 | Unused23 | Unused24 | Unused25 | Unused26 | Unused27 | Unused31),
DBAllowed = (0xFFFFFFFF & ~(AllUnused | DungeonBoss)) DBAllowed = (0xFFFFFFFF & ~(AllUnused | DungeonBoss))
} }
Source/Game/Entities/Creature/Creature.cs
+3 -2
View File
@@ -2264,8 +2264,8 @@ namespace Game.Entities
if (target.HasUnitState(UnitState.Died)) if (target.HasUnitState(UnitState.Died))
{ {
// guards can detect fake death // some creatures can detect fake death
if (IsGuard() && target.HasUnitFlag2(UnitFlags2.FeignDeath)) if (CanIgnoreFeignDeath() && target.HasUnitFlag2(UnitFlags2.FeignDeath))
return true; return true;
else else
return false; return false;
@@ -3287,6 +3287,7 @@ namespace Game.Entities
public void SetNoCallAssistance(bool val) { m_AlreadyCallAssistance = val; } public void SetNoCallAssistance(bool val) { m_AlreadyCallAssistance = val; }
public void SetNoSearchAssistance(bool val) { m_AlreadySearchedAssistance = val; } public void SetNoSearchAssistance(bool val) { m_AlreadySearchedAssistance = val; }
public bool HasSearchedAssistance() { return m_AlreadySearchedAssistance; } public bool HasSearchedAssistance() { return m_AlreadySearchedAssistance; }
public bool CanIgnoreFeignDeath() { return GetCreatureTemplate().FlagsExtra.HasFlag(CreatureFlagsExtra.IgnoreFeighDeath); }
public override MovementGeneratorType GetDefaultMovementType() { return DefaultMovementType; } public override MovementGeneratorType GetDefaultMovementType() { return DefaultMovementType; }
public void SetDefaultMovementType(MovementGeneratorType mgt) { DefaultMovementType = mgt; } public void SetDefaultMovementType(MovementGeneratorType mgt) { DefaultMovementType = mgt; }