Unstable v0.10.600.0

2020-10-01 12:19:24 -03:00
parent 20a69375ca
commit ebe1ce1427
217 changed files with 4284 additions and 1547 deletions
@@ -261,7 +261,23 @@ namespace Barotrauma.Items.Components
                if (!isNetworkMessage || open != PredictedState)
                {
                    StopPicking(null);
-                    PlaySound(forcedOpen ? ActionType.OnPicked : ActionType.OnUse);
+                    ActionType actionType = ActionType.OnUse;
+                    if (forcedOpen)
+                    {
+                        actionType = ActionType.OnPicked;
+                    }
+                    else
+                    {
+                        if (open && HasSoundsOfType[(int)ActionType.OnOpen])
+                        {
+                            actionType = ActionType.OnOpen;
+                        }
+                        else if (!open && HasSoundsOfType[(int)ActionType.OnClose])
+                        {
+                            actionType = ActionType.OnClose;
+                        }
+                    }
+                    PlaySound(actionType);
                    if (isOpen) { stuck = MathHelper.Clamp(stuck - StuckReductionOnOpen, 0.0f, 100.0f); }
                }
            }