Fix orb pickup noise when silenced.

Now, it flashes a variety of coloured, pretty lights, which have the
same effect of waking up nearby monsters. This is achieved by
"fake_noisy", which generates noise (but no message) regardless of
whether or not the area is silenced.

However, it has just occurred to me that the latter function might cause
weird interactions with mesmerisation and fear. Might be something to
keep in mind if its use is extended to areas where mermaids or other
monsters might be causing fear/mesmerising.

1 files changed, 48 insertions, 0 deletions

diff --git a/crawl-ref/source/orb.cc b/crawl-ref/source/orb.cc
new file mode 100644
index 0000000000..2e8308dffa
--- /dev/null
+++ b/crawl-ref/source/orb.cc
@@ -0,0 +1,48 @@
+/*
+ * File:      orb.cc
+ * Summary:   Orb-related functionality.
+ */
+
+#include "AppHdr.h"
+
+#include "areas.h"
+#include "message.h"
+#include "orb.h"
+#include "shout.h"
+#include "view.h"
+
+// Return true if it was an "actual" noise, flavour-wise.
+bool orb_noise (const coord_def& where, int loudness)
+{
+    fake_noisy(loudness, where);
+
+    if (silenced(where))
+    {
+        flash_view_delay(MAGENTA, 100);
+        flash_view_delay(LIGHTMAGENTA, 100);
+        flash_view_delay(MAGENTA, 100);
+        flash_view_delay(LIGHTMAGENTA, 100);
+
+        return (false);
+    }
+
+    return (true);
+}
+
+void orb_pickup_noise (const coord_def& where, int loudness, const char* msg, const char* msg2)
+{
+    if (orb_noise(where, loudness))
+    {
+        if (msg)
+            mpr(msg, MSGCH_ORB);
+        else
+            mpr("The orb lets out a hideous shriek!", MSGCH_ORB);
+    }
+    else
+    {
+        if (msg2)
+            mpr(msg2, MSGCH_ORB);
+        else
+            mpr("The orb lets out a furious burst of light!", MSGCH_ORB);
+    }
+}