Skip to content

Commit 196de23

Browse files
committed
Fixed Single Stick-Throttle Combined Device Overrides Shifted POV as SimDoNothing
1 parent 1ee546f commit 196de23

File tree

2 files changed

+33
-14
lines changed

2 files changed

+33
-14
lines changed

FalconBMS Alternative Launcher Cs/JoyAssgn.cs

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -190,19 +190,38 @@ public string GetKeyLinePOV()
190190
{
191191
for (int iii = 0; iii < 2; iii++)
192192
{
193-
// if (this.pov[i].direction[ii].GetCallback((Pinky)iii) == "SimDoNothing")
194-
// continue;
195-
assign += this.pov[i].direction[ii].GetCallback((Pinky)iii);
196-
if ((Pinky)iii == Pinky.UnShift)
197-
assign += " " + i.ToString();
198-
if ((Pinky)iii == Pinky.Shift)
199-
assign += " " + (i + 2).ToString();
200-
assign += " " + "-1";
201-
assign += " " + "-3";
202-
assign += " " + ii.ToString();
203-
assign += " " + "0x0";
204-
assign += " " + this.pov[i].direction[ii].GetSoundID((Pinky)iii);
205-
assign += "\n";
193+
if (i < 2)
194+
{
195+
// if (this.pov[i].direction[ii].GetCallback((Pinky)iii) == "SimDoNothing")
196+
// continue;
197+
assign += this.pov[i].direction[ii].GetCallback((Pinky)iii);
198+
if ((Pinky)iii == Pinky.UnShift)
199+
assign += " " + i.ToString();
200+
if ((Pinky)iii == Pinky.Shift)
201+
assign += " " + (i + 2).ToString();
202+
assign += " " + "-1";
203+
assign += " " + "-3";
204+
assign += " " + ii.ToString();
205+
assign += " " + "0x0";
206+
assign += " " + this.pov[i].direction[ii].GetSoundID((Pinky)iii);
207+
assign += "\n";
208+
}
209+
else
210+
{
211+
if (this.pov[i].direction[ii].GetCallback((Pinky)iii) == "SimDoNothing" & this.pov[i-2].direction[ii].GetCallback((Pinky)iii) != "SimDoNothing")
212+
continue;
213+
assign += this.pov[i].direction[ii].GetCallback((Pinky)iii);
214+
if ((Pinky)iii == Pinky.UnShift)
215+
assign += " " + i.ToString();
216+
if ((Pinky)iii == Pinky.Shift)
217+
assign += " " + (i + 2).ToString();
218+
assign += " " + "-1";
219+
assign += " " + "-3";
220+
assign += " " + ii.ToString();
221+
assign += " " + "0x0";
222+
assign += " " + this.pov[i].direction[ii].GetSoundID((Pinky)iii);
223+
assign += "\n";
224+
}
206225
}
207226
}
208227
}

FalconBMS Alternative Launcher Cs/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@
530530
<Image x:Name="LOGO433" Visibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Top" Height="64" Source="Resources/LOGO433.png" Stretch="Uniform" Margin="0,0,-350,0"/>
531531
<Image x:Name="LOGO434" Visibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Top" Height="64" Source="Resources/LOGO434.png" Stretch="Uniform" Margin="0,0,-350,0"/>
532532
<Image x:Name="LOGO435" Visibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Top" Height="64" Source="Resources/LOGO435.png" Stretch="Uniform" Margin="0,0,-350,0"/>
533-
<Label Content="FalconBMS Alternative Launcher v1.52" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontWeight="Bold" Margin="0,0,10,0"/>
533+
<Label Content="FalconBMS Alternative Launcher v1.53" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontWeight="Bold" Margin="0,0,10,0"/>
534534

535535
<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"/>
536536

0 commit comments

Comments
 (0)