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

Core/AI: Remove EnterEvadeMode calls from Guardian/Summon spell handlers. Add follow logic to CreatureAI::JustAppeared.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/9f7d3ebd6a474c2e325698b1665ab2939926cab6)
This commit is contained in:
hondacrx
2021-12-23 20:23:16 -05:00
parent e28b42b270
commit 2d87d0c75d
2 changed files with 17 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/CoreAI/CreatureAI.cs
+14 -3
View File
@@ -149,6 +149,20 @@ namespace Game.AI
me.GetMotionMaster().MoveDistract(5 * Time.InMilliseconds, me.GetAbsoluteAngle(who)); me.GetMotionMaster().MoveDistract(5 * Time.InMilliseconds, me.GetAbsoluteAngle(who));
} }
// Called when creature appears in the world (spawn, respawn, grid load etc...)
public virtual void JustAppeared()
{
if (me.GetVehicle() == null)
{
Unit owner = me.GetCharmerOrOwner();
if (owner != null)
{
me.GetMotionMaster().Clear();
me.GetMotionMaster().MoveFollow(owner, SharedConst.PetFollowDist, me.GetFollowAngle());
}
}
}
// Called for reaction at stopping attack at no attackers or targets // Called for reaction at stopping attack at no attackers or targets
public virtual void EnterEvadeMode(EvadeReason why = EvadeReason.Other) public virtual void EnterEvadeMode(EvadeReason why = EvadeReason.Other)
{ {
@@ -393,9 +407,6 @@ namespace Game.AI
public virtual bool IsEscorted() { return false; } public virtual bool IsEscorted() { return false; }
// Called when creature appears in the world (spawn, respawn, grid load etc...)
public virtual void JustAppeared() { }
public virtual void MovementInform(MovementGeneratorType type, uint id) { } public virtual void MovementInform(MovementGeneratorType type, uint id) { }
// Called when a spell cast gets interrupted // Called when a spell cast gets interrupted
Source/Game/Spells/SpellEffects.cs
+3 -48
View File
@@ -1713,10 +1713,8 @@ namespace Game.Spells
summon.SelectLevel(); // some summoned creaters have different from 1 DB data for level/hp summon.SelectLevel(); // some summoned creaters have different from 1 DB data for level/hp
summon.SetNpcFlags((NPCFlags)((int)summon.GetCreatureTemplate().Npcflag & 0xFFFFFFFF)); summon.SetNpcFlags((NPCFlags)((int)summon.GetCreatureTemplate().Npcflag & 0xFFFFFFFF));
summon.SetNpcFlags2((NPCFlags2)((int)summon.GetCreatureTemplate().Npcflag >> 32)); summon.SetNpcFlags2((NPCFlags2)((int)summon.GetCreatureTemplate().Npcflag >> 32));
summon.SetImmuneToAll(true); summon.SetImmuneToAll(true);
summon.GetAI().EnterEvadeMode();
break; break;
} }
default: default:
@@ -2928,20 +2926,6 @@ namespace Game.Spells
return; return;
} }
case 58418: // Portal to Orgrimmar
case 58420: // Portal to Stormwind
{
if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player) || effectInfo.EffectIndex != 0)
return;
uint spellID = (uint)m_spellInfo.GetEffect(0).CalcValue();
uint questID = (uint)m_spellInfo.GetEffect(1).CalcValue();
if (unitTarget.ToPlayer().GetQuestStatus(questID) == QuestStatus.Complete)
unitTarget.CastSpell(unitTarget, spellID, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCastId(m_castId));
return;
}
case 58941: // Rock Shards case 58941: // Rock Shards
if (unitTarget != null && m_originalCaster != null) if (unitTarget != null && m_originalCaster != null)
{ {
@@ -2983,33 +2967,7 @@ namespace Game.Spells
} }
return; return;
} }
case 45668: // Ultra-Advanced Proto-Typical Shortening Blaster break;
{
if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Unit))
return;
uint[] spellPlayer = new uint[5]
{
45674, // Bigger!
45675, // Shrunk
45678, // Yellow
45682, // Ghost
45684 // Polymorph
};
uint[] spellTarget = new uint[5]
{
45673, // Bigger!
45672, // Shrunk
45677, // Yellow
45681, // Ghost
45683 // Polymorph
};
m_caster.CastSpell(m_caster, spellPlayer[RandomHelper.IRand(0, 4)], new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCastId(m_castId));
unitTarget.CastSpell(unitTarget, spellTarget[RandomHelper.IRand(0, 4)], new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCastId(m_castId));
break;
}
} }
break; break;
} }
@@ -4473,8 +4431,8 @@ namespace Game.Spells
var dispellData = new SpellDispellData(); var dispellData = new SpellDispellData();
dispellData.SpellID = dispell.Item1; dispellData.SpellID = dispell.Item1;
dispellData.Harmful = false; // TODO: use me dispellData.Harmful = false; // TODO: use me
//dispellData.Rolled = none; // TODO: use me //dispellData.Rolled = none; // TODO: use me
//dispellData.Needed = none; // TODO: use me //dispellData.Needed = none; // TODO: use me
unitTarget.RemoveAurasDueToSpellBySteal(dispell.Item1, dispell.Item2, m_caster); unitTarget.RemoveAurasDueToSpellBySteal(dispell.Item1, dispell.Item2, m_caster);
@@ -4718,8 +4676,6 @@ namespace Game.Spells
summon.SetDisplayId(1126); summon.SetDisplayId(1126);
} }
summon.GetAI().EnterEvadeMode();
ExecuteLogEffectSummonObject(effect.Effect, summon); ExecuteLogEffectSummonObject(effect.Effect, summon);
} }
} }
@@ -5503,7 +5459,6 @@ namespace Game.Spells
playerTarget.SendPacket(packet); playerTarget.SendPacket(packet);
} }
[SpellEffectHandler(SpellEffectName.JumpCharge)] [SpellEffectHandler(SpellEffectName.JumpCharge)]
void EffectJumpCharge() void EffectJumpCharge()
{ {