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

Jump to bottom

Moar Games #428

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Moar Games #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5df30a4
jared
THW-Reaper Sep 19, 2023
4112f5d
Omega, Pavlov, Survivor detection
THW-Reaper Sep 19, 2023
68fca48
added more leniancy/icons to tree view
THW-Reaper Sep 20, 2023
d88707e
survivor
THW-Reaper Sep 21, 2023
400e91d
what to do next...
THW-Reaper Sep 24, 2023
3a9d9cb
Astroneer icon
THW-Reaper Sep 24, 2023
4a4f1a3
astroneer, again
THW-Reaper Sep 24, 2023
9629212
interface+Audio+Textures tree icon leniancy
THW-Reaper Sep 24, 2023
84289fd
Insurgency and Hell Let loose, need to add icons
THW-Reaper Sep 26, 2023
49673ed
HLL and Insurgency Icons
THW-Reaper Sep 26, 2023
aee5e11
Icons added to tree
THW-Reaper Sep 26, 2023
02f4a86
Merge branch '4sval:dev' into dev
THW-Reaper Oct 24, 2023
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
Binary file added FModel/Resources/HLL.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FModel/Resources/Insurgency.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FModel/Resources/icon_astroneer.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FModel/Resources/pavlov.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion FModel/ViewModels/GameSelectorViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private IEnumerable<EGame> EnumerateUeGames()
.GroupBy(value => (int)value)
.Select(group => group.First())
.OrderBy(value => (int)value == ((int)value & ~0xF));
private IEnumerable<DirectorySettings> EnumerateDetectedGames()
private IEnumerable<DirectorySettings> EnumerateDetectedGames() //Note for 4sval - Automatic mappings pulled from github raw OutInTheShade's Mapping archive might prove useful, I might work that into a seperate PR
{
yield return GetUnrealEngineGame("Fortnite", "\\FortniteGame\\Content\\Paks", EGame.GAME_UE5_3);
yield return DirectorySettings.Default("Fortnite [LIVE]", Constants._FN_LIVE_TRIGGER, ue: EGame.GAME_UE5_3);
Expand All @@ -102,9 +102,15 @@ private IEnumerable<DirectorySettings> EnumerateDetectedGames()
yield return GetSteamGame(381210, "\\DeadByDaylight\\Content\\Paks", EGame.GAME_UE4_27); // Dead By Daylight
yield return GetSteamGame(578080, "\\TslGame\\Content\\Paks", EGame.GAME_PlayerUnknownsBattlegrounds); // PUBG
yield return GetSteamGame(1172380, "\\SwGame\\Content\\Paks", EGame.GAME_StarWarsJediFallenOrder); // STAR WARS Jedi: Fallen Order™
yield return GetSteamGame(1774580, "\\SwGame\\Content\\Paks", EGame.GAME_UE4_26); // STAR WARS Jedi: Survivor™ //Can't remember what engine fallen order runs on so using this to be safe
yield return GetSteamGame(677620, "\\PortalWars\\Content\\Paks", EGame.GAME_Splitgate); // Splitgate
yield return GetSteamGame(1172620, "\\Athena\\Content\\Paks", EGame.GAME_SeaOfThieves); // Sea of Thieves
yield return GetSteamGame(1665460, "\\pak", EGame.GAME_UE4_26); // eFootball 2023
yield return GetSteamGame(1869590, "\\OmegaStrikers\\Content\\Paks", EGame.GAME_UE5_1); // Omega Strikers
yield return GetSteamGame(1869590, "\\Pavlov\\Content\\Paks", EGame.GAME_UE5_1); // Pavlov VR
yield return GetSteamGame(361420, "\\Astro\\Content\\Paks", EGame.GAME_UE4_23); // Astroneer - Should work
yield return GetSteamGame(686810, "\\HLL\\Content\\Paks", EGame.GAME_UE4_25); //Hell let loose
yield return GetSteamGame(581320, "\\Insurgency\\Content\\Paks", EGame.GAME_UE4_25);//Insurgency: Sandstorm //4.25 was latest version I could find on google.
yield return GetRockstarGamesGame("GTA III - Definitive Edition", "\\Gameface\\Content\\Paks", EGame.GAME_GTATheTrilogyDefinitiveEdition);
yield return GetRockstarGamesGame("GTA San Andreas - Definitive Edition", "\\Gameface\\Content\\Paks", EGame.GAME_GTATheTrilogyDefinitiveEdition);
yield return GetRockstarGamesGame("GTA Vice City - Definitive Edition", "\\Gameface\\Content\\Paks", EGame.GAME_GTATheTrilogyDefinitiveEdition);
Expand Down
42 changes: 42 additions & 0 deletions FModel/Views/Resources/Resources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@
<DataTrigger Binding="{Binding Header}" Value="Weapons">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/weapon.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="weapons">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/weapon.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Guns">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/weapon.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Localization">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/localization.png" />
</DataTrigger>
Expand All @@ -327,14 +333,26 @@
<DataTrigger Binding="{Binding Header}" Value="UI">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/ui.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Interface">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/ui.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Sounds">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/sound.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Audio">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/sound.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="2dAssets">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/texture.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="textures">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/texture.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Textures">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/texture.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="images">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/texture.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Engine">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/engine.png" />
Expand Down Expand Up @@ -369,12 +387,33 @@
<DataTrigger Binding="{Binding Header}" Value="SwGame">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/fallenorder.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Pavlov">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/pavlov.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Astro">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/icon_astroneer.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="HLL">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/HLL.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Insurgency">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/Insurgency.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Prospect">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/thecycle.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Materials">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/materialicon.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="materials">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/materialicon.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Mats">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/materialicon.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="mats">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/materialicon.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header, Converter={x:Static converters:CaseInsensitiveStringEqualsConverter.Instance}, ConverterParameter='Blueprints'}" Value="True">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/blueprint.png" />
</DataTrigger>
Expand All @@ -384,6 +423,9 @@
<DataTrigger Binding="{Binding Header}" Value="Movies">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/cinematics.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="CutScenes">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/cinematics.png" />
</DataTrigger>
<DataTrigger Binding="{Binding Header}" Value="Audio">
<Setter TargetName="TreeImage" Property="Source" Value="/FModel;component/Resources/sound.png" />
</DataTrigger>
Expand Down