Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-30 05:35:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Manually merge e73f209e26

Browse Source
This commit is contained in:
GMatrixGames 2022-02-28 09:59:43 -05:00
parent bb0af2d790
commit c0a66fa60f
No known key found for this signature in database
GPG Key ID: 2621164AAF16CEDF
6 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
FModel/Creator/Typefaces.cs
View File

@ -248,14 +248,6 @@ namespace FModel.Creator
break;
}
case FGame.ShooterGame:
break;
case FGame.DeadByDaylight:
break;
case FGame.OakGame:
break;
case FGame.Dungeons:
break;
case FGame.g3:
{
if (viewModel.Provider.TrySaveAsset(_SPELLBREAK_BASE_PATH + _QUADRAT_BOLD + _EXT, out data))
@ -274,18 +266,6 @@ namespace FModel.Creator
break;
}
case FGame.StateOfDecay2:
break;
case FGame.Prospect:
break;
case FGame.Indiana:
break;
case FGame.RogueCompany:
break;
case FGame.SwGame:
break;
case FGame.Platform:
break;
}
}

4
FModel/Enums.cs
View File

@ -89,7 +89,9 @@ namespace FModel
[Description("Splitgate")]
PortalWars,
[Description("GTA: The Trilogy - Definitive Edition")]
Gameface
Gameface,
[Description("Sea of Thieves")]
Athena
}
public enum ELoadingMode

15
FModel/Settings/UserSettings.cs
View File

@ -278,7 +278,8 @@ namespace FModel.Settings
{FGame.BendGame, Constants._NO_PRESET_TRIGGER},
{FGame.TslGame, Constants._NO_PRESET_TRIGGER},
{FGame.PortalWars, Constants._NO_PRESET_TRIGGER},
{FGame.Gameface, Constants._NO_PRESET_TRIGGER}
{FGame.Gameface, Constants._NO_PRESET_TRIGGER},
{FGame.Athena, Constants._NO_PRESET_TRIGGER}
};
public IDictionary<FGame, string> Presets
{
@ -305,7 +306,8 @@ namespace FModel.Settings
{FGame.BendGame, EGame.GAME_UE4_11},
{FGame.TslGame, EGame.GAME_PlayerUnknownsBattlegrounds},
{FGame.PortalWars, EGame.GAME_UE4_LATEST},
{FGame.Gameface, EGame.GAME_GTATheTrilogyDefinitiveEdition}
{FGame.Gameface, EGame.GAME_GTATheTrilogyDefinitiveEdition},
{FGame.Athena, EGame.GAME_SeaOfThieves}
};
public IDictionary<FGame, EGame> OverridedGame
{
@ -332,7 +334,8 @@ namespace FModel.Settings
{FGame.BendGame, null},
{FGame.TslGame, null},
{FGame.PortalWars, null},
{FGame.Gameface, null}
{FGame.Gameface, null},
{FGame.Athena, null}
};
public IDictionary<FGame, List<FCustomVersion>> OverridedCustomVersions
{
@ -359,7 +362,8 @@ namespace FModel.Settings
{FGame.BendGame, null},
{FGame.TslGame, null},
{FGame.PortalWars, null},
{FGame.Gameface, null}
{FGame.Gameface, null},
{FGame.Athena, null}
};
public IDictionary<FGame, Dictionary<string, bool>> OverridedOptions
{
@ -433,7 +437,8 @@ namespace FModel.Settings
{FGame.BendGame, new List<CustomDirectory>()},
{FGame.TslGame, new List<CustomDirectory>()},
{FGame.PortalWars, new List<CustomDirectory>()},
{FGame.Gameface, new List<CustomDirectory>()}
{FGame.Gameface, new List<CustomDirectory>()},
{FGame.Athena, new List<CustomDirectory>()}
};
public IDictionary<FGame, IList<CustomDirectory>> CustomDirectories
{

19
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@ -513,10 +513,16 @@ namespace FModel.ViewModels
}
break;
}
case "upluginmanifest":
case "uproject":
case "manifest":
case "uplugin":
case "archive":
case "html":
case "json":
case "ini":
case "txt":
case "log":
case "po":
case "bat":
case "dat":
case "cfg":
@ -524,14 +530,11 @@ namespace FModel.ViewModels
case "ipl":
case "zon":
case "xml":
case "h":
case "uproject":
case "uplugin":
case "upluginmanifest":
case "css":
case "csv":
case "json":
case "archive":
case "manifest":
case "js":
case "po":
case "h":
{
if (Provider.TrySaveAsset(fullPath, out var data))
{

1
FModel/ViewModels/GameSelectorViewModel.cs
View File

@ -115,6 +115,7 @@ namespace FModel.ViewModels
yield return GetSteamGame(381210, "\\DeadByDaylight\\Content\\Paks"); // Dead By Daylight
yield return GetSteamGame(578080, "\\TslGame\\Content\\Paks"); // PUBG
yield return GetSteamGame(677620, "\\PortalWars\\Content\\Paks"); // Splitgate
yield return GetSteamGame(1172620, "\\Athena\\Content\\Paks"); // Sea of Thieves
yield return GetRockstarGamesGame("GTA III - Definitive Edition", "\\Gameface\\Content\\Paks");
yield return GetRockstarGamesGame("GTA San Andreas - Definitive Edition", "\\Gameface\\Content\\Paks");
yield return GetRockstarGamesGame("GTA Vice City - Definitive Edition", "\\Gameface\\Content\\Paks");

1
FModel/Views/Resources/Converters/StringToGameConverter.cs
View File

@ -28,6 +28,7 @@ namespace FModel.Views.Resources.Converters
381210 => "Dead By Daylight",
578080 => "PLAYERUNKNOWN'S BATTLEGROUNDS",
677620 => "Splitgate",
1172620 => "Sea of Thieves",
_ => value,
};
}