fix(Core/Items): count stats programatically instead of manually set (#22564)
Co-authored-by: heyitsbench <benjymansy123@gmail.com>
This commit is contained in:
Tereneckla
GitHub
parent
b711c55c1e
commit
9ad7cef3c4
7 changed files with 146 additions and 85 deletions
|
|
@ -0,0 +1,22 @@
|
|||
--
|
||||
ALTER TABLE `item_template` DROP COLUMN `StatsCount`;
|
||||
|
||||
UPDATE `item_template` SET `fire_res` = `stat_value1`, `frost_res` = `stat_value2`, `shadow_res` = `stat_value3`, `arcane_res` = `stat_value4`, `nature_res` = `stat_value5`, `stat_type1` = 0, `stat_value1` = 0, `stat_type2` = 0, `stat_value2` = 0, `stat_type3` = 0, `stat_value3` = 0, `stat_type4` = 0, `stat_value4` = 0, `stat_type5` = 0, `stat_value5` = 0, `VerifiedBuild` = 0 WHERE `entry` = 5828;
|
||||
UPDATE `item_template` SET `fire_res` = `stat_value3`, `nature_res` = `stat_value4`, `stat_type3` = 0, `stat_value3` = 0, `stat_type4` = 0, `stat_value4` = 0, `VerifiedBuild` = 0 WHERE `entry` = 17802;
|
||||
UPDATE `item_template` SET `fire_res` = `stat_value3`, `stat_type3` = 0, `stat_value3` = 0, `VerifiedBuild` = 0 WHERE `entry` = 18881;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value3`, `stat_type3` = 0, `stat_value3` = 0, `VerifiedBuild` = 0 WHERE `entry` = 19065;
|
||||
UPDATE `item_template` SET `fire_res` = `stat_value3`, `stat_type3` = 0, `stat_value3` = 0, `VerifiedBuild` = 0 WHERE `entry` = 19158;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value3`, `fire_res` = `stat_value4`, `frost_res` = `stat_value5`, `shadow_res` = `stat_value6`, `arcane_res` = `stat_value7`, `nature_res` = `stat_value8`, `stat_type3` = 0, `stat_value3` = 0, `stat_type4` = 0, `stat_value4` = 0, `stat_type5` = 0, `stat_value5` = 0, `stat_type6` = 0, `stat_value6` = 0, `stat_type7` = 0, `stat_value7` = 0, `stat_type8` = 0, `stat_value8` = 0, `VerifiedBuild` = 0 WHERE `entry` = 20142;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value3`, `stat_type3` = 0, `stat_value3` = 0, `VerifiedBuild` = 0 WHERE `entry` = 20522;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value3`, `stat_type3` = 0, `stat_value3` = 0, `shadow_res` = `stat_value4`, `stat_type4` = 0, `stat_value4` = 0, `VerifiedBuild` = 0 WHERE `entry` = 20524;
|
||||
UPDATE `item_template` SET `nature_res` = `stat_value3`, `stat_type3` = 0, `stat_value3` = 0, `VerifiedBuild` = 0 WHERE `entry` = 21614;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value2`, `stat_type2` = 0, `stat_value2` = 0, `VerifiedBuild` = 0 WHERE `entry` = 22230;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value5`, `fire_res` = `stat_value6`, `shadow_res` = `stat_value7`,`stat_type5` = 0, `stat_value5` = 0, `stat_type6` = 0, `stat_value6` = 0, `stat_type7` = 0, `stat_value7` = 0, `VerifiedBuild` = 0 WHERE `entry` = 23362;
|
||||
UPDATE `item_template` SET `nature_res` = `stat_value5`, `arcane_res` = `stat_value6`, `stat_type5` = 0, `stat_value5` = 0, `stat_type6` = 0, `stat_value6` = 0, `VerifiedBuild` = 0 WHERE `entry` = 23363;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value5`, `stat_type5` = 0, `stat_value5` = 0, `VerifiedBuild` = 0 WHERE `entry` IN (32113, 32114, 32115, 32116, 32117, 32118, 32119, 32121, 32122, 32123, 32128, 32129, 32130, 32131, 32132);
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value1`, `stat_type1` = 0, `stat_value1` = 0, `VerifiedBuild` = 0 WHERE `entry` = 34187;
|
||||
UPDATE `item_template` SET `fire_res` = `stat_value5`, `stat_type5` = 0, `stat_value5` = 0, `VerifiedBuild` = 0 WHERE `entry` = 40762;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value1`, `stat_type1` = 0, `stat_value1` = 0, `VerifiedBuild` = 0 WHERE `entry` = 45860;
|
||||
UPDATE `item_template` SET `ArmorDamageModifier` = `stat_value2`, `stat_type2` = 0, `stat_value2` = 0, `VerifiedBuild` = 0 WHERE `entry` = 48945;
|
||||
UPDATE `item_template` SET `fire_res` = `stat_value3`, `stat_type3` = 0, `stat_value3` = 0, `VerifiedBuild` = 0 WHERE `entry` = 49312;
|
||||
UPDATE `item_template` SET `fire_res` = `stat_value5`, `stat_type5` = 0, `stat_value5` = 0, `VerifiedBuild` = 0 WHERE `entry` = 49314;
|
||||
|
|
@ -318,6 +318,8 @@ Player::Player(WorldSession* session): Unit(true), m_mover(this)
|
|||
m_baseRatingValue[i] = 0;
|
||||
|
||||
m_baseSpellPower = 0;
|
||||
m_baseSpellDamage = 0;
|
||||
m_baseSpellHealing = 0;
|
||||
m_baseFeralAP = 0;
|
||||
m_baseManaRegen = 0;
|
||||
m_baseHealthRegen = 0;
|
||||
|
|
@ -6836,7 +6838,10 @@ void Player::_ApplyItemBonuses(ItemTemplate const* proto, uint8 slot, bool apply
|
|||
break;
|
||||
/// @deprecated item mods
|
||||
case ITEM_MOD_SPELL_HEALING_DONE:
|
||||
ApplySpellHealingBonus(int32(val), apply);
|
||||
break;
|
||||
case ITEM_MOD_SPELL_DAMAGE_DONE:
|
||||
ApplySpellDamageBonus(int32(val), apply);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1964,6 +1964,8 @@ public:
|
|||
void UpdateAttackPowerAndDamage(bool ranged = false) override;
|
||||
void UpdateShieldBlockValue();
|
||||
void ApplySpellPowerBonus(int32 amount, bool apply);
|
||||
void ApplySpellDamageBonus(int32 amount, bool apply);
|
||||
void ApplySpellHealingBonus(int32 amount, bool apply);
|
||||
void UpdateSpellDamageAndHealingBonus();
|
||||
void ApplyRatingMod(CombatRating cr, int32 value, bool apply);
|
||||
void UpdateRating(CombatRating cr);
|
||||
|
|
@ -1982,6 +1984,8 @@ public:
|
|||
[[nodiscard]] float GetRatingMultiplier(CombatRating cr) const;
|
||||
[[nodiscard]] float GetRatingBonusValue(CombatRating cr) const;
|
||||
uint32 GetBaseSpellPowerBonus() { return m_baseSpellPower; }
|
||||
uint32 GetBaseSpellDamageBonus() { return m_baseSpellDamage; }
|
||||
uint32 GetBaseSpellHealingBonus() { return m_baseSpellHealing; }
|
||||
[[nodiscard]] int32 GetSpellPenetrationItemMod() const { return m_spellPenetrationItemMod; }
|
||||
|
||||
[[nodiscard]] float GetExpertiseDodgeOrParryReduction(WeaponAttackType attType) const;
|
||||
|
|
@ -2838,6 +2842,8 @@ protected:
|
|||
float m_auraBaseMod[BASEMOD_END][MOD_END];
|
||||
int32 m_baseRatingValue[MAX_COMBAT_RATING];
|
||||
uint32 m_baseSpellPower;
|
||||
uint32 m_baseSpellDamage;
|
||||
uint32 m_baseSpellHealing;
|
||||
uint32 m_baseFeralAP;
|
||||
uint32 m_baseManaRegen;
|
||||
uint32 m_baseHealthRegen;
|
||||
|
|
|
|||
|
|
@ -4616,8 +4616,15 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool
|
|||
HandleBaseModValue(SHIELD_BLOCK_VALUE, FLAT_MOD, float(enchant_amount), apply);
|
||||
LOG_DEBUG("entities.player.items", "+ {} BLOCK_VALUE", enchant_amount);
|
||||
break;
|
||||
case ITEM_MOD_SPELL_HEALING_DONE: // deprecated
|
||||
case ITEM_MOD_SPELL_DAMAGE_DONE: // deprecated
|
||||
/// @deprecated item mods
|
||||
case ITEM_MOD_SPELL_HEALING_DONE:
|
||||
ApplySpellHealingBonus(enchant_amount, apply);
|
||||
LOG_DEBUG("entities.player.items", "+ {} SPELL_HEALING", enchant_amount);
|
||||
break;
|
||||
case ITEM_MOD_SPELL_DAMAGE_DONE:
|
||||
ApplySpellDamageBonus(enchant_amount, apply);
|
||||
LOG_DEBUG("entities.player.items", "+ {} SPELL_DAMAGE", enchant_amount);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -174,6 +174,23 @@ void Player::ApplySpellPowerBonus(int32 amount, bool apply)
|
|||
ApplyModInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + i, amount, apply);
|
||||
}
|
||||
|
||||
void Player::ApplySpellDamageBonus(int32 amount, bool apply)
|
||||
{
|
||||
apply = _ModifyUInt32(apply, m_baseSpellDamage, amount);
|
||||
|
||||
// For speed just update for client
|
||||
for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
|
||||
ApplyModInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + i, amount, apply);
|
||||
}
|
||||
|
||||
void Player::ApplySpellHealingBonus(int32 amount, bool apply)
|
||||
{
|
||||
apply = _ModifyUInt32(apply, m_baseSpellHealing, amount);
|
||||
|
||||
// For speed just update for client
|
||||
ApplyModUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, amount, apply);
|
||||
}
|
||||
|
||||
void Player::UpdateSpellDamageAndHealingBonus()
|
||||
{
|
||||
// Magic damage modifiers implemented in Unit::SpellDamageBonusDone
|
||||
|
|
|
|||
|
|
@ -12034,6 +12034,7 @@ int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask)
|
|||
{
|
||||
// Base value
|
||||
DoneAdvertisedBenefit += ToPlayer()->GetBaseSpellPowerBonus();
|
||||
DoneAdvertisedBenefit += ToPlayer()->GetBaseSpellDamageBonus();
|
||||
|
||||
// Damage bonus from stats
|
||||
AuraEffectList const& mDamageDoneOfStatPercent = GetAuraEffectsByType(SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT);
|
||||
|
|
@ -12796,6 +12797,7 @@ int32 Unit::SpellBaseHealingBonusDone(SpellSchoolMask schoolMask)
|
|||
{
|
||||
// Base value
|
||||
AdvertisedBenefit += ToPlayer()->GetBaseSpellPowerBonus();
|
||||
AdvertisedBenefit += ToPlayer()->GetBaseSpellHealingBonus();
|
||||
|
||||
// Healing bonus from stats
|
||||
AuraEffectList const& mHealingDoneOfStatPercent = GetAuraEffectsByType(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT);
|
||||
|
|
|
|||
|
|
@ -2862,35 +2862,35 @@ void ObjectMgr::LoadItemTemplates()
|
|||
|
||||
// 0 1 2 3 4 5 6 7 8 9 10 11 12
|
||||
QueryResult result = WorldDatabase.Query("SELECT entry, class, subclass, SoundOverrideSubclass, name, displayid, Quality, Flags, FlagsExtra, BuyCount, BuyPrice, SellPrice, InventoryType, "
|
||||
// 13 14 15 16 17 18 19 20
|
||||
// 13 14 15 16 17 18 19 20
|
||||
"AllowableClass, AllowableRace, ItemLevel, RequiredLevel, RequiredSkill, RequiredSkillRank, requiredspell, requiredhonorrank, "
|
||||
// 21 22 23 24 25 26 27 28
|
||||
"RequiredCityRank, RequiredReputationFaction, RequiredReputationRank, maxcount, stackable, ContainerSlots, StatsCount, stat_type1, "
|
||||
// 29 30 31 32 33 34 35 36 37 38
|
||||
// 21 22 23 24 25 26 27
|
||||
"RequiredCityRank, RequiredReputationFaction, RequiredReputationRank, maxcount, stackable, ContainerSlots, stat_type1, "
|
||||
// 28 29 30 31 32 33 34 35 36 37
|
||||
"stat_value1, stat_type2, stat_value2, stat_type3, stat_value3, stat_type4, stat_value4, stat_type5, stat_value5, stat_type6, "
|
||||
// 39 40 41 42 43 44 45 46 47
|
||||
// 38 39 40 41 42 43 44 45 46
|
||||
"stat_value6, stat_type7, stat_value7, stat_type8, stat_value8, stat_type9, stat_value9, stat_type10, stat_value10, "
|
||||
// 48 49 50 51 52 53 54 55 56 57 58
|
||||
// 47 48 49 50 51 52 53 54 55 56 57
|
||||
"ScalingStatDistribution, ScalingStatValue, dmg_min1, dmg_max1, dmg_type1, dmg_min2, dmg_max2, dmg_type2, armor, holy_res, fire_res, "
|
||||
// 59 60 61 62 63 64 65 66 67 68
|
||||
// 58 59 60 61 62 63 64 65 66 67
|
||||
"nature_res, frost_res, shadow_res, arcane_res, delay, ammo_type, RangedModRange, spellid_1, spelltrigger_1, spellcharges_1, "
|
||||
// 69 70 71 72 73 74 75
|
||||
// 68 69 70 71 72 73 74
|
||||
"spellppmRate_1, spellcooldown_1, spellcategory_1, spellcategorycooldown_1, spellid_2, spelltrigger_2, spellcharges_2, "
|
||||
// 76 77 78 79 80 81 82
|
||||
// 75 76 77 78 79 80 81
|
||||
"spellppmRate_2, spellcooldown_2, spellcategory_2, spellcategorycooldown_2, spellid_3, spelltrigger_3, spellcharges_3, "
|
||||
// 83 84 85 86 87 88 89
|
||||
// 82 83 84 85 86 87 88
|
||||
"spellppmRate_3, spellcooldown_3, spellcategory_3, spellcategorycooldown_3, spellid_4, spelltrigger_4, spellcharges_4, "
|
||||
// 90 91 92 93 94 95 96
|
||||
// 89 90 91 92 93 94 95
|
||||
"spellppmRate_4, spellcooldown_4, spellcategory_4, spellcategorycooldown_4, spellid_5, spelltrigger_5, spellcharges_5, "
|
||||
// 97 98 99 100 101 102 103 104 105
|
||||
// 96 97 98 99 100 101 102 103 104
|
||||
"spellppmRate_5, spellcooldown_5, spellcategory_5, spellcategorycooldown_5, bonding, description, PageText, LanguageID, PageMaterial, "
|
||||
// 106 107 108 109 110 111 112 113 114 115 116 117
|
||||
// 105 106 107 108 109 110 111 112 113 114 115 116
|
||||
"startquest, lockid, Material, sheath, RandomProperty, RandomSuffix, block, itemset, MaxDurability, area, Map, BagFamily, "
|
||||
// 118 119 120 121 122 123 124 125
|
||||
// 117 118 119 120 121 122 123 124
|
||||
"TotemCategory, socketColor_1, socketContent_1, socketColor_2, socketContent_2, socketColor_3, socketContent_3, socketBonus, "
|
||||
// 126 127 128 129 130 131 132 133
|
||||
// 125 126 127 128 129 130 131 132
|
||||
"GemProperties, RequiredDisenchantSkill, ArmorDamageModifier, duration, ItemLimitCategory, HolidayId, ScriptName, DisenchantID, "
|
||||
// 134 135 136
|
||||
// 133 134 135 136
|
||||
"FoodType, minMoneyLoot, maxMoneyLoot, flagsCustom FROM item_template");
|
||||
|
||||
if (!result)
|
||||
|
|
@ -2940,84 +2940,91 @@ void ObjectMgr::LoadItemTemplates()
|
|||
itemTemplate.MaxCount = fields[24].Get<int32>();
|
||||
itemTemplate.Stackable = fields[25].Get<int32>();
|
||||
itemTemplate.ContainerSlots = uint32(fields[26].Get<uint8>());
|
||||
itemTemplate.StatsCount = uint32(fields[27].Get<uint8>());
|
||||
|
||||
for (uint8 i = 0; i < itemTemplate.StatsCount; ++i)
|
||||
uint8 statsCount = 0;
|
||||
while (statsCount < MAX_ITEM_PROTO_STATS)
|
||||
{
|
||||
itemTemplate.ItemStat[i].ItemStatType = uint32(fields[28 + i * 2].Get<uint8>());
|
||||
itemTemplate.ItemStat[i].ItemStatValue = fields[29 + i * 2].Get<int32>();
|
||||
}
|
||||
uint32 statType = uint32(fields[27 + statsCount * 2].Get<uint8>());
|
||||
int32 statValue = fields[28 + statsCount * 2].Get<int32>();
|
||||
if (statType == 0)
|
||||
break;
|
||||
|
||||
itemTemplate.ScalingStatDistribution = uint32(fields[48].Get<uint16>());
|
||||
itemTemplate.ScalingStatValue = fields[49].Get<int32>();
|
||||
itemTemplate.ItemStat[statsCount].ItemStatType = statType;
|
||||
itemTemplate.ItemStat[statsCount].ItemStatValue = statValue;
|
||||
statsCount++;
|
||||
}
|
||||
itemTemplate.StatsCount = statsCount;
|
||||
|
||||
itemTemplate.ScalingStatDistribution = uint32(fields[47].Get<uint16>());
|
||||
itemTemplate.ScalingStatValue = fields[48].Get<int32>();
|
||||
|
||||
for (uint8 i = 0; i < MAX_ITEM_PROTO_DAMAGES; ++i)
|
||||
{
|
||||
itemTemplate.Damage[i].DamageMin = fields[50 + i * 3].Get<float>();
|
||||
itemTemplate.Damage[i].DamageMax = fields[51 + i * 3].Get<float>();
|
||||
itemTemplate.Damage[i].DamageType = uint32(fields[52 + i * 3].Get<uint8>());
|
||||
itemTemplate.Damage[i].DamageMin = fields[49 + i * 3].Get<float>();
|
||||
itemTemplate.Damage[i].DamageMax = fields[50 + i * 3].Get<float>();
|
||||
itemTemplate.Damage[i].DamageType = uint32(fields[51 + i * 3].Get<uint8>());
|
||||
}
|
||||
|
||||
itemTemplate.Armor = fields[56].Get<uint32>();
|
||||
itemTemplate.HolyRes = fields[57].Get<int32>();
|
||||
itemTemplate.FireRes = fields[58].Get<int32>();
|
||||
itemTemplate.NatureRes = fields[59].Get<int32>();
|
||||
itemTemplate.FrostRes = fields[60].Get<int32>();
|
||||
itemTemplate.ShadowRes = fields[61].Get<int32>();
|
||||
itemTemplate.ArcaneRes = fields[62].Get<int32>();
|
||||
itemTemplate.Delay = uint32(fields[63].Get<uint16>());
|
||||
itemTemplate.AmmoType = uint32(fields[64].Get<uint8>());
|
||||
itemTemplate.RangedModRange = fields[65].Get<float>();
|
||||
itemTemplate.Armor = fields[55].Get<uint32>();
|
||||
itemTemplate.HolyRes = fields[56].Get<int32>();
|
||||
itemTemplate.FireRes = fields[57].Get<int32>();
|
||||
itemTemplate.NatureRes = fields[58].Get<int32>();
|
||||
itemTemplate.FrostRes = fields[59].Get<int32>();
|
||||
itemTemplate.ShadowRes = fields[60].Get<int32>();
|
||||
itemTemplate.ArcaneRes = fields[61].Get<int32>();
|
||||
itemTemplate.Delay = uint32(fields[62].Get<uint16>());
|
||||
itemTemplate.AmmoType = uint32(fields[63].Get<uint8>());
|
||||
itemTemplate.RangedModRange = fields[64].Get<float>();
|
||||
|
||||
for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
|
||||
{
|
||||
itemTemplate.Spells[i].SpellId = fields[66 + i * 7 ].Get<int32>();
|
||||
itemTemplate.Spells[i].SpellTrigger = uint32(fields[67 + i * 7].Get<uint8>());
|
||||
itemTemplate.Spells[i].SpellCharges = int32(fields[68 + i * 7].Get<int16>());
|
||||
itemTemplate.Spells[i].SpellPPMRate = fields[69 + i * 7].Get<float>();
|
||||
itemTemplate.Spells[i].SpellCooldown = fields[70 + i * 7].Get<int32>();
|
||||
itemTemplate.Spells[i].SpellCategory = uint32(fields[71 + i * 7].Get<uint16>());
|
||||
itemTemplate.Spells[i].SpellCategoryCooldown = fields[72 + i * 7].Get<int32>();
|
||||
itemTemplate.Spells[i].SpellId = fields[65 + i * 7 ].Get<int32>();
|
||||
itemTemplate.Spells[i].SpellTrigger = uint32(fields[66 + i * 7].Get<uint8>());
|
||||
itemTemplate.Spells[i].SpellCharges = int32(fields[67 + i * 7].Get<int16>());
|
||||
itemTemplate.Spells[i].SpellPPMRate = fields[68 + i * 7].Get<float>();
|
||||
itemTemplate.Spells[i].SpellCooldown = fields[69 + i * 7].Get<int32>();
|
||||
itemTemplate.Spells[i].SpellCategory = uint32(fields[70 + i * 7].Get<uint16>());
|
||||
itemTemplate.Spells[i].SpellCategoryCooldown = fields[71 + i * 7].Get<int32>();
|
||||
}
|
||||
|
||||
itemTemplate.Bonding = uint32(fields[101].Get<uint8>());
|
||||
itemTemplate.Description = fields[102].Get<std::string>();
|
||||
itemTemplate.PageText = fields[103].Get<uint32>();
|
||||
itemTemplate.LanguageID = uint32(fields[104].Get<uint8>());
|
||||
itemTemplate.PageMaterial = uint32(fields[105].Get<uint8>());
|
||||
itemTemplate.StartQuest = fields[106].Get<uint32>();
|
||||
itemTemplate.LockID = fields[107].Get<uint32>();
|
||||
itemTemplate.Material = int32(fields[108].Get<int8>());
|
||||
itemTemplate.Sheath = uint32(fields[109].Get<uint8>());
|
||||
itemTemplate.RandomProperty = fields[110].Get<int32>();
|
||||
itemTemplate.RandomSuffix = fields[111].Get<int32>();
|
||||
itemTemplate.Block = fields[112].Get<uint32>();
|
||||
itemTemplate.ItemSet = fields[113].Get<uint32>();
|
||||
itemTemplate.MaxDurability = uint32(fields[114].Get<uint16>());
|
||||
itemTemplate.Area = fields[115].Get<uint32>();
|
||||
itemTemplate.Map = uint32(fields[116].Get<uint16>());
|
||||
itemTemplate.BagFamily = fields[117].Get<uint32>();
|
||||
itemTemplate.TotemCategory = fields[118].Get<uint32>();
|
||||
itemTemplate.Bonding = uint32(fields[100].Get<uint8>());
|
||||
itemTemplate.Description = fields[101].Get<std::string>();
|
||||
itemTemplate.PageText = fields[102].Get<uint32>();
|
||||
itemTemplate.LanguageID = uint32(fields[103].Get<uint8>());
|
||||
itemTemplate.PageMaterial = uint32(fields[104].Get<uint8>());
|
||||
itemTemplate.StartQuest = fields[105].Get<uint32>();
|
||||
itemTemplate.LockID = fields[106].Get<uint32>();
|
||||
itemTemplate.Material = int32(fields[107].Get<int8>());
|
||||
itemTemplate.Sheath = uint32(fields[108].Get<uint8>());
|
||||
itemTemplate.RandomProperty = fields[109].Get<int32>();
|
||||
itemTemplate.RandomSuffix = fields[110].Get<int32>();
|
||||
itemTemplate.Block = fields[111].Get<uint32>();
|
||||
itemTemplate.ItemSet = fields[112].Get<uint32>();
|
||||
itemTemplate.MaxDurability = uint32(fields[113].Get<uint16>());
|
||||
itemTemplate.Area = fields[114].Get<uint32>();
|
||||
itemTemplate.Map = uint32(fields[115].Get<uint16>());
|
||||
itemTemplate.BagFamily = fields[116].Get<uint32>();
|
||||
itemTemplate.TotemCategory = fields[117].Get<uint32>();
|
||||
|
||||
for (uint8 i = 0; i < MAX_ITEM_PROTO_SOCKETS; ++i)
|
||||
{
|
||||
itemTemplate.Socket[i].Color = uint32(fields[119 + i * 2].Get<uint8>());
|
||||
itemTemplate.Socket[i].Content = fields[120 + i * 2].Get<uint32>();
|
||||
itemTemplate.Socket[i].Color = uint32(fields[118 + i * 2].Get<uint8>());
|
||||
itemTemplate.Socket[i].Content = fields[119 + i * 2].Get<uint32>();
|
||||
}
|
||||
|
||||
itemTemplate.socketBonus = fields[125].Get<uint32>();
|
||||
itemTemplate.GemProperties = fields[126].Get<uint32>();
|
||||
itemTemplate.RequiredDisenchantSkill = uint32(fields[127].Get<int16>());
|
||||
itemTemplate.ArmorDamageModifier = fields[128].Get<float>();
|
||||
itemTemplate.Duration = fields[129].Get<uint32>();
|
||||
itemTemplate.ItemLimitCategory = uint32(fields[130].Get<int16>());
|
||||
itemTemplate.HolidayId = fields[131].Get<uint32>();
|
||||
itemTemplate.ScriptId = GetScriptId(fields[132].Get<std::string>());
|
||||
itemTemplate.DisenchantID = fields[133].Get<uint32>();
|
||||
itemTemplate.FoodType = uint32(fields[134].Get<uint8>());
|
||||
itemTemplate.MinMoneyLoot = fields[135].Get<uint32>();
|
||||
itemTemplate.MaxMoneyLoot = fields[136].Get<uint32>();
|
||||
itemTemplate.FlagsCu = ItemFlagsCustom(fields[137].Get<uint32>());
|
||||
itemTemplate.socketBonus = fields[124].Get<uint32>();
|
||||
itemTemplate.GemProperties = fields[125].Get<uint32>();
|
||||
itemTemplate.RequiredDisenchantSkill = uint32(fields[126].Get<int16>());
|
||||
itemTemplate.ArmorDamageModifier = fields[127].Get<float>();
|
||||
itemTemplate.Duration = fields[128].Get<uint32>();
|
||||
itemTemplate.ItemLimitCategory = uint32(fields[129].Get<int16>());
|
||||
itemTemplate.HolidayId = fields[130].Get<uint32>();
|
||||
itemTemplate.ScriptId = GetScriptId(fields[131].Get<std::string>());
|
||||
itemTemplate.DisenchantID = fields[132].Get<uint32>();
|
||||
itemTemplate.FoodType = uint32(fields[133].Get<uint8>());
|
||||
itemTemplate.MinMoneyLoot = fields[134].Get<uint32>();
|
||||
itemTemplate.MaxMoneyLoot = fields[135].Get<uint32>();
|
||||
itemTemplate.FlagsCu = ItemFlagsCustom(fields[136].Get<uint32>());
|
||||
|
||||
// Checks
|
||||
ItemEntry const* dbcitem = sItemStore.LookupEntry(entry);
|
||||
|
|
@ -3171,12 +3178,6 @@ void ObjectMgr::LoadItemTemplates()
|
|||
itemTemplate.ContainerSlots = MAX_BAG_SIZE;
|
||||
}
|
||||
|
||||
if (itemTemplate.StatsCount > MAX_ITEM_PROTO_STATS)
|
||||
{
|
||||
LOG_ERROR("sql.sql", "Item (Entry: {}) has too large value in statscount ({}), replace by hardcoded limit ({}).", entry, itemTemplate.StatsCount, MAX_ITEM_PROTO_STATS);
|
||||
itemTemplate.StatsCount = MAX_ITEM_PROTO_STATS;
|
||||
}
|
||||
|
||||
for (uint8 j = 0; j < itemTemplate.StatsCount; ++j)
|
||||
{
|
||||
// for ItemStatValue != 0
|
||||
|
|
@ -3189,7 +3190,8 @@ void ObjectMgr::LoadItemTemplates()
|
|||
switch (itemTemplate.ItemStat[j].ItemStatType)
|
||||
{
|
||||
case ITEM_MOD_SPELL_HEALING_DONE:
|
||||
LOG_ERROR("sql.sql", "Item (Entry: {}) has deprecated stat_type{} ({})", entry, j + 1, itemTemplate.ItemStat[j].ItemStatType);
|
||||
case ITEM_MOD_SPELL_DAMAGE_DONE:
|
||||
LOG_WARN("sql.sql", "Item (Entry: {}) has deprecated stat_type{} ({})", entry, j + 1, itemTemplate.ItemStat[j].ItemStatType);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue