From 40e6cec1c6f46027dc07110dde8b14248f728d05 Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sat, 18 Apr 2009 16:59:42 +0000
Subject: Deep dwarves get the same number of initial strength points as
 mountain dwarves, so give their ghosts the same strength bonus that mountain
 dwarves get.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9627 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/describe.cc | 21 ++++++++++++---------
 crawl-ref/source/player.cc   |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 618a671b66..38062331d1 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2967,10 +2967,12 @@ std::string get_ghost_description(const monsters &mons, bool concise)
     // stats aren't required anyways, all that matters is whether
     // dex >= str. -- bwr
     const int dex = 10;
-    int str;
+    int str = 5;
+
     switch (gspecies)
     {
     case SP_MOUNTAIN_DWARF:
+    case SP_DEEP_DWARF:
     case SP_TROLL:
     case SP_OGRE:
     case SP_MINOTAUR:
@@ -2979,25 +2981,24 @@ std::string get_ghost_description(const monsters &mons, bool concise)
     case SP_NAGA:
     case SP_MUMMY:
     case SP_GHOUL:
-        str = 15;
+        str += 10;
         break;
 
     case SP_HUMAN:
     case SP_DEMIGOD:
     case SP_DEMONSPAWN:
-        str = 10;
+        str += 5;
         break;
 
     default:
-        str = 5;
         break;
     }
 
     gstr << ghost.name << " the "
-         << skill_title( ghost.best_skill,
-                         (unsigned char)ghost.best_skill_level,
-                         gspecies,
-                         str, dex, ghost.religion )
+         << skill_title(ghost.best_skill,
+                        (unsigned char)ghost.best_skill_level,
+                        gspecies,
+                        str, dex, ghost.religion)
          << ", a"
          << ((ghost.xl <  4) ? " weakling" :
              (ghost.xl <  7) ? "n average" :
@@ -3008,6 +3009,7 @@ std::string get_ghost_description(const monsters &mons, bool concise)
              (ghost.xl < 27) ? "n awesomely powerful"
                              : " legendary")
          << " ";
+
     if (concise)
     {
         gstr << get_species_abbrev(gspecies)
@@ -3020,13 +3022,14 @@ std::string get_ghost_description(const monsters &mons, bool concise)
              << " "
              << get_class_name(ghost.job);
     }
+
     if (ghost.religion != GOD_NO_GOD)
     {
         gstr << " of "
              << god_name(ghost.religion);
     }
 
-    return gstr.str();
+    return (gstr.str());
 }
 
 extern ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES];
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 3a04aaecda..d452d731e5 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6875,7 +6875,7 @@ bool player::permanent_levitation() const
 
 bool player::permanent_flight() const
 {
-    return (airborne() && wearing_amulet( AMU_CONTROLLED_FLIGHT )
+    return (airborne() && wearing_amulet(AMU_CONTROLLED_FLIGHT)
             && you.species == SP_KENKU && you.experience_level >= 15);
 }
 
-- 
cgit v1.2.3-54-g00ecf