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

just saving before i break my VS

Browse Source
This commit is contained in:
iAmAsval 2020-10-11 22:46:50 +02:00
parent 1ed59c448f
commit aeced01cce
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
using FModel.Creator.Bundles;
using FModel.Creator.Bundles;
using FModel.Creator.Texts;
using PakReader.Parsers.Class;
using PakReader.Parsers.PropertyTagData;
@ -230,7 +230,6 @@ namespace FModel.Creator.Bases
paint.TextSize -= 2;
}
c.DrawText(text, x, 155, paint);
}
paint.Color = SKColors.White.WithAlpha(150);

18
FModel/Creator/Creator.cs
View File

@ -25,13 +25,21 @@ namespace FModel.Creator
string assetFolder = d.Parent.Name;
if (Text.TypeFaces.NeedReload(false)) Text.TypeFaces = new Typefaces(); // when opening bundle creator settings without loading paks first
int index = Globals.Game.ActualGame == EGame.Valorant || Globals.Game.ActualGame == EGame.Spellbreak ? 1 : 0;
string exportType = exportTypes.Length > index ? exportTypes[index].String : string.Empty;
int index;
{
if (Globals.Game.ActualGame == EGame.Valorant || Globals.Game.ActualGame == EGame.Spellbreak)
index = 1;
else
index = 0;
}
string exportType;
{
if (exportTypes.Length > index && exportTypes[index].String == "BlueprintGeneratedClass")
index++;
if (Globals.Game.ActualGame == EGame.Spellbreak & exportType == "BlueprintGeneratedClass"){ // there should better way to do this
index++;
exportType = exportTypes.Length > index ? exportTypes[index].String : string.Empty;
}
}
switch (exportType)
{
case "AthenaConsumableEmoteItemDefinition":

2
FModel/Creator/Texts/Text.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using FModel.Creator.Bases;
using PakReader.Pak;
using PakReader.Parsers.Class;

15
FModel/PakReader/ReaderExtensions.cs
View File

@ -1,12 +1,13 @@
using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Text;
namespace PakReader
{
static class ReaderExtensions
{
public static unsafe string ReadFString(this BinaryReader reader)
public static string ReadFString(this BinaryReader reader)
{
var SaveNum = reader.ReadInt32();
@ -24,20 +25,12 @@ namespace PakReader
SaveNum = -SaveNum;
var dataBytes = reader.ReadBytes(SaveNum * sizeof(char));
fixed (byte* pData = dataBytes)
{
return new string((char*)pData, 0, SaveNum - 1); // 1 byte is removed because of null terminator (\0)
}
return Encoding.Unicode.GetString(dataBytes, 0, dataBytes.Length - 1); // 1 byte is removed because of null terminator (\0)
}
else
{
var dataBytes = reader.ReadBytes(SaveNum);
fixed (byte* pData = dataBytes)
{
return new string((sbyte*)pData, 0, SaveNum - 1); // 1 byte is removed because of null terminator (\0)
}
return Encoding.UTF8.GetString(dataBytes, 0, dataBytes.Length - 1); // 1 byte is removed because of null terminator (\0)
}
}

2
FModel/Properties/Resources.fr-FR.resx
View File

@ -832,6 +832,6 @@ C'est maintenant le logiciel gratuit le plus utilisé pour leak sur Fortnite.</v
<value>Afficher les statistiques</value>
</data>
<data name="Fat" xml:space="preserve">
<value>Gros</value>
<value>Gras</value>
</data>
</root>