diff --git a/Artemis/Artemis/DAL/ProfileProvider.cs b/Artemis/Artemis/DAL/ProfileProvider.cs index 9fea4dfc2..4b0e28181 100644 --- a/Artemis/Artemis/DAL/ProfileProvider.cs +++ b/Artemis/Artemis/DAL/ProfileProvider.cs @@ -167,7 +167,8 @@ namespace Artemis.DAL var gifDir = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Artemis\gifs"; Directory.CreateDirectory(gifDir); var gifPath = gifDir + $"\\{fileName}.gif"; - gifFile.Save(gifPath); + if (!File.Exists(gifPath)) + gifFile.Save(gifPath); foreach (var profile in profiles) { diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip b/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip index 80d8f3fbc..9973ee615 100644 Binary files a/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip and b/Artemis/Artemis/Modules/Games/UnrealTournament/Resources/ut-plugin.zip differ diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentModel.cs b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentModel.cs index 5a6ba3d87..1fb4f2c8e 100644 --- a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentModel.cs +++ b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentModel.cs @@ -47,7 +47,7 @@ namespace Artemis.Modules.Games.UnrealTournament var gameSettings = (UnrealTournamentSettings) Settings; // If already propertly set up, don't do anything if (gameSettings.GameDirectory != null && - File.Exists(gameSettings.GameDirectory + "UE4-Win64-Shipping.exe")) + File.Exists(gameSettings.GameDirectory + @"\Engine\Binaries\Win64\UE4-Win64-Shipping.exe")) return; // Attempt to read the file @@ -65,7 +65,7 @@ namespace Artemis.Modules.Games.UnrealTournament // Use backslash in path for consistency utDir = utDir.Replace('/', '\\'); - if (!File.Exists(utDir + @"\UE4-Win64-Shipping.exe")) + if (!File.Exists(utDir + @"\Engine\Binaries\Win64\UE4-Win64-Shipping.exe")) return; gameSettings.GameDirectory = utDir; @@ -78,7 +78,7 @@ namespace Artemis.Modules.Games.UnrealTournament var gameSettings = (UnrealTournamentSettings) Settings; var path = gameSettings.GameDirectory; - if (!File.Exists(path + @"\UE4-Win64-Shipping.exe")) + if (!File.Exists(path + @"\Engine\Binaries\Win64\UE4-Win64-Shipping.exe")) { _dialogService.ShowErrorMessageBox("Please select a valid Unreal Tournament directory\n\n" + @"By default Unreal Tournament is in C:\Program Files\Epic Games\UnrealTournament"); diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs index 3ed9edeee..81f678981 100644 --- a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs +++ b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs @@ -1,52 +1,52 @@ -using System.Windows.Forms; -using Artemis.DAL; -using Artemis.Managers; -using Artemis.Modules.Abstract; -using Artemis.Properties; -using Ninject; - -namespace Artemis.Modules.Games.UnrealTournament -{ - public sealed class UnrealTournamentViewModel : ModuleViewModel - { - public UnrealTournamentViewModel(MainManager mainManager, - [Named(nameof(UnrealTournamentModel))] ModuleModel moduleModel, IKernel kernel) - : base(mainManager, moduleModel, kernel) - { - DisplayName = "Unreal Tournament"; - InstallGif(); - } - - public override bool UsesProfileEditor => true; - - public void BrowseDirectory() - { - var dialog = new FolderBrowserDialog {SelectedPath = ((UnrealTournamentSettings) Settings).GameDirectory}; - var result = dialog.ShowDialog(); - if (result != DialogResult.OK) - return; - - ((UnrealTournamentSettings) Settings).GameDirectory = dialog.SelectedPath; - ((UnrealTournamentModel) ModuleModel).PlaceFiles(); - Settings.Save(); - NotifyOfPropertyChange(() => Settings); - } - - public void PlaceFiles() +using System.Windows.Forms; +using Artemis.DAL; +using Artemis.Managers; +using Artemis.Modules.Abstract; +using Artemis.Properties; +using Ninject; + +namespace Artemis.Modules.Games.UnrealTournament +{ + public sealed class UnrealTournamentViewModel : ModuleViewModel + { + public UnrealTournamentViewModel(MainManager mainManager, + [Named(nameof(UnrealTournamentModel))] ModuleModel moduleModel, IKernel kernel) + : base(mainManager, moduleModel, kernel) { - ((UnrealTournamentModel)ModuleModel).PlaceFiles(); - Settings.Save(); - NotifyOfPropertyChange(() => Settings); - } - - // Installing GIF on editor open to make sure the proper profiles are loaded - private void InstallGif() - { - var gif = Resources.redeemer; - if (gif == null) - return; - - ProfileProvider.InsertGif("UnrealTournament", "Default", "Redeemer GIF", gif, "redeemer"); - } - } + DisplayName = "Unreal Tournament"; + InstallGif(); + } + + public override bool UsesProfileEditor => true; + + public void BrowseDirectory() + { + var dialog = new FolderBrowserDialog {SelectedPath = ((UnrealTournamentSettings) Settings).GameDirectory}; + var result = dialog.ShowDialog(); + if (result != DialogResult.OK) + return; + + ((UnrealTournamentSettings) Settings).GameDirectory = dialog.SelectedPath; + ((UnrealTournamentModel) ModuleModel).PlaceFiles(); + Settings.Save(); + NotifyOfPropertyChange(() => Settings); + } + + public void PlaceFiles() + { + ((UnrealTournamentModel)ModuleModel).PlaceFiles(); + Settings.Save(); + NotifyOfPropertyChange(() => Settings); + } + + // Installing GIF on editor open to make sure the proper profiles are loaded + private void InstallGif() + { + var gif = Resources.redeemer; + if (gif == null) + return; + + ProfileProvider.InsertGif("UnrealTournament", "Default", "Redeemer GIF", gif, "redeemer"); + } + } } \ No newline at end of file