Remove misleading spell colours

Don't mark Vehumet-supported spells as "empowered" - their power isn't
increased and the success boost is already indicated elsewhere.
Duration spells aren't useless when you can extend the duration.

1 files changed, 6 insertions, 10 deletions

diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 57b3e89113..1cad065c0e 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -24,6 +24,7 @@
 #include "godabil.h"
 #include "stuff.h"
 #include "env.h"
+#include "items.h"
 #include "libutil.h"
 #include "mon-behv.h"
 #include "mon-util.h"
@@ -1058,13 +1059,6 @@ spell_type zap_type_to_spell(zap_type zap)
 
 static bool _spell_is_empowered(spell_type spell)
 {
-    if ((you.religion == GOD_VEHUMET)
-        && vehumet_supports_spell(spell)
-        && piety_rank() > 2)
-    {
-        return true;
-    }
-
     switch (spell)
     {
     case SPELL_STONESKIN:
@@ -1146,15 +1140,17 @@ bool spell_is_useless(spell_type spell, bool transient)
             return true;
         if (you.racial_permanent_flight())
             return true;
-        if (transient && you.flight_mode())
+        if (transient && you.permanent_flight())
             return true;
         break;
     case SPELL_INVISIBILITY:
-        if (transient && (you.duration[DUR_INVIS] > 0 || you.backlit()))
+        if (transient && you.backlit())
             return true;
         break;
     case SPELL_CONTROL_TELEPORT:
-        if (transient && you.duration[DUR_CONTROL_TELEPORT] > 0)
+        // Can be cast in advance in most places with -cTele,
+        // but useless once the orb is picked up.
+        if (player_has_orb())
             return true;
         break;
     case SPELL_DARKNESS: