Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EF cDLC Branch push #222

Merged
merged 3 commits into from
Nov 26, 2024
Merged

EF cDLC Branch push #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86c3702
cDLC update
jupster Nov 11, 2024
5621daf
Supporters Update
jupster Nov 26, 2024
79fc308
Version bump
jupster Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions FASTER/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@
<setting name="usingRFDlc" serializeAs="String">
<value>False</value>
</setting>
<setting name="usingEFDlc" serializeAs="String">
<value>False</value>
</setting>
</FASTER.Properties.Settings>
</userSettings>
</configuration>
2 changes: 1 addition & 1 deletion FASTER/FASTER.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
<Authors>Keelah Fox, Jupster, Canno.n</Authors>
<Version>1.9.6.1</Version>
<Version>1.9.6.2</Version>
<Company>FoxliCorp.</Company>
<Description>Fox's Arma Server Tool Extended Rewrite</Description>
<Copyright>Copyright © 2019</Copyright>
Expand Down
15 changes: 15 additions & 0 deletions FASTER/Models/ServerProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class ServerProfile : INotifyPropertyChanged
private bool _wsDlcChecked;
private bool _speDlcChecked;
private bool _rfDlcChecked;
private bool _efDlcChecked;
private bool _enableHT = true;
private bool _enableRanking;

Expand Down Expand Up @@ -214,6 +215,16 @@ public bool RFDLCChecked
}
}

public bool EFDLCChecked
{
get => _efDlcChecked;
set
{
_efDlcChecked = value;
RaisePropertyChanged(nameof(EFDLCChecked));
}
}

public bool EnableHyperThreading
{
get => _enableHT;
Expand Down Expand Up @@ -504,6 +515,10 @@ public string GetDlcAndPlayerMods(string playerMods)
{
_ = mods.Append($"{playerMods};");
}
if (EFDLCChecked)
{
_ = mods.Append("ef;");
}
return !string.IsNullOrWhiteSpace(mods.ToString()) ? $" \"-mod={mods}\"" : "";
}

Expand Down
3 changes: 3 additions & 0 deletions FASTER/Models/StaticData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ internal static class StaticData
"Harkness31",
"Ace",
"bojothebigman",
"EmPtY.zip",
"OverlordZorn",
"Jupster",
};

/// <summary>
Expand Down
11 changes: 11 additions & 0 deletions FASTER/Models/SteamUpdaterModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@
}
}

public bool UsingEFDlc
{
get => Settings.Default.usingEFDlc;
set
{
Settings.Default.usingEFDlc = value;
Settings.Default.Save();
RaisePropertyChanged(nameof(UsingEFDlc));
}
}

public string ApiKey
{
get => !string.IsNullOrEmpty(Settings.Default.SteamAPIKey)
Expand All @@ -185,7 +196,7 @@
}
}

public event PropertyChangedEventHandler PropertyChanged;

Check warning on line 199 in FASTER/Models/SteamUpdaterModel.cs

View workflow job for this annotation

GitHub Actions / Analyze with CodeQL (csharp) 

Nullability of reference types in type of 'event PropertyChangedEventHandler SteamUpdaterModel.PropertyChanged' doesn't match implicitly implemented member 'event PropertyChangedEventHandler? INotifyPropertyChanged.PropertyChanged'.

private void RaisePropertyChanged(string property)
{
Expand Down
15 changes: 15 additions & 0 deletions FASTER/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions FASTER/Properties/Settings.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,8 @@
<Setting Name="usingRFDlc" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="usingEFDlc" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
2 changes: 1 addition & 1 deletion FASTER/ViewModel/ProfileViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ internal async Task CopyModKeys()

internal async Task ClearModKeys()
{
var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey", "spe.bikey", "rf.bikey" };
var ignoredKeys = new[] {"a3.bikey", "a3c.bikey", "gm.bikey", "ws.bikey", "csla.bikey", "vn.bikey", "spe.bikey", "rf.bikey", "ef.bikey" };
if (Directory.Exists(Path.Combine(Profile.ArmaPath, "keys")))
{
foreach (var keyFile in Directory.GetFiles(Path.Combine(Profile.ArmaPath, "keys")))
Expand Down
12 changes: 11 additions & 1 deletion FASTER/ViewModel/SteamUpdaterViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
Analytics.TrackEvent("Updater - Clicked Update", new Dictionary<string, string>
{
{"Name", Properties.Settings.Default.steamUserName},
{"DLCs", $"{(Parameters.UsingGMDlc ? "GM " : "")}{(Parameters.UsingCSLADlc? "CSLA " : "")}{(Parameters.UsingPFDlc ? "SOG " : "")}{(Parameters.UsingWSDlc ? "WS " : "")}{(Parameters.UsingSPEDlc ? "SPE " : "")}{(Parameters.UsingRFDlc ? "RF " : "")}"},
{"DLCs", $"{(Parameters.UsingGMDlc ? "GM " : "")}{(Parameters.UsingCSLADlc? "CSLA " : "")}{(Parameters.UsingPFDlc ? "SOG " : "")}{(Parameters.UsingWSDlc ? "WS " : "")}{(Parameters.UsingSPEDlc ? "SPE " : "")}{(Parameters.UsingRFDlc ? "RF " : "")}{(Parameters.UsingEFDlc ? "EF " : "")}"},
{"Branch", $"{(Parameters.UsingPerfBinaries? "Profiling" : "Public")}"}
});

Expand All @@ -156,6 +156,7 @@
{233794, "Arma 3 Server Creator DLC - SOGPF"},
{233795, "Arma 3 Server Creator DLC - WS"},
{233799, "Arma 3 Server Creator DLC - RF"},
{233798, "Arma 3 Server Creator DLC - EF"},
};

//IReadOnlyList<Depot> depotsList;
Expand Down Expand Up @@ -257,6 +258,15 @@
null));
}

