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

Core/AI: refactor SpellHit and SpellHitTarget.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3171cd3fa9dbcec43f5d70b74ab2f54a2aa44173)
This commit is contained in:
hondacrx
2022-02-23 16:02:13 -05:00
parent 19abbbf0b5
commit c41acd0bc8
7 changed files with 28 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/CoreAI/CreatureAI.cs
+2 -4
View File
@@ -486,12 +486,10 @@ namespace Game.AI
public virtual void JustUnregisteredAreaTrigger(AreaTrigger areaTrigger) { }
// Called when hit by a spell
public virtual void SpellHit(Unit caster, SpellInfo spellInfo) { }
public virtual void SpellHitByGameObject(GameObject caster, SpellInfo spellInfo) { }
public virtual void SpellHit(WorldObject caster, SpellInfo spellInfo) { }
// Called when spell hits a target
public virtual void SpellHitTarget(Unit target, SpellInfo spellInfo) { }
public virtual void SpellHitTargetGameObject(GameObject target, SpellInfo spellInfo) { }
public virtual void SpellHitTarget(WorldObject target, SpellInfo spellInfo) { }
// Called when a spell cast gets interrupted
public virtual void OnSpellCastInterrupt(SpellInfo spell) { }
Source/Game/AI/CoreAI/GameObjectAI.cs
+2 -4
View File
@@ -95,12 +95,10 @@ namespace Game.AI
public virtual void EventInform(uint eventId) { }
// Called when hit by a spell
public virtual void SpellHit(Unit caster, SpellInfo spellInfo) { }
public virtual void SpellHitByGameObject(GameObject caster, SpellInfo spellInfo) { }
public virtual void SpellHit(WorldObject caster, SpellInfo spellInfo) { }
// Called when spell hits a target
public virtual void SpellHitTarget(Unit target, SpellInfo spellInfo) { }
public virtual void SpellHitTargetGameObject(GameObject target, SpellInfo spellInfo) { }
public virtual void SpellHitTarget(WorldObject target, SpellInfo spellInfo) { }
// Called when the gameobject summon successfully other creature
public virtual void JustSummoned(Creature summon) { }
Source/Game/AI/SmartScripts/SmartAI.cs
+6 -16
View File
@@ -664,24 +664,14 @@ namespace Game.AI
}
}
public override void SpellHit(Unit caster, SpellInfo spellInfo)
public override void SpellHit(WorldObject caster, SpellInfo spellInfo)
{
GetScript().ProcessEventsFor(SmartEvents.SpellHit, caster, 0, 0, false, spellInfo);
}
public override void SpellHitByGameObject(GameObject obj, SpellInfo spellInfo)
{
GetScript().ProcessEventsFor(SmartEvents.SpellHit, null, 0, 0, false, spellInfo, obj);
GetScript().ProcessEventsFor(SmartEvents.SpellHit, caster.ToUnit(), 0, 0, false, spellInfo, caster.ToGameObject());
}
public override void SpellHitTarget(Unit target, SpellInfo spellInfo)
public override void SpellHitTarget(WorldObject target, SpellInfo spellInfo)
{
GetScript().ProcessEventsFor(SmartEvents.SpellHitTarget, target, 0, 0, false, spellInfo);
}
public override void SpellHitTargetGameObject(GameObject target, SpellInfo spellInfo)
{
GetScript().ProcessEventsFor(SmartEvents.SpellHitTarget, null, 0, 0, false, spellInfo, target);
GetScript().ProcessEventsFor(SmartEvents.SpellHitTarget, target.ToUnit(), 0, 0, false, spellInfo, target.ToGameObject());
}
public override void DamageTaken(Unit attacker, ref uint damage)
@@ -1199,9 +1189,9 @@ namespace Game.AI
GetScript().ProcessEventsFor(SmartEvents.GoEventInform, null, eventId);
}
public override void SpellHit(Unit unit, SpellInfo spellInfo)
public override void SpellHit(WorldObject caster, SpellInfo spellInfo)
{
GetScript().ProcessEventsFor(SmartEvents.SpellHit, unit, 0, 0, false, spellInfo);
GetScript().ProcessEventsFor(SmartEvents.SpellHit, caster.ToUnit(), 0, 0, false, spellInfo);
}
public override void JustSummoned(Creature creature)
Source/Game/Spells/Spell.cs
+4 -14
View File
@@ -8226,12 +8226,7 @@ namespace Game.Spells
{
CreatureAI hitTargetAI = cHitTarget.GetAI();
if (hitTargetAI != null)
{
if (spell.GetCaster().IsGameObject())
hitTargetAI.SpellHitByGameObject(spell.GetCaster().ToGameObject(), spell.m_spellInfo);
else
hitTargetAI.SpellHit(spell.GetCaster().ToUnit(), spell.m_spellInfo);
}
hitTargetAI.SpellHit(spell.GetCaster(), spell.m_spellInfo);
}
if (spell.GetCaster().IsCreature() && spell.GetCaster().ToCreature().IsAIEnabled())
@@ -8285,17 +8280,12 @@ namespace Game.Spells
//AI functions
if (go.GetAI() != null)
{
if (spell.GetCaster().IsGameObject())
go.GetAI().SpellHitByGameObject(spell.GetCaster().ToGameObject(), spell.m_spellInfo);
else
go.GetAI().SpellHit(spell.GetCaster().ToUnit(), spell.m_spellInfo);
}
go.GetAI().SpellHit(spell.GetCaster(), spell.m_spellInfo);
if (spell.GetCaster().IsCreature() && spell.GetCaster().ToCreature().IsAIEnabled())
spell.GetCaster().ToCreature().GetAI().SpellHitTargetGameObject(go, spell.m_spellInfo);
spell.GetCaster().ToCreature().GetAI().SpellHitTarget(go, spell.m_spellInfo);
else if (spell.GetCaster().IsGameObject() && spell.GetCaster().ToGameObject().GetAI() != null)
spell.GetCaster().ToGameObject().GetAI().SpellHitTargetGameObject(go, spell.m_spellInfo);
spell.GetCaster().ToGameObject().GetAI().SpellHitTarget(go, spell.m_spellInfo);
spell.CallScriptOnHitHandlers();
spell.CallScriptAfterHitHandlers();
Source/Scripts/Pets/DeathKnight.cs
+3 -3
View File
@@ -72,13 +72,13 @@ namespace Scripts.Pets
}
// Fly away when dismissed
public override void SpellHit(Unit source, SpellInfo spell)
public override void SpellHit(WorldObject caster, SpellInfo spellInfo)
{
if (spell.Id != SpellIds.DismissGargoyle || !me.IsAlive())
if (spellInfo.Id != SpellIds.DismissGargoyle || !me.IsAlive())
return;
Unit owner = me.GetOwner();
if (!owner || owner != source)
if (!owner || owner != caster)
return;
// Stop Fighting
Source/Scripts/World/EmeraldDragons.cs
+2 -2
View File
@@ -294,9 +294,9 @@ namespace Scripts.World.EmeraldDragons
}
}
public override void SpellHitTarget(Unit target, SpellInfo spell)
public override void SpellHitTarget(WorldObject target, SpellInfo spellInfo)
{
if (spell.Id == SpellIds.DrawSpirit && target.IsTypeId(TypeId.Player))
if (spellInfo.Id == SpellIds.DrawSpirit && target.IsPlayer())
{
Position targetPos = target.GetPosition();
me.SummonCreature(CreatureIds.SpiritShade, targetPos, TempSummonType.TimedDespawnOutOfCombat, 50000);
Source/Scripts/World/NpcSpecial.cs
+9 -163
View File
@@ -162,17 +162,6 @@ namespace Scripts.World.NpcSpecial
//Guardianspells
public const uint Deathtouch = 5;
//Sayge
public const uint Strength = 23735; // +10% Strength
public const uint Agility = 23736; // +10% Agility
public const uint Stamina = 23737; // +10% Stamina
public const uint Spirit = 23738; // +10% Spirit
public const uint Intellect = 23766; // +10% Intellect
public const uint Armor = 23767; // +10% Armor
public const uint Damage = 23768; // +10% Damage
public const uint Resistance = 23769; // +25 Magic Resistance (All)
public const uint Fortune = 23765; // Darkmoon Faire Fortune
//Tonkmine
public const uint TonkMineDetonate = 25099;
@@ -296,28 +285,6 @@ namespace Scripts.World.NpcSpecial
struct GossipMenus
{
//Sayge
public const int OptionIdAnswer1 = 0;
public const int OptionIdAnswer2 = 1;
public const int OptionIdAnswer3 = 2;
public const int OptionIdAnswer4 = 3;
public const int IAmReadyToDiscover = 6186;
public const int OptionSayge = 6185;
public const int OptionSayge2 = 6187;
public const int OptionSayge3 = 6208;
public const int OptionSayge4 = 6209;
public const int OptionSayge5 = 6210;
public const int OptionSayge6 = 6211;
public const int IHaveLongKnown = 7339;
public const int YouHaveBeenTasked = 7340;
public const int SwornExecutioner = 7341;
public const int DiplomaticMission = 7361;
public const int YourBrotherSeeks = 7362;
public const int ATerribleBeast = 7363;
public const int YourFortuneIsCast = 7364;
public const int HereIsYourFortune = 7365;
public const int CantGiveYouYour = 7393;
//Wormhole
public const int MenuIdWormhole = 10668; // "This tear in the fabric of time and space looks ominous."
public const int OptionIdWormhole1 = 0; // "Borean Tundra"
@@ -1077,10 +1044,10 @@ namespace Scripts.World.NpcSpecial
public override void JustEngagedWith(Unit who) { }
public override void SpellHit(Unit caster, SpellInfo spell)
public override void SpellHit(WorldObject caster, SpellInfo spellInfo)
{
Player player = caster.ToPlayer();
if (!player || !me.IsAlive() || spell.Id != 20804)
if (!player || !me.IsAlive() || spellInfo.Id != 20804)
return;
if (player.GetQuestStatus(6624) == QuestStatus.Incomplete || player.GetQuestStatus(6622) == QuestStatus.Incomplete)
@@ -1199,9 +1166,9 @@ namespace Scripts.World.NpcSpecial
public override void JustEngagedWith(Unit who) { }
public override void SpellHit(Unit caster, SpellInfo spell)
public override void SpellHit(WorldObject caster, SpellInfo spellInfo)
{
if (spell.Id == SpellIds.LesserHealR2 || spell.Id == SpellIds.FortitudeR1)
if (spellInfo.Id == SpellIds.LesserHealR2 || spellInfo.Id == SpellIds.FortitudeR1)
{
//not while in combat
if (me.IsInCombat())
@@ -1216,16 +1183,16 @@ namespace Scripts.World.NpcSpecial
{
if (quest != 0 && player.GetQuestStatus(quest) == QuestStatus.Incomplete)
{
if (IsHealed && !CanRun && spell.Id == SpellIds.FortitudeR1)
if (IsHealed && !CanRun && spellInfo.Id == SpellIds.FortitudeR1)
{
Talk(TextIds.SayThanks, caster);
Talk(TextIds.SayThanks, player);
CanRun = true;
}
else if (!IsHealed && spell.Id == SpellIds.LesserHealR2)
else if (!IsHealed && spellInfo.Id == SpellIds.LesserHealR2)
{
CasterGUID = caster.GetGUID();
CasterGUID = player.GetGUID();
me.SetStandState(UnitStandStateType.Stand);
Talk(TextIds.SayHealed, caster);
Talk(TextIds.SayHealed, player);
IsHealed = true;
}
}
@@ -1301,127 +1268,6 @@ namespace Scripts.World.NpcSpecial
}
}
[Script]
class npc_sayge : ScriptedAI
{
public npc_sayge(Creature creature) : base(creature) { }
public override bool GossipHello(Player player)
{
if (me.IsQuestGiver())
player.PrepareQuestMenu(me.GetGUID());
if (player.GetSpellHistory().HasCooldown(SpellIds.Strength) ||
player.GetSpellHistory().HasCooldown(SpellIds.Agility) ||
player.GetSpellHistory().HasCooldown(SpellIds.Stamina) ||
player.GetSpellHistory().HasCooldown(SpellIds.Spirit) ||
player.GetSpellHistory().HasCooldown(SpellIds.Intellect) ||
player.GetSpellHistory().HasCooldown(SpellIds.Armor) ||
player.GetSpellHistory().HasCooldown(SpellIds.Damage) ||
player.GetSpellHistory().HasCooldown(SpellIds.Resistance))
player.SendGossipMenu(GossipMenus.CantGiveYouYour, me.GetGUID());
else
{
player.ADD_GOSSIP_ITEM_DB(GossipMenus.IAmReadyToDiscover, GossipMenus.OptionIdAnswer1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1);
player.SendGossipMenu(GossipMenus.IHaveLongKnown, me.GetGUID());
}
return true;
}
void SendAction(Player player, uint action)
{
switch (action)
{
case eTradeskill.GossipActionInfoDef + 1:
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge, GossipMenus.OptionIdAnswer1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge, GossipMenus.OptionIdAnswer2, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 3);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge, GossipMenus.OptionIdAnswer3, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 4);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge, GossipMenus.OptionIdAnswer4, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 5);
player.SendGossipMenu(GossipMenus.YouHaveBeenTasked, me.GetGUID());
break;
case eTradeskill.GossipActionInfoDef + 2:
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge2, GossipMenus.OptionIdAnswer1, eTradeskill.GossipSenderMain + 1, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge2, GossipMenus.OptionIdAnswer2, eTradeskill.GossipSenderMain + 2, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge2, GossipMenus.OptionIdAnswer3, eTradeskill.GossipSenderMain + 3, eTradeskill.GossipActionInfoDef);
player.SendGossipMenu(GossipMenus.SwornExecutioner, me.GetGUID());
break;
case eTradeskill.GossipActionInfoDef + 3:
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge3, GossipMenus.OptionIdAnswer1, eTradeskill.GossipSenderMain + 4, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge3, GossipMenus.OptionIdAnswer2, eTradeskill.GossipSenderMain + 5, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge3, GossipMenus.OptionIdAnswer3, eTradeskill.GossipSenderMain + 2, eTradeskill.GossipActionInfoDef);
player.SendGossipMenu(GossipMenus.DiplomaticMission, me.GetGUID());
break;
case eTradeskill.GossipActionInfoDef + 4:
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge4, GossipMenus.OptionIdAnswer1, eTradeskill.GossipSenderMain + 6, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge4, GossipMenus.OptionIdAnswer2, eTradeskill.GossipSenderMain + 7, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge4, GossipMenus.OptionIdAnswer3, eTradeskill.GossipSenderMain + 8, eTradeskill.GossipActionInfoDef);
player.SendGossipMenu(GossipMenus.YourBrotherSeeks, me.GetGUID());
break;
case eTradeskill.GossipActionInfoDef + 5:
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge5, GossipMenus.OptionIdAnswer1, eTradeskill.GossipSenderMain + 5, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge5, GossipMenus.OptionIdAnswer2, eTradeskill.GossipSenderMain + 4, eTradeskill.GossipActionInfoDef);
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge5, GossipMenus.OptionIdAnswer3, eTradeskill.GossipSenderMain + 3, eTradeskill.GossipActionInfoDef);
player.SendGossipMenu(GossipMenus.ATerribleBeast, me.GetGUID());
break;
case eTradeskill.GossipActionInfoDef:
player.ADD_GOSSIP_ITEM_DB(GossipMenus.OptionSayge6, GossipMenus.OptionIdAnswer1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 6);
player.SendGossipMenu(GossipMenus.YourFortuneIsCast, me.GetGUID());
break;
case eTradeskill.GossipActionInfoDef + 6:
DoCast(player, SpellIds.Fortune, new CastSpellExtraArgs(false));
player.SendGossipMenu(GossipMenus.HereIsYourFortune, me.GetGUID());
break;
}
}
public override bool GossipSelect(Player player, uint menuId, uint gossipListId)
{
uint sender = player.PlayerTalkClass.GetGossipOptionSender(gossipListId);
uint action = player.PlayerTalkClass.GetGossipOptionAction(gossipListId);
player.PlayerTalkClass.ClearMenus();
uint spellId = 0;
switch (sender)
{
case eTradeskill.GossipSenderMain:
SendAction(player, action);
break;
case eTradeskill.GossipSenderMain + 1:
spellId = SpellIds.Damage;
break;
case eTradeskill.GossipSenderMain + 2:
spellId = SpellIds.Resistance;
break;
case eTradeskill.GossipSenderMain + 3:
spellId = SpellIds.Armor;
break;
case eTradeskill.GossipSenderMain + 4:
spellId = SpellIds.Spirit;
break;
case eTradeskill.GossipSenderMain + 5:
spellId = SpellIds.Intellect;
break;
case eTradeskill.GossipSenderMain + 6:
spellId = SpellIds.Stamina;
break;
case eTradeskill.GossipSenderMain + 7:
spellId = SpellIds.Strength;
break;
case eTradeskill.GossipSenderMain + 8:
spellId = SpellIds.Agility;
break;
}
if (spellId != 0)
{
DoCast(player, spellId, new CastSpellExtraArgs(false));
player.GetSpellHistory().AddCooldown(spellId, 0, TimeSpan.FromHours(2));
SendAction(player, action);
}
return true;
}
}
[Script]
class npc_steam_tonk : ScriptedAI
{