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.

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

[Merge] Feature/update 1.9 Hotfix #182

Merged
merged 12 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FASTER/FASTER.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<PublishReadyToRunComposite>false</PublishReadyToRunComposite>
<UseWPF>true</UseWPF>
<Version>1.9.5.1</Version>
<Version>1.9.5.2</Version>
<Authors>Keelah Fox</Authors>
<Company>FoxliCorp.</Company>
<Description>Fox's Arma Server Tool Extended Rewrite</Description>
Expand Down
54 changes: 27 additions & 27 deletions FASTER/Models/Arma3Profile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,39 @@ public static class ProfileCfgArrays
public static string[] TacticalPingStrings { get; } = { "Disabled", "3D only", "Map only", "Both" };
public static string[] AiPresetStrings { get; } = { "Low", "Normal", "High", "Custom" };
public static string[] ThirdPersonStrings { get; } = { "Disabled", "Enabled", "Vehicles Only" };
public static string[] ForcedDifficultyStrings { get; } = { "Recruit", "Regular", "Veteran", "Custom" };
public static string[] ForcedDifficultyStrings { get; } = { "Recruit", "Regular", "Veteran", "Custom" };
}

[Serializable]
public class Arma3Profile : INotifyPropertyChanged
{
private ushort reducedDamage = 0;
private ushort groupIndicators = 2;
private ushort friendlyTags = 1;
private ushort enemyTags = 0;
private ushort detectedMines = 1;
private ushort commands = 1;
private ushort waypoints = 1;
private ushort weaponInfo = 2;
private ushort stanceIndicator = 2;
private ushort staminaBar = 1;
private ushort weaponCrosshair = 1;
private ushort visionAid = 0;
private ushort thirdPersonView = 1;
private ushort cameraShake = 1;
private ushort scoreTable = 1;
private ushort deathMessages = 1;
private ushort vonID = 1;
private ushort reducedDamage = 0;
private ushort groupIndicators = 2;
private ushort friendlyTags = 1;
private ushort enemyTags = 0;
private ushort detectedMines = 1;
private ushort commands = 1;
private ushort waypoints = 1;
private ushort weaponInfo = 2;
private ushort stanceIndicator = 2;
private ushort staminaBar = 1;
private ushort weaponCrosshair = 1;
private ushort visionAid = 0;
private ushort thirdPersonView = 1;
private ushort cameraShake = 1;
private ushort scoreTable = 1;
private ushort deathMessages = 1;
private ushort vonID = 1;
private ushort mapContentFriendly = 1;
private ushort mapContentEnemy = 1;
private ushort mapContentMines = 1;
private ushort autoReport = 0;
private ushort multipleSaves = 0;
private ushort tacticalPing = 1;
private ushort mapContentEnemy = 1;
private ushort mapContentMines = 1;
private ushort autoReport = 0;
private ushort multipleSaves = 0;
private int tacticalPing = 1;

private ushort aiLevelPreset = 3;
private double skillAi = 0.5;
private double precisionAi = 0.5;
private ushort aiLevelPreset = 3;
private double skillAi = 0.5;
private double precisionAi = 0.5;

private string armaProfileContent;

Expand Down Expand Up @@ -284,7 +284,7 @@ public string TacticalPing
get => ProfileCfgArrays.TacticalPingStrings[tacticalPing];
set
{
tacticalPing = (ushort)Array.IndexOf(ProfileCfgArrays.TacticalPingStrings, value);
tacticalPing = Array.IndexOf(ProfileCfgArrays.TacticalPingStrings, value);
RaisePropertyChanged("TacticalPing");
}
}
Expand Down
2 changes: 1 addition & 1 deletion FASTER/Models/ArmaMod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public class ArmaMod : INotifyPropertyChanged


