From 63a5074a966506be65fd85d3ca898cc68910432f Mon Sep 17 00:00:00 2001
From: Charles Otto <ottochar@gmail.com>
Date: Sun, 10 Jan 2010 17:12:16 -0500
Subject: Adjust the activation cost of evolution and change Fedhas ability
 order

Change Fedhas ability order to:
decomposition - evolution - sunlight - growth - spores - rain
and adjust the activation cost/casting difficulty of evolutino to be
more reasonable for a low level ability. Also change the corresponding
religion titles for these abilities.
---
 crawl-ref/source/abl-show.cc | 11 ++++++-----
 crawl-ref/source/describe.cc |  8 +++-----
 crawl-ref/source/religion.cc | 12 ++++++------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 5b751154ea..66c878dcb3 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -145,8 +145,8 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
     { ABIL_JIYVA_CALL_JELLY, ABIL_NON_ABILITY, ABIL_NON_ABILITY,
       ABIL_JIYVA_SLIMIFY, ABIL_JIYVA_CURE_BAD_MUTATION },
     // Fedhas
-    { ABIL_FEDHAS_SUNLIGHT, ABIL_FEDHAS_PLANT_RING, ABIL_FEDHAS_RAIN,
-      ABIL_FEDHAS_SPAWN_SPORES, ABIL_FEDHAS_EVOLUTION },
+    { ABIL_FEDHAS_EVOLUTION, ABIL_FEDHAS_SUNLIGHT, ABIL_FEDHAS_PLANT_RING,
+      ABIL_FEDHAS_SPAWN_SPORES, ABIL_FEDHAS_RAIN},
     // Cheibriados
     { ABIL_NON_ABILITY, ABIL_CHEIBRIADOS_TIME_BEND, ABIL_NON_ABILITY,
       ABIL_CHEIBRIADOS_SLOUCH, ABIL_CHEIBRIADOS_TIME_STEP },
@@ -327,11 +327,12 @@ static const ability_def Ability_List[] =
 
     // Fedhas
     { ABIL_FEDHAS_FUNGAL_BLOOM, "Decomposition", 0, 0, 0, 0, ABFLAG_NONE },
+    { ABIL_FEDHAS_EVOLUTION, "Evolution", 2, 0, 0, 0, ABFLAG_FRUIT},
     { ABIL_FEDHAS_SUNLIGHT, "Sunlight", 2, 0, 0, 0, ABFLAG_NONE},
     { ABIL_FEDHAS_PLANT_RING, "Growth", 2, 0, 0, 0, ABFLAG_FRUIT},
-    { ABIL_FEDHAS_RAIN, "Rain", 4, 0, 100, 2, ABFLAG_NONE},
     { ABIL_FEDHAS_SPAWN_SPORES, "Reproduction", 4, 0, 50, 2, ABFLAG_NONE},
-    { ABIL_FEDHAS_EVOLUTION, "Evolution", 4, 0, 0, 2, ABFLAG_FRUIT},
+    { ABIL_FEDHAS_RAIN, "Rain", 4, 0, 100, 4, ABFLAG_NONE},
+
 
     // Cheibriados
     { ABIL_CHEIBRIADOS_PONDEROUSIFY, "Make Ponderous", 2, 0, 0, 0, ABFLAG_NONE },
@@ -682,6 +683,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
     case ABIL_LUGONU_ABYSS_EXIT:
     case ABIL_JIYVA_CALL_JELLY:
     case ABIL_FEDHAS_SUNLIGHT:
+    case ABIL_FEDHAS_EVOLUTION:
         invoc = true;
         failure = 30 - (you.piety / 20) - (6 * you.skills[SK_INVOCATIONS]);
         break;
@@ -767,7 +769,6 @@ static talent _get_talent(ability_type ability, bool check_confused)
     case ABIL_OKAWARU_HASTE:
     case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB:
     case ABIL_LUGONU_CORRUPT:
-    case ABIL_FEDHAS_EVOLUTION:
         invoc = true;
         failure = 70 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4);
         break;
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 164c1ff7ba..fc7a2f4d5c 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3371,11 +3371,9 @@ const char *divine_title[NUM_GODS][8] =
     {"Scum",               "Jelly",                 "Squelcher",                "Dissolver",
      "Putrid Slime",       "Consuming %s",          "Archjelly",                "Royal Jelly"},
 
-    // Fedhas Madash -- nature theme.  Titles could use some work, but the
-    // progression is generally from nature lover to walking disaster.
-    // -cao
-    {"Walking Fertiliser", "Green %s",              "Photosynthesist",          "Planter",
-     "Nimbus",             "Sporadic Warrior",      "Green Death",              "Force of Nature"},
+    // Fedhas Madash -- nature theme.  Titles could use some work
+    {"Walking Fertiliser", "Green %s",           "Inducer",                  "Photosynthesist",
+     "Planter",            "Sporadic Warrior",   "Nimbus",                   "Force of Nature"},
 
     // Cheibriados -- slow theme
     {"Unwound %s",         "Timekeeper",            "Righteous Timekeeper",     "Chronographer",
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 25407604c8..aba33ed8b4 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -299,11 +299,11 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
       "call upon Jiyva to remove your harmful mutations"
     },
     // Fedhas
-    { "call sunshine",
+    { "induce evolution",
+      "call sunshine",
       "cause a ring of plants to grow",
-      "control the weather",
       "spawn explosive spores",
-      "induce evolution"
+      "control the weather"
     },
     // Cheibriados
     { "Cheibriados is slowing your {biology}.",
@@ -406,11 +406,11 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
       "call upon Jiyva to remove your harmful mutations"
     },
     // Fedhas
-    { "call sunshine",
+    { "induce evolution",
+      "call sunshine",
       "cause a ring of plants to grow",
-      "control the weather",
       "spawn explosive spores",
-      "induce evolution"
+      "control the weather"
     },
     // Cheibriados
     { "Cheibriados will no longer slow your {biology}.",
-- 
cgit v1.2.3-54-g00ecf