Added on blackscreen timing type to ER

FrankvdStam · Jul 14, 2022 · 0fab8c1 · 0fab8c1
1 parent c8675d3
commit 0fab8c1
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/Components/SoulSplitter.dll b/Components/SoulSplitter.dll
diff --git a/src/SoulSplitter/Splitters/EldenRingSplitter.cs b/src/SoulSplitter/Splitters/EldenRingSplitter.cs
@@ -320,6 +320,14 @@ private void ResolveSplitTiming(Split s)
                         s.SplitTriggered = true;
                     }
                     break;
+
+                case TimingType.OnBlackscreen:
+                    if (_eldenRing.IsBlackscreenActive())
+                    {
+                        _timerModel.Split();
+                        s.SplitTriggered = true;
+                    }
+                    break;
             }
         }
 

diff --git a/src/SoulSplitter/TimingType.cs b/src/SoulSplitter/TimingType.cs
@@ -9,5 +9,8 @@ public enum TimingType
 
         [Display(Name = "on loading")]
         OnLoading,
+
+        [Display(Name = "on blackscreen")]
+        OnBlackscreen,
     }
 }
diff --git a/src/SoulSplitter/UI/EldenRing/EldenRingControl.xaml b/src/SoulSplitter/UI/EldenRing/EldenRingControl.xaml
@@ -136,6 +136,11 @@
                     <soulSplitter:TimingType>OnLoading</soulSplitter:TimingType>
                 </ComboBoxItem.Tag>
             </ComboBoxItem>
+            <ComboBoxItem Content="During a blackscreen after">
+                <ComboBoxItem.Tag>
+                    <soulSplitter:TimingType>OnBlackscreen</soulSplitter:TimingType>
+                </ComboBoxItem.Tag>
+            </ComboBoxItem>
         </ComboBox>
 
         <!-- split type -->

diff --git a/src/soulmemory-rs/src/tas/xinput.rs b/src/soulmemory-rs/src/tas/xinput.rs
@@ -208,10 +208,12 @@ pub fn tas_start()
 {
     unsafe
     {
-        info!("Starting TAS");
-
-        TAS_STATE = TasState::Running;
-        TAS_INPUT_INDEX = 0;
+        if TAS_STATE != TasState::Running
+        {
+            info!("Starting TAS");
+            TAS_STATE = TasState::Running;
+            TAS_INPUT_INDEX = 0;
+        }
     }
 }