if (Parameters.UsingEFDlc)
{
Parameters.Output += "\nChecking Arma 3 Server Creator DLC - EF...";
depotsDownload.Add((
depotsIDs.FirstOrDefault(d => d.Value == "Arma 3 Server Creator DLC - EF").Key,
"creatordlc",
null));
}

await RunServerUpdater(Parameters.InstallDirectory, appId, depotsDownload);

Parameters.Output += "\n\nAll Done ! ";
Expand Down Expand Up @@ -744,7 +754,7 @@
public async Task<MessageDialogResult> SteamGuardInputPhone()
{ return await DialogCoordinator.ShowMessageAsync(this, "Steam Guard", "Press OK after accepting authentification on mobile\nOr press Cancel to enter a 2FA Code", MessageDialogStyle.AffirmativeAndNegative); }

public event PropertyChangedEventHandler PropertyChanged;

Check warning on line 757 in FASTER/ViewModel/SteamUpdaterViewModel.cs

View workflow job for this annotation

GitHub Actions / Analyze with CodeQL (csharp) 

Nullability of reference types in type of 'event PropertyChangedEventHandler SteamUpdaterViewModel.PropertyChanged' doesn't match implicitly implemented member 'event PropertyChangedEventHandler? INotifyPropertyChanged.PropertyChanged'.

private void RaisePropertyChanged(string property)
{
Expand Down
2 changes: 2 additions & 0 deletions FASTER/Views/Profile.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
<CheckBox IsChecked="{Binding Profile.WSDLCChecked}" Content="Western Sahara DLC" Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Profile.SPEDLCChecked}" Content="Spearhead 1944 DLC" Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Profile.RFDLCChecked}" Content="Reaction Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Profile.EFDLCChecked}" Content="Expeditionary Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
<StackPanel Height="10"/>
</StackPanel>
</GroupBox>
Expand Down Expand Up @@ -114,6 +115,7 @@
<CheckBox IsChecked="{Binding Profile.WSDLCChecked}" Content="Western Sahara DLC" Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Profile.SPEDLCChecked}" Content="Spearhead 1944 DLC" Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Profile.RFDLCChecked}" Content="Reaction Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Profile.EFDLCChecked}" Content="Expeditionary Forces DLC" Margin="10,3" HorizontalAlignment="Left"/>
</StackPanel>
</Expander>
</Canvas>-->
Expand Down
4 changes: 3 additions & 1 deletion FASTER/Views/Updater.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@
<CheckBox IsChecked="{Binding Parameters.UsingSPEDlc}" Content="Spearhead 1944 DLC"
Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Parameters.UsingRFDlc}" Content="Reaction Forces DLC"
Margin="10,3" HorizontalAlignment="Left"/>
Margin="10,3" HorizontalAlignment="Left"/>
<CheckBox IsChecked="{Binding Parameters.UsingEFDlc}" Content="Expeditionary Forces DLC"
Margin="10,3" HorizontalAlignment="Left"/>
</StackPanel>
<Button Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}" BorderThickness="0" Grid.Row="4" Content="Update" Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Click="Update_Click"/>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion FASTER_Version.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.9.6.1</version>
<version>1.9.6.2</version>
<url>https://github.com/Foxlider/FASTER/releases/latest/download/Release_x64.zip</url>
<changelog>https://github.com/Foxlider/FASTER/releases</changelog>
<mandatory>true</mandatory>
Expand Down
Loading