Two changes:

1.) If Beogh can't find a nearby follower in LOS to bless, try again 
without the LOS restriction (but still nearby). If this also fails, recall 
a small amount of followers (1 + rnd(4) + rnd(4)) on the level. I don't
think there's much harm in Beogh actively doing something you already
have as an invocation as long as it doesn't make the invocation
superfluous (and this doesn't). 
In this case, the chance of this happening should probably be lowered, 
and actual reinforcement should be rarer still.

2.) Identify magical staves if you have at least 4 skill levels in the
corresponding spell school when wielding it, or gain the 4th level while
wielding it. (I decided on 4 because that is what most mages start out 
with in their special school, and it seems a good enough treshold.) 
Prior to that, there's still the random identification chance at casting
an appropriate spell, as before.


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

1 files changed, 7 insertions, 7 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 74ca17a0fa..4687203d10 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -776,8 +776,8 @@ int player_equip( equipment_type slot, int sub_type, bool calc_unid )
         if (you.equip[EQ_WEAPON] != -1
             && you.inv[you.equip[EQ_WEAPON]].base_type == OBJ_STAVES
             && you.inv[you.equip[EQ_WEAPON]].sub_type == sub_type
-            && (calc_unid ||
-                item_type_known(you.inv[you.equip[EQ_WEAPON]])))
+            && (calc_unid
+                || item_type_known( you.inv[you.equip[EQ_WEAPON]] )))
         {
             ret++;
         }
@@ -786,16 +786,16 @@ int player_equip( equipment_type slot, int sub_type, bool calc_unid )
     case EQ_RINGS:
         if (you.equip[EQ_LEFT_RING] != -1
             && you.inv[you.equip[EQ_LEFT_RING]].sub_type == sub_type
-            && (calc_unid ||
-                item_type_known(you.inv[you.equip[EQ_LEFT_RING]])))
+            && (calc_unid
+                || item_type_known( you.inv[you.equip[EQ_LEFT_RING]] )))
         {
             ret++;
         }
 
         if (you.equip[EQ_RIGHT_RING] != -1
             && you.inv[you.equip[EQ_RIGHT_RING]].sub_type == sub_type
-            && (calc_unid ||
-               item_type_known(you.inv[you.equip[EQ_RIGHT_RING]])))
+            && (calc_unid
+                || item_type_known( you.inv[you.equip[EQ_RIGHT_RING]] )))
         {
             ret++;
         }
@@ -2870,7 +2870,7 @@ void level_change(bool skip_attribute_increase)
     you.redraw_experience = true;
 
     while (you.experience_level < 27
-            && you.experience > exp_needed(you.experience_level + 2))
+           && you.experience > exp_needed(you.experience_level + 2))
     {
         bool skip_more = false;