diff options
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/World/World.cpp | 7 | ||||
| -rwxr-xr-x | src/server/game/World/World.h | 3 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 64f9c33b835..1fc46ca92b2 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -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: { diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 62e545262a6..f4117fb9671 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -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); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index fc55aebe9a6..d9178fda58e 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -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, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 642b0a6b806..770da7decf0 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -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 |