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

Core/Quests: Implement new logic for selecting spell casters for accept/reward spells based on quest flags

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/7d2cbd4e7cec5737c742437e126ddb745d65f6a9)
This commit is contained in:
hondacrx
2019-09-03 23:57:18 -04:00
parent 42d9ed78ee
commit 4128cc8516
4 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Quest.cs
+26 -15
View File
@@ -774,6 +774,20 @@ namespace Game.Entities
UpdatePvPState();
}
if (quest.SourceSpellID > 0)
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(quest.SourceSpellID);
Unit caster = this;
if (questGiver != null && questGiver.isTypeMask(TypeMask.Unit) && !quest.HasFlag(QuestFlags.PlayerCastOnAccept) && !spellInfo.HasTargetType(Targets.UnitCaster) && !spellInfo.HasTargetType(Targets.DestCasterSummon))
{
Unit unit = questGiver.ToUnit();
if (unit != null)
unit.CastSpell(this, quest.SourceSpellID, true);
}
caster.CastSpell(this, quest.SourceSpellID, true);
}
SetQuestSlot(log_slot, quest_id, qtime);
m_QuestStatusSave[quest_id] = QuestSaveType.Default;
@@ -1076,17 +1090,15 @@ namespace Game.Entities
if (quest.RewardSpell > 0)
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(quest.RewardSpell);
if (questGiver && questGiver.isTypeMask(TypeMask.Unit)
&& !spellInfo.HasEffect(Difficulty.None, SpellEffectName.LearnSpell)
&& !spellInfo.HasEffect(Difficulty.None, SpellEffectName.CreateItem)
&& !spellInfo.HasEffect(Difficulty.None, SpellEffectName.ApplyAura))
Unit caster = this;
if (questGiver != null && questGiver.isTypeMask(TypeMask.Unit) && !quest.HasFlag(QuestFlags.PlayerCastOnComplete) && !spellInfo.HasTargetType(Targets.UnitCaster))
{
Unit unit = questGiver.ToUnit();
if (unit)
unit.CastSpell(this, quest.RewardSpell, true);
if (unit != null)
caster = unit;
}
else
CastSpell(this, quest.RewardSpell, true);
caster.CastSpell(this, quest.RewardSpell, true);
}
else
{
@@ -1095,16 +1107,15 @@ namespace Game.Entities
if (quest.RewardDisplaySpell[i] > 0)
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(quest.RewardDisplaySpell[i]);
if (questGiver && questGiver.IsTypeId(TypeId.Unit)
&& !spellInfo.HasEffect(Difficulty.None, SpellEffectName.LearnSpell)
&& !spellInfo.HasEffect(Difficulty.None, SpellEffectName.CreateItem))
Unit caster = this;
if (questGiver != null && questGiver.isTypeMask(TypeMask.Unit) && !quest.HasFlag(QuestFlags.PlayerCastOnComplete) && !spellInfo.HasTargetType(Targets.UnitCaster))
{
Unit unit = questGiver.ToUnit();
if (unit)
unit.CastSpell(this, quest.RewardDisplaySpell[i], true);
if (unit != null)
caster = unit;
}
else
CastSpell(this, quest.RewardDisplaySpell[i], true);
caster.CastSpell(this, quest.RewardDisplaySpell[i], true);
}
}
}