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

Core/DataStores: Fixed db2 structures after 7.3.5

Browse Source
This commit is contained in:
hondacrx
2018-03-13 15:43:03 -04:00
parent 2199e07955
commit 0ab3b8e8cd
97 changed files with 3139 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/Aura.cs
+5 -5
View File
@@ -305,7 +305,7 @@ namespace Game.Spells
var powers = Global.DB2Mgr.GetSpellPowers(GetId(), caster ? caster.GetMap().GetDifficultyID() : Difficulty.None);
foreach (var power in powers)
if (power.ManaCostPerSecond != 0 || power.ManaCostPercentagePerSecond > 0.0f)
if (power.ManaPerSecond != 0 || power.PowerPctPerSecond > 0.0f)
m_periodicCosts.Add(power);
if (!m_periodicCosts.Empty())
@@ -653,14 +653,14 @@ namespace Game.Spells
foreach (SpellPowerRecord power in m_periodicCosts)
{
if (power.RequiredAura != 0 && !caster.HasAura(power.RequiredAura))
if (power.RequiredAuraSpellID != 0 && !caster.HasAura(power.RequiredAuraSpellID))
continue;
int manaPerSecond = (int)power.ManaCostPerSecond;
int manaPerSecond = (int)power.ManaPerSecond;
if (power.PowerType != PowerType.Health)
manaPerSecond += MathFunctions.CalculatePct(caster.GetMaxPower(power.PowerType), power.ManaCostPercentagePerSecond);
manaPerSecond += MathFunctions.CalculatePct(caster.GetMaxPower(power.PowerType), power.PowerPctPerSecond);
else
manaPerSecond += (int)MathFunctions.CalculatePct(caster.GetMaxHealth(), power.ManaCostPercentagePerSecond);
manaPerSecond += (int)MathFunctions.CalculatePct(caster.GetMaxHealth(), power.PowerPctPerSecond);
if (manaPerSecond != 0)
{
Source/Game/Spells/Auras/AuraEffect.cs
+8 -8
View File
@@ -105,7 +105,7 @@ namespace Game.Spells
{
for (int t = 0; t < ItemConst.MaxItemEnchantmentEffects; t++)
{
if (pEnchant.EffectSpellID[t] == m_spellInfo.Id)
if (pEnchant.EffectArg[t] == m_spellInfo.Id)
{
amount = (int)((item_rand_suffix.AllocationPct[k] * castItem.GetItemSuffixFactor()) / 10000);
break;
@@ -146,7 +146,7 @@ namespace Game.Spells
uint mountType = (uint)GetMiscValueB();
MountRecord mountEntry = Global.DB2Mgr.GetMount(GetId());
if (mountEntry != null)
mountType = mountEntry.MountTypeId;
mountType = mountEntry.MountTypeID;
var mountCapability = GetBase().GetUnitOwner().GetMountCapability(mountType);
if (mountCapability != null)
@@ -2197,7 +2197,7 @@ namespace Game.Spells
}).ToList();
if (!usableDisplays.Empty())
displayId = usableDisplays.SelectRandom().DisplayID;
displayId = usableDisplays.SelectRandom().CreatureDisplayInfoID;
}
}
// TODO: CREATE TABLE mount_vehicle (mountId, vehicleCreatureId) for future mounts that are vehicles (new mounts no longer have proper data in MiscValue)
@@ -2229,7 +2229,7 @@ namespace Game.Spells
{
var mountCapability = CliDB.MountCapabilityStorage.LookupByKey(GetAmount());
if (mountCapability != null)
target.CastSpell(target, mountCapability.SpeedModSpell, true);
target.CastSpell(target, mountCapability.ModSpellAuraID, true);
}
}
else
@@ -2245,7 +2245,7 @@ namespace Game.Spells
// remove speed aura
var mountCapability = CliDB.MountCapabilityStorage.LookupByKey(GetAmount());
if (mountCapability != null)
target.RemoveAurasDueToSpell(mountCapability.SpeedModSpell, target.GetGUID());
target.RemoveAurasDueToSpell(mountCapability.ModSpellAuraID, target.GetGUID());
}
}
}
@@ -3512,7 +3512,7 @@ namespace Game.Spells
return;
Unit target = aurApp.GetTarget();
if (target.GetPowerIndex((PowerType)powerDisplay.PowerType) == (int)PowerType.Max)
if (target.GetPowerIndex((PowerType)powerDisplay.ActualType) == (int)PowerType.Max)
return;
if (apply)
@@ -4693,7 +4693,7 @@ namespace Game.Spells
{
for (byte i = 0; i < SharedConst.MaxOverrideSpell; ++i)
{
uint spellId = overrideSpells.SpellID[i];
uint spellId = overrideSpells.Spells[i];
if (spellId != 0)
target.AddTemporarySpell(spellId);
}
@@ -4707,7 +4707,7 @@ namespace Game.Spells
{
for (byte i = 0; i < SharedConst.MaxOverrideSpell; ++i)
{
uint spellId = overrideSpells.SpellID[i];
uint spellId = overrideSpells.Spells[i];
if (spellId != 0)
target.RemoveTemporarySpell(spellId);
}