From 3bc1b078892a9f2e31b8563e29b220b6b9d09be0 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 27 Jul 2017 17:31:01 -0400 Subject: [PATCH] Defined TARGET_GAMEOBJECT_CONE_109 Fixed SpellPowerEntry structure * ManaCosts are signed --- Framework/Constants/Spells/SpellConst.cs | 3 ++- Game/DataStorage/Structs/S_Records.cs | 4 ++-- Game/Spells/SpellInfo.cs | 4 ++-- Game/Spells/SpellManager.cs | 13 ------------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Framework/Constants/Spells/SpellConst.cs b/Framework/Constants/Spells/SpellConst.cs index 05400b0ab..95f315a2f 100644 --- a/Framework/Constants/Spells/SpellConst.cs +++ b/Framework/Constants/Spells/SpellConst.cs @@ -2316,7 +2316,8 @@ namespace Framework.Constants UnitUnk105 = 105, // 1 Spell DestChannelCaster = 106, UnkDestAreaUnk107 = 107, // Not Enough Info - Only Generic Spells Avalible - GameobjectCone = 108, + GameobjectCone_108 = 108, + GameobjectCone_109 = 109, UnitConeEntry110 = 110, Unk111 = 111, Unk112 = 112, diff --git a/Game/DataStorage/Structs/S_Records.cs b/Game/DataStorage/Structs/S_Records.cs index b16071ddb..5213a3715 100644 --- a/Game/DataStorage/Structs/S_Records.cs +++ b/Game/DataStorage/Structs/S_Records.cs @@ -408,7 +408,7 @@ namespace Game.DataStorage public sealed class SpellPowerRecord { public uint SpellID; - public uint ManaCost; + public int ManaCost; public float ManaCostPercentage; public float ManaCostPercentagePerSecond; public uint RequiredAura; @@ -418,7 +418,7 @@ namespace Game.DataStorage public uint Id; public int ManaCostPerLevel; public int ManaCostPerSecond; - public uint ManaCostAdditional; // Spell uses [ManaCost, ManaCost+ManaCostAdditional] power - affects tooltip parsing as multiplier on SpellEffectEntry::EffectPointsPerResource + public int ManaCostAdditional; // Spell uses [ManaCost, ManaCost+ManaCostAdditional] power - affects tooltip parsing as multiplier on SpellEffectEntry::EffectPointsPerResource // only SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE, SPELL_EFFECT_WEAPON_DAMAGE, SPELL_EFFECT_NORMALIZED_WEAPON_DMG public uint PowerDisplayID; public uint UnitPowerBarID; diff --git a/Game/Spells/SpellInfo.cs b/Game/Spells/SpellInfo.cs index 3136ac8bf..c63397073 100644 --- a/Game/Spells/SpellInfo.cs +++ b/Game/Spells/SpellInfo.cs @@ -3642,8 +3642,8 @@ namespace Game.Spells new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 105 TARGET_UNIT_UNK_105 new StaticData(SpellTargetObjectTypes.Dest, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Channel, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 106 TARGET_DEST_CHANNEL_CASTER new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.Dest, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 107 TARGET_UNK_DEST_AREA_UNK_107 - new StaticData(SpellTargetObjectTypes.Gobj, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.Front), // 108 TARGET_GAMEOBJECT_CONE - new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 109 + new StaticData(SpellTargetObjectTypes.Gobj, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.Front), // 108 TARGET_GAMEOBJECT_CONE_108 + new StaticData(SpellTargetObjectTypes.Gobj, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.Front), // 109 TARGET_GAMEOBJECT_CONE_109 new StaticData(SpellTargetObjectTypes.Unit, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Cone, SpellTargetCheckTypes.Entry , SpellTargetDirectionTypes.Front), // 110 TARGET_DEST_UNK_110 new StaticData(SpellTargetObjectTypes.None, SpellTargetReferenceTypes.None, SpellTargetSelectionCategories.Nyi, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 111 new StaticData(SpellTargetObjectTypes.Dest, SpellTargetReferenceTypes.Caster, SpellTargetSelectionCategories.Default, SpellTargetCheckTypes.Default, SpellTargetDirectionTypes.None), // 112 diff --git a/Game/Spells/SpellManager.cs b/Game/Spells/SpellManager.cs index babec1ceb..b6b828a47 100644 --- a/Game/Spells/SpellManager.cs +++ b/Game/Spells/SpellManager.cs @@ -2692,9 +2692,6 @@ namespace Game.Entities case 63137: // Summon Valiant Test (HACK: Target shouldn't be changed; summon position should be untied from spell destination) spellInfo.GetEffect(0).TargetA = new SpellImplicitTargetInfo(Targets.DestDb); break; - case 42436: // Drink! (Brewfest) - spellInfo.GetEffect(0).TargetA = new SpellImplicitTargetInfo(Targets.UnitAny); - break; case 52611: // Summon Skeletons case 52612: // Summon Skeletons spellInfo.GetEffect(0).MiscValueB = 64; @@ -2731,16 +2728,6 @@ namespace Game.Entities case 36350: //They Must Burn Bomb Aura (self) spellInfo.GetEffect(0).TriggerSpell = 36325; // They Must Burn Bomb Drop (DND) break; - case 61407: // Energize Cores - case 62136: // Energize Cores - case 54069: // Energize Cores - case 56251: // Energize Cores - spellInfo.GetEffect(0).TargetA = new SpellImplicitTargetInfo(Targets.UnitSrcAreaEntry); - break; - case 50785: // Energize Cores - case 59372: // Energize Cores - spellInfo.GetEffect(0).TargetA = new SpellImplicitTargetInfo(Targets.UnitSrcAreaEnemy); - break; case 5308: // Execute spellInfo.AttributesEx3 |= SpellAttr3.CantTriggerProc; break;