sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core/Creature): Calculate BaseArmor as float (#17448)

Browse Source
This commit is contained in:
Kitzunu
2023-10-08 13:56:16 +02:00
committed by GitHub
parent 1ad1ba07c8
commit b1395b9450
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/Creature.cpp
+1 -1
View File
@@ -535,7 +535,7 @@ bool Creature::UpdateEntry(uint32 Entry, const CreatureData* data, bool changele
SetMeleeDamageSchool(SpellSchools(cInfo->dmgschool)); SetMeleeDamageSchool(SpellSchools(cInfo->dmgschool));
CreatureBaseStats const* stats = sObjectMgr->GetCreatureBaseStats(GetLevel(), cInfo->unit_class); CreatureBaseStats const* stats = sObjectMgr->GetCreatureBaseStats(GetLevel(), cInfo->unit_class);
float armor = (float)stats->GenerateArmor(cInfo); /// @todo: Why is this treated as uint32 when it's a float? float armor = stats->GenerateArmor(cInfo);
SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, armor); SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, armor);
SetModifierValue(UNIT_MOD_RESISTANCE_HOLY, BASE_VALUE, float(cInfo->resistance[SPELL_SCHOOL_HOLY])); SetModifierValue(UNIT_MOD_RESISTANCE_HOLY, BASE_VALUE, float(cInfo->resistance[SPELL_SCHOOL_HOLY]));
SetModifierValue(UNIT_MOD_RESISTANCE_FIRE, BASE_VALUE, float(cInfo->resistance[SPELL_SCHOOL_FIRE])); SetModifierValue(UNIT_MOD_RESISTANCE_FIRE, BASE_VALUE, float(cInfo->resistance[SPELL_SCHOOL_FIRE]));
src/server/game/Entities/Creature/CreatureData.h
+3 -3
View File
@@ -292,7 +292,7 @@ struct CreatureBaseStats
{ {
uint32 BaseHealth[MAX_EXPANSIONS]; uint32 BaseHealth[MAX_EXPANSIONS];
uint32 BaseMana; uint32 BaseMana;
uint32 BaseArmor; float BaseArmor;
uint32 AttackPower; uint32 AttackPower;
uint32 RangedAttackPower; uint32 RangedAttackPower;
float BaseDamage[MAX_EXPANSIONS]; float BaseDamage[MAX_EXPANSIONS];
@@ -313,9 +313,9 @@ struct CreatureBaseStats
return uint32(std::ceil(BaseMana * info->ModMana)); return uint32(std::ceil(BaseMana * info->ModMana));
} }
uint32 GenerateArmor(CreatureTemplate const* info) const float GenerateArmor(CreatureTemplate const* info) const
{ {
return uint32(std::ceil(BaseArmor * info->ModArmor)); return std::ceil(BaseArmor * info->ModArmor);
} }
float GenerateBaseDamage(CreatureTemplate const* info) const float GenerateBaseDamage(CreatureTemplate const* info) const