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

Core/Spells: Fixed value of aura effects for stat mod auras applied by items

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/123858331211db6fe6745f0886c1499f8e598443)
This commit is contained in:
hondacrx
2019-12-02 14:01:46 -05:00
parent 40ed357043
commit cdb225a4b6
13 changed files with 120 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/CliDB.cs
+27 -2
View File
@@ -359,7 +359,7 @@ namespace Game.DataStorage
BarberShopCostBaseGameTable = GameTableReader.Read<GtBarberShopCostBaseRecord>("BarberShopCostBase.txt");
BaseMPGameTable = GameTableReader.Read<GtBaseMPRecord>("BaseMp.txt");
CombatRatingsGameTable = GameTableReader.Read<GtCombatRatingsRecord>("CombatRatings.txt");
CombatRatingsMultByILvlGameTable = GameTableReader.Read<GtCombatRatingsMultByILvlRecord>("CombatRatingsMultByILvl.txt");
CombatRatingsMultByILvlGameTable = GameTableReader.Read<GtGenericMultByILvlRecord>("CombatRatingsMultByILvl.txt");
ItemSocketCostPerLevelGameTable = GameTableReader.Read<GtItemSocketCostPerLevelRecord>("ItemSocketCostPerLevel.txt");
HpPerStaGameTable = GameTableReader.Read<GtHpPerStaRecord>("HpPerSta.txt");
NpcDamageByClassGameTable[0] = GameTableReader.Read<GtNpcDamageByClassRecord>("NpcDamageByClass.txt");
@@ -380,6 +380,7 @@ namespace Game.DataStorage
NpcTotalHpGameTable[6] = GameTableReader.Read<GtNpcTotalHpRecord>("NpcTotalHpExp6.txt");
NpcTotalHpGameTable[7] = GameTableReader.Read<GtNpcTotalHpRecord>("NpcTotalHpExp7.txt");
SpellScalingGameTable = GameTableReader.Read<GtSpellScalingRecord>("SpellScaling.txt");
StaminaMultByILvlGameTable = GameTableReader.Read<GtGenericMultByILvlRecord>("StaminaMultByILvl.txt");
XpGameTable = GameTableReader.Read<GtXpRecord>("xp.txt");
Log.outInfo(LogFilter.ServerLoading, "Initialized {0} DBC GameTables data stores in {1} ms", LoadedFileCount, Time.GetMSTimeDiffToNow(oldMSTime));
@@ -641,13 +642,14 @@ namespace Game.DataStorage
public static GameTable<GtBarberShopCostBaseRecord> BarberShopCostBaseGameTable;
public static GameTable<GtBaseMPRecord> BaseMPGameTable;
public static GameTable<GtCombatRatingsRecord> CombatRatingsGameTable;
public static GameTable<GtCombatRatingsMultByILvlRecord> CombatRatingsMultByILvlGameTable;
public static GameTable<GtGenericMultByILvlRecord> CombatRatingsMultByILvlGameTable;
public static GameTable<GtHpPerStaRecord> HpPerStaGameTable;
public static GameTable<GtItemSocketCostPerLevelRecord> ItemSocketCostPerLevelGameTable;
public static GameTable<GtNpcDamageByClassRecord>[] NpcDamageByClassGameTable = new GameTable<GtNpcDamageByClassRecord>[(int)Expansion.Max];
public static GameTable<GtNpcManaCostScalerRecord> NpcManaCostScalerGameTable;
public static GameTable<GtNpcTotalHpRecord>[] NpcTotalHpGameTable = new GameTable<GtNpcTotalHpRecord>[(int)Expansion.Max];
public static GameTable<GtSpellScalingRecord> SpellScalingGameTable;
public static GameTable<GtGenericMultByILvlRecord> StaminaMultByILvlGameTable;
public static GameTable<GtXpRecord> XpGameTable;
#endregion
@@ -747,6 +749,29 @@ namespace Game.DataStorage
return 0.0f;
}
public static float GetIlvlStatMultiplier(GtGenericMultByILvlRecord row, InventoryType invType)
{
switch (invType)
{
case InventoryType.Neck:
case InventoryType.Finger:
return row.JewelryMultiplier;
case InventoryType.Trinket:
return row.TrinketMultiplier;
case InventoryType.Weapon:
case InventoryType.Shield:
case InventoryType.Ranged:
case InventoryType.Weapon2Hand:
case InventoryType.WeaponMainhand:
case InventoryType.WeaponOffhand:
case InventoryType.Holdable:
case InventoryType.RangedRight:
return row.WeaponMultiplier;
default:
return row.ArmorMultiplier;
}
}
#endregion
}
}
Source/Game/DataStorage/Structs/GameTablesRecords.cs
+1 -1
View File
@@ -90,7 +90,7 @@ namespace Game.DataStorage
public float Unused12;
}
public sealed class GtCombatRatingsMultByILvlRecord
public sealed class GtGenericMultByILvlRecord
{
public float ArmorMultiplier;
public float WeaponMultiplier;