1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

Merge pull request #5769 from IvanSavenko/mysticism

Percentage-based mana regeneration
This commit is contained in:
Ivan Savenko
2025-06-04 21:11:45 +03:00
committed by GitHub
5 changed files with 15 additions and 12 deletions

View File

@@ -410,9 +410,9 @@ double getArtifactBonusRelevance(const CGHeroInstance * hero, const std::shared_
if (bonus->subtype == BonusCustomSubtype::damageTypeMelee)
return veryRelevant * (1 - getArmyPercentageWithBonus(BonusType::SHOOTER));
return 0;
case BonusType::FULL_MANA_REGENERATION:
case BonusType::MANA_PERCENTAGE_REGENERATION:
case BonusType::MANA_REGENERATION:
return hero->mana < hero->manaLimit() ? relevant : notRelevant;
return hero->hasSpellbook() ? relevant : notRelevant;
case BonusType::LEARN_BATTLE_SPELL_CHANCE:
return hero->hasBonusOfType(BonusType::LEARN_BATTLE_SPELL_LEVEL_LIMIT) ? relevant : notRelevant;
case BonusType::NO_DISTANCE_PENALTY:
@@ -483,8 +483,8 @@ int32_t getArtifactBonusScoreImpl(const std::shared_ptr<Bonus> & bonus)
return 0;
case BonusType::CREATURE_GROWTH:
return (1+bonus->subtype.getNum()) * bonus->val * 400;
case BonusType::FULL_MANA_REGENERATION:
return 15000;
case BonusType::MANA_PERCENTAGE_REGENERATION:
return bonus->val * 150;
case BonusType::MANA_REGENERATION:
return bonus->val * 500;
case BonusType::SPELLS_OF_SCHOOL: