Added an option to disable sfx on blunders, bugfix where the same sfx…

… would play twice if player died between two GCDs
Felscream · Aug 31, 2024 · 3d29936 · 3d29936
1 parent 49ddc02
commit 3d29936
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 17 deletions.
diff --git a/DragoonMayCry/Assets/Audio/dead_weight.wav b/DragoonMayCry/Assets/Audio/dead_weight.wav
diff --git a/DragoonMayCry/Audio/AudioService.cs b/DragoonMayCry/Audio/AudioService.cs
@@ -36,7 +36,7 @@ public AudioService()
 
         public void PlaySfx(SoundId key, bool force = false)
         {
-            if (!SfxPaths.ContainsKey(key))
+            if (!Plugin.Configuration.PlaySoundEffects || !SfxPaths.ContainsKey(key))
             {
                 return;
             }
@@ -47,7 +47,6 @@ public void PlaySfx(SoundId key, bool force = false)
                 return;
             }
 
-            Service.Log.Debug($"Playing SFX {key}");
             audioEngine.PlaySfx(key, SfxPaths[key], GetSfxVolume());
 
             if (!soundIdsNextAvailability.ContainsKey(key) || force || soundIdsNextAvailability[key] == 0)

diff --git a/DragoonMayCry/Configuration/DmcConfiguration.cs b/DragoonMayCry/Configuration/DmcConfiguration.cs
@@ -11,6 +11,7 @@ public class DmcConfiguration : IPluginConfiguration
     public int Version { get; set; } = 0;
     public int SfxVolume { get; set; } = 80;
     public bool PlaySoundEffects { get; set; } = true;
+    public bool PlaySoundEffectsOnBlunder { get; set; } = true;
     public int PlaySfxEveryOccurrences { get; set; } = 3;
     public bool ApplyGameVolume { get; set; } = true;
     public bool ActiveOutsideInstance { get; set; } = false;

diff --git a/DragoonMayCry/DragoonMayCry.csproj b/DragoonMayCry/DragoonMayCry.csproj
@@ -10,7 +10,7 @@
       <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>0.4.3</Version>
+    <Version>0.5.0</Version>
     <Description>DragoonMayCry</Description>
     <PackageProjectUrl>https://github.com/Felscream/DragoonMayCry</PackageProjectUrl>
     <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>

diff --git a/DragoonMayCry/DragoonMayCry.json b/DragoonMayCry/DragoonMayCry.json
@@ -6,7 +6,7 @@
     "ApplicableVersion": "any",
     "LoadPriority": 0,
     "InternalName": "DragoonMayCry",
-    "AssemblyVersion": "0.4.3",
+    "AssemblyVersion": "0.5.0",
     "RepoUrl": "https://github.com/Felscream/DragoonMayCry",
     "Tags": [ "dmc", "style", "dragoon", "combo", "cry", "greed" ],
     "DalamudApiLevel": 10

diff --git a/DragoonMayCry/Score/Action/PlayerActionTracker.cs b/DragoonMayCry/Score/Action/PlayerActionTracker.cs
@@ -415,9 +415,10 @@ private unsafe void DetectClipping()
 
         private unsafe void DetectWastedGCD()
         {
+            // do not track dropped GCDs if the LB is being cast
+            // or the player died between 2 GCDs
             if (limitBreakCast != null)
             {
-                // do not track dropped GCDs if the LB is being cast
                 return;
             }
             if (!actionManager->isGCDRecastActive && !actionManager->isQueued)

diff --git a/DragoonMayCry/Score/ScoreProgressBar.cs b/DragoonMayCry/Score/ScoreProgressBar.cs
@@ -127,21 +127,18 @@ private void HandleDemotion()
 
         private void StartDemotionAlert()
         {
-            Service.Log.Debug("Starting demotion");
             demotionApplicationStopwatch.Restart();
             DemotionStart?.Invoke(this, DemotionTimerDuration);
         }
 
         private void ApplyDemotion()
         {
-            Service.Log.Debug("Applying demotion");
             demotionApplicationStopwatch.Reset();
             DemotionApplied?.Invoke(this, false);
         }
 
         private void CancelDemotion()
         {
-            Service.Log.Debug("Cancelling demotion");
             demotionApplicationStopwatch.Reset();
             DemotionCanceled?.Invoke(this, EventArgs.Empty);
         }

diff --git a/DragoonMayCry/Score/Style/StyleRankHandler.cs b/DragoonMayCry/Score/Style/StyleRankHandler.cs
@@ -41,12 +41,13 @@ public RankChangeData(
             StyleType.SSS);
 
         private readonly AudioService audioService;
+        private readonly PlayerState playerState;
 
         public StyleRankHandler(PlayerActionTracker playerActionTracker)
         {
             Reset();
             audioService = new AudioService();
-            var playerState = PlayerState.GetInstance();
+            playerState = PlayerState.GetInstance();
             playerState.RegisterCombatStateChangeHandler(OnCombatChange!);
             playerState.RegisterDeathStateChangeHandler(OnDeath);
             playerState.RegisterDamageDownHandler(OnDamageDown);
@@ -76,7 +77,7 @@ private void GoToNextRank(bool playSfx, bool loop = false, bool forceSfx = false
         {
             if (CurrentStyle.Next == null)
             {
-                if (Plugin.Configuration!.PlaySoundEffects && playSfx && forceSfx)
+                if (playSfx && forceSfx)
                 {
                     audioService.PlaySfx(CurrentStyle.Value);
                 }
@@ -91,7 +92,7 @@ private void GoToNextRank(bool playSfx, bool loop = false, bool forceSfx = false
                 StyleRankChange?.Invoke(this, new(CurrentStyle.Value, CurrentStyle.Next.Value, false));
                 CurrentStyle = CurrentStyle.Next;
                 Service.Log.Debug($"New rank reached {CurrentStyle.Value}");
-                if (Plugin.Configuration!.PlaySoundEffects && playSfx)
+                if (playSfx)
                 {
                     audioService.PlaySfx(CurrentStyle.Value);
                 }
@@ -165,7 +166,11 @@ private void OnCombatChange(object send, bool enteringCombat)
 
         private void OnGcdDropped(object? sender, EventArgs args)
         {
-            if (CurrentStyle.Value != StyleType.NoStyle && Plugin.Configuration!.PlaySoundEffects)
+            if (playerState.IsDead)
+            {
+                return;
+            }
+            if (CurrentStyle.Value != StyleType.NoStyle && Plugin.Configuration!.PlaySoundEffectsOnBlunder)
             {
                 audioService.PlaySfx(SoundId.DeadWeight);
             }
@@ -175,14 +180,18 @@ private void OnGcdDropped(object? sender, EventArgs args)
 
         private void OnLimitBreakCanceled(object? sender, EventArgs args)
         {
-            ForceRankTo(StyleType.D, true);
+            if (playerState.IsDead)
+            {
+                return;
+            }
+            ForceRankTo(StyleType.D, Plugin.Configuration!.PlaySoundEffectsOnBlunder);
         }
 
         private void OnDeath(object? sender, bool isDead)
         {
             if (isDead)
             {
-                ForceRankTo(StyleType.D, true);
+                ForceRankTo(StyleType.D, Plugin.Configuration!.PlaySoundEffectsOnBlunder);
             }
         }
 
@@ -197,12 +206,12 @@ private void OnLimitBreak(
 
         private void OnDamageDown(object? sender, bool hasDamageDown)
         {
-            if(!hasDamageDown)
+            if(!hasDamageDown || playerState.IsDead)
             {
                 return;
             }
 
-            ForceRankTo(StyleType.D, true);
+            ForceRankTo(StyleType.D, Plugin.Configuration!.PlaySoundEffectsOnBlunder);
         }
     }
 }
diff --git a/DragoonMayCry/UI/ConfigWindow.cs b/DragoonMayCry/UI/ConfigWindow.cs
@@ -32,7 +32,7 @@ public void Dispose() { }
     public override void Draw()
     {
         var lockScoreWindow = configuration.StyleRankUiConfiguration.LockScoreWindow;
-        if (ImGui.Checkbox("Lock Score Window", ref lockScoreWindow))
+        if (ImGui.Checkbox("Lock score window", ref lockScoreWindow))
         {
             configuration.StyleRankUiConfiguration.LockScoreWindow = lockScoreWindow;
             configuration.Save();
@@ -53,6 +53,13 @@ public override void Draw()
             configuration.Save();
         }
 
+        var playSoundEffectsOnBlunder = configuration.PlaySoundEffectsOnBlunder;
+        if (ImGui.Checkbox("Play sound effect on blunders", ref playSoundEffectsOnBlunder))
+        {
+            configuration.PlaySoundEffectsOnBlunder = playSoundEffectsOnBlunder;
+            configuration.Save();
+        }
+
         var applyGameVolume = configuration.ApplyGameVolume;
         if (ImGui.Checkbox("Apply game volume", ref applyGameVolume))
         {