1 files changed, 12 insertions, 1 deletions
diff --git a/desktop/companion/Mood.js b/desktop/companion/Mood.js
index 409a958..b59c1ab 100644
--- a/desktop/companion/Mood.js
+++ b/desktop/companion/Mood.js
@@ -23,11 +23,15 @@ var T = {
     mockCooldown: 20000,
     typingHold: 2000,
     waveHold: 3000,
+    singHold: 4000,         // her singing reaction to the headphones connecting
+    djHold: 6000,           // behind the decks when a track starts or changes
     wakeHold: 1500,         // the stretch after idling
     lineCooldown: 30000,
     monologueCooldown: 3600000,
     destruct: 1000,         // the glow and the flash; the sprite is hidden under it
     scorched: 3000,
+    goodbye: 2000,          // waving goodbye with a line, enough to read it
+    goodbyeSilent: 1000,    // waving goodbye with nothing to read
     admireLook: 1500,       // turned to the wallpaper, before the blush
     admireBlush: 3000,
     admireCooldown: 180000,
@@ -53,6 +57,9 @@ function clickFrame(count) {
 // The spec's priority table, top to bottom: the first that applies wins.
 // idle is 0 awake, 1 bored, 2 yawning, 3 lying down.
 function pick(s) {
+    // The user hid her: the goodbye outranks whatever she was doing. The
+    // frame here is a placeholder; Companion.qml cycles the wave frames.
+    if (s.leaving) return st("bye", "wave");
     const since = s.destructAt ? s.now - s.destructAt : Infinity;
     if (since < T.destruct) return st("destruct", "base");
     if (since < T.destruct + T.scorched) return st("scorched", "scorched");
@@ -62,6 +69,8 @@ function pick(s) {
     if (s.recording) return st("listen", "listen");
     if (s.busy) return st("think", "think");
     if (s.now - s.repliedAt < T.waveHold) return st("wave", "wave");
+    if (s.now - s.singAt < T.singHold) return st("sing", "sing");
+    if (s.now - s.djAt < T.djHold) return st("dj", "dj");
     if (s.clicks.count > 0 && s.now - s.clicks.at < T.clickHold)
         return st("clicks", clickFrame(s.clicks.count));
     if (s.now - s.admireAt < T.admireLook + T.admireBlush)
@@ -73,7 +82,9 @@ function pick(s) {
     if (s.monologue) return st("muse", "muse");
     if (s.idle >= 3) return st("lying", "lying");
     if (s.idle === 2) return st("yawn", "yawn");
-    if (s.idle === 1) return st("bored", "sleepy");
+    // Music turns boredom into a groove picked by Companion.qml; the
+    // deeper idle stages still win, so music does not keep her awake.
+    if (s.idle === 1) return s.music ? st("groove", s.groove || "whistle") : st("bored", "sleepy");
     return st("base", "base");
 }