public uint WorkshopId
{
{
get => _workshopId;
set
{
Expand Down
117 changes: 59 additions & 58 deletions FASTER/Models/ServerCfg.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion FASTER/Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
</SettingsFile>
2 changes: 1 addition & 1 deletion FASTER/ViewModel/ModsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ internal async Task DeleteAllMods()
DeleteMod(mod);
}
}

public void OpenModPage(ArmaMod mod)
{
if (mod == null)
Expand Down
4 changes: 2 additions & 2 deletions FASTER/ViewModel/ProfileViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ internal async Task ClearModKeys()

public ObservableCollection<string> LimitedDistanceStrings { get; } = new ObservableCollection<string>(ProfileCfgArrays.LimitedDistanceStrings);
public ObservableCollection<string> AiPresetStrings { get; } = new ObservableCollection<string>(ProfileCfgArrays.AiPresetStrings);
public ObservableCollection<string> ForcedDifficultyString { get; } = new ObservableCollection<string> { "Recruit", "Regular", "Veteran", "Custom" };
public ObservableCollection<string> ForcedDifficultyString { get; } = new ObservableCollection<string> { "Recruit", "Regular", "Veteran", "Custom" };
public ObservableCollection<string> ThirdPersonStrings { get; } = new ObservableCollection<string>(ProfileCfgArrays.ThirdPersonStrings);
public ObservableCollection<string> TacticalPingStrings { get; } = new ObservableCollection<string>(ProfileCfgArrays.TacticalPingStrings);

Expand Down Expand Up @@ -537,7 +537,7 @@ internal void ModsSelectAll(object to, bool select)
case "HC":
mod.HeadlessChecked = select;
break;
case "Opt":
case "Opt":
mod.OptChecked = select;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion FASTER_Version.xml
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.5.1</version>
<version>1.9.5.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
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Thanks go out to all the guys who helped the developpment and those who will tes
- Automated Update process

- SteamCMD Automation
- Install and update Arma 3 Server (Stable, Dev, DLCs, Legacy)
- Install and update Arma 3 Server (Stable, Dev, DLCs)
- Install, update and manage Arma 3 Workshop mods
- Import installed Steam Mods
- Supports Steam Guard and Mobile Auth
Expand Down Expand Up @@ -76,17 +76,17 @@ A complete Documentation is available on the [GitHub Wiki](https://github.com/Fo
<details>
<summary>Screenshots below</summary>

Main Menu
![MainMenu](https://user-images.githubusercontent.com/19773387/147384230-3da8cb8d-4a3a-4ae2-90f4-3fc90a3954ad.png)
Main Menu
![MainMenu](https://imgur.com/Izf9Kmm.png)

Profile Mods Menu
![Profile Mods Menu](https://private-user-images.githubusercontent.com/78136088/316247430-2488268d-9a55-44cc-9010-c306c5056a33.PNG?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTEyMDQwMTksIm5iZiI6MTcxMTIwMzcxOSwicGF0aCI6Ii83ODEzNjA4OC8zMTYyNDc0MzAtMjQ4ODI2OGQtOWE1NS00NGNjLTkwMTAtYzMwNmM1MDU2YTMzLlBORz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAzMjMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMzIzVDE0MjE1OVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTQxODRkOGZiOGNhN2E1ZDJkYjE5ODY1YzIyZTNiMmZjMGMyZjk4ZGZlMWYwYjMzM2IwMTVhN2YzNDUwYmQ5NDkmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.sum-WMePl76xam_FsJjLCys6c0Eo041wTrE2Hmjnm_M)
Profile Mods Menu
![Profile Mods Menu](https://imgur.com/D8LqSO6.png)

Mods Menu
![Steam Mods Menu](https://user-images.githubusercontent.com/19773387/147383857-ab63ab77-aeef-42ad-8b51-e0708096fbf9.png)
Mods Menu
![Mods Menu](https://imgur.com/VivCLM3.png)

Profile Menu
![Profile Menu](https://user-images.githubusercontent.com/19773387/95013037-d0c0cc80-063d-11eb-8ca1-ba3f445e5461.png)
Server Menu
![Profile Menu](https://imgur.com/1GuLqu2.png)

</details>

Expand Down
Loading