From 968a1dce4a04d587ec249f1a2d99889475011565 Mon Sep 17 00:00:00 2001
From: drachereborn <kerwin.khu@gmail.com>
Date: Sat, 22 Mar 2014 22:27:16 +0100
Subject: [PATCH] Recalculate chance for severe miscast for Sif worshipers
 under miscast protection. This can affect the colour of the spell fail rate
 displayed under "I" or "M" commands

---
 crawl-ref/source/spl-cast.cc | 18 +++++++++++++++++-
 crawl-ref/source/spl-cast.h  |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 62d86b8..745af13 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1976,11 +1976,27 @@ double get_miscast_chance(spell_type spell, int severity)
     return chance;
 }
 
+double get_miscast_prot(spell_type spell)
+{
+    double miscast_prot = 0;
+
+    if (you_worship(GOD_SIF_MUNA)
+        && !player_under_penance()
+        && you.piety >= piety_breakpoint(3))
+    {
+        miscast_prot = (double) you.piety/piety_breakpoint(5);
+    }
+    return min(1.0, miscast_prot);
+}
+
 // Chooses a colour for the failure rate display for a spell. The colour is
 // based on the chance of getting a severity >= 2 miscast.
 int failure_rate_colour(spell_type spell)
 {
-    double chance = get_miscast_chance(spell);
+    double raw_chance = get_miscast_chance(spell);
+    double miscast_prot = get_miscast_prot(spell);
+    double chance = raw_chance * (1 - miscast_prot);
+
     return (chance < 0.001) ? LIGHTGREY :
            (chance < 0.005) ? YELLOW    :
            (chance < 0.025) ? LIGHTRED  :
diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h
index bb948a4..997d5b8 100644
--- a/crawl-ref/source/spl-cast.h
+++ b/crawl-ref/source/spl-cast.h
@@ -72,6 +72,7 @@ spret_type your_spells(spell_type spell, int powc = 0, bool allow_fail = true,
                        bool check_range = true);
 
 double get_miscast_chance(spell_type spell, int severity = 2);
+double get_miscast_prot(spell_type spell);
 int failure_rate_colour(spell_type spell);
 int failure_rate_to_int(int fail);
 char* failure_rate_to_string(int fail);
-- 
1.8.1.2

From f7c7910ccb07b15ba69289e5ceed4f6fe26e4052 Mon Sep 17 00:00:00 2001
From: drachereborn <kerwin.khu@gmail.com>
Date: Sun, 23 Mar 2014 00:29:15 +0100
Subject: [PATCH] Improve warning messages when learning difficult spells
 Separate messages for difficulty of casting and severity of potential
 miscasts.

---
 crawl-ref/source/spl-book.cc | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index b759363..21e1292 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1220,16 +1220,38 @@ bool learn_spell(spell_type specspell)
     if (!_learn_spell_checks(specspell))
         return false;
 
-    double chance = get_miscast_chance(specspell);
-
-    if (spell_fail(specspell) >= 100 && !vehumet_is_offering(specspell))
-        mprf(MSGCH_WARN, "This spell is impossible to cast!");
-    else if (chance >= 0.025)
-        mprf(MSGCH_WARN, "This spell is very dangerous to cast!");
-    else if (chance >= 0.005)
-        mprf(MSGCH_WARN, "This spell is quite dangerous to cast!");
-    else if (chance >= 0.001)
-        mprf(MSGCH_WARN, "This spell is slightly dangerous to cast.");
+    double raw_chance = get_miscast_chance(specspell);
+    double miscast_prot = get_miscast_prot(specspell);
+    double chance = raw_chance * (1 - miscast_prot);
+    string failwarning="";
+    string difficulty = (spell_fail(specspell) >= 100) ? "impossible"         :
+                        (spell_fail(specspell) >=  50) ? "difficult"          :
+                        (spell_fail(specspell) >=  35) ? "somewhat difficult" :
+                                                         "";
+    string miscast_danger = (chance >= 0.025) ? "very"     :
+                            (chance >= 0.005) ? "quite"    :
+                            (chance >= 0.001) ? "slightly" :
+                                                "";
+    if (vehumet_is_offering(specspell))
+        difficulty = ""; // ignore difficulty for Vehumet gifts.
+      // This replicates original behaviour of the code
+
+    if (difficulty == "impossible" ||
+        (miscast_danger == "" && difficulty != ""))
+        failwarning = "This spell is " + difficulty + " to cast";
+    else if (miscast_danger != "" && difficulty == "")
+        failwarning = "This spell can be " + miscast_danger + " dangerous if miscast";
+    else if (miscast_danger != "" && difficulty != "")
+        failwarning = "This spell is " + difficulty + " to cast, and can be "
+                    + miscast_danger + " dangerous if miscast";
+    if (miscast_danger == "very" || miscast_danger == "quite" ||
+        difficulty == "impossible" || difficulty == "difficult")
+        failwarning += "!";
+    else
+        failwarning += ".";
+
+    if(failwarning != ".")
+        mprf(MSGCH_WARN, "%s", failwarning.c_str());
 
     snprintf(info, INFO_SIZE,
              "Memorise %s, consuming %d spell level%s and leaving %d?",
-- 
1.8.1.2

From 07ff2f87f035eac838181ef8bab9185860878999 Mon Sep 17 00:00:00 2001
From: drachereborn <kerwin.khu@gmail.com>
Date: Thu, 8 May 2014 23:00:44 +0200
Subject: [PATCH 1/2] Recalculate chance for severe miscast for Sif worshipers

when under miscast protection. This affects the colour of the spell
fail rate displayed under "I" or "M" commands.
---
 crawl-ref/source/spl-cast.cc | 18 +++++++++++++++++-
 crawl-ref/source/spl-cast.h  |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 0d9c091..28e6a64 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1980,11 +1980,27 @@ double get_miscast_chance(spell_type spell, int severity)
     return chance;
 }
 
+double get_miscast_prot(spell_type spell)
+{
+    double miscast_prot = 0;
+
+    if (you_worship(GOD_SIF_MUNA)
+        && !player_under_penance()
+        && you.piety >= piety_breakpoint(3))
+    {
+        miscast_prot = (double) you.piety/piety_breakpoint(5);
+    }
+    return min(1.0, miscast_prot);
+}
+
 // Chooses a colour for the failure rate display for a spell. The colour is
 // based on the chance of getting a severity >= 2 miscast.
 int failure_rate_colour(spell_type spell)
 {
-    double chance = get_miscast_chance(spell);
+    double raw_chance = get_miscast_chance(spell);
+    double miscast_prot = get_miscast_prot(spell);
+    double chance = raw_chance * (1 - miscast_prot);
+
     return (chance < 0.001) ? LIGHTGREY :
            (chance < 0.005) ? YELLOW    :
            (chance < 0.025) ? LIGHTRED  :
diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h
index bb948a4..997d5b8 100644
--- a/crawl-ref/source/spl-cast.h
+++ b/crawl-ref/source/spl-cast.h
@@ -72,6 +72,7 @@ spret_type your_spells(spell_type spell, int powc = 0, bool allow_fail = true,
                        bool check_range = true);
 
 double get_miscast_chance(spell_type spell, int severity = 2);
+double get_miscast_prot(spell_type spell);
 int failure_rate_colour(spell_type spell);
 int failure_rate_to_int(int fail);
 char* failure_rate_to_string(int fail);
-- 
1.8.1.2

From e4df320c728cf3311cd208650aa6d030284ea8e8 Mon Sep 17 00:00:00 2001
From: drachereborn <kerwin.khu@gmail.com>
Date: Thu, 8 May 2014 23:14:01 +0200
Subject: [PATCH 2/2] Improve warning messages when learning difficult spells

Add new message for "difficult" spells which are not dangerous
(due to Sif miscast protection). Otherwise, old behavior is preserved
---
 crawl-ref/source/spl-book.cc | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 9ebebe3..1bc0e0d 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1216,16 +1216,36 @@ bool learn_spell(spell_type specspell)
     if (!_learn_spell_checks(specspell))
         return false;
 
-    double chance = get_miscast_chance(specspell);
-
-    if (spell_fail(specspell) >= 100 && !vehumet_is_offering(specspell))
-        mprf(MSGCH_WARN, "This spell is impossible to cast!");
-    else if (chance >= 0.025)
-        mprf(MSGCH_WARN, "This spell is very dangerous to cast!");
-    else if (chance >= 0.005)
-        mprf(MSGCH_WARN, "This spell is quite dangerous to cast!");
-    else if (chance >= 0.001)
-        mprf(MSGCH_WARN, "This spell is slightly dangerous to cast.");
+    double raw_chance = get_miscast_chance(specspell);
+    double miscast_prot = get_miscast_prot(specspell);
+    double chance = raw_chance * (1 - miscast_prot);
+    string failwarning="";
+    string difficulty = (spell_fail(specspell) >= 100) ? "impossible"         :
+                        (spell_fail(specspell) >=  50) ? "difficult"          :
+                        (spell_fail(specspell) >=  35) ? "somewhat difficult" :
+                                                         "";
+    string miscast_danger = (chance >= 0.025) ? "very"     :
+                            (chance >= 0.005) ? "quite"    :
+                            (chance >= 0.001) ? "slightly" :
+                                                "";
+    if (vehumet_is_offering(specspell))
+        difficulty = ""; // ignore difficulty for Vehumet gifts.
+       // This replicates original behaviour of the code
+
+    if (difficulty == "impossible" ||
+        (miscast_danger == "" && difficulty != ""))
+        failwarning = "This spell is " + difficulty + " to cast";
+    else if (miscast_danger != "")
+        failwarning = "This spell can be " + miscast_danger + " dangerous if miscast";
+
+    if (miscast_danger == "very" || miscast_danger == "quite" ||
+        difficulty == "impossible" || difficulty == "difficult")
+        failwarning += "!";
+    else
+        failwarning += ".";
+
+    if(failwarning != ".")
+        mprf(MSGCH_WARN, "%s", failwarning.c_str());
 
     snprintf(info, INFO_SIZE,
              "Memorise %s, consuming %d spell level%s and leaving %d?",
-- 
1.8.1.2