Core/Misc: Implement config option for energy regeneration rate, patch by Ramus, closes issue 4394

--HG--
branch : trunk
This commit is contained in:
Shocker
2010-10-12 21:05:37 +03:00
parent 91db34c4b5
commit 66dec6d86f
4 changed files with 10 additions and 4 deletions
+1 -1
View File
@@ -2236,7 +2236,7 @@ void Player::Regenerate(Powers power)
}
} break;
case POWER_ENERGY: // Regenerate energy (rogue)
addvalue += 0.01f * m_regenTimer;
addvalue += 0.01f * m_regenTimer * sWorld.getRate(RATE_POWER_ENERGY);
break;
case POWER_RUNIC_POWER:
{
+5 -2
View File
@@ -437,8 +437,11 @@ void World::LoadConfigSettings(bool reload)
sLog.outError("Rate.RunicPower.Loss (%f) must be > 0. Using 1 instead.",rate_values[RATE_POWER_RUNICPOWER_LOSS]);
rate_values[RATE_POWER_RUNICPOWER_LOSS] = 1;
}
rate_values[RATE_POWER_FOCUS] = sConfig.GetFloatDefault("Rate.Focus", 1.0f);
rate_values[RATE_SKILL_DISCOVERY] = sConfig.GetFloatDefault("Rate.Skill.Discovery", 1.0f);
rate_values[RATE_POWER_FOCUS] = sConfig.GetFloatDefault("Rate.Focus", 1.0f);
rate_values[RATE_POWER_ENERGY] = sConfig.GetFloatDefault("Rate.Energy", 1.0f);
rate_values[RATE_SKILL_DISCOVERY] = sConfig.GetFloatDefault("Rate.Skill.Discovery", 1.0f);
rate_values[RATE_DROP_ITEM_POOR] = sConfig.GetFloatDefault("Rate.Drop.Item.Poor", 1.0f);
rate_values[RATE_DROP_ITEM_NORMAL] = sConfig.GetFloatDefault("Rate.Drop.Item.Normal", 1.0f);
rate_values[RATE_DROP_ITEM_UNCOMMON] = sConfig.GetFloatDefault("Rate.Drop.Item.Uncommon", 1.0f);
+2 -1
View File
@@ -312,13 +312,14 @@ enum WorldIntConfigs
/// Server rates
enum Rates
{
RATE_HEALTH=0,
RATE_HEALTH = 0,
RATE_POWER_MANA,
RATE_POWER_RAGE_INCOME,
RATE_POWER_RAGE_LOSS,
RATE_POWER_RUNICPOWER_INCOME,
RATE_POWER_RUNICPOWER_LOSS,
RATE_POWER_FOCUS,
RATE_POWER_ENERGY,
RATE_SKILL_DISCOVERY,
RATE_DROP_ITEM_POOR,
RATE_DROP_ITEM_NORMAL,
@@ -1455,6 +1455,7 @@ Visibility.Notify.Period.InBGArenas = 1000
# Rate.RunicPower.Income
# Rate.RunicPower.Loss
# Rate.Focus
# Rate.Energy
# Rate.Loyalty
# Health and power regeneration and rage income from damage.
# Default: 1
@@ -1645,6 +1646,7 @@ Rate.Rage.Loss = 1
Rate.RunicPower.Income = 1
Rate.RunicPower.Loss = 1
Rate.Focus = 1
Rate.Energy = 1
Rate.Loyalty = 1
Rate.Skill.Discovery = 1
Rate.Drop.Item.Poor = 1