[crawl-ref-commits] stone_soup-0.13 branch updated: 0.13-b1-14-g215694d

[<gi...@cr...>]

       via  215694d3d0d7a6d55f99b6547ba52f63b31d6df2 (commit)
      from  c4b83a3cecf7e8bf91b38d924a5fbec28f5de4a4 (commit)

-----------------------------------------------------------------------
commit 215694d3d0d7a6d55f99b6547ba52f63b31d6df2
Author: Neil Moore <ne...@s-...>
Date:   Sun Sep 29 12:32:02 2013 -0400

    Fix red devil hop attack order and messaging (#7573)
    
    Have them strike just before the hop, when they are adjacent to the foe
    and therefore guanteed to have line of effect.  Furthermore, print the
    "hops backward" message (which should only happen for successful hops)
    with the correct non-"it" noun whenever the monster was visible at
    *either* end of the hop, not just the destination.
    (cherry picked from commit f4aae922b97d1882f415f429851104e5d8654113)

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/mon-abil.cc |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index f8c348a..f4fd5a1 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -4205,11 +4205,20 @@ bool mon_special_ability(monster* mons, bolt & beem)
             else
                 found = true;
 
-            if (found && mons->move_to_pos(hopspot))
+            if (found)
             {
-                simple_monster_message(mons, " hops backward while attacking.");
+                const bool could_see = you.can_see(mons);
+
                 fight_melee(mons, mons->get_foe());
-                mons->speed_increment -= 2; // Add a small extra delay
+                if (mons->move_to_pos(hopspot))
+                {
+                    if (could_see || you.can_see(mons))
+                    {
+                        mprf("%s hops backward while attacking.",
+                             mons->name(DESC_THE, true).c_str());
+                    }
+                    mons->speed_increment -= 2; // Add a small extra delay
+                }
                 return true; // Energy has already been deducted via melee
             }
         }


-- 
Dungeon Crawl Stone Soup