mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 22:58:34 +00:00
Merge of hatebourne's stuff
This commit is contained in:
+1
-1
@@ -11043,7 +11043,7 @@ int32 Bot::CalcMaxHP() {
|
||||
|
||||
bot_hp += GroupLeadershipAAHealthEnhancement();
|
||||
|
||||
bot_hp += bot_hp * (spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000;
|
||||
bot_hp += bot_hp * ((spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000.0f);
|
||||
max_hp = bot_hp;
|
||||
|
||||
if (cur_hp > max_hp)
|
||||
|
||||
@@ -250,7 +250,7 @@ int32 Client::CalcMaxHP() {
|
||||
|
||||
max_hp += GroupLeadershipAAHealthEnhancement();
|
||||
|
||||
max_hp += max_hp * (spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000;
|
||||
max_hp += max_hp * ((spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000.0f);
|
||||
|
||||
if (cur_hp > max_hp)
|
||||
cur_hp = max_hp;
|
||||
|
||||
+1
-1
@@ -283,7 +283,7 @@ struct StatBonuses {
|
||||
int16 HundredHands; //extra haste, stacks with all other haste i
|
||||
int8 MeleeLifetap; //i
|
||||
int16 HealRate; // Spell effect that influences effectiveness of heals
|
||||
int16 MaxHPChange; // Spell Effect
|
||||
int32 MaxHPChange; // Spell Effect
|
||||
int16 SkillDmgTaken[HIGHEST_SKILL+2]; // All Skills + -1
|
||||
int32 HealAmt; // Item Effect
|
||||
int32 SpellDmg; // Item Effect
|
||||
|
||||
+1
-1
@@ -918,7 +918,7 @@ int32 Merc::CalcMaxHP() {
|
||||
|
||||
max_hp += GroupLeadershipAAHealthEnhancement();
|
||||
|
||||
max_hp += max_hp * (spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000;
|
||||
max_hp += max_hp * ((spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000.0f);
|
||||
|
||||
if (cur_hp > max_hp)
|
||||
cur_hp = max_hp;
|
||||
|
||||
+1
-1
@@ -615,7 +615,7 @@ int32 Mob::CalcMaxMana() {
|
||||
|
||||
int32 Mob::CalcMaxHP() {
|
||||
max_hp = (base_hp + itembonuses.HP + spellbonuses.HP);
|
||||
max_hp += max_hp * (aabonuses.MaxHPChange + spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000;
|
||||
max_hp += max_hp * ((aabonuses.MaxHPChange + spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000.0f);
|
||||
return max_hp;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user