s/Lucy/Lugonu/.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1060 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 17 insertions, 10 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 5f6e065112..0b0bb889a6 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -130,9 +130,9 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
       ABIL_ELYVILON_HEALING, ABIL_ELYVILON_RESTORATION,
       ABIL_ELYVILON_GREATER_HEALING },
     // Lucy
-    { ABIL_LUCY_ABYSS_EXIT, ABIL_NON_ABILITY,
-      ABIL_LUCY_SUMMON_DEMONS, ABIL_NON_ABILITY,
-      ABIL_LUCY_ABYSS_ENTER }
+    { ABIL_LUGONU_ABYSS_EXIT, ABIL_NON_ABILITY,
+      ABIL_LUGONU_SUMMON_DEMONS, ABIL_NON_ABILITY,
+      ABIL_LUGONU_ABYSS_ENTER }
 };
 
 // The description screen was way out of date with the actual costs.
@@ -257,9 +257,9 @@ static const struct ability_def Ability_List[] =
     { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 4, ABFLAG_NONE },
 
     // Lucy
-    { ABIL_LUCY_ABYSS_EXIT, "Depart the Abyss", 0, 0, 100, 10, ABFLAG_PAIN },
-    { ABIL_LUCY_SUMMON_DEMONS, "Summon Abyssal Servants", 7, 0, 100, 5, ABFLAG_NONE },
-    { ABIL_LUCY_ABYSS_ENTER, "Enter the Abyss", 9, 0, 200, 40, ABFLAG_NONE },
+    { ABIL_LUGONU_ABYSS_EXIT, "Depart the Abyss", 0, 0, 100, 10, ABFLAG_PAIN },
+    { ABIL_LUGONU_SUMMON_DEMONS, "Summon Abyssal Servants", 7, 0, 100, 5, ABFLAG_NONE },
+    { ABIL_LUGONU_ABYSS_ENTER, "Enter the Abyss", 9, 0, 200, 40, ABFLAG_NONE },
 
     // These six are unused "evil" god abilities:
     { ABIL_CHARM_SNAKE, "Charm Snake", 6, 0, 200, 5, ABFLAG_NONE },
@@ -1210,7 +1210,7 @@ bool activate_ability(void)
         exercise( SK_INVOCATIONS, 6 + random2(10) );
         break;
 
-    case ABIL_LUCY_ABYSS_EXIT:
+    case ABIL_LUGONU_ABYSS_EXIT:
         if ( you.level_type != LEVEL_ABYSS )
         {
             mpr("You aren't in the Abyss!");
@@ -1231,14 +1231,21 @@ bool activate_ability(void)
             set_mp(random2(you.magic_points), false);
         break;
 
-    case ABIL_LUCY_SUMMON_DEMONS:
-        for ( int i = 0; i < you.skills[SK_INVOCATIONS] / 4; ++i )
+    case ABIL_LUGONU_SUMMON_DEMONS:
+    {
+        int ndemons = 1 + you.skills[SK_INVOCATIONS] / 4;
+        if (ndemons > 5)
+            ndemons = 5;
+        
+        for ( int i = 0; i < ndemons; ++i )
             summon_ice_beast_etc( 20 + you.skills[SK_INVOCATIONS] * 3,
                                   summon_any_demon(DEMON_COMMON), true);
+        
         exercise(SK_INVOCATIONS, 6 + random2(6));
         break;
+    }
 
-    case ABIL_LUCY_ABYSS_ENTER:
+    case ABIL_LUGONU_ABYSS_ENTER:
         if (you.level_type == LEVEL_ABYSS)
         {
             mpr("You're already here.");