Changeset 25287

Timestamp:

Apr 18, 2021, 10:10:00 AM (3 years ago)

Author:

Freagarach

Message:

Play a sound when there are no idle entities.

If there are no idle units and the idle-unit hotkey is pressed there is now a sound played.
Beneficial when there are already units selected since selection doesn't change.

Sound courtesy of @Samualis.

Refs. #5360
Based on a patch by: @cpc
Differential revision: ​https://code.wildfiregames.com/D1692
Comments by: @asterix, @smiley, @Stan, @vladislavbelov

Location:

ps/trunk/binaries/data/mods/public

Files:

• audio/interface/alarm/alarm_no_idle_unit.xml (copied) (copied from ps/trunk/binaries/data/mods/public/audio/interface/alarm/alarm_invalid_building_placement.xml ) (1 diff)
• audio/interface/alarm/alarm_no_idle_unit_01.ogg (added)
• gui/credits/texts/programming.json (modified) (1 diff)
• gui/session/input.js (modified) (1 diff)
• simulation/components/GuiInterface.js (modified) (2 diffs)
• simulation/templates/special/player/player.xml (modified) (1 diff)

ps/trunk/binaries/data/mods/public/audio/interface/alarm/alarm_no_idle_unit.xml

@@ -9 +9 @@
     <Threshold>1</Threshold>
     <Path>audio/interface/alarm</Path>
-    <Sound>alarm_invalid_building_placement_01.ogg</Sound>
+    <Sound>alarm_t_01.ogg</Sound>
 </SoundGroup>

ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json

@@ -56 +56 @@
                 { "nick": "Chakakhan", "name": "Kenny Long" },
                 { "nick": "Clockwork-Muse", "name": "Stephen A. Imhoff" },
+
                 { "nick": "Cracker78", "name": "Chad Heim" },
                 { "nick": "Crynux", "name": "Stephen J. Fewer" },

ps/trunk/binaries/data/mods/public/gui/session/input.js

@@ -1623 +1623 @@
     if (!idleUnits.length)
     {
-        // TODO: display a message or play a sound to indicate no more idle units, or something
-        // Reset for next cycle
+        // TODO: display a message to indicate no more idle units, or something
+        Engine.GuiInterfaceCall("PlaySoundForPlayer", {
+            "name": "no_idle_unit"
+        });
         resetIdleUnit();
         return;

ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -1791 +1791 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
 GuiInterface.prototype.PlaySound = function(player, data)
 {
@@ -2089 +2101 @@
     "GetFoundationSnapData": 1,
     "PlaySound": 1,
+
     "FindIdleUnits": 1,
     "HasIdleUnits": 1,

ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml

@@ -92 +92 @@
       <defeated_ally>interface/alarm/alarm_defeated_ally.xml</defeated_ally>
       <defeated_enemy>interface/alarm/alarm_defeated_enemy.xml</defeated_enemy>
+
     </SoundGroups>
   </Sound>