[crawl-ref-commits] master branch updated: 0.21-a0-54-g4ad91a0

[<gi...@cr...>]

       via  4ad91a05bbc20fc481583542ab70a125a0369532 (commit)
       via  44a88e32f74749e8c93969444017885c4f85010e (commit)
      from  bf4951533123dc54c6348ff2bf3c9dfbcfc56d33 (commit)

-----------------------------------------------------------------------
commit 4ad91a05bbc20fc481583542ab70a125a0369532
Author: Corin Buchanan-Howland <co...@bu...>
Date:   Tue Jun 13 20:26:00 2017 -0400

    Make amulet of magic regeneration give a fixed bonus
    
    The amulet now gives 1/4th of an mp each turn instead of +50% of current mp
    regen each turn. Since mana regen is 7/100ths of a mana + 1/100th per 2 maxmp,
    this amulet now gives regeneration equal to 50 additional mp. This breaks even
    with the previous version at 36 mp. At less mp, it is better, and at higher mp
    it is worse.
    
    I made this change both for better parallel with the amulet of regen and
    because the amulet had very little effect in the part of the game where
    additional mp regeneration would make the most difference. I am hoping
    that this change will make the amulet a little more competitive with other
    strong amulets. I'm not particularly worried that having access to faster
    mp regeneration as an amulet will push magic-heavy builds over the top.

commit 44a88e32f74749e8c93969444017885c4f85010e
Author: Corin Buchanan-Howland <co...@bu...>
Date:   Tue Jun 13 20:06:41 2017 -0400

    Make HP/MP regen display more granular.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/output.cc | 8 ++++----
 crawl-ref/source/player.cc | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index d5df7a1..7696a9a 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2364,11 +2364,11 @@ static vector<formatted_string> _get_overview_resistances(
 
     out += _stealth_bar(get_number_of_cols()) + "\n";
 
-    const int regen = (player_regen() + 9) / 10; // round up
-    out += make_stringf("Regen    %d.%d/turn\n", regen/10, regen % 10);
+    const int regen = player_regen(); // round up
+    out += make_stringf("HPRegen  %d.%d%d/turn\n", regen/100, regen/10%10, regen%10);
 
-    const int mp_regen = (player_mp_regen() + 9) / 10; // round up
-    out += make_stringf("MPRegen  %d.%d/turn\n", mp_regen/10, mp_regen % 10);
+    const int mp_regen = player_mp_regen(); // round up
+    out += make_stringf("MPRegen  %d.%d%d/turn\n", mp_regen/100, mp_regen/10%10, mp_regen%10);
 
     cols.add_formatted(0, out, false);
 
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 9712c8c..b0b461f 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1136,13 +1136,13 @@ int player_mp_regen()
 {
     int regen_amount = 7 + you.max_magic_points / 2;
 
-    int multiplier = 100;
     if (you.get_mutation_level(MUT_MANA_REGENERATION))
-        multiplier += 100;
+        regen_amount *= 2;
+
     if (you.props[MANA_REGEN_AMULET_ACTIVE].get_int() == 1)
-        multiplier += 50;
+        regen_amount += 25;
 
-    return regen_amount * multiplier / 100;
+    return regen_amount;
 }
 
 // Amulet of regeneration needs to be worn while at full health before it begins


-- 
Dungeon Crawl Stone Soup