Fixed Single Stick-Throttle Combined Device Overrides Shifted POV as …

…SimDoNothing
chihirobelmo · Oct 3, 2020 · 196de23 · 196de23
1 parent 1ee546f
commit 196de23
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/FalconBMS Alternative Launcher Cs/JoyAssgn.cs b/FalconBMS Alternative Launcher Cs/JoyAssgn.cs
@@ -190,19 +190,38 @@ public string GetKeyLinePOV()
                 {
                     for (int iii = 0; iii < 2; iii++)
                     {
-                        // if (this.pov[i].direction[ii].GetCallback((Pinky)iii) == "SimDoNothing")
-                        //    continue;
-                        assign += this.pov[i].direction[ii].GetCallback((Pinky)iii);
-                        if ((Pinky)iii == Pinky.UnShift)
-                            assign += " " + i.ToString();
-                        if ((Pinky)iii == Pinky.Shift)
-                            assign += " " + (i + 2).ToString();
-                        assign += " " + "-1";
-                        assign += " " + "-3";
-                        assign += " " + ii.ToString();
-                        assign += " " + "0x0";
-                        assign += " " + this.pov[i].direction[ii].GetSoundID((Pinky)iii);
-                        assign += "\n";
+                        if (i < 2)
+                        {
+                            // if (this.pov[i].direction[ii].GetCallback((Pinky)iii) == "SimDoNothing")
+                            //    continue;
+                            assign += this.pov[i].direction[ii].GetCallback((Pinky)iii);
+                            if ((Pinky)iii == Pinky.UnShift)
+                                assign += " " + i.ToString();
+                            if ((Pinky)iii == Pinky.Shift)
+                                assign += " " + (i + 2).ToString();
+                            assign += " " + "-1";
+                            assign += " " + "-3";
+                            assign += " " + ii.ToString();
+                            assign += " " + "0x0";
+                            assign += " " + this.pov[i].direction[ii].GetSoundID((Pinky)iii);
+                            assign += "\n";
+                        }
+                        else
+                        {
+                            if (this.pov[i].direction[ii].GetCallback((Pinky)iii) == "SimDoNothing" & this.pov[i-2].direction[ii].GetCallback((Pinky)iii) != "SimDoNothing")
+                                continue;
+                            assign += this.pov[i].direction[ii].GetCallback((Pinky)iii);
+                            if ((Pinky)iii == Pinky.UnShift)
+                                assign += " " + i.ToString();
+                            if ((Pinky)iii == Pinky.Shift)
+                                assign += " " + (i + 2).ToString();
+                            assign += " " + "-1";
+                            assign += " " + "-3";
+                            assign += " " + ii.ToString();
+                            assign += " " + "0x0";
+                            assign += " " + this.pov[i].direction[ii].GetSoundID((Pinky)iii);
+                            assign += "\n";
+                        }
                     }
                 }
             }

diff --git a/FalconBMS Alternative Launcher Cs/MainWindow.xaml b/FalconBMS Alternative Launcher Cs/MainWindow.xaml
@@ -530,7 +530,7 @@
         <Image x:Name="LOGO433" Visibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Top" Height="64" Source="Resources/LOGO433.png" Stretch="Uniform" Margin="0,0,-350,0"/>
         <Image x:Name="LOGO434" Visibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Top" Height="64" Source="Resources/LOGO434.png" Stretch="Uniform" Margin="0,0,-350,0"/>
         <Image x:Name="LOGO435" Visibility="Hidden"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="64" Source="Resources/LOGO435.png" Stretch="Uniform" Margin="0,0,-350,0"/>
-        <Label Content="FalconBMS Alternative Launcher v1.52" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontWeight="Bold" Margin="0,0,10,0"/>
+        <Label Content="FalconBMS Alternative Launcher v1.53" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontWeight="Bold" Margin="0,0,10,0"/>
 
         <Button x:Name="Button_Apply_YAME64" Visibility="Hidden" Content="Apply" HorizontalAlignment="Right" Margin="0,31,10,0" VerticalAlignment="top" Width="128" Style="{StaticResource AccentedSquareButtonStyle}" Controls:ControlsHelper.ContentCharacterCasing="Normal" Click="Apply_YAME64"/>