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

fixed #169

Browse Source
This commit is contained in:
iAmAsval 2021-03-17 18:49:53 +01:00
parent 5d02d81ba1
commit af48c4393a
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FModel/Creator/Bases/BaseBundle.cs
View File

@ -79,9 +79,8 @@ namespace FModel.Creator.Bases
re.TryGetValue("ItemDefinition", out var d) && d is SoftObjectProperty itemDefinition)
{
if (!itemDefinition.Value.AssetPathName.IsNone &&
!itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Items/Tokens/") &&
!itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Athena/Items/Quests") &&
!itemDefinition.Value.AssetPathName.String.StartsWith("/BattlepassS15/Items/Tokens/"))
!itemDefinition.Value.AssetPathName.String.Contains("/Items/Tokens/") &&
!itemDefinition.Value.AssetPathName.String.Contains("/Items/Quests"))
{
CompletionRewards.Add(new CompletionReward(completionCount, quantity, itemDefinition));
}

4
FModel/Creator/Bases/BaseSeason.cs
View File

@ -64,8 +64,7 @@ namespace FModel.Creator.Bases
{
if (reward.Value is UObject o &&
o.GetExport<SoftObjectProperty>("ItemDefinition") is SoftObjectProperty itemDefinition &&
!itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Items/Tokens/") &&
!itemDefinition.Value.AssetPathName.String.StartsWith("/BattlepassS15/Items/Tokens/") &&
!itemDefinition.Value.AssetPathName.String.Contains("/Items/Tokens/") &&
o.GetExport<IntProperty>("Quantity") is IntProperty quantity)
{
BookXpSchedule[i].Add(new Reward(quantity, itemDefinition.Value));
@ -87,7 +86,6 @@ namespace FModel.Creator.Bases
{
if (reward.Value is UObject o &&
o.GetExport<SoftObjectProperty>("ItemDefinition") is SoftObjectProperty itemDefinition &&
//!itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Items/Tokens/") &&
o.GetExport<IntProperty>("Quantity") is IntProperty quantity)
{
BookXpSchedule[i].Add(new Reward(quantity, itemDefinition.Value));

1
FModel/Creator/Bundles/HeaderStyle.cs
View File

@ -96,6 +96,7 @@ namespace FModel.Creator.Bundles
break;
}
}
if (char.IsDigit(text[text.Length - 1]))
{
int s = text.Count(k => Char.IsDigit(k));

5
FModel/PakReader/Parsers/Class/USoundWave.cs
View File

@ -63,12 +63,11 @@ namespace FModel.PakReader.Parsers.Class
private void Serialize(PackageReader reader, Stream ubulk, long ubulkOffset)
{
// if UE4.25+ && Windows -> True
bStreaming = FModel.Globals.Game.Version >= EPakVersion.PATH_HASH_INDEX;
bCooked = reader.ReadInt32() != 0;
if (this.TryGetValue("bStreaming", out var v) && v is BoolProperty b)
bStreaming = b.Value;
else if (this.TryGetValue("LoadingBehavior", out var e) && e is EnumProperty loadingBehavior)
bStreaming = !loadingBehavior.Value.IsNone && loadingBehavior.Value.String != "ESoundWaveLoadingBehavior::ForceInline";
if (!bStreaming)
{

1
FModel/PakReader/Parsers/Objects/FStreamedAudioChunk.cs
View File

@ -22,7 +22,6 @@ namespace FModel.PakReader.Parsers.Objects
}
else
{
reader.Position -= 4;
throw new FileLoadException("StreamedAudioChunk must be cooked");
}
}

2
FModel/Utils/Assets.cs
View File

@ -251,7 +251,7 @@ namespace FModel.Utils
// Sound
var s = p.GetExport<USoundWave>();
if (s != null && (s.AudioFormat.String.Equals("OGG") || s.AudioFormat.String.Equals("OGG10000-1-1-1-1-1") || s.AudioFormat.String.Equals("OGG10025600-1-1-1-1-1")))
if (s != null && s.AudioFormat.String.Contains("OGG"))
{
string path = Properties.Settings.Default.OutputPath + "\\Sounds\\" + mount + entry.GetPathWithoutExtension() + ".ogg";
Directory.CreateDirectory(Path.GetDirectoryName(path));