Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Remove automatic multipliers when mob is marked as an NM #756

Merged
merged 2 commits into from Jun 24, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 7 additions & 24 deletions src/map/utils/mobutils.cpp
Expand Up @@ -278,15 +278,6 @@ void CalculateStats(CMobEntity * PMob)


PMob->health.maxhp = (int16)(base * pow(mLvl, growth) * hpScale);

if(isNM)
{
PMob->health.maxhp = (int32)(PMob->health.maxhp * 2.0f);
if(mLvl > 75){
PMob->health.maxhp = (int32)(PMob->health.maxhp * 2.5f);
}
}

}
else
{
Expand Down Expand Up @@ -351,14 +342,6 @@ void CalculateStats(CMobEntity * PMob)
if(PMob->MPmodifier == 0)
{
PMob->health.maxmp = (int16)(18.2 * pow(mLvl,1.1075) * scale) + 10;
if(isNM)
{
PMob->health.maxmp = (int32)(PMob->health.maxmp * 1.5f);
if(mLvl>75)
{
PMob->health.maxmp = (int32)(PMob->health.maxmp * 1.5f);
}
}
}
else
{
Expand Down Expand Up @@ -443,13 +426,13 @@ void CalculateStats(CMobEntity * PMob)

if(isNM)
{
PMob->stats.STR = (uint16)(PMob->stats.STR * 1.5f * map_config.nm_stat_multiplier);
PMob->stats.DEX = (uint16)(PMob->stats.DEX * 1.5f * map_config.nm_stat_multiplier);
PMob->stats.VIT = (uint16)(PMob->stats.VIT * 1.5f * map_config.nm_stat_multiplier);
PMob->stats.AGI = (uint16)(PMob->stats.AGI * 1.5f * map_config.nm_stat_multiplier);
PMob->stats.INT = (uint16)(PMob->stats.INT * 1.5f * map_config.nm_stat_multiplier);
PMob->stats.MND = (uint16)(PMob->stats.MND * 1.5f * map_config.nm_stat_multiplier);
PMob->stats.CHR = (uint16)(PMob->stats.CHR * 1.5f * map_config.nm_stat_multiplier);
PMob->stats.STR = (uint16)(PMob->stats.STR * map_config.nm_stat_multiplier);
PMob->stats.DEX = (uint16)(PMob->stats.DEX * map_config.nm_stat_multiplier);
PMob->stats.VIT = (uint16)(PMob->stats.VIT * map_config.nm_stat_multiplier);
PMob->stats.AGI = (uint16)(PMob->stats.AGI * map_config.nm_stat_multiplier);
PMob->stats.INT = (uint16)(PMob->stats.INT * map_config.nm_stat_multiplier);
PMob->stats.MND = (uint16)(PMob->stats.MND * map_config.nm_stat_multiplier);
PMob->stats.CHR = (uint16)(PMob->stats.CHR * map_config.nm_stat_multiplier);
}
else
{
Expand Down