From 985886c0381e6aa6076109a47fddad40421d2c59 Mon Sep 17 00:00:00 2001
From: Brandon Kime <rbrandonkime@gmail.com>
Date: Wed, 5 Nov 2014 18:44:32 -0500
Subject: [PATCH] Implement skill-specific titling for Kiku and Nemelex

This patch changes the title displayed for having highest skill in Necromancy and Evocations with Kiku and Nemelex, respectively. Since those gods use those skills for their abilities it seems appropriate. Additionally, it is a nice way for some of the titles on the huge list of unused ones to get some light. This overrides the normal highest skill titles, but not the easter egg one for Spriggans.
---
 crawl-ref/source/describe-god.cc | 28 ++++++++++++++++++++++++++++
 crawl-ref/source/skills.cc       |  7 +++++++
 2 files changed, 35 insertions(+)

diff --git a/crawl-ref/source/describe-god.cc b/crawl-ref/source/describe-god.cc
index 038fb4e..d893aae 100644
--- a/crawl-ref/source/describe-god.cc
+++ b/crawl-ref/source/describe-god.cc
@@ -125,6 +125,30 @@ static int _gold_level()
                                : 1;
 }
 
+//XXX: The "ranks" are a smashed a little weird to accommodate the 7(!) titles
+// each god has defined in this file. Skills normally have 5 ranks. 
+static int _skill_rank_necromancy()
+{
+    return (you.skill(SK_NECROMANCY) <=  4) ? 1:
+           (you.skill(SK_NECROMANCY) <=  8) ? 2:
+           (you.skill(SK_NECROMANCY) <= 12) ? 3:
+           (you.skill(SK_NECROMANCY) <= 16) ? 4:
+           (you.skill(SK_NECROMANCY) <= 20) ? 5:
+           (you.skill(SK_NECROMANCY) <= 26) ? 6
+           /* level 27 */                   : 7;
+}
+
+static int _skill_rank_evocations()
+{
+    return (you.skill(SK_EVOCATIONS) <=  4) ? 1:
+           (you.skill(SK_EVOCATIONS) <=  8) ? 2:
+           (you.skill(SK_EVOCATIONS) <= 12) ? 3:
+           (you.skill(SK_EVOCATIONS) <= 16) ? 4:
+           (you.skill(SK_EVOCATIONS) <= 20) ? 5:
+           (you.skill(SK_EVOCATIONS) <= 26) ? 6
+           /* level 27 */                   : 7;
+}
+
 static string _describe_favour(god_type which_god)
 {
     if (player_under_penance())
@@ -374,6 +398,10 @@ string god_title(god_type which_god, species_type which_species, int piety)
         title = divine_title[which_god][0];
     else if (which_god == GOD_GOZAG)
         title = divine_title[which_god][_gold_level()];
+    else if (which_god == GOD_KIKUBAAQUDGHA)
+        title = divine_title[which_god][_skill_rank_necromancy()];
+    else if (which_god == GOD_NEMELEX_XOBEH)
+        title = divine_title[which_god][_skill_rank_evocations()];
     else
         title = divine_title[which_god][_piety_level(piety)];
 
diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index a9b394a..7ca6124 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -1375,6 +1375,13 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
         case SK_NECROMANCY:
             if (species == SP_SPRIGGAN && skill_rank == 5)
                 result = "La Petite Mort";
+            else if (god == GOD_KIKUBAAQUDGHA) 
+                result = god_title((god_type)god, (species_type)species, piety);
+            break;
+
+        case SK_EVOCATIONS:
+            if (god == GOD_NEMELEX_XOBEH)
+                result = god_title((god_type)god, (species_type)species, piety);
             break;
 
         default:
-- 
1.8.3.2

From 1131a9a09ef632bdc1d308e2c8a070c32d748523 Mon Sep 17 00:00:00 2001
From: Brandon Kime <rbrandonkime@gmail.com>
Date: Wed, 5 Nov 2014 18:44:32 -0500
Subject: [PATCH] Implement skill-specific titling for Kiku and Nemelex

This patch changes the title displayed for having highest skill in Necromancy and Evocations with Kiku and Nemelex, respectively. Since those gods use those skills for their abilities it seems appropriate. Additionally, it is a nice way for some of the titles on the huge list of unused ones to get some light. This overrides the normal highest skill titles, but not the easter egg one for Spriggans.
---
 crawl-ref/source/skills.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index a9b394a..7ca6124 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -1375,6 +1375,13 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
         case SK_NECROMANCY:
             if (species == SP_SPRIGGAN && skill_rank == 5)
                 result = "La Petite Mort";
+            else if (god == GOD_KIKUBAAQUDGHA) 
+                result = god_title((god_type)god, (species_type)species, piety);
+            break;
+
+        case SK_EVOCATIONS:
+            if (god == GOD_NEMELEX_XOBEH)
+                result = god_title((god_type)god, (species_type)species, piety);
             break;
 
         default:
-- 
1.8.3.2