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

Core/AI: CreatureAI.EnterCombat is now called CreatureAI.JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/bce43de7f3fba618c370f2aba327d23dd30d1cdd)
This commit is contained in:
hondacrx
2021-04-19 10:22:43 -04:00
parent d0faa12ef6
commit c925d7af40
12 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Pets/Generic.cs
+1 -1
View File
@@ -49,7 +49,7 @@ namespace Scripts.Pets
me.GetMotionMaster().MoveFollow(owner, 0.0f, 0.0f);
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void UpdateAI(uint diff) { }
Source/Scripts/Pets/Hunter.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace Scripts.Pets
{
public npc_pet_hunter_snake_trap(Creature creature) : base(creature) { }
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void Reset()
{
Source/Scripts/Pets/Mage.cs
+1 -1
View File
@@ -151,7 +151,7 @@ namespace Scripts.Pets
owner.CastSpell(me, SpellIds.CloneMe, false);
}
public override void EnterCombat(Unit victim)
public override void JustEngagedWith(Unit victim)
{
if (me.GetVictim() && !me.GetVictim().HasBreakableByDamageCrowdControlAura(me))
{
Source/Scripts/World/EmeraldDragons.cs
+8 -8
View File
@@ -231,10 +231,10 @@ namespace Scripts.World.EmeraldDragons
});
}
public override void EnterCombat(Unit who)
public override void JustEngagedWith(Unit who)
{
Talk(TextIds.SayYsondreAggro);
base.EnterCombat(who);
base.JustEngagedWith(who);
}
// Summon druid spirits on 75%, 50% and 25% health
@@ -278,10 +278,10 @@ namespace Scripts.World.EmeraldDragons
});
}
public override void EnterCombat(Unit who)
public override void JustEngagedWith(Unit who)
{
Talk(TextIds.SayLethonAggro);
base.EnterCombat(who);
base.JustEngagedWith(who);
}
public override void DamageTaken(Unit attacker, ref uint damage)
@@ -361,10 +361,10 @@ namespace Scripts.World.EmeraldDragons
base.KilledUnit(who);
}
public override void EnterCombat(Unit who)
public override void JustEngagedWith(Unit who)
{
Talk(TextIds.SayEmerissAggro);
base.EnterCombat(who);
base.JustEngagedWith(who);
}
public override void DamageTaken(Unit attacker, ref uint damage)
@@ -419,10 +419,10 @@ namespace Scripts.World.EmeraldDragons
});
}
public override void EnterCombat(Unit who)
public override void JustEngagedWith(Unit who)
{
Talk(TextIds.SayTaerarAggro);
base.EnterCombat(who);
base.JustEngagedWith(who);
}
public override void SummonedCreatureDies(Creature summon, Unit killer)
Source/Scripts/World/NpcGuard.cs
+2 -2
View File
@@ -118,7 +118,7 @@ namespace Scripts.World.NpcGuard
DoReplyToTextEmote(textEmote);
}
public override void EnterCombat(Unit who)
public override void JustEngagedWith(Unit who)
{
if (me.GetEntry() == CreatureIds.CenarionHoldInfantry)
Talk(TextIds.SayGuardSilAggro, who);
@@ -202,7 +202,7 @@ namespace Scripts.World.NpcGuard
_scheduler.CancelAll();
}
public override void EnterCombat(Unit who)
public override void JustEngagedWith(Unit who)
{
ScheduleVanish();
}
Source/Scripts/World/NpcSpecial.cs
+9 -11
View File
@@ -619,7 +619,7 @@ namespace Scripts.World.NpcSpecial
me.RemoveNpcFlag(NPCFlags.QuestGiver);
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void UpdateAI(uint diff)
{
@@ -719,7 +719,7 @@ namespace Scripts.World.NpcSpecial
}
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void ReceiveEmote(Player player, TextEmotes emote)
{
@@ -1038,7 +1038,7 @@ namespace Scripts.World.NpcSpecial
}
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void QuestAccept(Player player, Quest quest)
{
@@ -1108,7 +1108,7 @@ namespace Scripts.World.NpcSpecial
}
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void SpellHit(Unit caster, SpellInfo spell)
{
@@ -1230,7 +1230,7 @@ namespace Scripts.World.NpcSpecial
me.SetHealth(me.CountPctFromMaxHealth(70));
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void SpellHit(Unit caster, SpellInfo spell)
{
@@ -1319,9 +1319,7 @@ namespace Scripts.World.NpcSpecial
me.AddUnitFlag(UnitFlags.NonAttackable);
}
public override void EnterCombat(Unit who)
{
}
public override void JustEngagedWith(Unit who) { }
public override void UpdateAI(uint diff)
{
@@ -1463,7 +1461,7 @@ namespace Scripts.World.NpcSpecial
public npc_steam_tonk(Creature creature) : base(creature) { }
public override void Reset() { }
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void OnPossess(bool apply)
{
@@ -1501,7 +1499,7 @@ namespace Scripts.World.NpcSpecial
Initialize();
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void AttackStart(Unit who) { }
public override void MoveInLineOfSight(Unit who) { }
@@ -1966,7 +1964,7 @@ namespace Scripts.World.NpcSpecial
me.GetMotionMaster().MoveFollow(owner, SharedConst.PetFollowDist, SharedConst.PetFollowAngle);
}
public override void EnterCombat(Unit who) { }
public override void JustEngagedWith(Unit who) { }
public override void DoAction(int param)
{