fixed a few things

This commit is contained in:
iAmAsval 2021-01-08 20:08:19 +01:00
parent ce42936a9c
commit 37131d1885
7 changed files with 18 additions and 23 deletions

View File

@ -80,7 +80,8 @@ namespace FModel.Creator.Bases
{
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("/Game/Athena/Items/Quests") &&
!itemDefinition.Value.AssetPathName.String.StartsWith("/BattlepassS15/Items/Tokens/"))
{
CompletionRewards.Add(new CompletionReward(completionCount, quantity, itemDefinition));
}

View File

@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Windows;
using FModel.Creator.Icons;
using FModel.Creator.Rarities;
using FModel.Creator.Stats;
@ -12,9 +10,6 @@ using FModel.PakReader.Parsers.Class;
using FModel.PakReader.Parsers.PropertyTagData;
using FModel.Properties;
using FModel.Utils;
using Fortnite_API.Objects;
using Fortnite_API.Objects.V1;
using SkiaSharp;
namespace FModel.Creator.Bases

View File

@ -5,7 +5,6 @@ using SkiaSharp.HarfBuzz;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Documents;
using FModel.PakReader.Parsers.Class;
using FModel.PakReader.Parsers.PropertyTagData;
@ -66,6 +65,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/") &&
o.GetExport<IntProperty>("Quantity") is IntProperty quantity)
{
BookXpSchedule[i].Add(new Reward(quantity, itemDefinition.Value));

View File

@ -107,7 +107,7 @@ namespace FModel
}
else
{
Globals.gNotifier.ShowCustomMessage("Mappings", "Fail to reload");
Globals.gNotifier.ShowCustomMessage("Mappings", "Failed to reload");
}
}

View File

@ -8,7 +8,6 @@ using FModel.PakReader.IO;
using FModel.PakReader.Parsers.Class;
using FModel.PakReader.Parsers.Objects;
using FModel.Utils;
using UsmapNET.Classes;
namespace FModel.PakReader.Parsers
{
@ -146,7 +145,6 @@ namespace FModel.PakReader.Parsers
}
FName exportType;
if (GlobalData != null && GlobalData.ScriptObjectByGlobalId.TryGetValue(trigger, out var scriptObject))
{
exportType = scriptObject.Name;

View File

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Diagnostics;
using Newtonsoft.Json;
namespace FModel.PakReader.Parsers.Objects

View File

@ -1,6 +1,6 @@
# FModel
<img src="https://cdn.asval.tk/i/FModel.png" align="right" alt="FModel Logo" width="128" height="128">
<img src="https://fmodel.app/images/fmodel/fmodel.ico" align="right" alt="FModel Logo" width="128" height="128">
Created in March 2019, FModel is a .PAK file explorer fully dedicated to Fortnite but also work with some other Unreal Engine's games. It quickly became popular to quickly generate images of new cosmetics added to the game.
Over time, new features got added and new users discovered the program.
@ -19,30 +19,32 @@ Over time, new features got added and new users discovered the program.
Load one or several .PAK files, see assets properties, create icons for cosmetics, challenges, and much more. Built with C#, FModel is the most feature-rich software to leak on Fortnite and is 100% free.
<p align="center">
<img src="https://cdn.asval.tk/i/2020-05/OAoZxW39Jv.gif">
</p>
[![FModel Features](https://fmodel.app/images/fmodel/NsAZOdHbQU.png)](https://youtu.be/fSmWby80Tzc)
<h5 align="center">FModel Features - Quick Overview</h5>
## Features
A few of the things you can do with FModel:
* .PAK Files
- Load all
- Load one
- Load new assets
- Load modified assets
- Load new and modified assets
- Backup all assets
- Load multiple files with different keys
- Load new assets only
- Load modified assets only
- Backup all current assets
- Jump to a specific directory
* Assets
- Extract properties
- Export RAW data
- Bulk extract and export
- Search and filter them with ease
- Copy path / name
* Icons
- All BR / STW cosmetics and challenges
- 15 different languages available
- Create your own icon theme
- Merge selected icons into 1 image
- 15+ different languages available
* Audio Player
- OGG / WAV files
- OGG / WAV / ADPCM / ... files
## Installation