1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00

Merge branch 'develop' into feature/nullkiller2

This commit is contained in:
Mircea TheHonestCTO
2025-11-15 17:15:46 +01:00
151 changed files with 17411 additions and 9818 deletions

View File

@@ -281,7 +281,9 @@ uint64_t RewardEvaluator::getArmyReward(
for(const auto & stackInfo : info.reward.creatures)
rewardValue += stackInfo.getType()->getAIValue() * stackInfo.getCount();
totalValue += rewardValue > 0 ? rewardValue / (info.reward.grantedArtifacts.size() + info.reward.creatures.size()) : 0;
auto combined_size = std::min(static_cast<size_t>(1), info.reward.grantedArtifacts.size() + info.reward.creatures.size() + info.reward.grantedScrolls.size());
totalValue += rewardValue > 0 ? rewardValue / combined_size : 0;
}
return totalValue;